When purging nodes, only delete them if nobody references them anymore.

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index e1580e6..1f0655b 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.195 2003/07/29 22:59:00 guus Exp $
+    $Id: net.c,v 1.35.4.198 2003/08/22 15:04:26 guus Exp $
 */
 
 #include "system.h"
@@ -42,6 +42,7 @@
 #include "xalloc.h"
 
 bool do_purge = false;
+volatile bool running = false;
 
 time_t now = 0;
 
@@ -58,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;
@@ -79,8 +82,26 @@ static void purge(void)
                                send_del_edge(broadcast, e);
                                edge_del(e);
                        }
+               }
+       }
 
-                       node_del(n);
+       /* 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;
+                       }
+
+                       if(!enode)
+                               node_del(n);
                }
        }
 }
@@ -280,7 +301,7 @@ static void check_network_activity(fd_set * f)
 /*
   this is where it all happens...
 */
-void main_loop(void)
+int main_loop(void)
 {
        fd_set fset;
        struct timeval tv;
@@ -294,7 +315,9 @@ void main_loop(void)
        last_config_check = now;
        srand(now);
 
-       for(;;) {
+       running = true;
+
+       while(running) {
                now = time(NULL);
 
                tv.tv_sec = 1 + (rand() & 7);   /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
@@ -310,7 +333,7 @@ void main_loop(void)
                                           strerror(errno));
                                cp_trace();
                                dump_connections();
-                               return;
+                               return 1;
                        }
 
                        continue;
@@ -379,7 +402,7 @@ void main_loop(void)
 
                        if(!read_server_config()) {
                                logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
-                               exit(1);
+                               return 1;
                        }
 
                        /* Close connections to hosts that have a changed or deleted host config file */
@@ -405,8 +428,8 @@ void main_loop(void)
                        /* Try to make outgoing connections */
                        
                        try_outgoing_connections();
-                                               
-                       continue;
                }
        }
+
+       return 0;
 }