X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fnet.c;h=2ee8aee446bc1df899354fb1cb93c1373e7aa844;hp=7c600534e3a682488200bbfa9f4cf320e7fe11f3;hb=8c8b506da9ce578fe6e6e406a91bbd21af13f7a3;hpb=529b8fab8c21e7ae5af91d742ff202eab38e51f3

diff --git a/src/net.c b/src/net.c
index 7c600534..2ee8aee4 100644
--- a/src/net.c
+++ b/src/net.c
@@ -29,6 +29,7 @@
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
+#include "sptps.h"
 #include "xalloc.h"
 
 #include <assert.h>
@@ -91,13 +92,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 +123,16 @@ static void timeout_handler(event_loop_t *loop, void *data) {
 			}
 		}
 
+		if(c->status.active && c->last_key_renewal + 3600 < mesh->loop.now.tv_sec) {
+			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) {
@@ -151,7 +155,7 @@ static void timeout_handler(event_loop_t *loop, void *data) {
 		}
 	}
 
-	timeout_set(&mesh->loop, data, &(struct timeval) {
+	timeout_set(&mesh->loop, data, &(struct timespec) {
 		1, prng(mesh, TIMER_FUDGE)
 	});
 }
@@ -346,7 +350,8 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 
 	if(mesh->contradicting_del_edge > 100 && mesh->contradicting_add_edge > 100) {
 		logger(mesh, MESHLINK_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", mesh->sleeptime);
-		usleep(mesh->sleeptime * 1000000LL);
+		struct timespec ts = {mesh->sleeptime, 0};
+		clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, NULL);
 		mesh->sleeptime *= 2;
 
 		if(mesh->sleeptime < 0) {
@@ -608,15 +613,29 @@ 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);
+
+			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 timeval) {
+	timeout_set(&mesh->loop, data, &(struct timespec) {
 		timeout, prng(mesh, TIMER_FUDGE)
 	});
 }
@@ -633,17 +652,13 @@ void retry(meshlink_handle_t *mesh) {
 	for list_each(outgoing_t, outgoing, mesh->outgoings) {
 		outgoing->timeout = 0;
 
-		if(outgoing->ev.cb)
-			timeout_set(&mesh->loop, &outgoing->ev, &(struct timeval) {
-			0, 0
-		});
+		if(outgoing->ev.cb) {
+			timeout_set(&mesh->loop, &outgoing->ev, &(struct timespec) {
+				0, 0
+			});
+		}
 	}
 
-#ifdef HAVE_IFADDRS_H
-	struct ifaddrs *ifa = NULL;
-	getifaddrs(&ifa);
-#endif
-
 	/* For active connections, check if their addresses are still valid.
 	 * If yes, reset their ping timers, otherwise terminate them. */
 	for list_each(connection_t, c, mesh->connections) {
@@ -655,12 +670,6 @@ void retry(meshlink_handle_t *mesh) {
 			c->last_ping_time = 0;
 		}
 
-#ifdef HAVE_IFADDRS_H
-
-		if(!ifa) {
-			continue;
-		}
-
 		sockaddr_t sa;
 		socklen_t salen = sizeof(sa);
 
@@ -668,34 +677,35 @@ void retry(meshlink_handle_t *mesh) {
 			continue;
 		}
 
-		bool found = false;
+		switch(sa.sa.sa_family) {
+		case AF_INET:
+			sa.in.sin_port = 0;
+			break;
 
-		for(struct ifaddrs *ifap = ifa; ifap; ifap = ifap->ifa_next) {
-			if(ifap->ifa_addr && !sockaddrcmp_noport(&sa, (sockaddr_t *)ifap->ifa_addr)) {
-				found = true;
-				break;
-			}
+		case AF_INET6:
+			sa.in6.sin6_port = 0;
+			break;
+
+		default:
+			continue;
+		}
 
+		int sock = socket(sa.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
+
+		if(sock != -1) {
+			continue;
 		}
 
-		if(!found) {
+		if(bind(sock, &sa.sa, salen) && errno == EADDRNOTAVAIL) {
 			logger(mesh, MESHLINK_DEBUG, "Local address for connection to %s no longer valid, terminating", c->name);
 			terminate_connection(mesh, c, c->status.active);
 		}
 
-#endif
-	}
-
-#ifdef HAVE_IFADDRS_H
-
-	if(ifa) {
-		freeifaddrs(ifa);
+		closesocket(sock);
 	}
 
-#endif
-
 	/* Kick the ping timeout handler */
-	timeout_set(&mesh->loop, &mesh->pingtimer, &(struct timeval) {
+	timeout_set(&mesh->loop, &mesh->pingtimer, &(struct timespec) {
 		0, 0
 	});
 }
@@ -704,10 +714,10 @@ void retry(meshlink_handle_t *mesh) {
   this is where it all happens...
 */
 void main_loop(meshlink_handle_t *mesh) {
-	timeout_add(&mesh->loop, &mesh->pingtimer, timeout_handler, &mesh->pingtimer, &(struct timeval) {
+	timeout_add(&mesh->loop, &mesh->pingtimer, timeout_handler, &mesh->pingtimer, &(struct timespec) {
 		1, prng(mesh, TIMER_FUDGE)
 	});
-	timeout_add(&mesh->loop, &mesh->periodictimer, periodic_handler, &mesh->periodictimer, &(struct timeval) {
+	timeout_add(&mesh->loop, &mesh->periodictimer, periodic_handler, &mesh->periodictimer, &(struct timespec) {
 		0, 0
 	});