X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.c;h=8bec6b67f52af5e52c671d94cc26ffad425244aa;hb=c5ef941dafcbce05801f65f9cf7abe8aa4a3e641;hp=304c62683b4e5faa2c50a3f675ad47051258ee57;hpb=4bd83124d50260738991f59a6afe23a31cb672ab;p=meshlink diff --git a/src/net.c b/src/net.c index 304c6268..8bec6b67 100644 --- a/src/net.c +++ b/src/net.c @@ -22,6 +22,7 @@ #include "utils.h" #include "conf.h" #include "connection.h" +#include "devtools.h" #include "graph.h" #include "logger.h" #include "meshlink_internal.h" @@ -29,6 +30,7 @@ #include "net.h" #include "netutl.h" #include "protocol.h" +#include "sptps.h" #include "xalloc.h" #include @@ -52,12 +54,16 @@ static const int default_interval = 60; void terminate_connection(meshlink_handle_t *mesh, connection_t *c, bool report) { logger(mesh, MESHLINK_INFO, "Closing connection with %s", c->name); - c->status.active = false; - if(c->node && c->node->connection == c) { + if(c->status.active && mesh->meta_status_cb) { + mesh->meta_status_cb(mesh, (meshlink_node_t *)c->node, false); + } + c->node->connection = NULL; } + c->status.active = false; + if(c->edge) { if(report) { send_del_edge(mesh, mesh->everyone, c->edge, 0); @@ -91,13 +97,6 @@ void terminate_connection(meshlink_handle_t *mesh, connection_t *c, bool report) if(outgoing) { do_outgoing_connection(mesh, outgoing); } - -#ifndef HAVE_MINGW - /* Clean up dead proxy processes */ - - while(waitpid(-1, NULL, WNOHANG) > 0); - -#endif } /* @@ -118,18 +117,30 @@ static void timeout_handler(event_loop_t *loop, void *data) { int pingtimeout = c->node ? mesh->dev_class_traits[c->node->devclass].pingtimeout : default_timeout; int pinginterval = c->node ? mesh->dev_class_traits[c->node->devclass].pinginterval : default_interval; - if(c->outgoing && c->outgoing->timeout < 5) { + if(c->outgoing && !c->status.active && c->outgoing->timeout < 5) { pingtimeout = 1; } // Also make sure that if outstanding key requests for the UDP counterpart of a connection has timed out, we restart it. if(c->node) { - if(c->node->status.waitingforkey && c->node->last_req_key + pingtimeout <= mesh->loop.now.tv_sec) { + if(c->node->status.waitingforkey && c->node->last_req_key + pingtimeout < mesh->loop.now.tv_sec) { send_req_key(mesh, c->node); } } - if(c->last_ping_time + pingtimeout <= mesh->loop.now.tv_sec) { + if(c->status.active && c->last_key_renewal + 3600 < mesh->loop.now.tv_sec) { + devtool_sptps_renewal_probe((meshlink_node_t *)c->node); + + if(!sptps_force_kex(&c->sptps)) { + logger(mesh, MESHLINK_ERROR, "SPTPS key renewal for connection with %s failed", c->name); + terminate_connection(mesh, c, true); + continue; + } else { + c->last_key_renewal = mesh->loop.now.tv_sec; + } + } + + if(c->last_ping_time + pingtimeout < mesh->loop.now.tv_sec) { if(c->status.active) { if(c->status.pinged) { logger(mesh, MESHLINK_INFO, "%s didn't respond to PING in %ld seconds", c->name, (long)mesh->loop.now.tv_sec - c->last_ping_time); @@ -151,7 +162,7 @@ static void timeout_handler(event_loop_t *loop, void *data) { } } - timeout_set(&mesh->loop, data, &(struct timeval) { + timeout_set(&mesh->loop, data, &(struct timespec) { 1, prng(mesh, TIMER_FUDGE) }); } @@ -346,7 +357,8 @@ static void periodic_handler(event_loop_t *loop, void *data) { if(mesh->contradicting_del_edge > 100 && mesh->contradicting_add_edge > 100) { logger(mesh, MESHLINK_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", mesh->sleeptime); - usleep(mesh->sleeptime * 1000000LL); + struct timespec ts = {mesh->sleeptime, 0}; + nanosleep(&ts, NULL); mesh->sleeptime *= 2; if(mesh->sleeptime < 0) { @@ -608,15 +620,30 @@ static void periodic_handler(event_loop_t *loop, void *data) { for splay_each(node_t, n, mesh->nodes) { if(n->status.dirty) { - if(node_write_config(mesh, n)) { + if(!node_write_config(mesh, n)) { logger(mesh, MESHLINK_DEBUG, "Could not update %s", n->name); } n->status.dirty = false; } + + if(n->status.reachable && n->status.validkey && n->last_req_key + 3600 < mesh->loop.now.tv_sec) { + logger(mesh, MESHLINK_DEBUG, "SPTPS key renewal for node %s", n->name); + devtool_sptps_renewal_probe((meshlink_node_t *)n); + + if(!sptps_force_kex(&n->sptps)) { + logger(mesh, MESHLINK_ERROR, "SPTPS key renewal for node %s failed", n->name); + n->status.validkey = false; + sptps_stop(&n->sptps); + n->status.waitingforkey = false; + n->last_req_key = -3600; + } else { + n->last_req_key = mesh->loop.now.tv_sec; + } + } } - timeout_set(&mesh->loop, data, &(struct timeval) { + timeout_set(&mesh->loop, data, &(struct timespec) { timeout, prng(mesh, TIMER_FUDGE) }); } @@ -633,10 +660,11 @@ void retry(meshlink_handle_t *mesh) { for list_each(outgoing_t, outgoing, mesh->outgoings) { outgoing->timeout = 0; - if(outgoing->ev.cb) - timeout_set(&mesh->loop, &outgoing->ev, &(struct timeval) { - 0, 0 - }); + if(outgoing->ev.cb) { + timeout_set(&mesh->loop, &outgoing->ev, &(struct timespec) { + 0, 0 + }); + } } /* For active connections, check if their addresses are still valid. @@ -647,7 +675,7 @@ void retry(meshlink_handle_t *mesh) { } if(!c->status.pinged) { - c->last_ping_time = 0; + c->last_ping_time = -3600; } sockaddr_t sa; @@ -685,7 +713,7 @@ void retry(meshlink_handle_t *mesh) { } /* Kick the ping timeout handler */ - timeout_set(&mesh->loop, &mesh->pingtimer, &(struct timeval) { + timeout_set(&mesh->loop, &mesh->pingtimer, &(struct timespec) { 0, 0 }); } @@ -694,10 +722,10 @@ void retry(meshlink_handle_t *mesh) { this is where it all happens... */ void main_loop(meshlink_handle_t *mesh) { - timeout_add(&mesh->loop, &mesh->pingtimer, timeout_handler, &mesh->pingtimer, &(struct timeval) { + timeout_add(&mesh->loop, &mesh->pingtimer, timeout_handler, &mesh->pingtimer, &(struct timespec) { 1, prng(mesh, TIMER_FUDGE) }); - timeout_add(&mesh->loop, &mesh->periodictimer, periodic_handler, &mesh->periodictimer, &(struct timeval) { + timeout_add(&mesh->loop, &mesh->periodictimer, periodic_handler, &mesh->periodictimer, &(struct timespec) { 0, 0 });