X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fgraph.c;h=60d3b02ff3ceb6d6e0625638d4b905e990ac5db8;hb=1ab929718ac182ebdf9fc006c2efe74b6d974fb8;hp=45063795893e7789b586f4dd61577915c7aa98af;hpb=4c30004cb6dc23616d7295b0ce631f066e7f1f82;p=meshlink

diff --git a/src/graph.c b/src/graph.c
index 45063795..60d3b02f 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -1,7 +1,6 @@
 /*
     graph.c -- graph algorithms
-    Copyright (C) 2001-2013 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,19 +43,15 @@
 
 #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 "meshlink_internal.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"
@@ -69,19 +64,19 @@
 static void mst_kruskal(void) {
 	/* Clear MST status on connections */
 
-	for list_each(connection_t, c, connection_list)
+	for list_each(connection_t, c, mesh->connections)
 		c->status.mst = false;
 
 	logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Running Kruskal's algorithm:");
 
 	/* Clear visited status on nodes */
 
-	for splay_each(node_t, n, node_tree)
+	for splay_each(node_t, n, mesh->nodes)
 		n->status.visited = false;
 
 	/* Starting point */
 
-	for splay_each(edge_t, e, edge_weight_tree) {
+	for splay_each(edge_t, e, mesh->edges) {
 		if(e->from->status.reachable) {
 			e->from->status.visited = true;
 			break;
@@ -92,7 +87,7 @@ static void mst_kruskal(void) {
 
 	bool skipped = false;
 
-	for splay_each(edge_t, e, edge_weight_tree) {
+	for splay_each(edge_t, e, mesh->edges) {
 		if(!e->reverse || (e->from->status.visited == e->to->status.visited)) {
 			skipped = true;
 			continue;
@@ -111,7 +106,7 @@ static void mst_kruskal(void) {
 
 		if(skipped) {
 			skipped = false;
-			next = edge_weight_tree->head;
+			next = mesh->edges->head;
 		}
 	}
 }
@@ -125,21 +120,21 @@ static void sssp_bfs(void) {
 
 	/* Clear visited status on nodes */
 
-	for splay_each(node_t, n, node_tree) {
+	for splay_each(node_t, n, mesh->nodes) {
 		n->status.visited = false;
 		n->status.indirect = true;
 		n->distance = -1;
 	}
 
-	/* Begin with myself */
+	/* Begin with mesh->self */
 
-	myself->status.visited = true;
-	myself->status.indirect = false;
-	myself->nexthop = myself;
-	myself->prevedge = NULL;
-	myself->via = myself;
-	myself->distance = 0;
-	list_insert_head(todo_list, myself);
+	mesh->self->status.visited = true;
+	mesh->self->status.indirect = false;
+	mesh->self->nexthop = mesh->self;
+	mesh->self->prevedge = NULL;
+	mesh->self->via = mesh->self;
+	mesh->self->distance = 0;
+	list_insert_head(todo_list, mesh->self);
 
 	/* Loop while todo_list is filled */
 
@@ -179,7 +174,7 @@ static void sssp_bfs(void) {
 
 			e->to->status.visited = true;
 			e->to->status.indirect = indirect;
-			e->to->nexthop = (n->nexthop == myself) ? e->to : n->nexthop;
+			e->to->nexthop = (n->nexthop == mesh->self) ? e->to : n->nexthop;
 			e->to->prevedge = e;
 			e->to->via = indirect ? n->via : e->to;
 			e->to->options = e->options;
@@ -201,7 +196,7 @@ static void sssp_bfs(void) {
 static void check_reachability(void) {
 	/* Check reachability status. */
 
-	for splay_each(node_t, n, node_tree) {
+	for splay_each(node_t, n, mesh->nodes) {
 		if(n->status.visited != n->status.reachable) {
 			n->status.reachable = !n->status.reachable;
 			n->last_state_change = now.tv_sec;
@@ -214,16 +209,11 @@ static void check_reachability(void) {
 					   n->name, n->hostname);
 			}
 
-			if(experimental && OPTION_VERSION(n->options) >= 2)
-				n->status.sptps = true;
-
 			/* 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;
-			}
+			sptps_stop(&n->sptps);
+			n->status.waitingforkey = false;
 			n->last_req_key = 0;
 
 			n->status.udp_confirmed = false;
@@ -233,52 +223,21 @@ static void check_reachability(void) {
 
 			timeout_del(&n->mtutimeout);
 
-			char *name;
-			char *address;
-			char *port;
-			char *envp[7];
-
-			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(int i = 0; i < 6; i++)
-				free(envp[i]);
-
-			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)
-						send_req_key(n);
-				} else {
-					send_ans_key(n);
-				}
+				if(n->connection->outgoing)
+					send_req_key(n);
 			}
 		}
 	}
 }
 
 void graph(void) {
-	subnet_cache_flush();
 	sssp_bfs();
 	check_reachability();
 	mst_kruskal();