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

diff --git a/src/graph.c b/src/graph.c
index e0c48d42..85643585 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -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 ? : "");