Merge branch 'master' into 1.1

[meshlink] / src / net.c

diff --git a/src/net.c b/src/net.c
index a4bff6d99fe4c0bd8ca6b9f7af115fb4d6fe3953..8ee782145cbd9b28a5d12734b50022db2dffd7ce 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,7 @@
 /*
     net.c -- most of the network code
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 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
@@ -41,7 +41,7 @@
 
 /* Purge edges and subnets of unreachable nodes. Use carefully. */
 
-static void purge(void) {
+void purge(void) {
        splay_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
        node_t *n;
        edge_t *e;
@@ -203,7 +203,7 @@ static void timeout_handler(int fd, short events, void *event) {
 void handle_meta_connection_data(int fd, short events, void *data) {
        connection_t *c = data;
        int result;
-       socklen_t len = sizeof(result);
+       socklen_t len = sizeof result;
 
        if(c->status.connecting) {
                c->status.connecting = false;
@@ -233,51 +233,17 @@ static void sigterm_handler(int signal, short events, void *data) {
        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();
-}
-
-static void sigwinch_handler(int signal, short events, void *data) {
+static void sighup_handler(int signal, short events, void *data) {
        logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
-       purge();
+       reload_configuration();
 }
 
-static void sighup_handler(int signal, short events, void *data) {
+int reload_configuration(void) {
        connection_t *c;
        splay_node_t *node, *next;
        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 */
 
@@ -287,7 +253,7 @@ static void sighup_handler(int signal, short events, void *data) {
        if(!read_server_config()) {
                logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
                event_loopexit(NULL);
-               return;
+               return EINVAL;
        }
 
        /* Close connections to hosts that have a changed or deleted host config file */
@@ -315,11 +281,11 @@ static void sighup_handler(int signal, short events, void *data) {
        /* Try to make outgoing connections */
        
        try_outgoing_connections();
-}
 
-static void sigalrm_handler(int signal, short events, void *data) {
-       logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+       return 0;
+}
 
+void retry(void) {
        connection_t *c;
        splay_node_t *node;
 
@@ -343,13 +309,8 @@ static void sigalrm_handler(int signal, short events, void *data) {
 int main_loop(void) {
        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();
 
@@ -357,20 +318,10 @@ int main_loop(void) {
        event_add(&timeout_event, &(struct timeval){pingtimeout, 0});
        signal_set(&sighup_event, SIGHUP, sighup_handler, NULL);
        signal_add(&sighup_event, NULL);
-       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));
@@ -378,13 +329,8 @@ int main_loop(void) {
        }
 
        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;