Only reset UDP SPTPS sessions if the session ID changed.

[meshlink] / src / graph.c

diff --git a/src/graph.c b/src/graph.c
index 5afa7c32526509a31b610e8153d26c4c41a87829..b73a35e69f749c98bc839c5f2ed9b3a414bdbe21 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -72,7 +72,7 @@ static void sssp_bfs(meshlink_handle_t *mesh) {
 
        /* Begin with mesh->self */
 
-       mesh->self->status.visited = true;
+       mesh->self->status.visited = mesh->threadstarted;
        mesh->self->nexthop = mesh->self;
        mesh->self->prevedge = NULL;
        mesh->self->distance = 0;
@@ -126,8 +126,8 @@ static void sssp_bfs(meshlink_handle_t *mesh) {
                        list_insert_tail(todo_list, e->to);
                }
 
-               next = node->next; /* Because the list_insert_tail() above could have added something extra for us! */
-               list_delete_node(todo_list, node);
+               list_next = list_node->next; /* Because the list_insert_tail() above could have added something extra for us! */
+               list_delete_node(todo_list, list_node);
        }
 
        list_free(todo_list);
@@ -136,52 +136,58 @@ static void sssp_bfs(meshlink_handle_t *mesh) {
 static void check_reachability(meshlink_handle_t *mesh) {
        /* Check reachability status. */
 
+       int reachable = -1; /* Don't count ourself */
+
        for splay_each(node_t, n, mesh->nodes) {
+               if(n->status.visited) {
+                       reachable++;
+               }
+
                /* Check for nodes that have changed session_id */
                if(n->status.visited && n->prevedge && n->prevedge->reverse->session_id != n->session_id) {
+                       logger(mesh, MESHLINK_DEBUG, "Node %s has a new session ID", n->name);
+
                        n->session_id = n->prevedge->reverse->session_id;
 
                        if(n->utcp) {
                                utcp_abort_all_connections(n->utcp);
                        }
 
-                       if(n->status.visited == n->status.reachable) {
-                               /* This session replaces the previous one without changing reachability status.
-                                * We still need to reset the UDP SPTPS state.
-                                */
-                               n->status.validkey = false;
-                               sptps_stop(&n->sptps);
-                               n->status.waitingforkey = false;
-                               n->last_req_key = 0;
-
-                               n->status.udp_confirmed = false;
-                               n->maxmtu = MTU;
-                               n->minmtu = 0;
-                               n->mtuprobes = 0;
-
-                               timeout_del(&mesh->loop, &n->mtutimeout);
-                       }
+                       n->status.validkey = false;
+                       sptps_stop(&n->sptps);
+                       n->status.waitingforkey = false;
+                       n->last_req_key = -3600;
+
+                       n->status.udp_confirmed = false;
+                       n->maxmtu = MTU;
+                       n->minmtu = 0;
+                       n->mtuprobes = 0;
+
+                       timeout_del(&mesh->loop, &n->mtutimeout);
                }
 
                if(n->status.visited != n->status.reachable) {
                        n->status.reachable = !n->status.reachable;
                        n->status.dirty = true;
 
-                       if(n->status.reachable) {
-                               logger(mesh, MESHLINK_DEBUG, "Node %s became reachable", n->name);
-                               n->last_reachable = mesh->loop.now.tv_sec;
-                       } else {
-                               logger(mesh, MESHLINK_DEBUG, "Node %s became unreachable", n->name);
-                               n->last_unreachable = mesh->loop.now.tv_sec;
+                       if(!n->status.blacklisted) {
+                               if(n->status.reachable) {
+                                       logger(mesh, MESHLINK_DEBUG, "Node %s became reachable", n->name);
+                                       bool first_time_reachable = !n->last_reachable;
+                                       n->last_reachable = time(NULL);
+
+                                       if(first_time_reachable) {
+                                               if(!node_write_config(mesh, n)) {
+                                                       logger(mesh, MESHLINK_WARNING, "Could not write host config file for node %s!\n", n->name);
+
+                                               }
+                                       }
+                               } else {
+                                       logger(mesh, MESHLINK_DEBUG, "Node %s became unreachable", n->name);
+                                       n->last_unreachable = time(NULL);
+                               }
                        }
 
-                       /* TODO: only clear status.validkey if node is unreachable? */
-
-                       n->status.validkey = false;
-                       sptps_stop(&n->sptps);
-                       n->status.waitingforkey = false;
-                       n->last_req_key = 0;
-
                        n->status.udp_confirmed = false;
                        n->maxmtu = MTU;
                        n->minmtu = 0;
@@ -196,10 +202,6 @@ static void check_reachability(meshlink_handle_t *mesh) {
                        if(!n->status.reachable) {
                                update_node_udp(mesh, n, NULL);
                                n->status.broadcast = false;
-                       } else if(n->connection) {
-                               if(n->connection->status.initiator) {
-                                       send_req_key(mesh, n);
-                               }
                        }
 
                        if(n->utcp) {
@@ -207,6 +209,20 @@ static void check_reachability(meshlink_handle_t *mesh) {
                        }
                }
        }
+
+       if(mesh->reachable != reachable) {
+               if(!reachable) {
+                       mesh->last_unreachable = mesh->loop.now.tv_sec;
+
+                       if(mesh->threadstarted && mesh->periodictimer.cb) {
+                               timeout_set(&mesh->loop, &mesh->periodictimer, &(struct timespec) {
+                                       0, prng(mesh, TIMER_FUDGE)
+                               });
+                       }
+               }
+
+               mesh->reachable = reachable;
+       }
 }
 
 void graph(meshlink_handle_t *mesh) {