X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fgraph.c;h=431a72a559f068d34fa0a61002e26602b884950e;hb=eeb8f3502fdf25704ce2d234732509cad32e8bff;hp=5afa7c32526509a31b610e8153d26c4c41a87829;hpb=42cef01039177f3c762001439c8fb6bbdcd6e159;p=meshlink diff --git a/src/graph.c b/src/graph.c index 5afa7c32..431a72a5 100644 --- 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; @@ -136,7 +136,13 @@ 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) { n->session_id = n->prevedge->reverse->session_id; @@ -167,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 = mesh->loop.now.tv_sec; + + 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 = mesh->loop.now.tv_sec; + } } /* TODO: only clear status.validkey if node is unreachable? */ @@ -207,6 +223,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) { + timeout_set(&mesh->loop, &mesh->periodictimer, &(struct timeval) { + 0, prng(mesh, TIMER_FUDGE) + }); + } + } + + mesh->reachable = reachable; + } } void graph(meshlink_handle_t *mesh) {