X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fgraph.c;h=8564358566fa7250f47874352c0a4c0d9287542b;hp=9dd3fa5df7e94537ed80a94fdebf672f9784f53c;hb=df4add94a4a6461758b218a9ad257efc735062fe;hpb=8b55dfacb199d152391aa5f7adbbbe35bceea7d7

diff --git a/src/graph.c b/src/graph.c
index 9dd3fa5d..85643585 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -1,6 +1,6 @@
 /*
     graph.c -- graph algorithms
-    Copyright (C) 2001-2006 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2009 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -101,7 +101,7 @@ void mst_kruskal(void)
 
 	/* Starting point */
 
-	for(node = edge_weight_tree->head; node; node = next) {
+	for(node = edge_weight_tree->head; node; node = node->next) {
 		e = node->data;
 		if(e->from->status.reachable) {
 			e->from->status.visited = true;
@@ -226,27 +226,8 @@ void sssp_bfs(void)
 			e->to->via = indirect ? n->via : e->to;
 			e->to->options = e->options;
 
-			if(sockaddrcmp(&e->to->address, &e->address)) {
-				node = avl_unlink(node_udp_tree, e->to);
-				sockaddrfree(&e->to->address);
-				sockaddrcpy(&e->to->address, &e->address);
-
-				if(e->to->hostname)
-					free(e->to->hostname);
-
-				e->to->hostname = sockaddr2hostname(&e->to->address);
-
-				if(node)
-					avl_insert_node(node_udp_tree, node);
-
-				if(e->to->options & OPTION_PMTU_DISCOVERY) {
-					e->to->mtuprobes = 0;
-					e->to->minmtu = 0;
-					e->to->maxmtu = MTU;
-					if(e->to->status.validkey)
-						send_mtu_probe(e->to);
-				}
-			}
+			if(e->to->address.sa.sa_family == AF_UNSPEC && e->address.sa.sa_family != AF_UNKNOWN)
+				update_node_udp(e->to, &e->address);
 
 			list_insert_tail(todo_list, e->to);
 		}
@@ -269,13 +250,13 @@ void sssp_bfs(void)
 			if(n->status.reachable) {
 				ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Node %s (%s) became reachable"),
 					   n->name, n->hostname);
-				avl_insert(node_udp_tree, n);
 			} else {
 				ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Node %s (%s) became unreachable"),
 					   n->name, n->hostname);
-				avl_delete(node_udp_tree, n);
 			}
 
+			/* TODO: only clear status.validkey if node is unreachable? */
+
 			n->status.validkey = false;
 			n->status.waitingforkey = false;
 
@@ -283,6 +264,11 @@ void sssp_bfs(void)
 			n->minmtu = 0;
 			n->mtuprobes = 0;
 
+			if(n->mtuevent) {
+				event_del(n->mtuevent);
+				n->mtuevent = NULL;
+			}
+
 			asprintf(&envp[0], "NETNAME=%s", netname ? : "");
 			asprintf(&envp[1], "DEVICE=%s", device ? : "");
 			asprintf(&envp[2], "INTERFACE=%s", iface ? : "");
@@ -313,6 +299,7 @@ void sssp_bfs(void)
 
 void graph(void)
 {
+	subnet_cache_flush();
 	sssp_bfs();
 	mst_kruskal();
 	graph_changed = true;
@@ -374,6 +361,9 @@ void dump_graph(void)
 		pclose(file);
 	} else {
 		fclose(file);
+#ifdef HAVE_MINGW
+		unlink(filename);
+#endif
 		rename(tmpname, filename);
 		free(tmpname);
 	}