X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fgraph.c;h=d3ac4e6b0a33a7ef1449d26d03f91d3d8a5f1ec3;hb=158cbe99f972a1613b7d4d95abfe5fe48e019e67;hp=9da552e743ccf36b4b8b2f834f4c0f6c2188e541;hpb=7a71d48009e03ff1143a6e1084803f456a27c849;p=meshlink

diff --git a/src/graph.c b/src/graph.c
index 9da552e7..d3ac4e6b 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -1,7 +1,6 @@
 /*
     graph.c -- graph algorithms
-    Copyright (C) 2001-2012 Guus Sliepen <guus@tinc-vpn.org>,
-                  2001-2005 Ivo Timmermans
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -44,57 +43,54 @@
 
 #include "system.h"
 
-#include "splay_tree.h"
-#include "config.h"
 #include "connection.h"
-#include "device.h"
 #include "edge.h"
 #include "graph.h"
+#include "list.h"
 #include "logger.h"
 #include "netutl.h"
 #include "node.h"
-#include "process.h"
 #include "protocol.h"
-#include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
 #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().
 */
 
 static void mst_kruskal(void) {
-	splay_node_t *node, *next;
-	edge_t *e;
-	node_t *n;
-	connection_t *c;
-
 	/* Clear MST status on connections */
 
-	for(node = connection_tree->head; node; node = node->next) {
-		c = node->data;
+	for list_each(connection_t, c, connection_list)
 		c->status.mst = false;
-	}
 
 	logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Running Kruskal's algorithm:");
 
 	/* Clear visited status on nodes */
 
-	for(node = node_tree->head; node; node = node->next) {
-		n = node->data;
+	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 */
 
-	for(node = edge_weight_tree->head; node; node = next) {
-		next = node->next;
-		e = node->data;
+	bool skipped = false;
 
-		if(!e->reverse || (e->from->status.visited && e->to->status.visited))
+	for splay_each(edge_t, e, edge_weight_tree) {
+		if(!e->reverse || (e->from->status.visited == e->to->status.visited)) {
+			skipped = true;
 			continue;
+		}
 
 		e->from->status.visited = true;
 		e->to->status.visited = true;
@@ -105,8 +101,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;
+		}
 	}
 }
 
@@ -115,19 +115,11 @@ static void mst_kruskal(void) {
 */
 
 static void sssp_bfs(void) {
-	splay_node_t *node, *to;
-	edge_t *e;
-	node_t *n;
-	list_t *todo_list;
-	list_node_t *from, *todonext;
-	bool indirect;
-
-	todo_list = list_alloc(NULL);
+	list_t *todo_list = list_alloc(NULL);
 
 	/* Clear visited status on nodes */
 
-	for(node = node_tree->head; node; node = node->next) {
-		n = node->data;
+	for splay_each(node_t, n, node_tree) {
 		n->status.visited = false;
 		n->status.indirect = true;
 		n->distance = -1;
@@ -145,14 +137,13 @@ static void sssp_bfs(void) {
 
 	/* Loop while todo_list is filled */
 
-	for(from = todo_list->head; from; from = todonext) {	/* "from" is the node from which we start */
-		n = from->data;
+	for list_each(node_t, n, todo_list) {                   /* "n" is the node from which we start */
+		logger(DEBUG_SCARY_THINGS, LOG_DEBUG, " Examining edges from %s", n->name);
+
 		if(n->distance < 0)
 			abort();
 
-		for(to = n->edge_tree->head; to; to = to->next) {	/* "to" is the edge connected to "from" */
-			e = to->data;
-
+		for splay_each(edge_t, e, n->edge_tree) {       /* "e" is the edge connected to "from" */
 			if(!e->reverse)
 				continue;
 
@@ -173,7 +164,7 @@ static void sssp_bfs(void) {
 			     of nodes behind it.
 			 */
 
-			indirect = n->status.indirect || e->options & OPTION_INDIRECT;
+			bool indirect = n->status.indirect || e->options & OPTION_INDIRECT;
 
 			if(e->to->status.visited
 			   && (!e->to->status.indirect || indirect)
@@ -188,35 +179,26 @@ static void sssp_bfs(void) {
 			e->to->options = e->options;
 			e->to->distance = n->distance + 1;
 
-			if(e->to->address.sa.sa_family == AF_UNSPEC && e->address.sa.sa_family != AF_UNKNOWN)
+			if(!e->to->status.reachable || (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);
 		}
 
-		todonext = from->next;
-		list_delete_node(todo_list, from);
+		next = node->next; /* Because the list_insert_tail() above could have added something extra for us! */
+		list_delete_node(todo_list, node);
 	}
 
 	list_free(todo_list);
 }
 
 static void check_reachability(void) {
-	splay_node_t *node, *next;
-	node_t *n;
-	char *name;
-	char *address, *port;
-	char *envp[7];
-	int i;
-
 	/* Check reachability status. */
 
-	for(node = node_tree->head; node; node = next) {
-		next = node->next;
-		n = node->data;
-
+	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 = now.tv_sec;
 
 			if(n->status.reachable) {
 				logger(DEBUG_TRAFFIC, LOG_DEBUG, "Node %s (%s) became reachable",
@@ -232,42 +214,25 @@ static void check_reachability(void) {
 			/* TODO: only clear status.validkey if node is unreachable? */
 
 			n->status.validkey = false;
+			if(n->status.sptps) {
+				sptps_stop(&n->sptps);
+				n->status.waitingforkey = false;
+			}
 			n->last_req_key = 0;
 
+			n->status.udp_confirmed = false;
 			n->maxmtu = MTU;
 			n->minmtu = 0;
 			n->mtuprobes = 0;
 
-			if(timeout_initialized(&n->mtuevent))
-				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);
-			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);
-
-			xasprintf(&name,
-					 n->status.reachable ? "hosts/%s-up" : "hosts/%s-down",
-					 n->name);
-			execute_script(name, envp);
-
-			free(name);
-			free(address);
-			free(port);
-
-			for(i = 0; i < 6; i++)
-				free(envp[i]);
+			timeout_del(&n->mtutimeout);
 
-			subnet_update(n, NULL, n->status.reachable);
+			//TODO: callback to application to inform of this node going up/down
 
 			if(!n->status.reachable) {
 				update_node_udp(n, NULL);
+				memset(&n->status, 0, sizeof n->status);
+				n->options = 0;
 			} else if(n->connection) {
 				if(n->status.sptps) {
 					if(n->connection->outgoing)
@@ -281,7 +246,6 @@ static void check_reachability(void) {
 }
 
 void graph(void) {
-	subnet_cache_flush();
 	sssp_bfs();
 	check_reachability();
 	mst_kruskal();