X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.c;h=3c1ad3e625ee7b237fb590243719693f41a73297;hb=4c57e6902219ecca1872e18e34365d8e54a0f407;hp=c7c6723c27d3eef7e9e797e8c8991b551617b141;hpb=bcd1979454cd14087394f0c0a983205f6fbfcaf4;p=meshlink diff --git a/src/net.c b/src/net.c index c7c6723c..3c1ad3e6 100644 --- a/src/net.c +++ b/src/net.c @@ -109,6 +109,8 @@ void terminate_connection(meshlink_handle_t *mesh, connection_t *c, bool report) and close the connection. */ static void timeout_handler(event_loop_t *loop, void *data) { + assert(data); + meshlink_handle_t *mesh = loop->data; logger(mesh, MESHLINK_DEBUG, "timeout_handler()"); @@ -116,6 +118,10 @@ 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) { + 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) { @@ -145,8 +151,8 @@ static void timeout_handler(event_loop_t *loop, void *data) { } } - timeout_set(&mesh->loop, data, &(struct timeval) { - default_timeout, rand() % 100000 + timeout_set(&mesh->loop, data, &(struct timespec) { + 1, prng(mesh, TIMER_FUDGE) }); } @@ -340,7 +346,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}; + clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, NULL); mesh->sleeptime *= 2; if(mesh->sleeptime < 0) { @@ -421,7 +428,7 @@ static void periodic_handler(event_loop_t *loop, void *data) { logger(mesh, MESHLINK_DEBUG, "* could not find node for initial connect"); } - splay_free_tree(nodes); + splay_delete_tree(nodes); } @@ -450,11 +457,11 @@ static void periodic_handler(event_loop_t *loop, void *data) { logger(mesh, MESHLINK_DEBUG, "* found better node"); connect_to = (node_t *)nodes->head->data; - splay_free_tree(nodes); + splay_delete_tree(nodes); break; } - splay_free_tree(nodes); + splay_delete_tree(nodes); } else { break; } @@ -484,7 +491,7 @@ static void periodic_handler(event_loop_t *loop, void *data) { logger(mesh, MESHLINK_DEBUG, "* could not find nodes for partition healing"); } - splay_free_tree(nodes); + splay_delete_tree(nodes); } @@ -546,7 +553,7 @@ static void periodic_handler(event_loop_t *loop, void *data) { disconnect_from = (node_t *)nodes->head->data; } - splay_free_tree(nodes); + splay_delete_tree(nodes); break; } } @@ -577,7 +584,7 @@ static void periodic_handler(event_loop_t *loop, void *data) { logger(mesh, MESHLINK_DEBUG, "* no node we want to disconnect, even though we have too many connections"); } - splay_free_tree(nodes); + splay_delete_tree(nodes); } @@ -602,13 +609,16 @@ static void periodic_handler(event_loop_t *loop, void *data) { for splay_each(node_t, n, mesh->nodes) { if(n->status.dirty) { - 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; } } - timeout_set(&mesh->loop, data, &(struct timeval) { - timeout, rand() % 100000 + timeout_set(&mesh->loop, data, &(struct timespec) { + timeout, prng(mesh, TIMER_FUDGE) }); } @@ -624,17 +634,13 @@ 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 + }); + } } -#ifdef HAVE_IFADDRS_H - struct ifaddrs *ifa = NULL; - getifaddrs(&ifa); -#endif - /* For active connections, check if their addresses are still valid. * If yes, reset their ping timers, otherwise terminate them. */ for list_each(connection_t, c, mesh->connections) { @@ -646,12 +652,6 @@ void retry(meshlink_handle_t *mesh) { c->last_ping_time = 0; } -#ifdef HAVE_IFADDRS_H - - if(!ifa) { - continue; - } - sockaddr_t sa; socklen_t salen = sizeof(sa); @@ -659,34 +659,35 @@ void retry(meshlink_handle_t *mesh) { continue; } - bool found = false; + switch(sa.sa.sa_family) { + case AF_INET: + sa.in.sin_port = 0; + break; - for(struct ifaddrs *ifap = ifa; ifap; ifap = ifap->ifa_next) { - if(ifap->ifa_addr && !sockaddrcmp_noport(&sa, (sockaddr_t *)ifap->ifa_addr)) { - found = true; - break; - } + case AF_INET6: + sa.in6.sin6_port = 0; + break; + + default: + continue; + } + int sock = socket(sa.sa.sa_family, SOCK_STREAM, IPPROTO_TCP); + + if(sock != -1) { + continue; } - if(!found) { + if(bind(sock, &sa.sa, salen) && errno == EADDRNOTAVAIL) { logger(mesh, MESHLINK_DEBUG, "Local address for connection to %s no longer valid, terminating", c->name); terminate_connection(mesh, c, c->status.active); } -#endif - } - -#ifdef HAVE_IFADDRS_H - - if(ifa) { - freeifaddrs(ifa); + closesocket(sock); } -#endif - /* Kick the ping timeout handler */ - timeout_set(&mesh->loop, &mesh->pingtimer, &(struct timeval) { + timeout_set(&mesh->loop, &mesh->pingtimer, &(struct timespec) { 0, 0 }); } @@ -694,31 +695,24 @@ void retry(meshlink_handle_t *mesh) { /* this is where it all happens... */ -int main_loop(meshlink_handle_t *mesh) { - timeout_add(&mesh->loop, &mesh->pingtimer, timeout_handler, &mesh->pingtimer, &(struct timeval) { - default_timeout, rand() % 100000 +void main_loop(meshlink_handle_t *mesh) { + 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 }); //Add signal handler mesh->datafromapp.signum = 0; - signal_add(&(mesh->loop), &(mesh->datafromapp), (signal_cb_t)meshlink_send_from_queue, mesh, mesh->datafromapp.signum); + signal_add(&mesh->loop, &mesh->datafromapp, meshlink_send_from_queue, mesh, mesh->datafromapp.signum); - if(!event_loop_run(&mesh->loop, &mesh->mesh_mutex)) { + if(!event_loop_run(&mesh->loop, &mesh->mutex)) { logger(mesh, MESHLINK_ERROR, "Error while waiting for input: %s", strerror(errno)); - abort(); - signal_del(&mesh->loop, &mesh->datafromapp); - timeout_del(&mesh->loop, &mesh->periodictimer); - timeout_del(&mesh->loop, &mesh->pingtimer); - - return 1; + call_error_cb(mesh, MESHLINK_ENETWORK); } signal_del(&mesh->loop, &mesh->datafromapp); timeout_del(&mesh->loop, &mesh->periodictimer); timeout_del(&mesh->loop, &mesh->pingtimer); - - return 0; }