Purge through the control socket

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index 2c7cc55..9d4a0a2 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -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;
@@ -121,8 +121,6 @@ void terminate_connection(connection_t *c, bool report) {
        if(c->socket)
                closesocket(c->socket);
 
-       event_del(&c->ev);
-
        if(c->edge) {
                if(report && !tunnelserver)
                        send_del_edge(broadcast, c->edge);
@@ -146,12 +144,6 @@ void terminate_connection(connection_t *c, bool report) {
                }
        }
 
-       free(c->outbuf);
-       c->outbuf = NULL;
-       c->outbuflen = 0;
-       c->outbufsize = 0;
-       c->outbufstart = 0;
-
        /* Check if this was our outgoing connection */
 
        if(c->outgoing)
@@ -260,27 +252,9 @@ static void sigint_handler(int signal, short events, void *data) {
        }
 }
 
-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) {
-       logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
-       purge();
-}
-
 static void sighup_handler(int signal, short events, void *data) {
        connection_t *c;
-       splay_node_t *node;
+       splay_node_t *node, *next;
        char *fname;
        struct stat s;
        static time_t last_config_check = 0;
@@ -300,8 +274,9 @@ static void sighup_handler(int signal, short events, void *data) {
 
        /* Close connections to hosts that have a changed or deleted host config file */
        
-       for(node = connection_tree->head; node; node = node->next) {
+       for(node = connection_tree->head; node; node = next) {
                c = node->data;
+               next = node->next;
                
                if(c->outgoing) {
                        free(c->outgoing->name);
@@ -353,9 +328,6 @@ int main_loop(void) {
        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();
@@ -370,12 +342,6 @@ int main_loop(void) {
        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);
 
@@ -388,9 +354,6 @@ int main_loop(void) {
        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);