Fix timeouts of 1 second expiring in less than one second.

[meshlink] / src / net.c

diff --git a/src/net.c b/src/net.c
index d80df2fd84c3d6d728a79bac55301e60a43e6d1d..1614d843b24e44117e7871b49479ff782e18640b 100644 (file)
--- 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"
@@ -53,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);
@@ -118,12 +123,24 @@ static void timeout_handler(event_loop_t *loop, void *data) {
 
                // 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);
@@ -341,7 +358,7 @@ 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);
                struct timespec ts = {mesh->sleeptime, 0};
-               clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, NULL);
+               nanosleep(&ts, NULL);
                mesh->sleeptime *= 2;
 
                if(mesh->sleeptime < 0) {
@@ -612,13 +629,14 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 
                if(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 = 0;
+                               n->last_req_key = -3600;
                        } else {
                                n->last_req_key = mesh->loop.now.tv_sec;
                        }
@@ -657,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;