X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=d6f4403b487c117f9d9aaf6f6ea8dca339e7abcf;hp=e1580e651ad4d202d1769112ee8a0b05a1c22302;hb=762cc2d2797d62ab593ea64d8ceeb4fe96be2a0d;hpb=721e4caee0f7c6e003c297c95fb6d93bd4102219

diff --git a/src/net.c b/src/net.c
index e1580e65..d6f4403b 100644
--- 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.199 2003/08/28 15:27:11 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);
 			}
+		}
+	}
+
+	/* 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;
 
-			node_del(n);
+				if(e->to == n)
+					break;
+			}
+
+			if(!enode)
+				node_del(n);
 		}
 	}
 }
@@ -165,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 */
@@ -280,7 +312,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 +326,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 +344,7 @@ void main_loop(void)
 					   strerror(errno));
 				cp_trace();
 				dump_connections();
-				return;
+				return 1;
 			}
 
 			continue;
@@ -379,7 +413,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 +439,8 @@ void main_loop(void)
 			/* Try to make outgoing connections */
 			
 			try_outgoing_connections();
-						
-			continue;
 		}
 	}
+
+	return 0;
 }