Allow log messages to be captured by tincctl.

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index ff08b3e..10a2d20 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -49,7 +49,7 @@ void purge(void) {
        edge_t *e;
        subnet_t *s;
 
-       ifdebug(PROTOCOL) logger(LOG_DEBUG, "Purging unreachable nodes");
+       logger(DEBUG_PROTOCOL, LOG_DEBUG, "Purging unreachable nodes");
 
        /* Remove all edges and subnets owned by unreachable nodes. */
 
@@ -58,13 +58,12 @@ void purge(void) {
                n = nnode->data;
 
                if(!n->status.reachable) {
-                       ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Purging node %s (%s)", n->name,
-                                          n->hostname);
+                       logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Purging node %s (%s)", n->name, n->hostname);
 
                        for(snode = n->subnet_tree->head; snode; snode = snext) {
                                snext = snode->next;
                                s = snode->data;
-                               send_del_subnet(broadcast, s);
+                               send_del_subnet(everyone, s);
                                if(!strictsubnets)
                                        subnet_del(n, s);
                        }
@@ -73,7 +72,7 @@ void purge(void) {
                                enext = enode->next;
                                e = enode->data;
                                if(!tunnelserver)
-                                       send_del_edge(broadcast, e);
+                                       send_del_edge(everyone, e);
                                edge_del(e);
                        }
                }
@@ -109,7 +108,7 @@ void purge(void) {
   - Deactivate the host
 */
 void terminate_connection(connection_t *c, bool report) {
-       ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Closing connection with %s (%s)",
+       logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Closing connection with %s (%s)",
                           c->name, c->hostname);
 
        c->status.active = false;
@@ -119,7 +118,7 @@ void terminate_connection(connection_t *c, bool report) {
 
        if(c->edge) {
                if(report && !tunnelserver)
-                       send_del_edge(broadcast, c->edge);
+                       send_del_edge(everyone, c->edge);
 
                edge_del(c->edge);
 
@@ -134,7 +133,7 @@ void terminate_connection(connection_t *c, bool report) {
                        e = lookup_edge(c->node, myself);
                        if(e) {
                                if(!tunnelserver)
-                                       send_del_edge(broadcast, e);
+                                       send_del_edge(everyone, e);
                                edge_del(e);
                        }
                }
@@ -165,10 +164,13 @@ static void timeout_handler(int fd, short events, void *event) {
                next = node->next;
                c = node->data;
 
+               if(c->status.control)
+                       continue;
+
                if(c->last_ping_time + pingtimeout <= now) {
                        if(c->status.active) {
                                if(c->status.pinged) {
-                                       ifdebug(CONNECTIONS) logger(LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds",
+                                       logger(DEBUG_CONNECTIONS, LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds",
                                                           c->name, c->hostname, now - c->last_ping_time);
                                        terminate_connection(c, true);
                                        continue;
@@ -177,13 +179,12 @@ static void timeout_handler(int fd, short events, void *event) {
                                }
                        } else {
                                if(c->status.connecting) {
-                                       ifdebug(CONNECTIONS)
-                                               logger(LOG_WARNING, "Timeout while connecting to %s (%s)", c->name, c->hostname);
+                                       logger(DEBUG_CONNECTIONS, LOG_WARNING, "Timeout while connecting to %s (%s)", c->name, c->hostname);
                                        c->status.connecting = false;
                                        closesocket(c->socket);
                                        do_outgoing_connection(c);
                                } else {
-                                       ifdebug(CONNECTIONS) logger(LOG_WARNING, "Timeout from %s (%s) during authentication", c->name, c->hostname);
+                                       logger(DEBUG_CONNECTIONS, LOG_WARNING, "Timeout from %s (%s) during authentication", c->name, c->hostname);
                                        terminate_connection(c, false);
                                        continue;
                                }
@@ -192,8 +193,8 @@ static void timeout_handler(int fd, short events, void *event) {
        }
 
        if(contradicting_del_edge > 100 && contradicting_add_edge > 100) {
-               logger(LOG_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", sleeptime);
-               sleep(sleeptime);
+               logger(DEBUG_ALWAYS, LOG_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", sleeptime);
+               usleep(sleeptime * 1000000LL);
                sleeptime *= 2;
                if(sleeptime < 0)
                        sleeptime = 3600;
@@ -222,7 +223,7 @@ void handle_meta_connection_data(int fd, short events, void *data) {
                if(!result)
                        finish_connecting(c);
                else {
-                       ifdebug(CONNECTIONS) logger(LOG_DEBUG,
+                       logger(DEBUG_CONNECTIONS, LOG_DEBUG,
                                           "Error while connecting to %s (%s): %s",
                                           c->name, c->hostname, sockstrerror(result));
                        closesocket(c->socket);
@@ -238,18 +239,18 @@ void handle_meta_connection_data(int fd, short events, void *data) {
 }
 
 static void sigterm_handler(int signal, short events, void *data) {
-       logger(LOG_NOTICE, "Got %s signal", strsignal(signal));
+       logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(signal));
        event_loopexit(NULL);
 }
 
 static void sighup_handler(int signal, short events, void *data) {
-       logger(LOG_NOTICE, "Got %s signal", strsignal(signal));
+       logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(signal));
        reopenlogger();
        reload_configuration();
 }
 
 static void sigalrm_handler(int signal, short events, void *data) {
-       logger(LOG_NOTICE, "Got %s signal", strsignal(signal));
+       logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(signal));
        retry();
 }
 
@@ -266,7 +267,7 @@ int reload_configuration(void) {
        init_configuration(&config_tree);
 
        if(!read_server_config()) {
-               logger(LOG_ERR, "Unable to reread configuration file, exitting.");
+               logger(DEBUG_ALWAYS, LOG_ERR, "Unable to reread configuration file, exitting.");
                event_loopexit(NULL);
                return EINVAL;
        }
@@ -276,6 +277,9 @@ int reload_configuration(void) {
        for(node = connection_tree->head; node; node = next) {
                c = node->data;
                next = node->next;
+
+               if(c->status.control)
+                       continue;
                
                if(c->outgoing) {
                        free(c->outgoing->name);
@@ -310,14 +314,14 @@ int reload_configuration(void) {
                        next = node->next;
                        subnet = node->data;
                        if(subnet->expires == 1) {
-                               send_del_subnet(broadcast, subnet);
+                               send_del_subnet(everyone, subnet);
                                if(subnet->owner->status.reachable)
                                        subnet_update(subnet->owner, subnet, false);
                                subnet_del(subnet->owner, subnet);
                        } else if(subnet->expires == -1) {
                                subnet->expires = 0;
                        } else {
-                               send_add_subnet(broadcast, subnet);
+                               send_add_subnet(everyone, subnet);
                                if(subnet->owner->status.reachable)
                                        subnet_update(subnet->owner, subnet, true);
                        }
@@ -375,7 +379,7 @@ int main_loop(void) {
 #endif
 
        if(event_loop(0) < 0) {
-               logger(LOG_ERR, "Error while waiting for input: %s", strerror(errno));
+               logger(DEBUG_ALWAYS, LOG_ERR, "Error while waiting for input: %s", strerror(errno));
                return 1;
        }