X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fgraph.c;h=06bf36d793cc43e6d76bba2fee33df75b5f26c33;hb=edebf579f2ea29e6e84360cb13731f5858a1555b;hp=4e060b7ffa9c647cd4cc3103085e3e542ddf3ef7;hpb=5a132550deb58473285e5f91705d286aef47be71;p=tinc

diff --git a/src/graph.c b/src/graph.c
index 4e060b7f..06bf36d7 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -13,11 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 /* We need to generate two trees from the graph:
@@ -57,6 +55,7 @@
 #include "process.h"
 #include "subnet.h"
 #include "utils.h"
+#include "xalloc.h"
 
 /* Implementation of Kruskal's algorithm.
    Running time: O(E)
@@ -69,8 +68,6 @@ void mst_kruskal(void) {
 	node_t *n;
 	connection_t *c;
 
-	cp();
-	
 	/* Clear MST status on connections */
 
 	for(node = connection_tree->head; node; node = node->next) {
@@ -122,8 +119,6 @@ void sssp_dijkstra(void) {
 	list_node_t *lnode, *nnode;
 	bool indirect;
 
-	cp();
-
 	todo_list = list_alloc(NULL);
 
 	ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Running Dijkstra's algorithm:");
@@ -248,8 +243,6 @@ void sssp_bfs(void) {
 	list_node_t *from, *todonext;
 	bool indirect;
 
-	cp();
-
 	todo_list = list_alloc(NULL);
 
 	/* Clear visited status on nodes */
@@ -343,10 +336,10 @@ void check_reachability() {
 			n->status.reachable = !n->status.reachable;
 
 			if(n->status.reachable) {
-				ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Node %s (%s) became reachable"),
+				ifdebug(TRAFFIC) logger(LOG_DEBUG, "Node %s (%s) became reachable",
 					   n->name, n->hostname);
 			} else {
-				ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Node %s (%s) became unreachable"),
+				ifdebug(TRAFFIC) logger(LOG_DEBUG, "Node %s (%s) became unreachable",
 					   n->name, n->hostname);
 			}
 
@@ -359,18 +352,20 @@ void check_reachability() {
 			n->minmtu = 0;
 			n->mtuprobes = 0;
 
-			asprintf(&envp[0], "NETNAME=%s", netname ? : "");
-			asprintf(&envp[1], "DEVICE=%s", device ? : "");
-			asprintf(&envp[2], "INTERFACE=%s", iface ? : "");
-			asprintf(&envp[3], "NODE=%s", n->name);
+			event_del(&n->mtuevent);
+
+			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);
 			sockaddr2str(&n->address, &address, &port);
-			asprintf(&envp[4], "REMOTEADDRESS=%s", address);
-			asprintf(&envp[5], "REMOTEPORT=%s", port);
+			xasprintf(&envp[4], "REMOTEADDRESS=%s", address);
+			xasprintf(&envp[5], "REMOTEPORT=%s", port);
 			envp[6] = NULL;
 
 			execute_script(n->status.reachable ? "host-up" : "host-down", envp);
 
-			asprintf(&name,
+			xasprintf(&name,
 					 n->status.reachable ? "hosts/%s-up" : "hosts/%s-down",
 					 n->name);
 			execute_script(name, envp);
@@ -387,44 +382,8 @@ void check_reachability() {
 	}
 }
 
-/* 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
-*/
-
-int dump_graph(struct evbuffer *out) {
-	splay_node_t *node;
-	node_t *n;
-	edge_t *e;
-
-	if(evbuffer_add_printf(out, "digraph {\n") == -1)
-		return errno;
-	
-	/* dump all nodes first */
-	for(node = node_tree->head; node; node = node->next) {
-		n = node->data;
-		if(evbuffer_add_printf(out, "	%s [label = \"%s\"];\n",
-							   n->name, n->name) == -1)
-			return errno;
-	}
-
-	/* now dump all edges */
-	for(node = edge_weight_tree->head; node; node = node->next) {
-		e = node->data;
-		if(evbuffer_add_printf(out, "	%s -> %s;\n",
-							   e->from->name, e->to->name) == -1)
-			return errno;
-	}
-
-	if(evbuffer_add_printf(out, "}\n") == -1)
-		return errno;
-
-	return 0;
-}
-
 void graph(void) {
-    subnet_cache_flush();
+	subnet_cache_flush();
 	sssp_dijkstra();
 	check_reachability();
 	mst_kruskal();