X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.c;h=1df3d8c0a187e0c8b665fd56d45462b24554872f;hb=c31f626c3a252a0d6805a5f3ca9154d934ea41f5;hp=1614d843b24e44117e7871b49479ff782e18640b;hpb=4e1a12cd6bb10e654ea06647ff1b5553b49c5942;p=meshlink

diff --git a/src/net.c b/src/net.c
index 1614d843..1df3d8c0 100644
--- a/src/net.c
+++ b/src/net.c
@@ -117,7 +117,7 @@ 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;
 		}
 
@@ -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);
 
@@ -713,9 +713,11 @@ void retry(meshlink_handle_t *mesh) {
 	}
 
 	/* Kick the ping timeout handler */
-	timeout_set(&mesh->loop, &mesh->pingtimer, &(struct timespec) {
-		0, 0
-	});
+	if(mesh->pingtimer.cb) {
+		timeout_set(&mesh->loop, &mesh->pingtimer, &(struct timespec) {
+			0, 0
+		});
+	}
 }
 
 /*