X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=7bf39897621ce26a0225c098af28f1951c5d44dd;hp=7d8c58c0f4ec66a9a9d1a215f7e83677ee6fcc41;hb=6c5f3d8b74ffea1522a727ef189a5ba65a939e07;hpb=5ac4179df66747a7013a10d576c23531d2b4fc58

diff --git a/src/net.c b/src/net.c
index 7d8c58c0..7bf39897 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.197 2003/08/17 12:05:08 guus Exp $
+    $Id: net.c,v 1.35.4.200 2003/08/28 21:05:10 guus Exp $
 */
 
 #include "system.h"
@@ -59,9 +59,11 @@ 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;
+		n = nnode->data;
 
 		if(!n->status.reachable) {
 			ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Purging node %s (%s)"), n->name,
@@ -69,19 +71,37 @@ static void purge(void)
 
 			for(snode = n->subnet_tree->head; snode; snode = snext) {
 				snext = snode->next;
-				s = (subnet_t *) snode->data;
+				s = snode->data;
 				send_del_subnet(broadcast, s);
 				subnet_del(n, s);
 			}
 
 			for(enode = n->edge_tree->head; enode; enode = enext) {
 				enext = enode->next;
-				e = (edge_t *) enode->data;
+				e = enode->data;
 				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 = nnode->data;
+
+		if(!n->status.reachable) {
+			for(enode = edge_weight_tree->head; enode; enode = enext) {
+				enext = enode->next;
+				e = enode->data;
+
+				if(e->to == n)
+					break;
+			}
 
-			node_del(n);
+			if(!enode)
+				node_del(n);
 		}
 	}
 }
@@ -102,7 +122,7 @@ static int build_fdset(fd_set * fs)
 
 	for(node = connection_tree->head; node; node = next) {
 		next = node->next;
-		c = (connection_t *) node->data;
+		c = node->data;
 
 		if(c->status.remove) {
 			connection_del(c);
@@ -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 */
@@ -193,7 +224,7 @@ static void check_dead_connections(void)
 
 	for(node = connection_tree->head; node; node = next) {
 		next = node->next;
-		c = (connection_t *) node->data;
+		c = node->data;
 
 		if(c->last_ping_time + pingtimeout < now) {
 			if(c->status.active) {
@@ -240,7 +271,7 @@ static void check_network_activity(fd_set * f)
 	}
 
 	for(node = connection_tree->head; node; node = node->next) {
-		c = (connection_t *) node->data;
+		c = node->data;
 
 		if(c->status.remove)
 			continue;
@@ -360,7 +391,7 @@ int main_loop(void)
 			logger(LOG_INFO, _("Flushing event queue"));
 
 			while(event_tree->head) {
-				event = (event_t *) event_tree->head->data;
+				event = event_tree->head->data;
 				event->handler(event->data);
 				event_del(event);
 			}
@@ -388,7 +419,7 @@ int main_loop(void)
 			/* Close connections to hosts that have a changed or deleted host config file */
 			
 			for(node = connection_tree->head; node; node = node->next) {
-				c = (connection_t *) node->data;
+				c = node->data;
 				
 				if(c->outgoing) {
 					free(c->outgoing->name);