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 b0e0b77a198a408cd2d88aecb2c4debde09022d3..b73a35e69f749c98bc839c5f2ed9b3a414bdbe21 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -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);
@@ -145,28 +145,25 @@ static void check_reachability(meshlink_handle_t *mesh) {
 
                /* 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) {
@@ -191,13 +188,6 @@ static void check_reachability(meshlink_handle_t *mesh) {
                                }
                        }
 
-                       /* 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;
@@ -212,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) {
@@ -228,7 +214,7 @@ static void check_reachability(meshlink_handle_t *mesh) {
                if(!reachable) {
                        mesh->last_unreachable = mesh->loop.now.tv_sec;
 
-                       if(mesh->threadstarted) {
+                       if(mesh->threadstarted && mesh->periodictimer.cb) {
                                timeout_set(&mesh->loop, &mesh->periodictimer, &(struct timespec) {
                                        0, prng(mesh, TIMER_FUDGE)
                                });