X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fgraph.c;h=958947721f4446a4d2fd3eebf6dfbb5cb593e92c;hb=760dd966efe7dbff316a8c638e40dee162848256;hp=b5af2241f51b189b8fafd8268aa6c63112cee8f5;hpb=0200d3cd5d773d9b101c33264532d2a301c2af32;p=tinc

diff --git a/src/graph.c b/src/graph.c
index b5af2241..95894772 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -58,8 +58,6 @@
 #include "subnet.h"
 #include "utils.h"
 
-static bool graph_changed = true;
-
 /* Implementation of Kruskal's algorithm.
    Running time: O(EN)
    Please note that sorting on weight is already done by add_edge().
@@ -101,7 +99,13 @@ void mst_kruskal(void)
 
 	/* Starting point */
 
-	((edge_t *) edge_weight_tree->head->data)->from->status.visited = true;
+	for(node = edge_weight_tree->head; node; node = node->next) {
+		e = node->data;
+		if(e->from->status.reachable) {
+			e->from->status.visited = true;
+			break;
+		}
+	}
 
 	/* Add safe edges */
 
@@ -305,22 +309,13 @@ void sssp_bfs(void)
 	}
 }
 
-void graph(void)
-{
-	mst_kruskal();
-	sssp_bfs();
-	graph_changed = true;
-}
-
-
-
 /* Dump nodes and edges to a graphviz file.
 	   
    The file can be converted to an image with
    dot -Tpng graph_filename -o image_filename.png -Gconcentrate=true
 */
 
-void dump_graph(void)
+static void dump_graph(int fd, short events, void *data)
 {
 	avl_node_t *node;
 	node_t *n;
@@ -328,11 +323,9 @@ void dump_graph(void)
 	char *filename = NULL, *tmpname = NULL;
 	FILE *file;
 	
-	if(!graph_changed || !get_config_string(lookup_config(config_tree, "GraphDumpFile"), &filename))
+	if(!get_config_string(lookup_config(config_tree, "GraphDumpFile"), &filename))
 		return;
 
-	graph_changed = false;
-
 	ifdebug(PROTOCOL) logger(LOG_NOTICE, "Dumping graph");
 	
 	if(filename[0] == '|') {
@@ -364,10 +357,26 @@ void dump_graph(void)
 
 	fprintf(file, "}\n");	
 	
-	fclose(file);
-
-	if(filename[0] != '|') {
+	if(filename[0] == '|') {
+		pclose(file);
+	} else {
+		fclose(file);
+#ifdef HAVE_MINGW
+		unlink(filename);
+#endif
 		rename(tmpname, filename);
 		free(tmpname);
 	}
 }
+
+void graph(void)
+{
+	static struct event ev;
+
+	sssp_bfs();
+	mst_kruskal();
+
+	if(!timeout_initialized(&ev))
+		timeout_set(&ev, dump_graph, NULL);
+	event_add(&ev, &(struct timeval){5, 0});
+}