X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fgraph.c;h=1f1fdb3d54c50050530afd5034a2bb75930a3855;hb=af81c436d6e11a53803747af7cc8ecfd449ccd4c;hp=56ebb61130b7949fcae8a2e793f43f6ed6ae7ad6;hpb=f75e6f61f280b138082b87ce69bdbdee3e4ba56e;p=tinc

diff --git a/src/graph.c b/src/graph.c
index 56ebb611..1f1fdb3d 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:
@@ -173,7 +173,7 @@ static void sssp_bfs(void) {
 
 			if(e->to->status.visited
 			   && (!e->to->status.indirect || indirect)
-			   && (e->to->prevedge && (e->to->distance != n->distance + 1 || e->weight >= e->to->prevedge->weight)))
+			   && (e->to->distance != n->distance + 1 || e->weight >= e->to->prevedge->weight))
 				continue;
 
 			// Only update nexthop if it doesn't increase the path length
@@ -247,28 +247,23 @@ static void check_reachability(void) {
 			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);