X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_setup.c;h=1b091db04034bd1a343390f508752d89de571b6a;hb=e306efba0aa513ae498b84b7f383b05365022092;hp=033bf3761eb773bd728e4827cf30de6ec72de723;hpb=046158a216e78a0412186ec8463157f6bce45d5d;p=meshlink

diff --git a/src/net_setup.c b/src/net_setup.c
index 033bf376..1b091db0 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -1,7 +1,6 @@
 /*
     net_setup.c -- Setup.
-    Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014-2017 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,489 +12,461 @@
     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 "splay_tree.h"
-#include "cipher.h"
 #include "conf.h"
 #include "connection.h"
-#include "control.h"
-#include "device.h"
-#include "digest.h"
+#include "ecdsa.h"
 #include "graph.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "net.h"
 #include "netutl.h"
-#include "process.h"
+#include "packmsg.h"
 #include "protocol.h"
 #include "route.h"
-#include "rsa.h"
-#include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
+#include "submesh.h"
 
-char *myport;
-static struct event device_ev;
-
-bool read_rsa_public_key(connection_t *c) {
-	FILE *fp;
-	char *fname;
-	char *n;
-	bool result;
+/// Helper function to start parsing a host config file
+static bool node_get_config(meshlink_handle_t *mesh, node_t *n, config_t *config, packmsg_input_t *in) {
+	if(!config_read(mesh, "current", n->name, config, mesh->config_key)) {
+		return false;
+	}
 
-	cp();
+	in->ptr = config->buf;
+	in->len = config->len;
 
-	/* First, check for simple PublicKey statement */
+	uint32_t version = packmsg_get_uint32(in);
 
-	if(get_config_string(lookup_config(c->config_tree, "PublicKey"), &n)) {
-		result = rsa_set_hex_public_key(&c->rsa, n, "FFFF");
-		free(n);
-		return result;
+	if(version != MESHLINK_CONFIG_VERSION) {
+		logger(mesh, MESHLINK_ERROR, "Invalid config file for node %s", n->name);
+		config_free(config);
+		return false;
 	}
 
-	/* Else, check for PublicKeyFile statement and read it */
+	const char *name;
+	uint32_t len = packmsg_get_str_raw(in, &name);
 
-	if(!get_config_string(lookup_config(c->config_tree, "PublicKeyFile"), &fname))
-		asprintf(&fname, "%s/hosts/%s", confbase, c->name);
-
-	fp = fopen(fname, "r");
-
-	if(!fp) {
-		logger(LOG_ERR, _("Error reading RSA public key file `%s': %s"),
-			   fname, strerror(errno));
-		free(fname);
+	if(len != strlen(n->name) || !name || strncmp(name, n->name, len)) {
+		logger(mesh, MESHLINK_ERROR, "Invalid config file for node %s", n->name);
+		config_free(config);
 		return false;
 	}
 
-	result = rsa_read_pem_public_key(&c->rsa, fp);
-	fclose(fp);
-
-	if(!result) 
-		logger(LOG_ERR, _("Reading RSA public key file `%s' failed: %s"), fname, strerror(errno));
-	free(fname);
-	return result;
+	return true;
 }
 
-bool read_rsa_private_key() {
-	FILE *fp;
-	char *fname;
-	char *n, *d;
-	bool result;
-
-	cp();
-
-	/* First, check for simple PrivateKey statement */
-
-	if(get_config_string(lookup_config(config_tree, "PrivateKey"), &d)) {
-		if(!get_config_string(lookup_config(myself->connection->config_tree, "PublicKey"), &n)) {
-			logger(LOG_ERR, _("PrivateKey used but no PublicKey found!"));
-			free(d);
-			return false;
-		}
-		result = rsa_set_hex_private_key(&myself->connection->rsa, n, "FFFF", d);
-		free(n);
-		free(d);
+/// Read the public key from a host config file. Used whenever we need to start an SPTPS session.
+bool node_read_public_key(meshlink_handle_t *mesh, node_t *n) {
+	if(ecdsa_active(n->ecdsa)) {
 		return true;
 	}
 
-	/* Else, check for PrivateKeyFile statement and read it */
+	config_t config;
+	packmsg_input_t in;
 
-	if(!get_config_string(lookup_config(config_tree, "PrivateKeyFile"), &fname))
-		asprintf(&fname, "%s/rsa_key.priv", confbase);
-
-	fp = fopen(fname, "r");
-
-	if(!fp) {
-		logger(LOG_ERR, _("Error reading RSA private key file `%s': %s"),
-			   fname, strerror(errno));
-		free(fname);
+	if(!node_get_config(mesh, n, &config, &in)) {
 		return false;
 	}
 
-#if !defined(HAVE_MINGW) && !defined(HAVE_CYGWIN)
-	struct stat s;
+	packmsg_skip_element(&in); /* submesh */
+	packmsg_get_int32(&in); /* devclass */
+	packmsg_get_bool(&in); /* blacklisted */
 
-	if(fstat(fileno(fp), &s)) {
-		logger(LOG_ERR, _("Could not stat RSA private key file `%s': %s'"), fname, strerror(errno));
-		free(fname);
+	const void *key;
+	uint32_t len = packmsg_get_bin_raw(&in, &key);
+
+	if(len != 32) {
+		config_free(&config);
 		return false;
 	}
 
-	if(s.st_mode & ~0100700)
-		logger(LOG_WARNING, _("Warning: insecure file permissions for RSA private key file `%s'!"), fname);
-#endif
+	n->ecdsa = ecdsa_set_public_key(key);
 
-	result = rsa_read_pem_private_key(&myself->connection->rsa, fp);
-	fclose(fp);
+	// While we are at it, read known address information
+	if(!n->canonical_address) {
+		n->canonical_address = packmsg_get_str_dup(&in);
+	} else {
+		packmsg_skip_element(&in);
+	}
 
-	if(!result) 
-		logger(LOG_ERR, _("Reading RSA private key file `%s' failed: %s"), fname, strerror(errno));
-	free(fname);
-	return result;
-}
+	// Append any known addresses in the config file to the list we currently have
+	uint32_t known_count = 0;
 
-static struct event keyexpire_event;
+	for(uint32_t i = 0; i < MAX_RECENT; i++) {
+		if(n->recent[i].sa.sa_family) {
+			known_count++;
+		}
+	}
 
-static void keyexpire_handler(int fd, short events, void *data) {
-	regenerate_key();
-}
+	uint32_t count = packmsg_get_array(&in);
 
-void regenerate_key() {
-	ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
+	for(uint32_t i = 0; i < count; i++) {
+		if(i < MAX_RECENT - known_count) {
+			n->recent[i + known_count] = packmsg_get_sockaddr(&in);
+		} else {
+			packmsg_skip_element(&in);
+		}
+	}
 
-	if(!cipher_regenerate_key(&myself->cipher, true)) {
-		logger(LOG_ERR, _("Error regenerating key!"));
-		abort();
+	time_t last_reachable = packmsg_get_int64(&in);
+	time_t last_unreachable = packmsg_get_int64(&in);
+
+	if(!n->last_reachable) {
+		n->last_reachable = last_reachable;
 	}
 
-	if(timeout_initialized(&keyexpire_event)) {
-		event_del(&keyexpire_event);
-		send_key_changed(broadcast, myself);
-	} else {
-		timeout_set(&keyexpire_event, keyexpire_handler, NULL);
+	if(!n->last_unreachable) {
+		n->last_unreachable = last_unreachable;
 	}
 
-	event_add(&keyexpire_event, &(struct timeval){keylifetime, 0});
+	config_free(&config);
+	return true;
 }
 
-/*
-  Configure node_t myself and set up the local sockets (listen only)
-*/
-bool setup_myself(void) {
-	config_t *cfg;
-	subnet_t *subnet;
-	char *name, *hostname, *mode, *afname, *cipher, *digest;
-	char *address = NULL;
-	char *envp[5];
-	struct addrinfo *ai, *aip, hint = {0};
-	bool choice;
-	int i, err;
-
-	cp();
-
-	myself = new_node();
-	myself->connection = new_connection();
-	init_configuration(&myself->connection->config_tree);
-
-	asprintf(&myself->hostname, _("MYSELF"));
-	asprintf(&myself->connection->hostname, _("MYSELF"));
-
-	myself->connection->options = 0;
-	myself->connection->protocol_version = PROT_CURRENT;
-
-	if(!get_config_string(lookup_config(config_tree, "Name"), &name)) {	/* Not acceptable */
-		logger(LOG_ERR, _("Name for tinc daemon required!"));
-		return false;
+/// Fill in node details from a config blob.
+bool node_read_from_config(meshlink_handle_t *mesh, node_t *n, const config_t *config) {
+	if(n->canonical_address) {
+		return true;
 	}
 
-	if(!check_id(name)) {
-		logger(LOG_ERR, _("Invalid name for myself!"));
-		free(name);
+	packmsg_input_t in = {config->buf, config->len};
+	uint32_t version = packmsg_get_uint32(&in);
+
+	if(version != MESHLINK_CONFIG_VERSION) {
 		return false;
 	}
 
-	myself->name = name;
-	myself->connection->name = xstrdup(name);
+	char *name = packmsg_get_str_dup(&in);
 
-	if(!read_connection_config(myself->connection)) {
-		logger(LOG_ERR, _("Cannot open host configuration file for myself!"));
+	if(!name) {
 		return false;
 	}
 
-	if(!read_rsa_private_key())
-		return false;
+	if(n->name) {
+		if(strcmp(n->name, name)) {
+			free(name);
+			return false;
+		}
 
-	if(!get_config_string(lookup_config(myself->connection->config_tree, "Port"), &myport))
-		asprintf(&myport, "655");
+		free(name);
+	} else {
+		n->name = name;
+	}
 
-	/* Read in all the subnets specified in the host configuration file */
+	char *submesh_name = packmsg_get_str_dup(&in);
 
-	cfg = lookup_config(myself->connection->config_tree, "Subnet");
+	if(!strcmp(submesh_name, CORE_MESH)) {
+		free(submesh_name);
+		n->submesh = NULL;
+	} else {
+		n->submesh = lookup_or_create_submesh(mesh, submesh_name);
+		free(submesh_name);
 
-	while(cfg) {
-		if(!get_config_subnet(cfg, &subnet))
+		if(!n->submesh) {
 			return false;
-
-		subnet_add(myself, subnet);
-
-		cfg = lookup_config_next(myself->connection->config_tree, cfg);
+		}
 	}
 
-	/* Check some options */
-
-	if(get_config_bool(lookup_config(config_tree, "IndirectData"), &choice) && choice)
-		myself->options |= OPTION_INDIRECT;
+	n->devclass = packmsg_get_int32(&in);
+	n->status.blacklisted = packmsg_get_bool(&in);
+	const void *key;
+	uint32_t len = packmsg_get_bin_raw(&in, &key);
 
-	if(get_config_bool(lookup_config(config_tree, "TCPOnly"), &choice) && choice)
-		myself->options |= OPTION_TCPONLY;
-
-	if(get_config_bool(lookup_config(myself->connection->config_tree, "IndirectData"), &choice) && choice)
-		myself->options |= OPTION_INDIRECT;
+	if(len) {
+		if(len != 32) {
+			return false;
+		}
 
-	if(get_config_bool(lookup_config(myself->connection->config_tree, "TCPOnly"), &choice) && choice)
-		myself->options |= OPTION_TCPONLY;
+		if(!ecdsa_active(n->ecdsa)) {
+			n->ecdsa = ecdsa_set_public_key(key);
+		}
+	}
 
-	if(get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice) && choice)
-		myself->options |= OPTION_PMTU_DISCOVERY;
+	n->canonical_address = packmsg_get_str_dup(&in);
+	uint32_t count = packmsg_get_array(&in);
 
-	if(myself->options & OPTION_TCPONLY)
-		myself->options |= OPTION_INDIRECT;
+	for(uint32_t i = 0; i < count; i++) {
+		if(i < MAX_RECENT) {
+			n->recent[i] = packmsg_get_sockaddr(&in);
+		} else {
+			packmsg_skip_element(&in);
+		}
+	}
 
-	get_config_bool(lookup_config(config_tree, "TunnelServer"), &tunnelserver);
+	n->last_reachable = packmsg_get_int64(&in);
+	n->last_unreachable = packmsg_get_int64(&in);
 
-	if(get_config_string(lookup_config(config_tree, "Mode"), &mode)) {
-		if(!strcasecmp(mode, "router"))
-			routing_mode = RMODE_ROUTER;
-		else if(!strcasecmp(mode, "switch"))
-			routing_mode = RMODE_SWITCH;
-		else if(!strcasecmp(mode, "hub"))
-			routing_mode = RMODE_HUB;
-		else {
-			logger(LOG_ERR, _("Invalid routing mode!"));
-			return false;
-		}
-		free(mode);
-	} else
-		routing_mode = RMODE_ROUTER;
+	return packmsg_done(&in);
+}
 
-	get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
+bool node_write_config(meshlink_handle_t *mesh, node_t *n) {
+	if(!mesh->confbase) {
+		return true;
+	}
 
-#if !defined(SOL_IP) || !defined(IP_TOS)
-	if(priorityinheritance)
-		logger(LOG_WARNING, _("PriorityInheritance not supported on this platform"));
-#endif
+	uint8_t buf[4096];
+	packmsg_output_t out = {buf, sizeof(buf)};
 
-	if(!get_config_int(lookup_config(config_tree, "MACExpire"), &macexpire))
-		macexpire = 600;
+	packmsg_add_uint32(&out, MESHLINK_CONFIG_VERSION);
+	packmsg_add_str(&out, n->name);
+	packmsg_add_str(&out, n->submesh ? n->submesh->name : CORE_MESH);
+	packmsg_add_int32(&out, n->devclass);
+	packmsg_add_bool(&out, n->status.blacklisted);
 
-	if(get_config_int(lookup_config(config_tree, "MaxTimeout"), &maxtimeout)) {
-		if(maxtimeout <= 0) {
-			logger(LOG_ERR, _("Bogus maximum timeout!"));
-			return false;
-		}
-	} else
-		maxtimeout = 900;
-
-	if(get_config_string(lookup_config(config_tree, "AddressFamily"), &afname)) {
-		if(!strcasecmp(afname, "IPv4"))
-			addressfamily = AF_INET;
-		else if(!strcasecmp(afname, "IPv6"))
-			addressfamily = AF_INET6;
-		else if(!strcasecmp(afname, "any"))
-			addressfamily = AF_UNSPEC;
-		else {
-			logger(LOG_ERR, _("Invalid address family!"));
-			return false;
-		}
-		free(afname);
+	if(ecdsa_active(n->ecdsa)) {
+		packmsg_add_bin(&out, ecdsa_get_public_key(n->ecdsa), 32);
+	} else {
+		packmsg_add_bin(&out, "", 0);
 	}
 
-	get_config_bool(lookup_config(config_tree, "Hostnames"), &hostnames);
+	packmsg_add_str(&out, n->canonical_address ? n->canonical_address : "");
 
-	/* Generate packet encryption key */
+	uint32_t count = 0;
 
-	if(!get_config_string(lookup_config(myself->connection->config_tree, "Cipher"), &cipher))
-		cipher = xstrdup("blowfish");
-
-	if(!cipher_open_by_name(&myself->cipher, cipher)) {
-		logger(LOG_ERR, _("Unrecognized cipher type!"));
-		return false;
+	for(uint32_t i = 0; i < MAX_RECENT; i++) {
+		if(n->recent[i].sa.sa_family) {
+			count++;
+		} else {
+			break;
+		}
 	}
 
-	if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
-		keylifetime = 3600;
+	packmsg_add_array(&out, count);
 
-	regenerate_key();
-
-	/* Check if we want to use message authentication codes... */
+	for(uint32_t i = 0; i < count; i++) {
+		packmsg_add_sockaddr(&out, &n->recent[i]);
+	}
 
-	if(!get_config_string(lookup_config(myself->connection->config_tree, "Digest"), &digest))
-		digest = xstrdup("sha1");
+	packmsg_add_int64(&out, n->last_reachable);
+	packmsg_add_int64(&out, n->last_unreachable);
 
-	if(!digest_open_by_name(&myself->digest, digest)) {
-		logger(LOG_ERR, _("Unrecognized digest type!"));
+	if(!packmsg_output_ok(&out)) {
+		meshlink_errno = MESHLINK_EINTERNAL;
 		return false;
 	}
 
-	if(!get_config_int(lookup_config(myself->connection->config_tree, "MACLength"), &myself->maclength))
+	config_t config = {buf, packmsg_output_size(&out, buf)};
 
-	if(digest_active(&myself->digest)) {
-		if(myself->maclength > digest_length(&myself->digest)) {
-			logger(LOG_ERR, _("MAC length exceeds size of digest!"));
-			return false;
-		} else if(myself->maclength < 0) {
-			logger(LOG_ERR, _("Bogus MAC length!"));
-			return false;
-		}
+	if(!config_write(mesh, "current", n->name, &config, mesh->config_key)) {
+		call_error_cb(mesh, MESHLINK_ESTORAGE);
+		return false;
 	}
 
-	/* Compression */
+	return true;
+}
 
-	if(get_config_int(lookup_config(myself->connection->config_tree, "Compression"), &myself->compression)) {
-		if(myself->compression < 0 || myself->compression > 11) {
-			logger(LOG_ERR, _("Bogus compression level!"));
-			return false;
-		}
-	} else
-		myself->compression = 0;
+static bool load_node(meshlink_handle_t *mesh, const char *name, void *priv) {
+	(void)priv;
 
-	myself->connection->outcompression = 0;
+	if(!check_id(name)) {
+		return true;
+	}
 
-	/* Done */
+	node_t *n = lookup_node(mesh, name);
 
-	myself->nexthop = myself;
-	myself->via = myself;
-	myself->status.reachable = true;
-	node_add(myself);
+	if(n) {
+		return true;
+	}
 
-	graph();
+	n = new_node();
+	n->name = xstrdup(name);
 
-	/* Open device */
+	config_t config;
+	packmsg_input_t in;
 
-	if(!setup_device())
+	if(!node_get_config(mesh, n, &config, &in)) {
+		free_node(n);
 		return false;
+	}
 
-	event_set(&device_ev, device_fd, EV_READ|EV_PERSIST, handle_device_data, NULL);
-
-	if (event_add(&device_ev, NULL) < 0) {
-		logger(LOG_ERR, _("event_add failed: %s"), strerror(errno));
-		close_device();
+	if(!node_read_from_config(mesh, n, &config)) {
+		logger(mesh, MESHLINK_ERROR, "Invalid config file for node %s", n->name);
+		config_free(&config);
+		free_node(n);
 		return false;
 	}
 
-	/* Run tinc-up script to further initialize the tap interface */
-	asprintf(&envp[0], "NETNAME=%s", netname ? : "");
-	asprintf(&envp[1], "DEVICE=%s", device ? : "");
-	asprintf(&envp[2], "INTERFACE=%s", iface ? : "");
-	asprintf(&envp[3], "NAME=%s", myself->name);
-	envp[4] = NULL;
+	config_free(&config);
 
-	execute_script("tinc-up", envp);
+	node_add(mesh, n);
 
-	for(i = 0; i < 5; i++)
-		free(envp[i]);
+	return true;
+}
 
-	/* Run subnet-up scripts for our own subnets */
+/*
+  Add listening sockets.
+*/
+static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bindto) {
+	char *port = mesh->myport;
 
-	subnet_update(myself, NULL, true);
+	if(address) {
+		char *space = strchr(address, ' ');
 
-	/* Open sockets */
+		if(space) {
+			*space++ = 0;
+			port = space;
+		}
 
-	get_config_string(lookup_config(config_tree, "BindToAddress"), &address);
+		if(!strcmp(address, "*")) {
+			*address = 0;
+		}
+	}
+
+	struct addrinfo *ai;
 
-	hint.ai_family = addressfamily;
-	hint.ai_socktype = SOCK_STREAM;
-	hint.ai_protocol = IPPROTO_TCP;
-	hint.ai_flags = AI_PASSIVE;
+	struct addrinfo hint = {
+		.ai_family = AF_UNSPEC,
+		.ai_socktype = SOCK_STREAM,
+		.ai_protocol = IPPROTO_TCP,
+		.ai_flags = AI_PASSIVE,
+	};
 
-	err = getaddrinfo(address, myport, &hint, &ai);
+	int err = getaddrinfo(address && *address ? address : NULL, port, &hint, &ai);
+
+	free(address);
 
 	if(err || !ai) {
-		logger(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo",
-			   gai_strerror(err));
+		logger(mesh, MESHLINK_ERROR, "System call `%s' failed: %s", "getaddrinfo", err == EAI_SYSTEM ? strerror(err) : gai_strerror(err));
 		return false;
 	}
 
-	listen_sockets = 0;
+	bool success = false;
+
+	for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
+		// Ignore duplicate addresses
+		bool found = false;
 
-	for(aip = ai; aip; aip = aip->ai_next) {
-		listen_socket[listen_sockets].tcp =
-			setup_listen_socket((sockaddr_t *) aip->ai_addr);
+		for(int i = 0; i < mesh->listen_sockets; i++)
+			if(!memcmp(&mesh->listen_socket[i].sa, aip->ai_addr, aip->ai_addrlen)) {
+				found = true;
+				break;
+			}
 
-		if(listen_socket[listen_sockets].tcp < 0)
+		if(found) {
 			continue;
+		}
+
+		if(mesh->listen_sockets >= MAXSOCKETS) {
+			logger(mesh, MESHLINK_ERROR, "Too many listening sockets");
+			return false;
+		}
 
-		listen_socket[listen_sockets].udp =
-			setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
+		int tcp_fd = setup_listen_socket((sockaddr_t *) aip->ai_addr);
 
-		if(listen_socket[listen_sockets].udp < 0) {
-			close(listen_socket[listen_sockets].tcp);
+		if(tcp_fd < 0) {
 			continue;
 		}
 
-		event_set(&listen_socket[listen_sockets].ev_tcp,
-				  listen_socket[listen_sockets].tcp,
-				  EV_READ|EV_PERSIST,
-				  handle_new_meta_connection, NULL);
-		if(event_add(&listen_socket[listen_sockets].ev_tcp, NULL) < 0) {
-			logger(LOG_EMERG, _("event_add failed: %s"), strerror(errno));
-			abort();
-		}
+		int udp_fd = setup_vpn_in_socket(mesh, (sockaddr_t *) aip->ai_addr);
 
-		event_set(&listen_socket[listen_sockets].ev_udp,
-				  listen_socket[listen_sockets].udp,
-				  EV_READ|EV_PERSIST,
-				  handle_incoming_vpn_data, NULL);
-		if(event_add(&listen_socket[listen_sockets].ev_udp, NULL) < 0) {
-			logger(LOG_EMERG, _("event_add failed: %s"), strerror(errno));
-			abort();
+		if(udp_fd < 0) {
+			close(tcp_fd);
+			continue;
 		}
 
-		ifdebug(CONNECTIONS) {
-			hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
-			logger(LOG_NOTICE, _("Listening on %s"), hostname);
+		io_add(&mesh->loop, &mesh->listen_socket[mesh->listen_sockets].tcp, handle_new_meta_connection, &mesh->listen_socket[mesh->listen_sockets], tcp_fd, IO_READ);
+		io_add(&mesh->loop, &mesh->listen_socket[mesh->listen_sockets].udp, handle_incoming_vpn_data, &mesh->listen_socket[mesh->listen_sockets], udp_fd, IO_READ);
+
+		if(mesh->log_level >= MESHLINK_INFO) {
+			char *hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
+			logger(mesh, MESHLINK_INFO, "Listening on %s", hostname);
 			free(hostname);
 		}
 
-		memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
-		listen_sockets++;
+		mesh->listen_socket[mesh->listen_sockets].bindto = bindto;
+		memcpy(&mesh->listen_socket[mesh->listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
+		memcpy(&mesh->listen_socket[mesh->listen_sockets].broadcast_sa, aip->ai_addr, aip->ai_addrlen);
 
-		if(listen_sockets >= MAXSOCKETS) {
-			logger(LOG_WARNING, _("Maximum of %d listening sockets reached"), MAXSOCKETS);
-			break;
+		if(aip->ai_family == AF_INET6) {
+			mesh->listen_socket[mesh->listen_sockets].broadcast_sa.in6.sin6_addr.s6_addr[0x0] = 0xff;
+			mesh->listen_socket[mesh->listen_sockets].broadcast_sa.in6.sin6_addr.s6_addr[0x1] = 0x02;
+			mesh->listen_socket[mesh->listen_sockets].broadcast_sa.in6.sin6_addr.s6_addr[0xf] = 0x01;
+		} else {
+			mesh->listen_socket[mesh->listen_sockets].broadcast_sa.in.sin_addr.s_addr = 0xffffffff;
 		}
+
+		mesh->listen_sockets++;
+		success = true;
 	}
 
 	freeaddrinfo(ai);
+	return success;
+}
+
+/*
+  Configure node_t mesh->self and set up the local sockets (listen only)
+*/
+bool setup_myself(meshlink_handle_t *mesh) {
+	/* Set some defaults */
+
+	mesh->maxtimeout = 900;
+
+	/* Done */
+
+	mesh->self->nexthop = mesh->self;
+
+	node_add(mesh, mesh->self);
+
+	if(!config_scan_all(mesh, "current", "hosts", load_node, NULL)) {
+		logger(mesh, MESHLINK_WARNING, "Could not scan all host config files");
+	}
+
+	/* Open sockets */
+
+	mesh->listen_sockets = 0;
+
+	if(!add_listen_address(mesh, NULL, NULL)) {
+		if(strcmp(mesh->myport, "0")) {
+			logger(mesh, MESHLINK_INFO, "Could not bind to port %s, asking OS to choose one for us", mesh->myport);
+			free(mesh->myport);
+			mesh->myport = strdup("0");
+
+			if(!mesh->myport) {
+				return false;
+			}
 
-	if(listen_sockets)
-		logger(LOG_NOTICE, _("Ready"));
-	else {
-		logger(LOG_ERR, _("Unable to create any listening socket!"));
+			if(!add_listen_address(mesh, NULL, NULL)) {
+				return false;
+			}
+		} else {
+			return false;
+		}
+	}
+
+	if(!mesh->listen_sockets) {
+		logger(mesh, MESHLINK_ERROR, "Unable to create any listening socket!");
 		return false;
 	}
 
+	/* Done. */
+
+	mesh->last_config_check = mesh->loop.now.tv_sec;
+	mesh->last_unreachable = mesh->loop.now.tv_sec;
+
 	return true;
 }
 
 /*
-  setup all initial network connections
+  initialize network
 */
-bool setup_network_connections(void) {
-	cp();
-
-	init_connections();
-	init_subnets();
-	init_nodes();
-	init_edges();
-	init_requests();
-
-	if(get_config_int(lookup_config(config_tree, "PingInterval"), &pinginterval)) {
-		if(pinginterval < 1) {
-			pinginterval = 86400;
-		}
-	} else
-		pinginterval = 60;
-
-	if(!get_config_int(lookup_config(config_tree, "PingTimeout"), &pingtimeout))
-		pingtimeout = 5;
-	if(pingtimeout < 1 || pingtimeout > pinginterval)
-		pingtimeout = pinginterval;
-
-	if(!get_config_int(lookup_config(config_tree, "MaxOutputBufferSize"), &maxoutbufsize))
-		maxoutbufsize = 4 * MTU;
-
-	if(!setup_myself())
+bool setup_network(meshlink_handle_t *mesh) {
+	init_connections(mesh);
+	init_submeshes(mesh);
+	init_nodes(mesh);
+	init_edges(mesh);
+	init_requests(mesh);
+
+	if(!setup_myself(mesh)) {
 		return false;
-
-	try_outgoing_connections();
+	}
 
 	return true;
 }
@@ -503,59 +474,33 @@ bool setup_network_connections(void) {
 /*
   close all open network connections
 */
-void close_network_connections(void) {
-	splay_node_t *node, *next;
-	connection_t *c;
-	char *envp[5];
-	int i;
-
-	cp();
-
-	for(node = connection_tree->head; node; node = next) {
-		next = node->next;
-		c = node->data;
-
-		if(c->outgoing) {
-			if(c->outgoing->ai)
-				freeaddrinfo(c->outgoing->ai);
-			free(c->outgoing->name);
-			free(c->outgoing);
+void close_network_connections(meshlink_handle_t *mesh) {
+	if(mesh->connections) {
+		for(list_node_t *node = mesh->connections->head, *next; node; node = next) {
+			next = node->next;
+			connection_t *c = node->data;
 			c->outgoing = NULL;
+			terminate_connection(mesh, c, false);
 		}
-
-		terminate_connection(c, false);
 	}
 
-	if(myself && myself->connection) {
-		subnet_update(myself, NULL, false);
-		terminate_connection(myself->connection, false);
+	for(int i = 0; i < mesh->listen_sockets; i++) {
+		io_del(&mesh->loop, &mesh->listen_socket[i].tcp);
+		io_del(&mesh->loop, &mesh->listen_socket[i].udp);
+		close(mesh->listen_socket[i].tcp.fd);
+		close(mesh->listen_socket[i].udp.fd);
 	}
 
-	for(i = 0; i < listen_sockets; i++) {
-		event_del(&listen_socket[i].ev_tcp);
-		event_del(&listen_socket[i].ev_udp);
-		close(listen_socket[i].tcp);
-		close(listen_socket[i].udp);
-	}
-
-	asprintf(&envp[0], "NETNAME=%s", netname ? : "");
-	asprintf(&envp[1], "DEVICE=%s", device ? : "");
-	asprintf(&envp[2], "INTERFACE=%s", iface ? : "");
-	asprintf(&envp[3], "NAME=%s", myself->name);
-	envp[4] = NULL;
-
-	exit_requests();
-	exit_edges();
-	exit_subnets();
-	exit_nodes();
-	exit_connections();
-
-	execute_script("tinc-down", envp);
+	exit_requests(mesh);
+	exit_edges(mesh);
+	exit_nodes(mesh);
+	exit_submeshes(mesh);
+	exit_connections(mesh);
 
-	for(i = 0; i < 4; i++)
-		free(envp[i]);
+	free(mesh->myport);
+	mesh->myport = NULL;
 
-	close_device();
+	mesh->self = NULL;
 
 	return;
 }