Remove old edges from unreachable nodes to us. This prevents the hosts/NAME-up

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index a8d7cc6..d6f4403 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net.c,v 1.35.4.196 2003/08/02 20:50:38 guus Exp $
+    $Id: net.c,v 1.35.4.199 2003/08/28 15:27:11 guus Exp $
 */
 
 #include "system.h"
@@ -42,7 +42,7 @@
 #include "xalloc.h"
 
 bool do_purge = false;
-volatile bool running;
+volatile bool running = false;
 
 time_t now = 0;
 
@@ -59,6 +59,8 @@ static void purge(void)
 
        ifdebug(PROTOCOL) logger(LOG_DEBUG, _("Purging unreachable nodes"));
 
+       /* Remove all edges and subnets owned by unreachable nodes. */
+
        for(nnode = node_tree->head; nnode; nnode = nnext) {
                nnext = nnode->next;
                n = (node_t *) nnode->data;
@@ -80,8 +82,26 @@ static void purge(void)
                                send_del_edge(broadcast, e);
                                edge_del(e);
                        }
+               }
+       }
+
+       /* Check if anyone else claims to have an edge to an unreachable node. If not, delete node. */
+
+       for(nnode = node_tree->head; nnode; nnode = nnext) {
+               nnext = nnode->next;
+               n = (node_t *) nnode->data;
+
+               if(!n->status.reachable) {
+                       for(enode = edge_weight_tree->head; enode; enode = enext) {
+                               enext = enode->next;
+                               e = (edge_t *) enode->data;
+
+                               if(e->to == n)
+                                       break;
+                       }
 
-                       node_del(n);
+                       if(!enode)
+                               node_del(n);
                }
        }
 }
@@ -166,6 +186,17 @@ void terminate_connection(connection_t *c, bool report)
                /* Run MST and SSSP algorithms */
 
                graph();
+
+               /* If the node is not reachable anymore but we remember it had an edge to us, clean it up */
+
+               if(report && !c->node->status.reachable) {
+                       edge_t *e;
+                       e = lookup_edge(c->node, myself);
+                       if(e) {
+                               send_del_edge(broadcast, e);
+                               edge_del(e);
+                       }
+               }
        }
 
        /* Check if this was our outgoing connection */