Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[meshlink] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index 650c512951ad4ad957942515d616ec50ab1a1378..1c5b6cfd9c1d43dba0c6a2e21defabdb4c431209 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
@@ -30,10 +30,11 @@
 
 bool tunnelserver = false;
 bool strictsubnets = false;
+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,
@@ -79,85 +80,71 @@ bool send_request(connection_t *c, const char *format, ...) {
        va_end(args);
 
        if(len < 0 || len > MAXBUFSIZE - 1) {
-               logger(LOG_ERR, "Output buffer overflow while sending request to %s (%s)",
+               logger(DEBUG_ALWAYS, LOG_ERR, "Output buffer overflow while sending request to %s (%s)",
                           c->name, c->hostname);
                return false;
        }
 
-       ifdebug(PROTOCOL) {
-               ifdebug(META)
-                       logger(LOG_DEBUG, "Sending %s to %s (%s): %s",
-                                  request_name[atoi(request)], c->name, c->hostname, request);
-               else
-                       logger(LOG_DEBUG, "Sending %s to %s (%s)", request_name[atoi(request)],
-                                  c->name, c->hostname);
-       }
+       logger(DEBUG_META, LOG_DEBUG, "Sending %s to %s (%s): %s", request_name[atoi(request)], c->name, c->hostname, request);
 
        request[len++] = '\n';
 
-       if(c == broadcast) {
+       if(c == everyone) {
                broadcast_meta(NULL, request, len);
                return true;
        } else
                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! */
-       ifdebug(PROTOCOL) {
-               ifdebug(META)
-                       logger(LOG_DEBUG, "Forwarding %s from %s (%s): %s",
-                                  request_name[atoi(request)], from->name, from->hostname, request);
-               else
-                       logger(LOG_DEBUG, "Forwarding %s from %s (%s)",
-                                  request_name[atoi(request)], from->name, from->hostname);
-       }
+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(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') {
                if((reqno < 0) || (reqno >= LAST) || !request_handlers[reqno]) {
-                       ifdebug(META)
-                               logger(LOG_DEBUG, "Unknown request from %s (%s): %s",
-                                          c->name, c->hostname, request);
-                       else
-                               logger(LOG_ERR, "Unknown request from %s (%s)",
-                                          c->name, c->hostname);
-
+                       logger(DEBUG_META, LOG_DEBUG, "Unknown request from %s (%s): %s", c->name, c->hostname, request);
                        return false;
                } else {
-                       ifdebug(PROTOCOL) {
-                               ifdebug(META)
-                                       logger(LOG_DEBUG, "Got %s from %s (%s): %s",
-                                                  request_name[reqno], c->name, c->hostname, request);
-                               else
-                                       logger(LOG_DEBUG, "Got %s from %s (%s)",
-                                                  request_name[reqno], c->name, c->hostname);
-                       }
+                       logger(DEBUG_META, LOG_DEBUG, "Got %s from %s (%s): %s", request_name[reqno], c->name, c->hostname, request);
                }
 
                if((c->allow_request != ALL) && (c->allow_request != reqno)) {
-                       logger(LOG_ERR, "Unauthorized request from %s (%s)", c->name,
-                                  c->hostname);
+                       logger(DEBUG_ALWAYS, LOG_ERR, "Unauthorized request from %s (%s)", c->name, c->hostname);
                        return false;
                }
 
                if(!request_handlers[reqno](c, request)) {
                        /* Something went wrong. Probably scriptkiddies. Terminate. */
 
-                       logger(LOG_ERR, "Error while processing %s from %s (%s)",
-                                  request_name[reqno], c->name, c->hostname);
+                       logger(DEBUG_ALWAYS, LOG_ERR, "Error while processing %s from %s (%s)", request_name[reqno], c->name, c->hostname);
                        return false;
                }
        } else {
-               logger(LOG_ERR, "Bogus data received from %s (%s)",
-                          c->name, c->hostname);
+               logger(DEBUG_ALWAYS, LOG_ERR, "Bogus data received from %s (%s)", c->name, c->hostname);
                return false;
        }
 
@@ -170,20 +157,20 @@ 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;
 
-bool seen_request(char *request) {
+bool seen_request(const char *request) {
        past_request_t *new, p = {NULL};
 
        p.request = request;
 
        if(splay_search(past_request_tree, &p)) {
-               ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Already seen request");
+               logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Already seen request");
                return true;
        } else {
                new = xmalloc(sizeof *new);
@@ -212,7 +199,7 @@ static void age_past_requests(int fd, short events, void *data) {
        }
 
        if(left || deleted)
-               ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Aging past requests: deleted %d, left %d",
+               logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Aging past requests: deleted %d, left %d",
                           deleted, left);
 
        if(left)