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 fd908949b6fa13bb6ab49a7640169504680ed338..116e139eebc98c686652bb62e8b4d0095b3a525e 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -30,6 +30,7 @@
 
 bool tunnelserver = false;
 bool strictsubnets = false;
+bool experimental = false;
 
 /* Jumptable for the request handlers */
 
@@ -95,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
@@ -205,7 +206,7 @@ static 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++;