X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fgraph.c;h=34af237e0b228ed8547b6ee6de460bd854614cee;hb=2e606e5823d06aece9a0d4719e07ce3b28ebeadc;hp=a7612ab0aa6d94c01230f7d7cc0ed2e36a29f61b;hpb=528a8616e36ff08ddf1f9f16f748a272e48846be;p=meshlink

diff --git a/src/graph.c b/src/graph.c
index a7612ab0..34af237e 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -61,10 +61,10 @@
    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:");
@@ -115,7 +115,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 */
@@ -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,13 +193,13 @@ 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",
@@ -221,24 +221,25 @@ 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
+			if(mesh->node_status_cb)
+				mesh->node_status_cb(mesh, (meshlink_node_t *)n, n->status.reachable);
 
 			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);
 }