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

diff --git a/src/net.c b/src/net.c
index 1614d843..35cfc650 100644
--- a/src/net.c
+++ b/src/net.c
@@ -52,7 +52,9 @@ static const int default_interval = 60;
   - Check if we need to retry making an outgoing connection
 */
 void terminate_connection(meshlink_handle_t *mesh, connection_t *c, bool report) {
-	logger(mesh, MESHLINK_INFO, "Closing connection with %s", c->name);
+	if(c->status.active) {
+		logger(mesh, MESHLINK_INFO, "Closing connection with %s", c->name);
+	}
 
 	if(c->node && c->node->connection == c) {
 		if(c->status.active && mesh->meta_status_cb) {
@@ -117,7 +119,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;
 		}
 
@@ -620,14 +622,12 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 
 	for splay_each(node_t, n, mesh->nodes) {
 		if(n->status.dirty) {
-			if(!node_write_config(mesh, n)) {
+			if(!node_write_config(mesh, n, false)) {
 				logger(mesh, MESHLINK_DEBUG, "Could not update %s", n->name);
 			}
-
-			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);
 
@@ -700,7 +700,7 @@ void retry(meshlink_handle_t *mesh) {
 
 		int sock = socket(sa.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
 
-		if(sock != -1) {
+		if(sock == -1) {
 			continue;
 		}
 
@@ -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
+		});
+	}
 }
 
 /*
@@ -733,7 +735,7 @@ void main_loop(meshlink_handle_t *mesh) {
 	mesh->datafromapp.signum = 0;
 	signal_add(&mesh->loop, &mesh->datafromapp, meshlink_send_from_queue, mesh, mesh->datafromapp.signum);
 
-	if(!event_loop_run(&mesh->loop, &mesh->mutex)) {
+	if(!event_loop_run(&mesh->loop, mesh)) {
 		logger(mesh, MESHLINK_ERROR, "Error while waiting for input: %s", strerror(errno));
 		call_error_cb(mesh, MESHLINK_ENETWORK);
 	}