/* 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;
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);
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) {
n->session_id = n->prevedge->reverse->session_id;
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;
if(n->status.visited != n->status.reachable) {
n->status.reachable = !n->status.reachable;
- n->last_state_change = mesh->loop.now.tv_sec;
+ n->status.dirty = true;
- if(n->status.reachable) {
- logger(mesh, MESHLINK_DEBUG, "Node %s became reachable", n->name);
- } else {
- logger(mesh, MESHLINK_DEBUG, "Node %s became unreachable", n->name);
+ 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->last_req_key = -3600;
n->status.udp_confirmed = false;
n->maxmtu = MTU;
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) {
}
}
}
+
+ 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) {