X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.c;h=336bf9eec312bcc381751fd5d2fba8c8306d078a;hb=e4e5a81447142da0fb1291b2d2119ed6981b89e5;hp=df5fae77ccb2009cd450ccea483df6bd6bf5514e;hpb=7e1117197ca4fc62af93fda50e28e0ff06cb736c;p=meshlink

diff --git a/src/net.c b/src/net.c
index df5fae77..80e866a0 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,6 @@
 /*
     net.c -- most of the network code
-    Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+    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
@@ -13,484 +12,577 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
 
-#include <openssl/rand.h>
-
 #include "utils.h"
-#include "avl_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"
 
-volatile bool running = false;
+#include <assert.h>
 
-time_t now = 0;
+static const int min(int a, int b) {
+	return a < b ? a : b;
+}
 
-/* Purge edges and subnets of unreachable nodes. Use carefully. */
+/*
+  Terminate a connection:
+  - Mark it as inactive
+  - Remove the edge representing this connection
+  - Kill it with fire
+  - Check if we need to retry making an outgoing connection
+*/
+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);
 
-static void purge(void)
-{
-	avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
-	node_t *n;
-	edge_t *e;
-	subnet_t *s;
+	c->status.active = false;
 
-	cp();
+	if(c->node && c->node->connection == c)
+		c->node->connection = NULL;
 
-	ifdebug(PROTOCOL) logger(LOG_DEBUG, _("Purging unreachable nodes"));
+	if(c->edge) {
+		if(report)
+			send_del_edge(mesh, mesh->everyone, c->edge);
 
-	/* Remove all edges and subnets owned by unreachable nodes. */
+		edge_del(mesh, c->edge);
+		c->edge = NULL;
 
-	for(nnode = node_tree->head; nnode; nnode = nnext) {
-		nnext = nnode->next;
-		n = nnode->data;
+		/* Run MST and SSSP algorithms */
 
-		if(!n->status.reachable) {
-			ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Purging node %s (%s)"), n->name,
-					   n->hostname);
+		graph(mesh);
 
-			for(snode = n->subnet_tree->head; snode; snode = snext) {
-				snext = snode->next;
-				s = snode->data;
-				if(!tunnelserver)
-					send_del_subnet(broadcast, s);
-				subnet_del(n, s);
-			}
+		/* If the node is not reachable anymore but we remember it had an edge to us, clean it up */
 
-			for(enode = n->edge_tree->head; enode; enode = enext) {
-				enext = enode->next;
-				e = enode->data;
-				if(!tunnelserver)
-					send_del_edge(broadcast, e);
-				edge_del(e);
+		if(report && !c->node->status.reachable) {
+			edge_t *e;
+			e = lookup_edge(c->node, mesh->self);
+			if(e) {
+				send_del_edge(mesh, mesh->everyone, e);
+				edge_del(mesh, e);
 			}
 		}
 	}
 
-	/* Check if anyone else claims to have an edge to an unreachable node. If not, delete node. */
+	outgoing_t *outgoing = c->outgoing;
+	connection_del(mesh, c);
 
-	for(nnode = node_tree->head; nnode; nnode = nnext) {
-		nnext = nnode->next;
-		n = nnode->data;
+	/* Check if this was our outgoing connection */
 
-		if(!n->status.reachable) {
-			for(enode = edge_weight_tree->head; enode; enode = enext) {
-				enext = enode->next;
-				e = enode->data;
+	if(outgoing)
+		do_outgoing_connection(mesh, outgoing);
 
-				if(e->to == n)
-					break;
-			}
+#ifndef HAVE_MINGW
+	/* Clean up dead proxy processes */
 
-			if(!enode)
-				node_del(n);
-		}
-	}
+	while(waitpid(-1, NULL, WNOHANG) > 0);
+#endif
 }
 
 /*
-  put all file descriptors into events
-  While we're at it, purge stuf that needs to be removed.
+  Check if the other end is active.
+  If we have sent packets, but didn't receive any,
+  then possibly the other end is dead. We send a
+  PING request over the meta connection. If the other
+  end does not reply in time, we consider them dead
+  and close the connection.
 */
-static int build_fdset(void)
+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(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 {
+					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);
+		}
+	}
+
+	timeout_set(&mesh->loop, data, &(struct timeval){mesh->pingtimeout, rand() % 100000});
+}
+
+// devclass asc, last_connect_try desc
+static int node_compare_devclass_asc_last_connect_try_desc(const void *a, const void *b)
 {
-	avl_node_t *node, *next;
-	connection_t *c;
-	int i, max = 0;
+	const node_t *na = a, *nb = b;
 
-	cp();
+	if(na->devclass < nb->devclass)
+		{ return -1; }
 
-	for(node = connection_tree->head; node; node = next) {
-		next = node->next;
-		c = node->data;
+	if(na->devclass > nb->devclass)
+		{ return 1; }
 
-		if(c->status.remove) {
-			connection_del(c);
-			if(!connection_tree->head)
-				purge();
-		}
-	}
+	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;
+}
+
+// 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;
 }
 
+// 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;
+}
+
+
 /*
-  Terminate a connection:
-  - Close the socket
-  - Remove associated edge and tell other connections about it if report = true
-  - Check if we need to retry making an outgoing connection
-  - Deactivate the host
-*/
-void terminate_connection(connection_t *c, bool report)
+
+
+autoconnect()
 {
-	cp();
+	timeout = 5
 
-	if(c->status.remove)
-		return;
+	// find the best one for initial connect
 
-	ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Closing connection with %s (%s)"),
-			   c->name, c->hostname);
+	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
 
-	c->status.remove = true;
-	c->status.active = false;
 
-	if(c->node)
-		c->node->connection = NULL;
+	// 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(c->socket)
-		closesocket(c->socket);
+	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
 
-	event_del(&c->ev);
 
-	if(c->edge) {
-		if(report && !tunnelserver)
-			send_del_edge(broadcast, c->edge);
+	// heal partitions
 
-		edge_del(c->edge);
+	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
 
-		/* Run MST and SSSP algorithms */
 
-		graph();
+	// connect
 
-		/* If the node is not reachable anymore but we remember it had an edge to us, clean it up */
+connect:
+	if newcon
+		connect newcon
 
-		if(report && !c->node->status.reachable) {
-			edge_t *e;
-			e = lookup_edge(c->node, myself);
-			if(e) {
-				if(!tunnelserver)
-					send_del_edge(broadcast, e);
-				edge_del(e);
+
+	// 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)
+
+}
+
+
+ */
+
+
+static void periodic_handler(event_loop_t *loop, void *data) {
+	meshlink_handle_t *mesh = loop->data;
+
+	/* 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;
+	}
+
+	mesh->contradicting_add_edge = 0;
+	mesh->contradicting_del_edge = 0;
+
+	int timeout = 5;
+
+	/* Check if we need to make or break connections. */
+
+	if(mesh->nodes->count > 1) {
+
+		logger(mesh, MESHLINK_INFO, "--- autoconnect begin ---");
+
+
+		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;
 			}
 		}
-	}
 
-	/* Check if this was our outgoing connection */
+		logger(mesh, MESHLINK_INFO, "* cur_connects = %d", cur_connects);
 
-	if(c->outgoing) {
-		retry_outgoing(c->outgoing);
-		c->outgoing = NULL;
-	}
 
-	free(c->outbuf);
-	c->outbuf = NULL;
-	c->outbuflen = 0;
-	c->outbufsize = 0;
-	c->outbufstart = 0;
-}
+		// get min_connects and max_connects
 
-/*
-  Check if the other end is active.
-  If we have sent packets, but didn't receive any,
-  then possibly the other end is dead. We send a
-  PING request over the meta connection. If the other
-  end does not reply in time, we consider them dead
-  and close the connection.
-*/
-static void check_dead_connections(void)
-{
-	avl_node_t *node, *next;
-	connection_t *c;
+		assert(mesh->devclass >= 0 && mesh->devclass <= _DEV_CLASS_MAX);
 
-	cp();
+		int min_connects = dev_class_traits[mesh->devclass].min_connects;
+		int max_connects = dev_class_traits[mesh->devclass].max_connects;
 
-	for(node = connection_tree->head; node; node = next) {
-		next = node->next;
-		c = node->data;
+		logger(mesh, MESHLINK_INFO, "* min_connects = %d", min_connects);
+		logger(mesh, MESHLINK_INFO, "* max_connects = %d", max_connects);
 
-		if(c->last_ping_time + pingtimeout < now) {
-			if(c->status.active) {
-				if(c->status.pinged) {
-					ifdebug(CONNECTIONS) logger(LOG_INFO, _("%s (%s) didn't respond to PING in %ld seconds"),
-							   c->name, c->hostname, now - c->last_ping_time);
-					c->status.timeout = true;
-					terminate_connection(c, true);
-				} else if(c->last_ping_time + pinginterval < now) {
-					send_ping(c);
-				}
-			} else {
-				if(c->status.remove) {
-					logger(LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."),
-						   c->name, c->hostname, c->status.value);
-					connection_del(c);
-					continue;
+
+		// 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);
+		}
+
+
+		// 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; }
 				}
-				ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
-						   c->name, c->hostname);
-				if(c->status.connecting) {
-					c->status.connecting = false;
-					closesocket(c->socket);
-					do_outgoing_connection(c);
-				} else {
-					terminate_connection(c, false);
+
+				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; }
 			}
 		}
 
-		if(c->outbuflen > 0 && c->last_flushed_time + pingtimeout < now) {
-			if(c->status.active) {
-				ifdebug(CONNECTIONS) logger(LOG_INFO,
-						_("%s (%s) could not flush for %ld seconds (%d bytes remaining)"),
-						c->name, c->hostname, now - c->last_flushed_time, c->outbuflen);
-				c->status.timeout = true;
-				terminate_connection(c, true);
+
+		// 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);
 		}
-	}
-}
 
-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.remove)
-		return;
+		// perform connect
+
+		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;
+				}
+			}
 
-	if(c->status.connecting) {
-		getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
-
-		if(!result)
-			finish_connecting(c);
-		else {
-			ifdebug(CONNECTIONS) logger(LOG_DEBUG,
-					   _("Error while connecting to %s (%s): %s"),
-					   c->name, c->hostname, strerror(result));
-			c->status.connecting = false;
-			closesocket(c->socket);
-			do_outgoing_connection(c);
-			return;
+			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);	
+			}
 		}
-	}
 
-	if (!receive_meta(c)) {
-		terminate_connection(c, c->status.active);
-		return;
-	}
-}
 
-static void dummy(int a, short b, void *c)
-{
-}
+		// disconnect suboptimal outgoing connections
 
-static void sigterm_handler(int signal, short events, void *data) {
-	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
-	running = false;
-	event_loopexit(NULL);
-}
+		if(min_connects < cur_connects && cur_connects <= max_connects)
+		{
+			unsigned int connects = 0;
 
-static void sigint_handler(int signal, short events, void *data) {
-	static int saved_debug_level = -1;
+			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; }
+				}
 
-	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+				if( min_connects < connects )
+				{
+					splay_tree_t *nodes = splay_alloc_tree(node_compare_devclass_desc, NULL);
 
-	if(saved_debug_level != -1) {
-		logger(LOG_NOTICE, _("Reverting to old debug level (%d)"),
-			saved_debug_level);
-		debug_level = saved_debug_level;
-		saved_debug_level = -1;
-	} else {
-		logger(LOG_NOTICE,
-			_("Temporarily setting debug level to 5.  Kill me with SIGINT again to go back to level %d."),
-			debug_level);
-		saved_debug_level = debug_level;
-		debug_level = 5;
-	}
-}
+					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); }
+					}
 
-static void sigusr1_handler(int signal, short events, void *data) {
-	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
-	dump_connections();
-}
+					if(nodes->head)
+					{
+						logger(mesh, MESHLINK_INFO, "* disconnect suboptimal outgoing connection");
+						disconnect_from = (node_t*)nodes->head->data;
+					}
 
-static void sigusr2_handler(int signal, short events, void *data) {
-	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
-	dump_device_stats();
-	dump_nodes();
-	dump_edges();
-	dump_subnets();
-}
+					splay_free_tree(nodes);
+					break;
+				}
+			}
+		}
 
-static void sigwinch_handler(int signal, short events, void *data) {
-	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
-	purge();
-}
 
-static void sighup_handler(int signal, short events, void *data) {
-	connection_t *c;
-	avl_node_t *node;
-	char *fname;
-	struct stat s;
-	static time_t last_config_check = 0;
-	
-	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+		// disconnect connections (too many connections)
 
-	/* Reread our own configuration file */
+		if(!disconnect_from && max_connects < cur_connects)
+		{
+			splay_tree_t *nodes = splay_alloc_tree(node_compare_devclass_desc, NULL);
 
-	exit_configuration(&config_tree);
-	init_configuration(&config_tree);
+			for list_each(connection_t, c, mesh->connections)
+			{
+				if(!c->status.remove_unused && c->node)
+					{ splay_insert(nodes, c->node); }
+			}
 
-	if(!read_server_config()) {
-		logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
-		event_loopexit(NULL);
-		return;
-	}
+			if(nodes->head)
+			{
+				logger(mesh, MESHLINK_INFO, "* disconnect connection (too many connections");
 
-	/* Close connections to hosts that have a changed or deleted host config file */
-	
-	for(node = connection_tree->head; node; node = node->next) {
-		c = node->data;
-		
-		if(c->outgoing) {
-			free(c->outgoing->name);
-			if(c->outgoing->ai)
-				freeaddrinfo(c->outgoing->ai);
-			free(c->outgoing);
-			c->outgoing = NULL;
+				//timeout = 0;
+				disconnect_from = (node_t*)nodes->head->data;
+			}
+
+			splay_free_tree(nodes);
 		}
-		
-		asprintf(&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);
+
+
+		// 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 ---");
 	}
 
-	last_config_check = time(NULL);
+	timeout_set(&mesh->loop, data, &(struct timeval){timeout, rand() % 100000});
+}
 
-	/* Try to make outgoing connections */
-	
-	try_outgoing_connections();
+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;
+	}
 }
 
-static void sigalrm_handler(int signal, short events, void *data) {
-	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
-
-	connection_t *c;
-	avl_node_t *node;
-
-	for(node = connection_tree->head; node; node = 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 timeval tv;
-	int r;
-	time_t last_ping_check;
-	struct event timeout;
-	struct event sighup_event;
-	struct event sigint_event;
-	struct event sigterm_event;
-	struct event sigquit_event;
-	struct event sigusr1_event;
-	struct event sigusr2_event;
-	struct event sigwinch_event;
-	struct event sigalrm_event;
-
-	cp();
-
-	signal_set(&sighup_event, SIGHUP, sighup_handler, NULL);
-	signal_add(&sighup_event, NULL);
-	signal_set(&sigint_event, SIGINT, sigint_handler, NULL);
-	signal_add(&sigint_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(&sigusr1_event, SIGUSR1, sigusr1_handler, NULL);
-	signal_add(&sigusr1_event, NULL);
-	signal_set(&sigusr2_event, SIGUSR2, sigusr2_handler, NULL);
-	signal_add(&sigusr2_event, NULL);
-	signal_set(&sigwinch_event, SIGWINCH, sigwinch_handler, NULL);
-	signal_add(&sigwinch_event, NULL);
-	signal_set(&sigalrm_event, SIGALRM, sigalrm_handler, NULL);
-	signal_add(&sigalrm_event, NULL);
-
-	last_ping_check = now;
-	
-	srand(now);
-
-	running = true;
-
-	while(running) {
-		now = time(NULL);
-
-	//	tv.tv_sec = 1 + (rand() & 7);	/* Approx. 5 seconds, randomized to prevent global synchronisation effects */
-		tv.tv_sec = 1;
-		tv.tv_usec = 0;
-
-		/* XXX: libevent transition: old timeout code in this loop */
-		timeout_set(&timeout, dummy, NULL);
-		timeout_add(&timeout, &tv);
-
-		r = build_fdset();
-		if(r < 0) {
-			logger(LOG_ERR, _("Error building fdset: %s"), strerror(errno));
-			cp_trace();
-			dump_connections();
-			return 1;
-		}
-
-		r = event_loop(EVLOOP_ONCE);
-		now = time(NULL);
-		if(r < 0) {
-			logger(LOG_ERR, _("Error while waiting for input: %s"),
-				   strerror(errno));
-			cp_trace();
-			dump_connections();
-			return 1;
-		}
-
-		/* XXX: more libevent transition */
-		timeout_del(&timeout);
+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});
 
-		/* Let's check if everybody is still alive */
+	//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(last_ping_check + pingtimeout < now) {
-			check_dead_connections();
-			last_ping_check = now;
-		}
+	if(!event_loop_run(&(mesh->loop), &(mesh->mesh_mutex))) {
+		logger(mesh, MESHLINK_ERROR, "Error while waiting for input: %s", strerror(errno));
+		return 1;
 	}
 
-	signal_del(&sighup_event);
-	signal_del(&sigint_event);
-	signal_del(&sigterm_event);
-	signal_del(&sigquit_event);
-	signal_del(&sigusr1_event);
-	signal_del(&sigusr2_event);
-	signal_del(&sigwinch_event);
-	signal_del(&sigalrm_event);
+	timeout_del(&mesh->loop, &mesh->periodictimer);
+	timeout_del(&mesh->loop, &mesh->pingtimer);
 
 	return 0;
 }