X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.c;h=ddfd2cf09aa828abc5a861742e60172e33b8fddb;hb=64720408e45d283eaaa5091957d949fab43087ef;hp=2a27350b3ed99e3ccec40c81103a69c4abe2c9fc;hpb=99ab0b58b4a20473670b442981eeed417dde1582;p=meshlink

diff --git a/src/net.c b/src/net.c
index 2a27350b..ddfd2cf0 100644
--- a/src/net.c
+++ b/src/net.c
@@ -387,8 +387,6 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 
 		// get min_connects and max_connects
 
-		assert(mesh->devclass >= 0 && mesh->devclass <= _DEV_CLASS_MAX);
-
 		unsigned int min_connects = dev_class_traits[mesh->devclass].min_connects;
 		unsigned int max_connects = dev_class_traits[mesh->devclass].max_connects;
 
@@ -402,7 +400,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 			splay_tree_t *nodes = splay_alloc_tree(node_compare_devclass_asc_lsc_desc, NULL);
 
 			for splay_each(node_t, n, mesh->nodes) {
-				logger(mesh, MESHLINK_DEBUG, "* n->devclass = %d", n->devclass);
+				logger(mesh, MESHLINK_DEBUG, "* %s->devclass = %d", n->name, n->devclass);
 
 				if(n != mesh->self && n->devclass <= mesh->devclass && !n->connection && !n->status.blacklisted && (n->last_connect_try == 0 || (time(NULL) - n->last_connect_try) > retry_timeout)) {
 					splay_insert(nodes, n);
@@ -410,10 +408,10 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 			}
 
 			if(nodes->head) {
-				logger(mesh, MESHLINK_DEBUG, "* found best one for initial connect");
-
 				//timeout = 0;
 				connect_to = (node_t *)nodes->head->data;
+
+				logger(mesh, MESHLINK_DEBUG, "* found best one for initial connect: %s", connect_to->name);
 			} else {
 				logger(mesh, MESHLINK_DEBUG, "* could not find node for initial connect");
 			}
@@ -427,7 +425,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 		if(!connect_to && min_connects <= cur_connects && cur_connects < max_connects) {
 			unsigned int connects = 0;
 
-			for(unsigned int devclass = 0; devclass <= mesh->devclass; ++devclass) {
+			for(int32_t devclass = 0; devclass <= mesh->devclass; ++devclass) {
 				for list_each(connection_t, c, mesh->connections) {
 					if(c->status.active && c->node && c->node->devclass == devclass) {
 						connects += 1;
@@ -492,24 +490,27 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 			logger(mesh, MESHLINK_DEBUG, "Autoconnect trying to connect to %s", connect_to->name);
 
 			/* check if there is already a connection attempt to this node */
-			bool found = false;
+			bool skip = false;
 
 			for list_each(outgoing_t, outgoing, mesh->outgoings) {
-				if(!strcmp(outgoing->name, connect_to->name)) {
-					found = true;
+				if(outgoing->node == connect_to) {
+					logger(mesh, MESHLINK_DEBUG, "* skip autoconnect since it is an outgoing connection already");
+					skip = true;
 					break;
 				}
 			}
 
-			if(!found) {
+			if(!connect_to->status.reachable && !node_read_public_key(mesh, connect_to)) {
+				logger(mesh, MESHLINK_DEBUG, "* skip autoconnect since we don't know this node's public key");
+				skip = true;
+			}
+
+			if(!skip) {
 				logger(mesh, MESHLINK_DEBUG, "Autoconnecting to %s", connect_to->name);
 				outgoing_t *outgoing = xzalloc(sizeof(outgoing_t));
-				outgoing->mesh = mesh;
-				outgoing->name = xstrdup(connect_to->name);
+				outgoing->node = connect_to;
 				list_insert_tail(mesh->outgoings, outgoing);
 				setup_outgoing_connection(mesh, outgoing);
-			} else {
-				logger(mesh, MESHLINK_DEBUG, "* skip autoconnect since it is an outgoing connection already");
 			}
 		}
 
@@ -519,7 +520,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 		if(min_connects < cur_connects /*&& cur_connects <= max_connects*/) {
 			unsigned int connects = 0;
 
-			for(unsigned int devclass = 0; devclass <= mesh->devclass; ++devclass) {
+			for(int32_t devclass = 0; devclass <= mesh->devclass; ++devclass) {
 				for list_each(connection_t, c, mesh->connections) {
 					if(c->status.active && c->node && c->node->devclass == devclass) {
 						connects += 1;
@@ -584,12 +585,23 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 			terminate_connection(mesh, disconnect_from->connection, disconnect_from->connection->status.active);
 		}
 
+		// reduce timeout if we don't have enough connections + outgoings
+		if(cur_connects + mesh->outgoings->count < 3) {
+			timeout = 1;
+		}
 
 		// done!
 
 		logger(mesh, MESHLINK_DEBUG, "--- autoconnect end ---");
 	}
 
+	for splay_each(node_t, n, mesh->nodes) {
+		if(n->status.dirty) {
+			node_write_config(mesh, n);
+			n->status.dirty = false;
+		}
+	}
+
 	timeout_set(&mesh->loop, data, &(struct timeval) {
 		timeout, rand() % 100000
 	});
@@ -613,13 +625,61 @@ void retry(meshlink_handle_t *mesh) {
 		});
 	}
 
-	/* Check for outgoing connections that are in progress, and reset their ping timers */
+#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) {
-		if(c->outgoing && !c->node) {
+		if(!c->status.active) {
+			continue;
+		}
+
+		if(!c->status.pinged) {
 			c->last_ping_time = 0;
 		}
+
+#ifdef HAVE_IFADDRS_H
+
+		if(!ifa) {
+			continue;
+		}
+
+		sockaddr_t sa;
+		socklen_t salen = sizeof(sa);
+
+		if(getsockname(c->socket, &sa.sa, &salen)) {
+			continue;
+		}
+
+		bool found = false;
+
+		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;
+			}
+
+		}
+
+		if(!found) {
+			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);
 	}
 
+#endif
+
 	/* Kick the ping timeout handler */
 	timeout_set(&mesh->loop, &mesh->pingtimer, &(struct timeval) {
 		0, 0