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

diff --git a/src/net.c b/src/net.c
index b5705a47..3c1ad3e6 100644
--- a/src/net.c
+++ b/src/net.c
@@ -40,6 +40,7 @@ static inline int min(int a, int b) {
 #endif
 
 static const int default_timeout = 5;
+static const int default_interval = 60;
 
 /*
   Terminate a connection:
@@ -108,11 +109,18 @@ void terminate_connection(meshlink_handle_t *mesh, connection_t *c, bool report)
   and close the connection.
 */
 static void timeout_handler(event_loop_t *loop, void *data) {
+	assert(data);
+
 	meshlink_handle_t *mesh = loop->data;
 	logger(mesh, MESHLINK_DEBUG, "timeout_handler()");
 
 	for list_each(connection_t, c, mesh->connections) {
 		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) {
+			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) {
@@ -125,7 +133,7 @@ static void timeout_handler(event_loop_t *loop, void *data) {
 			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);
-				} else if(c->last_ping_time + mesh->dev_class_traits[c->node->devclass].pinginterval <= mesh->loop.now.tv_sec) {
+				} else if(c->last_ping_time + pinginterval <= mesh->loop.now.tv_sec) {
 					send_ping(mesh, c);
 					continue;
 				} else {
@@ -143,8 +151,8 @@ static void timeout_handler(event_loop_t *loop, void *data) {
 		}
 	}
 
-	timeout_set(&mesh->loop, data, &(struct timeval) {
-		default_timeout, rand() % 100000
+	timeout_set(&mesh->loop, data, &(struct timespec) {
+		1, prng(mesh, TIMER_FUDGE)
 	});
 }
 
@@ -338,7 +346,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) {
@@ -419,7 +428,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 				logger(mesh, MESHLINK_DEBUG, "* could not find node for initial connect");
 			}
 
-			splay_free_tree(nodes);
+			splay_delete_tree(nodes);
 		}
 
 
@@ -448,11 +457,11 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 						logger(mesh, MESHLINK_DEBUG, "* found better node");
 						connect_to = (node_t *)nodes->head->data;
 
-						splay_free_tree(nodes);
+						splay_delete_tree(nodes);
 						break;
 					}
 
-					splay_free_tree(nodes);
+					splay_delete_tree(nodes);
 				} else {
 					break;
 				}
@@ -482,7 +491,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 				logger(mesh, MESHLINK_DEBUG, "* could not find nodes for partition healing");
 			}
 
-			splay_free_tree(nodes);
+			splay_delete_tree(nodes);
 		}
 
 
@@ -544,7 +553,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 						disconnect_from = (node_t *)nodes->head->data;
 					}
 
-					splay_free_tree(nodes);
+					splay_delete_tree(nodes);
 					break;
 				}
 			}
@@ -575,7 +584,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 				logger(mesh, MESHLINK_DEBUG, "* no node we want to disconnect, even though we have too many connections");
 			}
 
-			splay_free_tree(nodes);
+			splay_delete_tree(nodes);
 		}
 
 
@@ -600,13 +609,16 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 
 	for splay_each(node_t, n, mesh->nodes) {
 		if(n->status.dirty) {
-			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;
 		}
 	}
 
-	timeout_set(&mesh->loop, data, &(struct timeval) {
-		timeout, rand() % 100000
+	timeout_set(&mesh->loop, data, &(struct timespec) {
+		timeout, prng(mesh, TIMER_FUDGE)
 	});
 }
 
@@ -622,17 +634,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) {
@@ -644,12 +652,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);
 
@@ -657,34 +659,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
 	});
 }
@@ -692,29 +695,24 @@ void retry(meshlink_handle_t *mesh) {
 /*
   this is where it all happens...
 */
-int main_loop(meshlink_handle_t *mesh) {
-	timeout_add(&mesh->loop, &mesh->pingtimer, timeout_handler, &mesh->pingtimer, &(struct timeval) {
-		default_timeout, rand() % 100000
+void main_loop(meshlink_handle_t *mesh) {
+	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
 	});
 
 	//Add signal handler
 	mesh->datafromapp.signum = 0;
-	signal_add(&(mesh->loop), &(mesh->datafromapp), (signal_cb_t)meshlink_send_from_queue, mesh, mesh->datafromapp.signum);
+	signal_add(&mesh->loop, &mesh->datafromapp, meshlink_send_from_queue, mesh, mesh->datafromapp.signum);
 
-	if(!event_loop_run(&(mesh->loop), &(mesh->mesh_mutex))) {
+	if(!event_loop_run(&mesh->loop, &mesh->mutex)) {
 		logger(mesh, MESHLINK_ERROR, "Error while waiting for input: %s", strerror(errno));
-		abort();
-		timeout_del(&mesh->loop, &mesh->periodictimer);
-		timeout_del(&mesh->loop, &mesh->pingtimer);
-
-		return 1;
+		call_error_cb(mesh, MESHLINK_ENETWORK);
 	}
 
+	signal_del(&mesh->loop, &mesh->datafromapp);
 	timeout_del(&mesh->loop, &mesh->periodictimer);
 	timeout_del(&mesh->loop, &mesh->pingtimer);
-
-	return 0;
 }