X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fgraph.c;h=e6cd011fa0727b69a29c26e1a1bd5ccc9d765d81;hb=3a316823b971396a428f020f401b9fe41252d98d;hp=8f20ec7d79ad0fbbe5d2e389314eb33aa67a664e;hpb=bc33a073d82cd4b5e75d00e379ddfeeaa6ade962;p=tinc

diff --git a/src/graph.c b/src/graph.c
index 8f20ec7d..e6cd011f 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -1,6 +1,6 @@
 /*
     graph.c -- graph algorithms
-    Copyright (C) 2001-2013 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2017 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -149,7 +149,7 @@ static void sssp_bfs(void) {
 			abort();
 
 		for splay_each(edge_t, e, n->edge_tree) {       /* "e" is the edge connected to "from" */
-			if(!e->reverse)
+			if(!e->reverse || e->to == myself)
 				continue;
 
 			/* Situation:
@@ -204,6 +204,9 @@ static void sssp_bfs(void) {
 static void check_reachability(void) {
 	/* Check reachability status. */
 
+	int reachable_count = 0;
+	int became_reachable_count = 0;
+	int became_unreachable_count = 0;
 	for splay_each(node_t, n, node_tree) {
 		if(n->status.visited != n->status.reachable) {
 			n->status.reachable = !n->status.reachable;
@@ -212,9 +215,13 @@ static void check_reachability(void) {
 			if(n->status.reachable) {
 				logger(DEBUG_TRAFFIC, LOG_DEBUG, "Node %s (%s) became reachable",
 					   n->name, n->hostname);
+				if (n != myself)
+					became_reachable_count++;
 			} else {
 				logger(DEBUG_TRAFFIC, LOG_DEBUG, "Node %s (%s) became unreachable",
 					   n->name, n->hostname);
+				if (n != myself)
+					became_unreachable_count++;
 			}
 
 			if(experimental && OPTION_VERSION(n->options) >= 2)
@@ -231,52 +238,55 @@ static void check_reachability(void) {
 
 			n->status.udp_confirmed = false;
 			n->maxmtu = MTU;
+			n->maxrecentlen = 0;
 			n->minmtu = 0;
 			n->mtuprobes = 0;
 
-			timeout_del(&n->mtutimeout);
+			timeout_del(&n->udp_ping_timeout);
 
 			char *name;
 			char *address;
 			char *port;
-			char *envp[8] = {NULL};
 
-			xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
-			xasprintf(&envp[1], "DEVICE=%s", device ? : "");
-			xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
-			xasprintf(&envp[3], "NODE=%s", n->name);
+			environment_t env;
+			environment_init(&env);
+			environment_add(&env, "NODE=%s", n->name);
 			sockaddr2str(&n->address, &address, &port);
-			xasprintf(&envp[4], "REMOTEADDRESS=%s", address);
-			xasprintf(&envp[5], "REMOTEPORT=%s", port);
-			xasprintf(&envp[6], "NAME=%s", myself->name);
+			environment_add(&env, "REMOTEADDRESS=%s", address);
+			environment_add(&env, "REMOTEPORT=%s", port);
 
-			execute_script(n->status.reachable ? "host-up" : "host-down", envp);
+			execute_script(n->status.reachable ? "host-up" : "host-down", &env);
 
 			xasprintf(&name, n->status.reachable ? "hosts/%s-up" : "hosts/%s-down", n->name);
-			execute_script(name, envp);
+			execute_script(name, &env);
 
 			free(name);
 			free(address);
 			free(port);
-
-			for(int i = 0; i < 7; i++)
-				free(envp[i]);
+			environment_exit(&env);
 
 			subnet_update(n, NULL, n->status.reachable);
 
 			if(!n->status.reachable) {
 				update_node_udp(n, NULL);
-				memset(&n->status, 0, sizeof n->status);
+				memset(&n->status, 0, sizeof(n->status));
 				n->options = 0;
 			} else if(n->connection) {
-				if(n->status.sptps) {
-					if(n->connection->outgoing)
-						send_req_key(n);
-				} else {
+				// Speed up UDP probing by sending our key.
+				if(!n->status.sptps)
 					send_ans_key(n);
-				}
 			}
 		}
+
+		if(n->status.reachable && n != myself)
+			reachable_count++;
+	}
+
+	if (device_standby) {
+		if (reachable_count == 0 && became_unreachable_count > 0)
+			device_disable();
+		else if (reachable_count > 0 && reachable_count == became_reachable_count)
+			device_enable();
 	}
 }