X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fnet.c;h=8bec6b67f52af5e52c671d94cc26ffad425244aa;hb=refs%2Fheads%2Ffeature%2Fmetaconnection-address;hp=6fd90e194442e9e96298825fa28083bf6cb444be;hpb=c169f4b833479afffe4a3596771c7d0617c6e7be;p=meshlink

diff --git a/src/net.c b/src/net.c
index 6fd90e19..8bec6b67 100644
--- a/src/net.c
+++ b/src/net.c
@@ -54,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);
@@ -113,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);
 			}
 		}
@@ -136,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);
@@ -623,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);