X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.c;h=80e866a0ad461fc49bce1794379044ca97e2e33c;hb=e4e5a81447142da0fb1291b2d2119ed6981b89e5;hp=16368080ce61940ca28cc50d80b912d09a647839;hpb=4c8ead98743254be97c830e942f0cc53539d780c;p=meshlink

diff --git a/src/net.c b/src/net.c
index 16368080..80e866a0 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1,9 +1,6 @@
 /*
     net.c -- most of the network code
-    Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
-                  2006      Scott Lamb <slamb@slamb.org>
-		  2011      Loïc Grenié <loic.grenie@gmail.com>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,93 +20,32 @@
 #include "system.h"
 
 #include "utils.h"
-#include "splay_tree.h"
 #include "conf.h"
 #include "connection.h"
-#include "device.h"
 #include "graph.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "meta.h"
 #include "net.h"
 #include "netutl.h"
-#include "process.h"
 #include "protocol.h"
-#include "subnet.h"
 #include "xalloc.h"
 
-int contradicting_add_edge = 0;
-int contradicting_del_edge = 0;
-static int sleeptime = 10;
+#include <assert.h>
 
-/* Purge edges and subnets of unreachable nodes. Use carefully. */
-
-void purge(void) {
-	splay_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
-	node_t *n;
-	edge_t *e;
-	subnet_t *s;
-
-	logger(DEBUG_PROTOCOL, LOG_DEBUG, "Purging unreachable nodes");
-
-	/* Remove all edges and subnets owned by unreachable nodes. */
-
-	for(nnode = node_tree->head; nnode; nnode = nnext) {
-		nnext = nnode->next;
-		n = nnode->data;
-
-		if(!n->status.reachable) {
-			logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Purging node %s (%s)", n->name, n->hostname);
-
-			for(snode = n->subnet_tree->head; snode; snode = snext) {
-				snext = snode->next;
-				s = snode->data;
-				send_del_subnet(everyone, s);
-				if(!strictsubnets)
-					subnet_del(n, s);
-			}
-
-			for(enode = n->edge_tree->head; enode; enode = enext) {
-				enext = enode->next;
-				e = enode->data;
-				if(!tunnelserver)
-					send_del_edge(everyone, e);
-				edge_del(e);
-			}
-		}
-	}
-
-	/* Check if anyone else claims to have an edge to an unreachable node. If not, delete node. */
-
-	for(nnode = node_tree->head; nnode; nnode = nnext) {
-		nnext = nnode->next;
-		n = nnode->data;
-
-		if(!n->status.reachable) {
-			for(enode = edge_weight_tree->head; enode; enode = enext) {
-				enext = enode->next;
-				e = enode->data;
-
-				if(e->to == n)
-					break;
-			}
-
-			if(!enode && (!strictsubnets || !n->subnet_tree->head))
-				/* in strictsubnets mode do not delete nodes with subnets */
-				node_del(n);
-		}
-	}
+static const int min(int a, int b) {
+	return a < b ? a : b;
 }
 
 /*
   Terminate a connection:
-  - Close the socket
-  - Remove associated edge and tell other connections about it if report = true
+  - Mark it as inactive
+  - Remove the edge representing this connection
+  - Kill it with fire
   - Check if we need to retry making an outgoing connection
-  - Deactivate the host
 */
-void terminate_connection(connection_t *c, bool report) {
-	logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Closing connection with %s (%s)",
-			   c->name, c->hostname);
+void terminate_connection(meshlink_handle_t *mesh, connection_t *c, bool report) {
+	logger(mesh, MESHLINK_INFO, "Closing connection with %s (%s)", c->name, c->hostname);
 
 	c->status.active = false;
 
@@ -117,38 +53,41 @@ void terminate_connection(connection_t *c, bool report) {
 		c->node->connection = NULL;
 
 	if(c->edge) {
-		if(report && !tunnelserver)
-			send_del_edge(everyone, c->edge);
+		if(report)
+			send_del_edge(mesh, mesh->everyone, c->edge);
 
-		edge_del(c->edge);
+		edge_del(mesh, c->edge);
 		c->edge = NULL;
 
 		/* Run MST and SSSP algorithms */
 
-		graph();
+		graph(mesh);
 
 		/* If the node is not reachable anymore but we remember it had an edge to us, clean it up */
 
 		if(report && !c->node->status.reachable) {
 			edge_t *e;
-			e = lookup_edge(c->node, myself);
+			e = lookup_edge(c->node, mesh->self);
 			if(e) {
-				if(!tunnelserver)
-					send_del_edge(everyone, e);
-				edge_del(e);
+				send_del_edge(mesh, mesh->everyone, e);
+				edge_del(mesh, e);
 			}
 		}
 	}
 
-	free_connection_partially(c);
+	outgoing_t *outgoing = c->outgoing;
+	connection_del(mesh, c);
 
 	/* Check if this was our outgoing connection */
 
-	if(c->outgoing) {
-		do_outgoing_connection(c);
-	} else {
-	        connection_del(c);
-        }
+	if(outgoing)
+		do_outgoing_connection(mesh, outgoing);
+
+#ifndef HAVE_MINGW
+	/* Clean up dead proxy processes */
+
+	while(waitpid(-1, NULL, WNOHANG) > 0);
+#endif
 }
 
 /*
@@ -159,294 +98,491 @@ void terminate_connection(connection_t *c, bool report) {
   end does not reply in time, we consider them dead
   and close the connection.
 */
-static void timeout_handler(int fd, short events, void *event) {
-	splay_node_t *node, *next;
-	connection_t *c;
-	time_t now = time(NULL);
-
-	for(node = connection_tree->head; node; node = next) {
-		next = node->next;
-		c = node->data;
-
-		if(c->status.control)
-			continue;
-
-		if(c->last_ping_time + pingtimeout <= now) {
+static void timeout_handler(event_loop_t *loop, void *data) {
+	meshlink_handle_t *mesh = loop->data;
+	logger(mesh, MESHLINK_DEBUG, "timeout_handler()");
+
+	for list_each(connection_t, c, mesh->connections) {
+		// Also make sure that if outstanding key requests for the UDP counterpart of a connection has timed out, we restart it.
+		if(c->node) {
+			if(c->node->status.waitingforkey && c->node->last_req_key + mesh->pingtimeout <= mesh->loop.now.tv_sec)
+				send_req_key(mesh, c->node);
+		}
+		if(c->last_ping_time + mesh->pingtimeout <= mesh->loop.now.tv_sec) {
 			if(c->status.active) {
 				if(c->status.pinged) {
-					logger(DEBUG_CONNECTIONS, LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds",
-							   c->name, c->hostname, (long)now - c->last_ping_time);
-					terminate_connection(c, true);
+					logger(mesh, MESHLINK_INFO, "%s (%s) didn't respond to PING in %ld seconds", c->name, c->hostname, (long)mesh->loop.now.tv_sec - c->last_ping_time);
+				} else if(c->last_ping_time + mesh->pinginterval <= mesh->loop.now.tv_sec) {
+					send_ping(mesh, c);
 					continue;
-				} else if(c->last_ping_time + pinginterval <= now) {
-					send_ping(c);
-				}
-			} else {
-				if(c->status.connecting) {
-					logger(DEBUG_CONNECTIONS, LOG_WARNING, "Timeout while connecting to %s (%s)", c->name, c->hostname);
-					c->status.connecting = false;
-					closesocket(c->socket);
-					do_outgoing_connection(c);
 				} else {
-					logger(DEBUG_CONNECTIONS, LOG_WARNING, "Timeout from %s (%s) during authentication", c->name, c->hostname);
-					terminate_connection(c, false);
 					continue;
 				}
+			} else {
+				if(c->status.connecting)
+					logger(mesh, MESHLINK_WARNING, "Timeout while connecting to %s (%s)", c->name, c->hostname);
+				else
+					logger(mesh, MESHLINK_WARNING, "Timeout from %s (%s) during authentication", c->name, c->hostname);
 			}
+			terminate_connection(mesh, c, c->status.active);
 		}
 	}
 
-	if(contradicting_del_edge > 100 && contradicting_add_edge > 100) {
-		logger(DEBUG_ALWAYS, LOG_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", sleeptime);
-		usleep(sleeptime * 1000000LL);
-		sleeptime *= 2;
-		if(sleeptime < 0)
-			sleeptime = 3600;
-	} else {
-		sleeptime /= 2;
-		if(sleeptime < 10)
-			sleeptime = 10;
-	}
+	timeout_set(&mesh->loop, data, &(struct timeval){mesh->pingtimeout, rand() % 100000});
+}
 
-	contradicting_add_edge = 0;
-	contradicting_del_edge = 0;
+// devclass asc, last_connect_try desc
+static int node_compare_devclass_asc_last_connect_try_desc(const void *a, const void *b)
+{
+	const node_t *na = a, *nb = b;
 
-	event_add(event, &(struct timeval){pingtimeout, 0});
-}
+	if(na->devclass < nb->devclass)
+		{ return -1; }
 
-void handle_meta_connection_data(int fd, short events, void *data) {
-	connection_t *c = data;
-	int result;
-	socklen_t len = sizeof result;
-
-	if(c->status.connecting) {
-		c->status.connecting = false;
-
-		getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
-
-		if(!result)
-			finish_connecting(c);
-		else {
-			logger(DEBUG_CONNECTIONS, LOG_DEBUG,
-					   "Error while connecting to %s (%s): %s",
-					   c->name, c->hostname, sockstrerror(result));
-			closesocket(c->socket);
-			do_outgoing_connection(c);
-			return;
-		}
-	}
+	if(na->devclass > nb->devclass)
+		{ return 1; }
 
-	if (!receive_meta(c)) {
-		terminate_connection(c, c->status.active);
-		return;
-	}
+	if(na->last_connect_try == nb->last_connect_try)
+		return 0;
+
+	if(nb->last_connect_try == 0 || na->last_connect_try < nb->last_connect_try)
+		return -1;
+
+	if(na->last_connect_try == 0 || na->last_connect_try > nb->last_connect_try)
+		return 1;
+
+	return 0;
 }
 
-static void sigterm_handler(int signal, short events, void *data) {
-	logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(signal));
-	event_loopexit(NULL);
+// last_connect_try desc
+static int node_compare_last_connect_try_desc(const void *a, const void *b)
+{
+	const node_t *na = a, *nb = b;
+
+	if(na->last_connect_try == nb->last_connect_try)
+		return 0;
+
+	if(nb->last_connect_try == 0 || na->last_connect_try < nb->last_connect_try)
+		return -1;
+
+	if(na->last_connect_try == 0 || na->last_connect_try > nb->last_connect_try)
+		return 1;
+
+	return 0;
 }
 
-static void sighup_handler(int signal, short events, void *data) {
-	logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(signal));
-	reopenlogger();
-	reload_configuration();
+// devclass desc
+static int node_compare_devclass_desc(const void *a, const void *b)
+{
+	const node_t *na = a, *nb = b;
+
+	if(na->devclass < nb->devclass)
+		{ return -1; }
+
+	if(na->devclass > nb->devclass)
+		{ return 1; }
+
+	return 0;
 }
 
-static void sigalrm_handler(int signal, short events, void *data) {
-	logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(signal));
-	retry();
+
+/*
+
+
+autoconnect()
+{
+	timeout = 5
+
+	// find the best one for initial connect
+
+	if cur < min
+		newcon =
+			first from nodes
+				where dclass <= my.dclass and !connection and (timestamp - last_retry) > retry_timeout
+				order by dclass asc, last_connection desc
+		if newcon
+			timeout = 0
+			goto connect
+
+
+	// find better nodes to connect to: in case we have less than min connections within [BACKBONE, i] and there are nodes which we are not connected to within the range
+
+	if min <= cur < max
+		j = 0
+		for i = BACKBONE to my.dclass
+			j += count(from connections where node.dclass = i)
+			if j < min
+				newcon =
+					first from nodes
+						where dclass = i and !connection and (timestamp - last_retry) > retry_timeout
+						order by last_connection desc
+				if newcon
+					goto connect
+			else
+				break
+
+
+	// heal partitions
+
+	if min <= cur < max
+		newcon =
+			first from nodes
+				where dclass <= my.dclass and !reachable and (timestamp - last_retry) > retry_timeout
+				order by dclass asc, last_connection desc
+		if newcon
+			goto connect
+
+
+	// connect
+
+connect:
+	if newcon
+		connect newcon
+
+
+	// disconnect outgoing connections in case we have more than min connections within [BACKBONE, i] and there are nodes which we are connected to within the range [i, PORTABLE]
+
+	if min < cur <= max
+		j = 0
+		for i = BACKBONE to my.dclass
+			j += count(from connections where node.dclass = i)
+			if min < j
+				delcon =
+					first from nodes
+						where dclass >= i and outgoing_connection
+						order by dclass desc
+				if disconnect
+					goto disconnect
+				else
+					break
+
+
+	// disconnect connections in case we have more than enough connections
+
+	if max < cur
+		delcon =
+			first from nodes
+				where outgoing_connection
+				order by dclass desc
+		goto disconnect
+
+	// disconnect
+
+disconnect
+	if delcon
+		disconnect delcon
+
+
+	// next iteration
+	next (timeout, autoconnect)
+
 }
 
-int reload_configuration(void) {
-	connection_t *c;
-	splay_node_t *node, *next;
-	char *fname;
-	struct stat s;
-	static time_t last_config_check = 0;
 
-	/* Reread our own configuration file */
+ */
+
 
-	exit_configuration(&config_tree);
-	init_configuration(&config_tree);
+static void periodic_handler(event_loop_t *loop, void *data) {
+	meshlink_handle_t *mesh = loop->data;
 
-	if(!read_server_config()) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Unable to reread configuration file, exitting.");
-		event_loopexit(NULL);
-		return EINVAL;
+	/* Check if there are too many contradicting ADD_EDGE and DEL_EDGE messages.
+	   This usually only happens when another node has the same Name as this node.
+	   If so, sleep for a short while to prevent a storm of contradicting messages.
+	*/
+
+	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);
+		mesh->sleeptime *= 2;
+		if(mesh->sleeptime < 0)
+			mesh->sleeptime = 3600;
+	} else {
+		mesh->sleeptime /= 2;
+		if(mesh->sleeptime < 10)
+			mesh->sleeptime = 10;
 	}
 
-	read_config_options(config_tree, NULL);
+	mesh->contradicting_add_edge = 0;
+	mesh->contradicting_del_edge = 0;
 
-        xasprintf(&fname, "%s/hosts/%s", confbase, myself->name);
-        read_config_file(config_tree, fname);
-	free(fname);	
+	int timeout = 5;
 
-	/* Parse some options that are allowed to be changed while tinc is running */
+	/* Check if we need to make or break connections. */
 
-	setup_myself_reloadable();
+	if(mesh->nodes->count > 1) {
 
-	/* Close connections to hosts that have a changed or deleted host config file */
-	
-	for(node = connection_tree->head; node; node = next) {
-		c = node->data;
-		next = node->next;
+		logger(mesh, MESHLINK_INFO, "--- autoconnect begin ---");
 
-		if(c->status.control)
-			continue;
-		
-		if(c->outgoing) {
-			free(c->outgoing->name);
-			if(c->outgoing->ai)
-				freeaddrinfo(c->outgoing->ai);
-			free(c->outgoing);
-			c->outgoing = NULL;
+
+		int retry_timeout = min(mesh->nodes->count * 5, 60);
+
+		// connect disconnect nodes
+
+		node_t* connect_to = NULL;
+		node_t* disconnect_from = NULL;
+
+
+		// get cur_connects
+
+		int cur_connects = 0;
+
+		for list_each(connection_t, c, mesh->connections)
+		{
+			if(!c->status.remove_unused)
+			{
+				cur_connects += 1;
+			}
 		}
-		
-		xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-		if(stat(fname, &s) || s.st_mtime > last_config_check)
-			terminate_connection(c, c->status.active);
-		free(fname);
-	}
 
-	last_config_check = time(NULL);
+		logger(mesh, MESHLINK_INFO, "* cur_connects = %d", cur_connects);
+
+
+		// get min_connects and max_connects
 
-	/* If StrictSubnet is set, expire deleted Subnets and read new ones in */
+		assert(mesh->devclass >= 0 && mesh->devclass <= _DEV_CLASS_MAX);
 
-	if(strictsubnets) {
-		subnet_t *subnet;
+		int min_connects = dev_class_traits[mesh->devclass].min_connects;
+		int max_connects = dev_class_traits[mesh->devclass].max_connects;
 
-		for(node = subnet_tree->head; node; node = node->next) {
-			subnet = node->data;
-			subnet->expires = 1;
+		logger(mesh, MESHLINK_INFO, "* min_connects = %d", min_connects);
+		logger(mesh, MESHLINK_INFO, "* max_connects = %d", max_connects);
+
+
+		// find the best one for initial connect
+
+		if(cur_connects < min_connects)
+		{
+			splay_tree_t *nodes = splay_alloc_tree(node_compare_devclass_asc_last_connect_try_desc, NULL);
+
+			for splay_each(node_t, n, mesh->nodes)
+			{
+				if(n->devclass <= mesh->devclass && !n->connection && (n->last_connect_try == 0 || (time(NULL) - n->last_connect_try) > retry_timeout))
+					{ splay_insert(nodes, n); }
+			}
+
+			if(nodes->head)
+			{
+				logger(mesh, MESHLINK_INFO, "* found best one for initial connect");
+
+				//timeout = 0;
+				connect_to = (node_t*)nodes->head->data;
+			}
+
+			splay_free_tree(nodes);
 		}
 
-		load_all_subnets();
-
-		for(node = subnet_tree->head; node; node = next) {
-			next = node->next;
-			subnet = node->data;
-			if(subnet->expires == 1) {
-				send_del_subnet(everyone, subnet);
-				if(subnet->owner->status.reachable)
-					subnet_update(subnet->owner, subnet, false);
-				subnet_del(subnet->owner, subnet);
-			} else if(subnet->expires == -1) {
-				subnet->expires = 0;
-			} else {
-				send_add_subnet(everyone, subnet);
-				if(subnet->owner->status.reachable)
-					subnet_update(subnet->owner, subnet, true);
+
+		// find better nodes to connect to
+
+		if(!connect_to && min_connects <= cur_connects && cur_connects < max_connects)
+		{
+			unsigned int connects = 0;
+
+			for(int devclass = 0; devclass <= mesh->devclass; ++devclass)
+			{
+				for list_each(connection_t, c, mesh->connections)
+				{
+					if(!c->status.remove_unused && c->node && c->node->devclass == devclass)
+						{ connects += 1; }
+				}
+
+				if( connects < min_connects )
+				{
+					splay_tree_t *nodes = splay_alloc_tree(node_compare_last_connect_try_desc, NULL);
+
+					for splay_each(node_t, n, mesh->nodes)
+					{
+						if(n->devclass == devclass && !n->connection && (n->last_connect_try == 0 || (time(NULL) - n->last_connect_try) > retry_timeout))
+							{ splay_insert(nodes, n); }
+					}
+
+					if(nodes->head)
+					{
+						logger(mesh, MESHLINK_INFO, "* found better node");
+						connect_to = (node_t*)nodes->head->data;
+
+						splay_free_tree(nodes);
+						break;
+					}
+
+					splay_free_tree(nodes);
+				}
+				else
+					{ break; }
 			}
 		}
-	} else { /* Only read our own subnets back in */
-		subnet_t *subnet, *s2;
-
-		for(node = myself->subnet_tree->head; node; node = node->next) {
-			subnet_t *subnet = node->data;
-			logger(DEBUG_ALWAYS, LOG_DEBUG, "subnet %p expires %d\n", subnet, subnet->expires);
-			if(!subnet->expires)
-				subnet->expires = 1;
+
+
+		// heal partitions
+
+		if(!connect_to && min_connects <= cur_connects && cur_connects < max_connects)
+		{
+			splay_tree_t *nodes = splay_alloc_tree(node_compare_devclass_asc_last_connect_try_desc, NULL);
+
+			for splay_each(node_t, n, mesh->nodes)
+			{
+				if(n->devclass <= mesh->devclass && !n->status.reachable && (n->last_connect_try == 0 || (time(NULL) - n->last_connect_try) > retry_timeout))
+					{ splay_insert(nodes, n); }
+			}
+
+			if(nodes->head)
+			{
+				logger(mesh, MESHLINK_INFO, "* try to heal partition");
+				connect_to = (node_t*)nodes->head->data;
+			}
+
+			splay_free_tree(nodes);
 		}
 
-		config_t *cfg = lookup_config(config_tree, "Subnet");
 
-		while(cfg) {
-			if(!get_config_subnet(cfg, &subnet))
-				continue;
+		// perform connect
 
-			if((s2 = lookup_subnet(myself, subnet))) {
-				logger(DEBUG_ALWAYS, LOG_DEBUG, "read subnet that already exists: %p expires %d\n", s2, s2->expires);
-				if(s2->expires == 1)
-					s2->expires = 0;
+		if(connect_to && !connect_to->connection)
+		{
+			/* check if there is already a connection attempt to this node */
+			bool found = false;
+			for list_each(outgoing_t, outgoing, mesh->outgoings) {
+				if(!strcmp(outgoing->name, connect_to->name)) {
+					found = true;
+					break;
+				}
+			}
 
-				free_subnet(subnet);
-			} else {
-				logger(DEBUG_ALWAYS, LOG_DEBUG, "read new subnet %p", subnet);
-				subnet_add(myself, subnet);
-				send_add_subnet(everyone, subnet);
-				subnet_update(myself, subnet, true);
+			if(!found)
+			{
+				logger(mesh, MESHLINK_INFO, "Autoconnecting to %s", connect_to->name);
+				outgoing_t *outgoing = xzalloc(sizeof(outgoing_t));
+				outgoing->mesh = mesh;
+				outgoing->name = xstrdup(connect_to->name);
+				list_insert_tail(mesh->outgoings, outgoing);
+				setup_outgoing_connection(mesh, outgoing);	
 			}
+		}
+
 
-			cfg = lookup_config_next(config_tree, cfg);
+		// disconnect suboptimal outgoing connections
+
+		if(min_connects < cur_connects && cur_connects <= max_connects)
+		{
+			unsigned int connects = 0;
+
+			for(int devclass = 0; devclass <= mesh->devclass; ++devclass)
+			{
+				for list_each(connection_t, c, mesh->connections)
+				{
+					if(!c->status.remove_unused && c->node && c->node->devclass == devclass)
+						{ connects += 1; }
+				}
+
+				if( min_connects < connects )
+				{
+					splay_tree_t *nodes = splay_alloc_tree(node_compare_devclass_desc, NULL);
+
+					for list_each(connection_t, c, mesh->connections)
+					{
+						if(!c->status.remove_unused && c->outgoing && c->node && c->node->devclass >= devclass)
+							{ splay_insert(nodes, c->node); }
+					}
+
+					if(nodes->head)
+					{
+						logger(mesh, MESHLINK_INFO, "* disconnect suboptimal outgoing connection");
+						disconnect_from = (node_t*)nodes->head->data;
+					}
+
+					splay_free_tree(nodes);
+					break;
+				}
+			}
 		}
 
-		for(node = myself->subnet_tree->head; node; node = next) {
-			next = node->next;
-			subnet_t *subnet = node->data;
-			if(subnet->expires == 1) {
-				logger(DEBUG_ALWAYS, LOG_DEBUG, "removed subnet %p", subnet);
-				send_del_subnet(everyone, subnet);
-				subnet_update(myself, subnet, false);
-				subnet_del(myself, subnet);
+
+		// disconnect connections (too many connections)
+
+		if(!disconnect_from && max_connects < cur_connects)
+		{
+			splay_tree_t *nodes = splay_alloc_tree(node_compare_devclass_desc, NULL);
+
+			for list_each(connection_t, c, mesh->connections)
+			{
+				if(!c->status.remove_unused && c->node)
+					{ splay_insert(nodes, c->node); }
 			}
+
+			if(nodes->head)
+			{
+				logger(mesh, MESHLINK_INFO, "* disconnect connection (too many connections");
+
+				//timeout = 0;
+				disconnect_from = (node_t*)nodes->head->data;
+			}
+
+			splay_free_tree(nodes);
 		}
+
+
+		// perform disconnect
+
+		if(disconnect_from && disconnect_from->connection)
+		{
+			logger(mesh, MESHLINK_INFO, "Autodisconnecting from %s", disconnect_from->connection->name);
+			list_delete(mesh->outgoings, disconnect_from->connection->outgoing);
+			disconnect_from->connection->outgoing = NULL;
+			terminate_connection(mesh, disconnect_from->connection, disconnect_from->connection->status.active);
+		}
+
+
+		// done!
+
+		logger(mesh, MESHLINK_INFO, "--- autoconnect end ---");
 	}
 
-	/* Try to make outgoing connections */
-	
-	try_outgoing_connections();
+	timeout_set(&mesh->loop, data, &(struct timeval){timeout, rand() % 100000});
+}
 
-	return 0;
+void handle_meta_connection_data(meshlink_handle_t *mesh, connection_t *c) {
+	if (!receive_meta(mesh, c)) {
+		terminate_connection(mesh, c, c->status.active);
+		return;
+	}
 }
 
-void retry(void) {
-	connection_t *c;
-	splay_node_t *node, *next;
-
-	for(node = connection_tree->head; node; node = next) {
-		next = node->next;
-		c = node->data;
-		
-		if(c->outgoing && !c->node) {
-			if(timeout_initialized(&c->outgoing->ev))
-				event_del(&c->outgoing->ev);
-			if(c->status.connecting)
-				close(c->socket);
-			c->outgoing->timeout = 0;
-			do_outgoing_connection(c);
-		}
+void retry(meshlink_handle_t *mesh) {
+	/* Reset the reconnection timers for all outgoing connections */
+	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});
+	}
+
+	/* Check for outgoing connections that are in progress, and reset their ping timers */
+	for list_each(connection_t, c, mesh->connections) {
+		if(c->outgoing && !c->node)
+			c->last_ping_time = 0;
 	}
+
+	/* Kick the ping timeout handler */
+	timeout_set(&mesh->loop, &mesh->pingtimer, &(struct timeval){0, 0});
 }
 
 /*
   this is where it all happens...
 */
-int main_loop(void) {
-	struct event timeout_event;
-
-	timeout_set(&timeout_event, timeout_handler, &timeout_event);
-	event_add(&timeout_event, &(struct timeval){pingtimeout, 0});
+int main_loop(meshlink_handle_t *mesh) {
+	timeout_add(&mesh->loop, &mesh->pingtimer, timeout_handler, &mesh->pingtimer, &(struct timeval){mesh->pingtimeout, rand() % 100000});
+	timeout_add(&mesh->loop, &mesh->periodictimer, periodic_handler, &mesh->periodictimer, &(struct timeval){0, 0});
 
-#ifndef HAVE_MINGW
-	struct event sighup_event;
-	struct event sigterm_event;
-	struct event sigquit_event;
-	struct event sigalrm_event;
-
-	signal_set(&sighup_event, SIGHUP, sighup_handler, NULL);
-	signal_add(&sighup_event, NULL);
-	signal_set(&sigterm_event, SIGTERM, sigterm_handler, NULL);
-	signal_add(&sigterm_event, NULL);
-	signal_set(&sigquit_event, SIGQUIT, sigterm_handler, NULL);
-	signal_add(&sigquit_event, NULL);
-	signal_set(&sigalrm_event, SIGALRM, sigalrm_handler, NULL);
-	signal_add(&sigalrm_event, NULL);
-#endif
+	//Add signal handler
+	mesh->datafromapp.signum = 0;
+	signal_add(&(mesh->loop),&(mesh->datafromapp), (signal_cb_t)meshlink_send_from_queue,mesh, mesh->datafromapp.signum);
 
-	if(event_loop(0) < 0) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error while waiting for input: %s", strerror(errno));
+	if(!event_loop_run(&(mesh->loop), &(mesh->mesh_mutex))) {
+		logger(mesh, MESHLINK_ERROR, "Error while waiting for input: %s", strerror(errno));
 		return 1;
 	}
 
-#ifndef HAVE_MINGW
-	signal_del(&sighup_event);
-	signal_del(&sigterm_event);
-	signal_del(&sigquit_event);
-	signal_del(&sigalrm_event);
-#endif
-
-	event_del(&timeout_event);
+	timeout_del(&mesh->loop, &mesh->periodictimer);
+	timeout_del(&mesh->loop, &mesh->pingtimer);
 
 	return 0;
 }