X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fgraph.c;h=9592f98010defd40dbaea395b71ae7081e8af948;hp=cca0935029587cc20d2cafa3fddb992b9c4a5b10;hb=8d64561dbc0542e7e1185591b8ecde3e56e1bfca;hpb=b47fbb8c5be20000f504e9e65d8ef0376ae92ff9

diff --git a/src/graph.c b/src/graph.c
index cca09350..9592f980 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -1,6 +1,6 @@
 /*
     graph.c -- graph algorithms
-    Copyright (C) 2001-2012 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2013 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -45,7 +45,7 @@
 #include "system.h"
 
 #include "avl_tree.h"
-#include "config.h"
+#include "conf.h"
 #include "connection.h"
 #include "device.h"
 #include "edge.h"
@@ -156,7 +156,7 @@ static void sssp_bfs(void) {
 	bool indirect;
 	char *name;
 	char *address, *port;
-	char *envp[7];
+	char *envp[8] = {NULL};
 	int i;
 
 	todo_list = list_alloc(NULL);
@@ -212,9 +212,13 @@ static void sssp_bfs(void) {
 			   && (!e->to->status.indirect || indirect))
 				continue;
 
+			// Only update nexthop the first time we visit this node.
+
+			if(!e->to->status.visited)
+				e->to->nexthop = (n->nexthop == myself) ? e->to : n->nexthop;
+
 			e->to->status.visited = true;
 			e->to->status.indirect = indirect;
-			e->to->nexthop = (n->nexthop == myself) ? e->to : n->nexthop;
 			e->to->prevedge = e;
 			e->to->via = indirect ? n->via : e->to;
 			e->to->options = e->options;
@@ -269,7 +273,7 @@ static void sssp_bfs(void) {
 			sockaddr2str(&n->address, &address, &port);
 			xasprintf(&envp[4], "REMOTEADDRESS=%s", address);
 			xasprintf(&envp[5], "REMOTEPORT=%s", port);
-			envp[6] = NULL;
+			xasprintf(&envp[6], "NAME=%s", myself->name);
 
 			execute_script(n->status.reachable ? "host-up" : "host-down", envp);
 
@@ -282,7 +286,7 @@ static void sssp_bfs(void) {
 			free(address);
 			free(port);
 
-			for(i = 0; i < 6; i++)
+			for(i = 0; i < 7; i++)
 				free(envp[i]);
 
 			subnet_update(n, NULL, n->status.reachable);