Remove disconnect code from autoconnect because it makes the mesh flapping

[meshlink] / src / graph.c

diff --git a/src/graph.c b/src/graph.c
index 60d3b02ff3ceb6d6e0625638d4b905e990ac5db8..2453d6f1c21f52414be0f0d849f54b5130300354 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -61,13 +61,13 @@
    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)
                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 */
 
@@ -102,7 +102,7 @@ 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;
@@ -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 */
@@ -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, 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,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);
 }