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 18376c14956a619a9e99441365fd44c42a7cfa18..1efdb26c9b21ad73a809a9fa95ec16076528c8c7 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);
@@ -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;
@@ -173,12 +173,22 @@ static void check_reachability(meshlink_handle_t *mesh) {
                        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? */
@@ -186,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;
@@ -202,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) {
@@ -218,8 +224,8 @@ static void check_reachability(meshlink_handle_t *mesh) {
                if(!reachable) {
                        mesh->last_unreachable = mesh->loop.now.tv_sec;
 
-                       if(mesh->threadstarted) {
-                               timeout_set(&mesh->loop, &mesh->periodictimer, &(struct timeval) {
+                       if(mesh->threadstarted && mesh->periodictimer.cb) {
+                               timeout_set(&mesh->loop, &mesh->periodictimer, &(struct timespec) {
                                        0, prng(mesh, TIMER_FUDGE)
                                });
                        }