K&R style braces
[tinc] / src / net.c
index f9f6bd0..33d90da 100644 (file)
--- a/src/net.c
+++ b/src/net.c
 #include "netutl.h"
 #include "process.h"
 #include "protocol.h"
-#include "route.h"
 #include "subnet.h"
 #include "xalloc.h"
 
-bool do_purge = false;
-volatile bool running = false;
-
-time_t now = 0;
-
 /* Purge edges and subnets of unreachable nodes. Use carefully. */
 
-static void purge(void)
-{
+static void purge(void) {
        avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
        node_t *n;
        edge_t *e;
@@ -111,8 +104,7 @@ static void purge(void)
   put all file descriptors into events
   While we're at it, purge stuf that needs to be removed.
 */
-static int build_fdset(void)
-{
+static int build_fdset(void) {
        avl_node_t *node, *next;
        connection_t *c;
        int i, max = 0;
@@ -140,8 +132,7 @@ static int build_fdset(void)
   - Check if we need to retry making an outgoing connection
   - Deactivate the host
 */
-void terminate_connection(connection_t *c, bool report)
-{
+void terminate_connection(connection_t *c, bool report) {
        cp();
 
        if(c->status.remove)
@@ -206,10 +197,10 @@ void terminate_connection(connection_t *c, bool report)
   end does not reply in time, we consider them dead
   and close the connection.
 */
-static void check_dead_connections(void)
-{
+static void timeout_handler(int fd, short events, void *event) {
        avl_node_t *node, *next;
        connection_t *c;
+       time_t now = time(NULL);
 
        cp();
 
@@ -245,21 +236,12 @@ static void check_dead_connections(void)
                                }
                        }
                }
-
-               if(c->outbuflen > 0 && c->last_flushed_time + pingtimeout < now) {
-                       if(c->status.active) {
-                               ifdebug(CONNECTIONS) logger(LOG_INFO,
-                                               _("%s (%s) could not flush for %ld seconds (%d bytes remaining)"),
-                                               c->name, c->hostname, now - c->last_flushed_time, c->outbuflen);
-                               c->status.timeout = true;
-                               terminate_connection(c, true);
-                       }
-               }
        }
+
+       event_add(event, &(struct timeval){pingtimeout, 0});
 }
 
-void handle_meta_connection_data(int fd, short events, void *data)
-{
+void handle_meta_connection_data(int fd, short events, void *data) {
        connection_t *c = data;
        int result;
        socklen_t len = sizeof(result);
@@ -268,7 +250,6 @@ void handle_meta_connection_data(int fd, short events, void *data)
                return;
 
        if(c->status.connecting) {
-               c->status.connecting = false;
                getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
 
                if(!result)
@@ -277,6 +258,7 @@ void handle_meta_connection_data(int fd, short events, void *data)
                        ifdebug(CONNECTIONS) logger(LOG_DEBUG,
                                           _("Error while connecting to %s (%s): %s"),
                                           c->name, c->hostname, strerror(result));
+                       c->status.connecting = false;
                        closesocket(c->socket);
                        do_outgoing_connection(c);
                        return;
@@ -289,17 +271,57 @@ void handle_meta_connection_data(int fd, short events, void *data)
        }
 }
 
-static void dummy(int a, short b, void *c)
-{
+static void sigterm_handler(int signal, short events, void *data) {
+       logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+       event_loopexit(NULL);
+}
+
+static void sigint_handler(int signal, short events, void *data) {
+       static int saved_debug_level = -1;
+
+       logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+
+       if(saved_debug_level != -1) {
+               logger(LOG_NOTICE, _("Reverting to old debug level (%d)"),
+                       saved_debug_level);
+               debug_level = saved_debug_level;
+               saved_debug_level = -1;
+       } else {
+               logger(LOG_NOTICE,
+                       _("Temporarily setting debug level to 5.  Kill me with SIGINT again to go back to level %d."),
+                       debug_level);
+               saved_debug_level = debug_level;
+               debug_level = 5;
+       }
+}
+
+static void sigusr1_handler(int signal, short events, void *data) {
+       logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+       dump_connections();
+}
+
+static void sigusr2_handler(int signal, short events, void *data) {
+       logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+       dump_device_stats();
+       dump_nodes();
+       dump_edges();
+       dump_subnets();
 }
 
-void sighup_handler(int signal, short events, void *data) {
+static void sigwinch_handler(int signal, short events, void *data) {
+       logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+       purge();
+}
+
+static void sighup_handler(int signal, short events, void *data) {
        connection_t *c;
        avl_node_t *node;
        char *fname;
        struct stat s;
        static time_t last_config_check = 0;
        
+       logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+
        /* Reread our own configuration file */
 
        exit_configuration(&config_tree);
@@ -337,97 +359,77 @@ void sighup_handler(int signal, short events, void *data) {
        try_outgoing_connections();
 }
 
+static void sigalrm_handler(int signal, short events, void *data) {
+       logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+
+       connection_t *c;
+       avl_node_t *node;
+
+       for(node = connection_tree->head; node; node = node->next) {
+               c = node->data;
+               
+               if(c->outgoing && !c->node) {
+                       if(timeout_initialized(&c->outgoing->ev))
+                               event_del(&c->outgoing->ev);
+                       if(c->status.connecting)
+                               close(c->socket);
+                       c->outgoing->timeout = 0;
+                       do_outgoing_connection(c);
+               }
+       }
+}
+
 /*
   this is where it all happens...
 */
-int main_loop(void)
-{
+int main_loop(void) {
        struct timeval tv;
        int r;
-       time_t last_ping_check;
-       struct event timeout;
+       struct event timeout_event;
        struct event sighup_event;
+       struct event sigint_event;
+       struct event sigterm_event;
+       struct event sigquit_event;
+       struct event sigusr1_event;
+       struct event sigusr2_event;
+       struct event sigwinch_event;
+       struct event sigalrm_event;
 
        cp();
 
+       timeout_set(&timeout_event, timeout_handler, &timeout_event);
+       event_add(&timeout_event, &(struct timeval){pingtimeout, 0});
        signal_set(&sighup_event, SIGHUP, sighup_handler, NULL);
        signal_add(&sighup_event, NULL);
-
-       last_ping_check = now;
-       
-       srand(now);
-
-       running = true;
-
-       while(running) {
-               now = time(NULL);
-
-       //      tv.tv_sec = 1 + (rand() & 7);   /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
-               tv.tv_sec = 1;
-               tv.tv_usec = 0;
-
-               /* XXX: libevent transition: old timeout code in this loop */
-               timeout_set(&timeout, dummy, NULL);
-               timeout_add(&timeout, &tv);
-
-               r = build_fdset();
-               if(r < 0) {
-                       logger(LOG_ERR, _("Error building fdset: %s"), strerror(errno));
-                       cp_trace();
-                       dump_connections();
-                       return 1;
-               }
-
-               r = event_loop(EVLOOP_ONCE);
-               now = time(NULL);
-               if(r < 0) {
-                       logger(LOG_ERR, _("Error while waiting for input: %s"),
-                                  strerror(errno));
-                       cp_trace();
-                       dump_connections();
-                       return 1;
-               }
-
-               /* XXX: more libevent transition */
-               timeout_del(&timeout);
-
-               if(do_purge) {
-                       purge();
-                       do_purge = false;
-               }
-
-               /* Let's check if everybody is still alive */
-
-               if(last_ping_check + pingtimeout < now) {
-                       check_dead_connections();
-                       last_ping_check = now;
-
-                       if(routing_mode == RMODE_SWITCH)
-                               age_subnets();
-
-                       age_past_requests();
-
-                       /* Should we regenerate our key? */
-
-                       if(keyexpires < now) {
-                               ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
-
-                               RAND_pseudo_bytes((unsigned char *)myself->key, myself->keylength);
-                               if(myself->cipher)
-                                       EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, (unsigned char *)myself->key, (unsigned char *)myself->key + myself->cipher->key_len);
-                               send_key_changed(broadcast, myself);
-                               keyexpires = now + keylifetime;
-                       }
-               }
-
-               if(sigalrm) {
-                       logger(LOG_INFO, _("Flushing event queue"));
-                       // TODO: do this another way
-                       sigalrm = false;
-               }
+       signal_set(&sigint_event, SIGINT, sigint_handler, NULL);
+       signal_add(&sigint_event, NULL);
+       signal_set(&sigterm_event, SIGTERM, sigterm_handler, NULL);
+       signal_add(&sigterm_event, NULL);
+       signal_set(&sigquit_event, SIGQUIT, sigterm_handler, NULL);
+       signal_add(&sigquit_event, NULL);
+       signal_set(&sigusr1_event, SIGUSR1, sigusr1_handler, NULL);
+       signal_add(&sigusr1_event, NULL);
+       signal_set(&sigusr2_event, SIGUSR2, sigusr2_handler, NULL);
+       signal_add(&sigusr2_event, NULL);
+       signal_set(&sigwinch_event, SIGWINCH, sigwinch_handler, NULL);
+       signal_add(&sigwinch_event, NULL);
+       signal_set(&sigalrm_event, SIGALRM, sigalrm_handler, NULL);
+       signal_add(&sigalrm_event, NULL);
+
+       if(event_loop(0) < 0) {
+               logger(LOG_ERR, _("Error while waiting for input: %s"), strerror(errno));
+               return 1;
        }
 
        signal_del(&sighup_event);
+       signal_del(&sigint_event);
+       signal_del(&sigterm_event);
+       signal_del(&sigquit_event);
+       signal_del(&sigusr1_event);
+       signal_del(&sigusr2_event);
+       signal_del(&sigwinch_event);
+       signal_del(&sigalrm_event);
+       event_del(&timeout_event);
 
        return 0;
 }