X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fgraph.c;h=19a33e2e9de1485cd1d7a462168ff288bbf2e49b;hb=de126fa104aaeabbc66b5dd59da9d07da2f0fd97;hp=017e10dc4ba6fd17f0aad6bf901b0d3d31d4ce2d;hpb=93f89bcae11e8d250831896bc5694ee8bd2ad22b;p=meshlink

diff --git a/src/graph.c b/src/graph.c
index 017e10dc..19a33e2e 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -61,18 +61,20 @@
    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, mesh->connections)
+	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, mesh->nodes)
+	for splay_each(node_t, n, mesh->nodes) {
 		n->status.visited = false;
+	}
 
 	/* Starting point */
 
@@ -96,13 +98,15 @@ static void mst_kruskal(void) {
 		e->from->status.visited = true;
 		e->to->status.visited = true;
 
-		if(e->connection)
+		if(e->connection) {
 			e->connection->status.mst = true;
+		}
 
-		if(e->reverse->connection)
+		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;
@@ -115,7 +119,7 @@ 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 */
@@ -139,22 +143,24 @@ 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)
+		if(n->distance < 0) {
 			abort();
+		}
 
 		for splay_each(edge_t, e, n->edge_tree) {       /* "e" is the edge connected to "from" */
-			if(!e->reverse)
+			if(!e->reverse) {
 				continue;
+			}
 
 			/* Situation:
 
-				   /
-				  /
+			           /
+			          /
 			   ----->(n)---e-->(e->to)
-				  \
-				   \
+			          \
+			           \
 
 			   Where e is an edge, (n) and (e->to) are nodes.
 			   n->address is set to the e->address of the edge left of n to n.
@@ -168,9 +174,10 @@ static void sssp_bfs(void) {
 			bool indirect = n->status.indirect || e->options & OPTION_INDIRECT;
 
 			if(e->to->status.visited
-			   && (!e->to->status.indirect || indirect)
-			   && (e->to->distance != n->distance + 1 || e->weight >= e->to->prevedge->weight))
+			                && (!e->to->status.indirect || indirect)
+			                && (e->to->distance != n->distance + 1 || e->weight >= e->to->prevedge->weight)) {
 				continue;
+			}
 
 			e->to->status.visited = true;
 			e->to->status.indirect = indirect;
@@ -180,8 +187,9 @@ static void sssp_bfs(void) {
 			e->to->options = e->options;
 			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);
+			if(!e->to->status.reachable || (e->to->address.sa.sa_family == AF_UNSPEC && e->address.sa.sa_family != AF_UNKNOWN)) {
+				update_node_udp(mesh, e->to, &e->address);
+			}
 
 			list_insert_tail(todo_list, e->to);
 		}
@@ -193,20 +201,18 @@ 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, 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",
-					   n->name, n->hostname);
+				logger(mesh, MESHLINK_DEBUG, "Node %s became reachable", n->name);
 			} else {
-				logger(DEBUG_TRAFFIC, LOG_DEBUG, "Node %s (%s) became unreachable",
-					   n->name, n->hostname);
+				logger(mesh, MESHLINK_DEBUG, "Node %s became unreachable", n->name);
 			}
 
 			/* TODO: only clear status.validkey if node is unreachable? */
@@ -223,22 +229,25 @@ static void check_reachability(void) {
 
 			timeout_del(&mesh->loop, &n->mtutimeout);
 
-			//TODO: callback to application to inform of this node going up/down
+			if(!n->status.blacklisted) {
+				update_node_status(mesh, n);
+			}
 
 			if(!n->status.reachable) {
-				update_node_udp(n, NULL);
-				memset(&n->status, 0, sizeof n->status);
+				update_node_udp(mesh, n, NULL);
+				n->status.broadcast = false;
 				n->options = 0;
 			} else if(n->connection) {
-				if(n->connection->outgoing)
-					send_req_key(n);
+				if(n->connection->outgoing) {
+					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);
 }