X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.c;h=0aa20439a87de39d518cb130d7c7d4852be27d9f;hb=5d583af29b3ba76f9acaeb77c0e0457268776dcb;hp=3c1ad3e625ee7b237fb590243719693f41a73297;hpb=4c57e6902219ecca1872e18e34365d8e54a0f407;p=meshlink

diff --git a/src/net.c b/src/net.c
index 3c1ad3e6..0aa20439 100644
--- 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"
@@ -29,6 +30,7 @@
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
+#include "sptps.h"
 #include "xalloc.h"
 
 #include <assert.h>
@@ -91,13 +93,6 @@ void terminate_connection(meshlink_handle_t *mesh, connection_t *c, bool report)
 	if(outgoing) {
 		do_outgoing_connection(mesh, outgoing);
 	}
-
-#ifndef HAVE_MINGW
-	/* Clean up dead proxy processes */
-
-	while(waitpid(-1, NULL, WNOHANG) > 0);
-
-#endif
 }
 
 /*
@@ -129,6 +124,18 @@ static void timeout_handler(event_loop_t *loop, void *data) {
 			}
 		}
 
+		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) {
@@ -609,12 +616,27 @@ 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)) {
 				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) {
+			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;
+			} else {
+				n->last_req_key = mesh->loop.now.tv_sec;
+			}
+		}
 	}
 
 	timeout_set(&mesh->loop, data, &(struct timespec) {