Merge branch 'master' into 1.1

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index 2565be1..863dd76 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -113,7 +113,7 @@ void terminate_connection(connection_t *c, bool report) {
 
        c->status.active = false;
 
-       if(c->node)
+       if(c->node && c->node->connection == c)
                c->node->connection = NULL;
 
        if(c->edge) {
@@ -145,8 +145,10 @@ void terminate_connection(connection_t *c, bool report) {
        /* Check if this was our outgoing connection */
 
        if(c->outgoing) {
-               do_outgoing_connection(c);      
-       }
+               do_outgoing_connection(c);
+       } else {
+               connection_del(c);
+        }
 }
 
 /*
@@ -339,9 +341,10 @@ int reload_configuration(void) {
 
 void retry(void) {
        connection_t *c;
-       splay_node_t *node;
+       splay_node_t *node, *next;
 
-       for(node = connection_tree->head; node; node = node->next) {
+       for(node = connection_tree->head; node; node = next) {
+               next = node->next;
                c = node->data;
                
                if(c->outgoing && !c->node) {