X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fgraph.c;h=bb55dfdcba1c821d25fcf1f27e4c81fc5478fb7f;hb=1e2d9b08991861c8770aa2c5a73d86dc02e3067d;hp=bdb32a01622d351cf9f5e9fdc80822262ba3d1b3;hpb=ce8775000ab38229a78ecf3dc26bab008ca0f332;p=tinc

diff --git a/src/graph.c b/src/graph.c
index bdb32a01..bb55dfdc 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -49,6 +49,7 @@
 #include "connection.h"
 #include "device.h"
 #include "edge.h"
+#include "graph.h"
 #include "logger.h"
 #include "netutl.h"
 #include "node.h"
@@ -57,6 +58,7 @@
 #include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
+#include "graph.h"
 
 /* Implementation of Kruskal's algorithm.
    Running time: O(E)
@@ -112,7 +114,7 @@ void mst_kruskal(void) {
    Running time: O(N^2)
 */
 
-void sssp_dijkstra(void) {
+static void sssp_dijkstra(void) {
 	splay_node_t *node, *to;
 	edge_t *e;
 	node_t *n, *m;
@@ -182,9 +184,6 @@ void sssp_dijkstra(void) {
 			   n->address is set to the e->address of the edge left of n to n.
 			   We are currently examining the edge e right of n from n:
 
-			   - If e->reverse->address != n->address, then e->to is probably
-			     not reachable for the nodes left of n. We do as if the indirectdata
-			     flag is set on edge e.
 			   - If edge e provides for better reachability of e->to, update e->to.
 			 */
 
@@ -202,27 +201,8 @@ void sssp_dijkstra(void) {
 			e->to->via = indirect ? n->via : e->to;
 			e->to->options = e->options;
 
-			if(sockaddrcmp(&e->to->address, &e->address)) {
-				node = splay_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)
-					splay_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);
 
 			ifdebug(SCARY_THINGS) logger(LOG_DEBUG, " Updating edge %s - %s weight %d distance %d", e->from->name,
 					   e->to->name, e->weight, e->to->distance);
@@ -315,7 +295,7 @@ void sssp_bfs(void) {
 	list_free(todo_list);
 }
 
-void check_reachability() {
+static void check_reachability(void) {
 	splay_node_t *node, *next;
 	node_t *n;
 	char *name;
@@ -349,7 +329,8 @@ void check_reachability() {
 			n->minmtu = 0;
 			n->mtuprobes = 0;
 
-			event_del(&n->mtuevent);
+			if(timeout_initialized(&n->mtuevent))
+				event_del(&n->mtuevent);
 
 			xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
 			xasprintf(&envp[1], "DEVICE=%s", device ? : "");