Fancier protocol for control socket

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index 2c7cc55..a4bff6d 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -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)
@@ -280,7 +272,7 @@ static void sigwinch_handler(int signal, short events, void *data) {
 
 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 +292,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);