X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fgraph.c;h=87bb220402dbd864e029782df1594eb55cdb9356;hp=691a5adb0bda04f97226d96510aaef9271305e51;hb=3308d13e7e3bf20cfeaf6f2ab17228a9820cea66;hpb=de78d79db84c486afcc353884ec1770866beb653

diff --git a/src/graph.c b/src/graph.c
index 691a5adb..87bb2204 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -1,6 +1,6 @@
 /*
     graph.c -- graph algorithms
-    Copyright (C) 2001-2006 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2009 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -47,6 +47,7 @@
 #include "system.h"
 
 #include "avl_tree.h"
+#include "config.h"
 #include "connection.h"
 #include "device.h"
 #include "edge.h"
@@ -57,6 +58,8 @@
 #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().
@@ -98,7 +101,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 */
 
@@ -217,27 +226,8 @@ void sssp_bfs(void)
 			e->to->via = indirect ? n->via : e->to;
 			e->to->options = e->options;
 
-			if(sockaddrcmp(&e->to->address, &e->address)) {
-				node = avl_unlink(node_udp_tree, e->to);
-				sockaddrfree(&e->to->address);
-				sockaddrcpy(&e->to->address, &e->address);
-
-				if(e->to->hostname)
-					free(e->to->hostname);
-
-				e->to->hostname = sockaddr2hostname(&e->to->address);
-
-				if(node)
-					avl_insert_node(node_udp_tree, node);
-
-				if(e->to->options & OPTION_PMTU_DISCOVERY) {
-					e->to->mtuprobes = 0;
-					e->to->minmtu = 0;
-					e->to->maxmtu = MTU;
-					if(e->to->status.validkey)
-						send_mtu_probe(e->to);
-				}
-			}
+			if(e->to->address.sa.sa_family == AF_UNSPEC && e->address.sa.sa_family != AF_UNKNOWN)
+				update_node_udp(e->to, &e->address);
 
 			list_insert_tail(todo_list, e->to);
 		}
@@ -260,13 +250,13 @@ void sssp_bfs(void)
 			if(n->status.reachable) {
 				ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Node %s (%s) became reachable"),
 					   n->name, n->hostname);
-				avl_insert(node_udp_tree, n);
 			} else {
 				ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Node %s (%s) became unreachable"),
 					   n->name, n->hostname);
-				avl_delete(node_udp_tree, n);
 			}
 
+			/* TODO: only clear status.validkey if node is unreachable? */
+
 			n->status.validkey = false;
 			n->status.waitingforkey = false;
 
@@ -283,6 +273,8 @@ void sssp_bfs(void)
 			asprintf(&envp[5], "REMOTEPORT=%s", port);
 			envp[6] = NULL;
 
+			execute_script(n->status.reachable ? "host-up" : "host-down", envp);
+
 			asprintf(&name,
 					 n->status.reachable ? "hosts/%s-up" : "hosts/%s-down",
 					 n->name);
@@ -302,6 +294,72 @@ void sssp_bfs(void)
 
 void graph(void)
 {
-	mst_kruskal();
+	subnet_cache_flush();
 	sssp_bfs();
+	mst_kruskal();
+	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)
+{
+	avl_node_t *node;
+	node_t *n;
+	edge_t *e;
+	char *filename = NULL, *tmpname = NULL;
+	FILE *file;
+	
+	if(!graph_changed || !get_config_string(lookup_config(config_tree, "GraphDumpFile"), &filename))
+		return;
+
+	graph_changed = false;
+
+	ifdebug(PROTOCOL) logger(LOG_NOTICE, "Dumping graph");
+	
+	if(filename[0] == '|') {
+		file = popen(filename + 1, "w");
+	} else {
+		asprintf(&tmpname, "%s.new", filename);
+		file = fopen(tmpname, "w");
+	}
+
+	if(!file) {
+		logger(LOG_ERR, "Unable to open graph dump file %s: %s", filename, strerror(errno));
+		free(tmpname);
+		return;
+	}
+
+	fprintf(file, "digraph {\n");
+	
+	/* dump all nodes first */
+	for(node = node_tree->head; node; node = node->next) {
+		n = node->data;
+		fprintf(file, "	%s [label = \"%s\"];\n", n->name, n->name);
+	}
+
+	/* now dump all edges */
+	for(node = edge_weight_tree->head; node; node = node->next) {
+		e = node->data;
+		fprintf(file, "	%s -> %s;\n", e->from->name, e->to->name);
+	}
+
+	fprintf(file, "}\n");	
+	
+	if(filename[0] == '|') {
+		pclose(file);
+	} else {
+		fclose(file);
+#ifdef HAVE_MINGW
+		unlink(filename);
+#endif
+		rename(tmpname, filename);
+		free(tmpname);
+	}
 }