X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Fgraph.c;h=302056a312f786cdf5303e99f5930e8d0846b66f;hb=e70b5b5bd77bb66e8dd324c17d86d9bff151aa82;hp=73db3b2fddb46e05a15d2d61ed360584e6248246;hpb=6bc5d626a8726fc23365ee705761a3c666a08ad4;p=tinc

diff --git a/src/graph.c b/src/graph.c
index 73db3b2f..302056a3 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
@@ -44,13 +44,13 @@
 
 #include "system.h"
 
-#include "config.h"
 #include "connection.h"
 #include "device.h"
 #include "edge.h"
 #include "graph.h"
 #include "list.h"
 #include "logger.h"
+#include "names.h"
 #include "netutl.h"
 #include "node.h"
 #include "process.h"
@@ -61,7 +61,7 @@
 #include "graph.h"
 
 /* Implementation of Kruskal's algorithm.
-   Running time: O(E)
+   Running time: O(EN)
    Please note that sorting on weight is already done by add_edge().
 */
 
@@ -78,11 +78,24 @@ static void mst_kruskal(void) {
 	for splay_each(node_t, n, node_tree)
 		n->status.visited = false;
 
+	/* Starting point */
+
+	for splay_each(edge_t, e, edge_weight_tree) {
+		if(e->from->status.reachable) {
+			e->from->status.visited = true;
+			break;
+		}
+	}
+
 	/* Add safe edges */
 
+	bool skipped = false;
+
 	for splay_each(edge_t, e, edge_weight_tree) {
-		if(!e->reverse || (e->from->status.visited && e->to->status.visited))
+		if(!e->reverse || (e->from->status.visited == e->to->status.visited)) {
+			skipped = true;
 			continue;
+		}
 
 		e->from->status.visited = true;
 		e->to->status.visited = true;
@@ -93,8 +106,12 @@ static void mst_kruskal(void) {
 		if(e->reverse->connection)
 			e->reverse->connection->status.mst = true;
 
-		logger(DEBUG_SCARY_THINGS, LOG_DEBUG, " Adding edge %s - %s weight %d", e->from->name,
-				   e->to->name, e->weight);
+		logger(DEBUG_SCARY_THINGS, LOG_DEBUG, " Adding edge %s - %s weight %d", e->from->name, e->to->name, e->weight);
+
+		if(skipped) {
+			skipped = false;
+			next = edge_weight_tree->head;
+		}
 	}
 }
 
@@ -186,7 +203,7 @@ static void check_reachability(void) {
 	for splay_each(node_t, n, node_tree) {
 		if(n->status.visited != n->status.reachable) {
 			n->status.reachable = !n->status.reachable;
-			n->last_state_change = time(NULL);
+			n->last_state_change = now.tv_sec;
 
 			if(n->status.reachable) {
 				logger(DEBUG_TRAFFIC, LOG_DEBUG, "Node %s (%s) became reachable",