Always let the initiator send a REQ_KEY once a connection is activated.

[meshlink] / src / graph.c

diff --git a/src/graph.c b/src/graph.c
index b0e0b77a198a408cd2d88aecb2c4debde09022d3..1efdb26c9b21ad73a809a9fa95ec16076528c8c7 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);
@@ -158,7 +158,7 @@ static void check_reachability(meshlink_handle_t *mesh) {
                                n->status.validkey = false;
                                sptps_stop(&n->sptps);
                                n->status.waitingforkey = false;
-                               n->last_req_key = 0;
+                               n->last_req_key = -3600;
 
                                n->status.udp_confirmed = false;
                                n->maxmtu = MTU;
@@ -196,7 +196,7 @@ static void check_reachability(meshlink_handle_t *mesh) {
                        n->status.validkey = false;
                        sptps_stop(&n->sptps);
                        n->status.waitingforkey = false;
-                       n->last_req_key = 0;
+                       n->last_req_key = -3600;
 
                        n->status.udp_confirmed = false;
                        n->maxmtu = MTU;
@@ -212,10 +212,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 +224,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)
                                });