X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fgraph.c;h=cca0935029587cc20d2cafa3fddb992b9c4a5b10;hp=9aadcd8616eaa99ea86dd5bf9db8accb526ae058;hb=e8bef0453680526bf82600ae766ff0c9dec22975;hpb=6d08eb1614b59d5f86a43edda9db06fca72b76cd

diff --git a/src/graph.c b/src/graph.c
index 9aadcd86..cca09350 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -1,6 +1,6 @@
 /*
     graph.c -- graph algorithms
-    Copyright (C) 2001-2011 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2012 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -174,6 +174,7 @@ static void sssp_bfs(void) {
 	myself->status.visited = true;
 	myself->status.indirect = false;
 	myself->nexthop = myself;
+	myself->prevedge = NULL;
 	myself->via = myself;
 	list_insert_head(todo_list, myself);
 
@@ -214,6 +215,7 @@ static void sssp_bfs(void) {
 			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;
 
@@ -285,10 +287,13 @@ static void sssp_bfs(void) {
 
 			subnet_update(n, NULL, n->status.reachable);
 
-			if(!n->status.reachable)
+			if(!n->status.reachable) {
 				update_node_udp(n, NULL);
-			else if(n->connection)
+				memset(&n->status, 0, sizeof n->status);
+				n->options = 0;
+			} else if(n->connection) {
 				send_ans_key(n);
+			}
 		}
 	}
 }
@@ -313,7 +318,7 @@ void dump_graph(void) {
 	node_t *n;
 	edge_t *e;
 	char *filename = NULL, *tmpname = NULL;
-	FILE *file;
+	FILE *file, *pipe = NULL;
 	
 	if(!graph_changed || !get_config_string(lookup_config(config_tree, "GraphDumpFile"), &filename))
 		return;
@@ -323,7 +328,7 @@ void dump_graph(void) {
 	ifdebug(PROTOCOL) logger(LOG_NOTICE, "Dumping graph");
 	
 	if(filename[0] == '|') {
-		file = popen(filename + 1, "w");
+		file = pipe = popen(filename + 1, "w");
 	} else {
 		xasprintf(&tmpname, "%s.new", filename);
 		file = fopen(tmpname, "w");
@@ -351,8 +356,8 @@ void dump_graph(void) {
 
 	fprintf(file, "}\n");	
 	
-	if(filename[0] == '|') {
-		pclose(file);
+	if(pipe) {
+		pclose(pipe);
 	} else {
 		fclose(file);
 #ifdef HAVE_MINGW