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 ac4b767ea5d10d50672a39df51f7667c4db2b552..116e139eebc98c686652bb62e8b4d0095b3a525e 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -29,6 +29,8 @@
 #include "xalloc.h"
 
 bool tunnelserver = false;
+bool strictsubnets = false;
+bool experimental = false;
 
 /* Jumptable for the request handlers */
 
@@ -38,7 +40,7 @@ static bool (*request_handlers[])(connection_t *, char *) = {
                ping_h, pong_h,
                add_subnet_h, del_subnet_h,
                add_edge_h, del_edge_h,
-               key_changed_h, req_key_h, ans_key_h, tcppacket_h,
+               key_changed_h, req_key_h, ans_key_h, tcppacket_h, control_h,
 };
 
 /* Request names */
@@ -48,7 +50,7 @@ static char (*request_name[]) = {
                "STATUS", "ERROR", "TERMREQ",
                "PING", "PONG",
                "ADD_SUBNET", "DEL_SUBNET",
-               "ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET",
+               "ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET", "CONTROL",
 };
 
 static splay_tree_t *past_request_tree;
@@ -94,7 +96,7 @@ bool send_request(connection_t *c, const char *format, ...) {
 
        request[len++] = '\n';
 
-       if(c == broadcast) {
+       if(c == everyone) {
                broadcast_meta(NULL, request, len);
                return true;
        } else
@@ -102,6 +104,7 @@ bool send_request(connection_t *c, const char *format, ...) {
 }
 
 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",
@@ -112,7 +115,7 @@ void forward_request(connection_t *from, char *request) {
        }
 
        int len = strlen(request);
-       request[len] = '\n';
+       request[len++] = '\n';
        broadcast_meta(from, request, len);
 }
 
@@ -176,7 +179,7 @@ static void free_past_request(past_request_t *r) {
 static struct event past_request_event;
 
 bool seen_request(char *request) {
-       past_request_t *new, p = {0};
+       past_request_t *new, p = {NULL};
 
        p.request = request;
 
@@ -193,7 +196,7 @@ bool seen_request(char *request) {
        }
 }
 
-void age_past_requests(int fd, short events, void *data) {
+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;
@@ -203,7 +206,7 @@ void age_past_requests(int fd, short events, void *data) {
                next = node->next;
                p = node->data;
 
-               if(p->firstseen + pinginterval < now)
+               if(p->firstseen + pinginterval <= now)
                        splay_delete_node(past_request_tree, node), deleted++;
                else
                        left++;
@@ -226,5 +229,6 @@ void init_requests(void) {
 void exit_requests(void) {
        splay_delete_tree(past_request_tree);
 
-       event_del(&past_request_event);
+       if(timeout_initialized(&past_request_event))
+               event_del(&past_request_event);
 }