Don't send proxy requests for incoming connections.

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index 8b62916..fc16ffe 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -1,7 +1,7 @@
 /*
     protocol.c -- handle the meta-protocol, basic functions
     Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ bool experimental = false;
 
 /* Jumptable for the request handlers */
 
-static bool (*request_handlers[])(connection_t *, char *) = {
+static bool (*request_handlers[])(connection_t *, const char *) = {
                id_h, metakey_h, challenge_h, chal_reply_h, ack_h,
                status_h, error_h, termreq_h,
                ping_h, pong_h,
@@ -56,6 +56,9 @@ static char (*request_name[]) = {
 static splay_tree_t *past_request_tree;
 
 bool check_id(const char *id) {
+       if(!id || !*id)
+               return false;
+
        for(; *id; id++)
                if(!isalnum(*id) && *id != '_')
                        return false;
@@ -96,16 +99,32 @@ bool send_request(connection_t *c, const char *format, ...) {
                return send_meta(c, request, len);
 }
 
-void forward_request(connection_t *from, char *request) {
-       /* Note: request is not zero terminated anymore after a call to this function! */
+void forward_request(connection_t *from, const char *request) {
        logger(DEBUG_META, LOG_DEBUG, "Forwarding %s from %s (%s): %s", request_name[atoi(request)], from->name, from->hostname, request);
 
+       // Create a temporary newline-terminated copy of the request
        int len = strlen(request);
-       request[len++] = '\n';
-       broadcast_meta(from, request, len);
+       char tmp[len + 1];
+       memcpy(tmp, request, len);
+       tmp[len] = '\n';
+       broadcast_meta(from, tmp, sizeof tmp);
 }
 
-bool receive_request(connection_t *c, char *request) {
+bool receive_request(connection_t *c, const char *request) {
+       if(c->outgoing && proxytype == PROXY_HTTP && c->allow_request == ID) {
+               if(!request[0] || request[0] == '\r')
+                       return true;
+               if(!strncasecmp(request, "HTTP/1.1 ", 9)) {
+                       if(!strncmp(request + 9, "200", 3)) {
+                               logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request granted");
+                               return true;
+                       } else {
+                               logger(DEBUG_ALWAYS, LOG_DEBUG, "Proxy request rejected: %s", request + 9);
+                               return false;
+                       }
+               }
+       }
+
        int reqno = atoi(request);
 
        if(reqno || *request == '0') {
@@ -141,14 +160,31 @@ static int past_request_compare(const past_request_t *a, const past_request_t *b
 
 static void free_past_request(past_request_t *r) {
        if(r->request)
-               free(r->request);
+               free((char *)r->request);
 
        free(r);
 }
 
-static struct event past_request_event;
+static timeout_t past_request_timeout;
+
+static void age_past_requests(void *data) {
+       int left = 0, deleted = 0;
+
+       for splay_each(past_request_t, p, past_request_tree) {
+               if(p->firstseen + pinginterval <= now.tv_sec)
+                       splay_delete_node(past_request_tree, node), deleted++;
+               else
+                       left++;
+       }
+
+       if(left || deleted)
+               logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Aging past requests: deleted %d, left %d", deleted, left);
+
+       if(left)
+               timeout_set(&past_request_timeout, &(struct timeval){10, rand() % 100000});
+}
 
-bool seen_request(char *request) {
+bool seen_request(const char *request) {
        past_request_t *new, p = {NULL};
 
        p.request = request;
@@ -161,44 +197,17 @@ bool seen_request(char *request) {
                new->request = xstrdup(request);
                new->firstseen = time(NULL);
                splay_insert(past_request_tree, new);
-               event_add(&past_request_event, &(struct timeval){10, 0});
+               timeout_add(&past_request_timeout, age_past_requests, NULL, &(struct timeval){10, rand() % 100000});
                return false;
        }
 }
 
-static void age_past_requests(int fd, short events, void *data) {
-       splay_node_t *node, *next;
-       past_request_t *p;
-       int left = 0, deleted = 0;
-       time_t now = time(NULL);
-
-       for(node = past_request_tree->head; node; node = next) {
-               next = node->next;
-               p = node->data;
-
-               if(p->firstseen + pinginterval <= now)
-                       splay_delete_node(past_request_tree, node), deleted++;
-               else
-                       left++;
-       }
-
-       if(left || deleted)
-               logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Aging past requests: deleted %d, left %d",
-                          deleted, left);
-
-       if(left)
-               event_add(&past_request_event, &(struct timeval){10, 0});
-}
-
 void init_requests(void) {
        past_request_tree = splay_alloc_tree((splay_compare_t) past_request_compare, (splay_action_t) free_past_request);
-
-       timeout_set(&past_request_event, age_past_requests, NULL);
 }
 
 void exit_requests(void) {
        splay_delete_tree(past_request_tree);
 
-       if(timeout_initialized(&past_request_event))
-               event_del(&past_request_event);
+       timeout_del(&past_request_timeout);
 }