Don't try to renew SPTPS keys for unreachable nodes.

[meshlink] / src / net.c

diff --git a/src/net.c b/src/net.c
index 9dc9598afc663ff8a08352e151bd816e2f8ad90c..8bec6b67f52af5e52c671d94cc26ffad425244aa 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -117,13 +117,13 @@ 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);
                        }
                }
@@ -140,7 +140,7 @@ static void timeout_handler(event_loop_t *loop, void *data) {
                        }
                }
 
-               if(c->last_ping_time + pingtimeout <= 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);
@@ -627,7 +627,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
                        n->status.dirty = false;
                }
 
-               if(n->status.validkey && n->last_req_key + 3600 < mesh->loop.now.tv_sec) {
+               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);