X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fgraph.c;h=b18d06105660aa0196bb35b0211bf6e2cde156c8;hb=8c5bd53b91c720acf34d770e0f09d2b207b068eb;hp=43e526b044ce781976d403f4b50fee581a472d11;hpb=1e08f518b26db292ad81ce44fc0df06f4df3a869;p=meshlink

diff --git a/src/graph.c b/src/graph.c
index 43e526b0..b18d0610 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -61,22 +61,22 @@
    Please note that sorting on weight is already done by add_edge().
 */
 
-static void mst_kruskal(void) {
+static void mst_kruskal(meshlink_handle_t *mesh) {
 	/* 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:");
+	logger(mesh, MESHLINK_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;
@@ -87,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;
@@ -102,11 +102,11 @@ 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(mesh, MESHLINK_DEBUG, " Adding edge %s - %s weight %d", e->from->name, e->to->name, e->weight);
 
 		if(skipped) {
 			skipped = false;
-			next = edge_weight_tree->head;
+			next = mesh->edges->head;
 		}
 	}
 }
@@ -115,12 +115,12 @@ static void mst_kruskal(void) {
    Running time: O(E)
 */
 
-static void sssp_bfs(void) {
+static void sssp_bfs(meshlink_handle_t *mesh) {
 	list_t *todo_list = list_alloc(NULL);
 
 	/* 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;
@@ -139,7 +139,7 @@ static void sssp_bfs(void) {
 	/* Loop while todo_list is filled */
 
 	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);
+		logger(mesh, MESHLINK_DEBUG, " Examining edges from %s", n->name);
 
 		if(n->distance < 0)
 			abort();
@@ -181,7 +181,7 @@ static void sssp_bfs(void) {
 			e->to->distance = n->distance + 1;
 
 			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);
+				update_node_udp(mesh, e->to, &e->address);
 
 			list_insert_tail(todo_list, e->to);
 		}
@@ -193,19 +193,19 @@ static void sssp_bfs(void) {
 	list_free(todo_list);
 }
 
-static void check_reachability(void) {
+static void check_reachability(meshlink_handle_t *mesh) {
 	/* 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;
+			n->last_state_change = mesh->loop.now.tv_sec;
 
 			if(n->status.reachable) {
-				logger(DEBUG_TRAFFIC, LOG_DEBUG, "Node %s (%s) became reachable",
+				logger(mesh, MESHLINK_DEBUG, "Node %s (%s) became reachable",
 					   n->name, n->hostname);
 			} else {
-				logger(DEBUG_TRAFFIC, LOG_DEBUG, "Node %s (%s) became unreachable",
+				logger(mesh, MESHLINK_DEBUG, "Node %s (%s) became unreachable",
 					   n->name, n->hostname);
 			}
 
@@ -221,24 +221,24 @@ static void check_reachability(void) {
 			n->minmtu = 0;
 			n->mtuprobes = 0;
 
-			timeout_del(&n->mtutimeout);
+			timeout_del(&mesh->loop, &n->mtutimeout);
 
-			//TODO: callback to application to inform of this node going up/down
+			update_node_status(mesh, n);
 
 			if(!n->status.reachable) {
-				update_node_udp(n, NULL);
+				update_node_udp(mesh, n, NULL);
 				memset(&n->status, 0, sizeof n->status);
 				n->options = 0;
 			} else if(n->connection) {
 				if(n->connection->outgoing)
-					send_req_key(n);
+					send_req_key(mesh, n);
 			}
 		}
 	}
 }
 
-void graph(void) {
-	sssp_bfs();
-	check_reachability();
-	mst_kruskal();
+void graph(meshlink_handle_t *mesh) {
+	sssp_bfs(mesh);
+	check_reachability(mesh);
+	mst_kruskal(mesh);
 }