X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_setup.c;h=1a123cf5415665e9ead4390fde87742dc9d8ff80;hb=a5a8005b2d89712e124ab7295165a3e229abdad5;hp=6aeceaf305aa1438ed83a6bed4b7950089739575;hpb=b180c1af99c559809d0e7b23fce3022817ec56a9;p=meshlink

diff --git a/src/net_setup.c b/src/net_setup.c
index 6aeceaf3..1a123cf5 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -1,9 +1,6 @@
 /*
     net_setup.c -- Setup.
-    Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
-                  2006      Scott Lamb <slamb@slamb.org>
-                  2010      Brandon Black <blblack@gmail.com>
+    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
@@ -22,953 +19,422 @@
 
 #include "system.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 "names.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 io_t device_io;
-devops_t devops;
-
-char *proxyhost;
-char *proxyport;
-char *proxyuser;
-char *proxypass;
-proxytype_t proxytype;
-int autoconnect;
-bool disablebuggypeers;
-
-char *scriptinterpreter;
-char *scriptextension;
-
-bool node_read_ecdsa_public_key(node_t *n) {
-	if(ecdsa_active(n->ecdsa))
-		return true;
-
-	splay_tree_t *config_tree;
-	FILE *fp;
-	char *pubname = NULL;
-	char *p;
+/// 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;
+	}
 
-	init_configuration(&config_tree);
-	if(!read_host_config(config_tree, n->name))
-		goto exit;
+	in->ptr = config->buf;
+	in->len = config->len;
 
-	/* First, check for simple ECDSAPublicKey statement */
+	uint32_t version = packmsg_get_uint32(in);
 
-	if(get_config_string(lookup_config(config_tree, "ECDSAPublicKey"), &p)) {
-		n->ecdsa = ecdsa_set_base64_public_key(p);
-		free(p);
-		goto exit;
+	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 ECDSAPublicKeyFile statement and read it */
+	const char *name;
+	uint32_t len = packmsg_get_str_raw(in, &name);
 
-	if(!get_config_string(lookup_config(config_tree, "ECDSAPublicKeyFile"), &pubname))
-		xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, n->name);
-
-	fp = fopen(pubname, "r");
-
-	if(!fp) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA public key file `%s': %s", pubname, strerror(errno));
-		goto exit;
+	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;
 	}
 
-	n->ecdsa = ecdsa_read_pem_public_key(fp);
-	fclose(fp);
-
-exit:
-	exit_configuration(&config_tree);
-	free(pubname);
-	return n->ecdsa;
+	return true;
 }
 
-bool read_ecdsa_public_key(connection_t *c) {
-	if(ecdsa_active(c->ecdsa))
+/// 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;
-
-	FILE *fp;
-	char *fname;
-	char *p;
-
-	if(!c->config_tree) {
-		init_configuration(&c->config_tree);
-		if(!read_host_config(c->config_tree, c->name))
-			return false;
 	}
 
-	/* First, check for simple ECDSAPublicKey statement */
+	config_t config;
+	packmsg_input_t in;
 
-	if(get_config_string(lookup_config(c->config_tree, "ECDSAPublicKey"), &p)) {
-		c->ecdsa = ecdsa_set_base64_public_key(p);
-		free(p);
-		return c->ecdsa;
+	if(!node_get_config(mesh, n, &config, &in)) {
+		return false;
 	}
 
-	/* Else, check for ECDSAPublicKeyFile statement and read it */
+	packmsg_skip_element(&in); /* submesh */
+	packmsg_get_int32(&in); /* devclass */
+	packmsg_get_bool(&in); /* blacklisted */
 
-	if(!get_config_string(lookup_config(c->config_tree, "ECDSAPublicKeyFile"), &fname))
-		xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, c->name);
+	const void *key;
+	uint32_t len = packmsg_get_bin_raw(&in, &key);
 
-	fp = fopen(fname, "r");
-
-	if(!fp) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA public key file `%s': %s",
-			   fname, strerror(errno));
-		free(fname);
+	if(len != 32) {
+		config_free(&config);
 		return false;
 	}
 
-	c->ecdsa = ecdsa_read_pem_public_key(fp);
-	fclose(fp);
-
-	if(!c->ecdsa)
-		logger(DEBUG_ALWAYS, LOG_ERR, "Parsing ECDSA public key file `%s' failed.", fname);
-	free(fname);
-	return c->ecdsa;
-}
-
-bool read_rsa_public_key(connection_t *c) {
-	if(ecdsa_active(c->ecdsa))
-		return true;
+	n->ecdsa = ecdsa_set_public_key(key);
 
-	FILE *fp;
-	char *fname;
-	char *n;
+	// 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);
+	}
 
-	/* First, check for simple PublicKey statement */
+	// Append any known addresses in the config file to the list we currently have
+	uint32_t known_count = 0;
 
-	if(get_config_string(lookup_config(c->config_tree, "PublicKey"), &n)) {
-		c->rsa = rsa_set_hex_public_key(n, "FFFF");
-		free(n);
-		return c->rsa;
+	for(uint32_t i = 0; i < 5; i++) {
+		if(n->recent[i].sa.sa_family) {
+			known_count++;
+		}
 	}
 
-	/* Else, check for PublicKeyFile statement and read it */
-
-	if(!get_config_string(lookup_config(c->config_tree, "PublicKeyFile"), &fname))
-		xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, c->name);
+	uint32_t count = packmsg_get_array(&in);
 
-	fp = fopen(fname, "r");
+	if(count > 5 - known_count) {
+		count = 5 - known_count;
+	}
 
-	if(!fp) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error reading RSA public key file `%s': %s", fname, strerror(errno));
-		free(fname);
-		return false;
+	for(uint32_t i = 0; i < count; i++) {
+		n->recent[i + known_count] = packmsg_get_sockaddr(&in);
 	}
 
-	c->rsa = rsa_read_pem_public_key(fp);
-	fclose(fp);
 
-	if(!c->rsa)
-		logger(DEBUG_ALWAYS, LOG_ERR, "Reading RSA public key file `%s' failed: %s", fname, strerror(errno));
-	free(fname);
-	return c->rsa;
+	config_free(&config);
+	return true;
 }
 
-static bool read_ecdsa_private_key(void) {
-	FILE *fp;
-	char *fname;
-
-	/* Check for PrivateKeyFile statement and read it */
-
-	if(!get_config_string(lookup_config(config_tree, "ECDSAPrivateKeyFile"), &fname))
-		xasprintf(&fname, "%s" SLASH "ecdsa_key.priv", confbase);
-
-	fp = fopen(fname, "r");
-
-	if(!fp) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA private key file `%s': %s", fname, strerror(errno));
-		if(errno == ENOENT)
-			logger(DEBUG_ALWAYS, LOG_INFO, "Create an ECDSA keypair with `tinc -n %s generate-ecdsa-keys'.", netname ?: ".");
-		free(fname);
-		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 !defined(HAVE_MINGW) && !defined(HAVE_CYGWIN)
-	struct stat s;
+	packmsg_input_t in = {config->buf, config->len};
+	uint32_t version = packmsg_get_uint32(&in);
 
-	if(fstat(fileno(fp), &s)) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Could not stat ECDSA private key file `%s': %s'", fname, strerror(errno));
-		free(fname);
+	if(version != MESHLINK_CONFIG_VERSION) {
 		return false;
 	}
 
-	if(s.st_mode & ~0100700)
-		logger(DEBUG_ALWAYS, LOG_WARNING, "Warning: insecure file permissions for ECDSA private key file `%s'!", fname);
-#endif
+	char *name = packmsg_get_str_dup(&in);
 
-	myself->connection->ecdsa = ecdsa_read_pem_private_key(fp);
-	fclose(fp);
-
-	if(!myself->connection->ecdsa)
-		logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", fname, strerror(errno));
-	free(fname);
-	return myself->connection->ecdsa;
-}
-
-static bool read_invitation_key(void) {
-	FILE *fp;
-	char *fname;
-
-	if(invitation_key) {
-		ecdsa_free(invitation_key);
-		invitation_key = NULL;
+	if(!name) {
+		return false;
 	}
 
-	xasprintf(&fname, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", confbase);
-
-	fp = fopen(fname, "r");
+	if(n->name) {
+		if(strcmp(n->name, name)) {
+			free(name);
+			return false;
+		}
 
-	if(fp) {
-		invitation_key = ecdsa_read_pem_private_key(fp);
-		fclose(fp);
-		if(!invitation_key)
-			logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", fname, strerror(errno));
+		free(name);
+	} else {
+		n->name = name;
 	}
 
-	free(fname);
-	return invitation_key;
-}
-
-static bool read_rsa_private_key(void) {
-	FILE *fp;
-	char *fname;
-	char *n, *d;
+	char *submesh_name = packmsg_get_str_dup(&in);
 
-	/* First, check for simple PrivateKey statement */
+	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);
 
-	if(get_config_string(lookup_config(config_tree, "PrivateKey"), &d)) {
-		if(!get_config_string(lookup_config(config_tree, "PublicKey"), &n)) {
-			logger(DEBUG_ALWAYS, LOG_ERR, "PrivateKey used but no PublicKey found!");
-			free(d);
+		if(!n->submesh) {
 			return false;
 		}
-		myself->connection->rsa = rsa_set_hex_private_key(n, "FFFF", d);
-		free(n);
-		free(d);
-		return myself->connection->rsa;
 	}
 
-	/* Else, check for PrivateKeyFile statement and read it */
+	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_string(lookup_config(config_tree, "PrivateKeyFile"), &fname))
-		xasprintf(&fname, "%s" SLASH "rsa_key.priv", confbase);
-
-	fp = fopen(fname, "r");
-
-	if(!fp) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error reading RSA private key file `%s': %s",
-			   fname, strerror(errno));
-		free(fname);
+	if(len != 32) {
 		return false;
 	}
 
-#if !defined(HAVE_MINGW) && !defined(HAVE_CYGWIN)
-	struct stat s;
-
-	if(fstat(fileno(fp), &s)) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Could not stat RSA private key file `%s': %s'", fname, strerror(errno));
-		free(fname);
-		return false;
+	if(!ecdsa_active(n->ecdsa)) {
+		n->ecdsa = ecdsa_set_public_key(key);
 	}
 
-	if(s.st_mode & ~0100700)
-		logger(DEBUG_ALWAYS, LOG_WARNING, "Warning: insecure file permissions for RSA private key file `%s'!", fname);
-#endif
-
-	myself->connection->rsa = rsa_read_pem_private_key(fp);
-	fclose(fp);
-
-	if(!myself->connection->rsa)
-		logger(DEBUG_ALWAYS, LOG_ERR, "Reading RSA private key file `%s' failed: %s", fname, strerror(errno));
-	free(fname);
-	return myself->connection->rsa;
-}
-
-static timeout_t keyexpire_timeout;
-
-static void keyexpire_handler(void *data) {
-	regenerate_key();
-	timeout_set(data, &(struct timeval){keylifetime, rand() % 100000});
-}
+	n->canonical_address = packmsg_get_str_dup(&in);
+	uint32_t count = packmsg_get_array(&in);
 
-void regenerate_key(void) {
-	logger(DEBUG_STATUS, LOG_INFO, "Expiring symmetric keys");
-	send_key_changed();
-}
-
-/*
-  Read Subnets from all host config files
-*/
-void load_all_subnets(void) {
-	DIR *dir;
-	struct dirent *ent;
-	char *dname;
-
-	xasprintf(&dname, "%s" SLASH "hosts", confbase);
-	dir = opendir(dname);
-	if(!dir) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
-		free(dname);
-		return;
+	if(count > 5) {
+		count = 5;
 	}
 
-	while((ent = readdir(dir))) {
-		if(!check_id(ent->d_name))
-			continue;
-
-		node_t *n = lookup_node(ent->d_name);
-		#ifdef _DIRENT_HAVE_D_TYPE
-		//if(ent->d_type != DT_REG)
-		//	continue;
-		#endif
-
-		splay_tree_t *config_tree;
-		init_configuration(&config_tree);
-		read_config_options(config_tree, ent->d_name);
-		read_host_config(config_tree, ent->d_name);
-
-		if(!n) {
-			n = new_node();
-			n->name = xstrdup(ent->d_name);
-			node_add(n);
-		}
-
-		for(config_t *cfg = lookup_config(config_tree, "Subnet"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
-			subnet_t *s, *s2;
-
-			if(!get_config_subnet(cfg, &s))
-				continue;
-
-			if((s2 = lookup_subnet(n, s))) {
-				s2->expires = -1;
-			} else {
-				subnet_add(n, s);
-			}
-		}
-
-		exit_configuration(&config_tree);
+	for(uint32_t i = 0; i < count; i++) {
+		n->recent[i] = packmsg_get_sockaddr(&in);
 	}
 
-	closedir(dir);
+	return packmsg_done(&in);
 }
 
-void load_all_nodes(void) {
-	DIR *dir;
-	struct dirent *ent;
-	char *dname;
-
-	xasprintf(&dname, "%s" SLASH "hosts", confbase);
-	dir = opendir(dname);
-	if(!dir) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
-		free(dname);
-		return;
+bool node_write_config(meshlink_handle_t *mesh, node_t *n) {
+	if(!mesh->confbase) {
+		return true;
 	}
 
-	while((ent = readdir(dir))) {
-		if(!check_id(ent->d_name))
-			continue;
+	uint8_t buf[4096];
+	packmsg_output_t out = {buf, sizeof(buf)};
 
-		node_t *n = lookup_node(ent->d_name);
-		if(n)
-			continue;
+	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);
 
-		n = new_node();
-		n->name = xstrdup(ent->d_name);
-		node_add(n);
+	if(ecdsa_active(n->ecdsa)) {
+		packmsg_add_bin(&out, ecdsa_get_public_key(n->ecdsa), 32);
+	} else {
+		packmsg_add_bin(&out, "", 0);
 	}
 
-	closedir(dir);
-}
-
+	packmsg_add_str(&out, n->canonical_address ? n->canonical_address : "");
 
-char *get_name(void) {
-	char *name = NULL;
+	uint32_t count = 0;
 
-	get_config_string(lookup_config(config_tree, "Name"), &name);
+	for(uint32_t i = 0; i < 5; i++) {
+		if(n->recent[i].sa.sa_family) {
+			count++;
+		} else {
+			break;
+		}
+	}
 
-	if(!name)
-		return NULL;
+	packmsg_add_array(&out, count);
 
-	if(*name == '$') {
-		char *envname = getenv(name + 1);
-		if(!envname) {
-			if(strcmp(name + 1, "HOST")) {
-				logger(DEBUG_ALWAYS, LOG_ERR, "Invalid Name: environment variable %s does not exist\n", name + 1);
-				return false;
-			}
-			char envname[32];
-			if(gethostname(envname, 32)) {
-				logger(DEBUG_ALWAYS, LOG_ERR, "Could not get hostname: %s\n", strerror(errno));
-				return false;
-			}
-			envname[31] = 0;
-		}
-		free(name);
-		name = xstrdup(envname);
-		for(char *c = name; *c; c++)
-			if(!isalnum(*c))
-				*c = '_';
+	for(uint32_t i = 0; i < count; i++) {
+		packmsg_add_sockaddr(&out, &n->recent[i]);
 	}
 
-	if(!check_id(name)) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Invalid name for myself!");
-		free(name);
+	if(!packmsg_output_ok(&out)) {
 		return false;
 	}
 
-	return name;
-}
-
-bool setup_myself_reloadable(void) {
-	char *proxy = NULL;
-	char *rmode = NULL;
-	char *fmode = NULL;
-	char *bmode = NULL;
-	char *afname = NULL;
-	char *address = NULL;
-	char *space;
-	bool choice;
-
-	free(scriptinterpreter);
-	scriptinterpreter = NULL;
-	get_config_string(lookup_config(config_tree, "ScriptsInterpreter"), &scriptinterpreter);
-
-
-	free(scriptextension);
-	if(!get_config_string(lookup_config(config_tree, "ScriptsExtension"), &scriptextension))
-#ifdef HAVE_MINGW
-		scriptextension = xstrdup(".bat");
-#else
-		scriptextension = xstrdup("");
-#endif
-
-	get_config_string(lookup_config(config_tree, "Proxy"), &proxy);
-	if(proxy) {
-		if((space = strchr(proxy, ' ')))
-			*space++ = 0;
-
-		if(!strcasecmp(proxy, "none")) {
-			proxytype = PROXY_NONE;
-		} else if(!strcasecmp(proxy, "socks4")) {
-			proxytype = PROXY_SOCKS4;
-		} else if(!strcasecmp(proxy, "socks4a")) {
-			proxytype = PROXY_SOCKS4A;
-		} else if(!strcasecmp(proxy, "socks5")) {
-			proxytype = PROXY_SOCKS5;
-		} else if(!strcasecmp(proxy, "http")) {
-			proxytype = PROXY_HTTP;
-		} else if(!strcasecmp(proxy, "exec")) {
-			proxytype = PROXY_EXEC;
-		} else {
-			logger(DEBUG_ALWAYS, LOG_ERR, "Unknown proxy type %s!", proxy);
-			return false;
-		}
-
-		switch(proxytype) {
-			case PROXY_NONE:
-			default:
-				break;
-
-			case PROXY_EXEC:
-				if(!space || !*space) {
-					logger(DEBUG_ALWAYS, LOG_ERR, "Argument expected for proxy type exec!");
-					return false;
-				}
-				proxyhost =  xstrdup(space);
-				break;
-
-			case PROXY_SOCKS4:
-			case PROXY_SOCKS4A:
-			case PROXY_SOCKS5:
-			case PROXY_HTTP:
-				proxyhost = space;
-				if(space && (space = strchr(space, ' ')))
-					*space++ = 0, proxyport = space;
-				if(space && (space = strchr(space, ' ')))
-					*space++ = 0, proxyuser = space;
-				if(space && (space = strchr(space, ' ')))
-					*space++ = 0, proxypass = space;
-				if(!proxyhost || !*proxyhost || !proxyport || !*proxyport) {
-					logger(DEBUG_ALWAYS, LOG_ERR, "Host and port argument expected for proxy!");
-					return false;
-				}
-				proxyhost = xstrdup(proxyhost);
-				proxyport = xstrdup(proxyport);
-				if(proxyuser && *proxyuser)
-					proxyuser = xstrdup(proxyuser);
-				if(proxypass && *proxypass)
-					proxypass = xstrdup(proxypass);
-				break;
-		}
+	config_t config = {buf, packmsg_output_size(&out, buf)};
 
-		free(proxy);
+	if(!config_write(mesh, "current", n->name, &config, mesh->config_key)) {
+		call_error_cb(mesh, MESHLINK_ESTORAGE);
+		return false;
 	}
 
-	if(get_config_bool(lookup_config(config_tree, "IndirectData"), &choice) && choice)
-		myself->options |= OPTION_INDIRECT;
-
-	if(get_config_bool(lookup_config(config_tree, "TCPOnly"), &choice) && choice)
-		myself->options |= OPTION_TCPONLY;
-
-	if(myself->options & OPTION_TCPONLY)
-		myself->options |= OPTION_INDIRECT;
+	return true;
+}
 
-	get_config_bool(lookup_config(config_tree, "DirectOnly"), &directonly);
-	get_config_bool(lookup_config(config_tree, "LocalDiscovery"), &localdiscovery);
+static bool load_node(meshlink_handle_t *mesh, const char *name, void *priv) {
+	(void)priv;
 
-	memset(&localdiscovery_address, 0, sizeof localdiscovery_address);
-	if(get_config_string(lookup_config(config_tree, "LocalDiscoveryAddress"), &address)) {
-		struct addrinfo *ai = str2addrinfo(address, myport, SOCK_DGRAM);
-		free(address);
-		if(!ai)
-			return false;
-		memcpy(&localdiscovery_address, ai->ai_addr, ai->ai_addrlen);
+	if(!check_id(name)) {
+		return true;
 	}
 
+	node_t *n = lookup_node(mesh, name);
 
-	if(get_config_string(lookup_config(config_tree, "Mode"), &rmode)) {
-		if(!strcasecmp(rmode, "router"))
-			routing_mode = RMODE_ROUTER;
-		else if(!strcasecmp(rmode, "switch"))
-			routing_mode = RMODE_SWITCH;
-		else if(!strcasecmp(rmode, "hub"))
-			routing_mode = RMODE_HUB;
-		else {
-			logger(DEBUG_ALWAYS, LOG_ERR, "Invalid routing mode!");
-			return false;
-		}
-		free(rmode);
-	}
-
-	if(get_config_string(lookup_config(config_tree, "Forwarding"), &fmode)) {
-		if(!strcasecmp(fmode, "off"))
-			forwarding_mode = FMODE_OFF;
-		else if(!strcasecmp(fmode, "internal"))
-			forwarding_mode = FMODE_INTERNAL;
-		else if(!strcasecmp(fmode, "kernel"))
-			forwarding_mode = FMODE_KERNEL;
-		else {
-			logger(DEBUG_ALWAYS, LOG_ERR, "Invalid forwarding mode!");
-			return false;
-		}
-		free(fmode);
-	}
-
-	choice = true;
-	get_config_bool(lookup_config(config_tree, "PMTUDiscovery"), &choice);
-	if(choice)
-		myself->options |= OPTION_PMTU_DISCOVERY;
-
-	choice = true;
-	get_config_bool(lookup_config(config_tree, "ClampMSS"), &choice);
-	if(choice)
-		myself->options |= OPTION_CLAMP_MSS;
-
-	get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
-	get_config_bool(lookup_config(config_tree, "DecrementTTL"), &decrement_ttl);
-	if(get_config_string(lookup_config(config_tree, "Broadcast"), &bmode)) {
-		if(!strcasecmp(bmode, "no"))
-			broadcast_mode = BMODE_NONE;
-		else if(!strcasecmp(bmode, "yes") || !strcasecmp(bmode, "mst"))
-			broadcast_mode = BMODE_MST;
-		else if(!strcasecmp(bmode, "direct"))
-			broadcast_mode = BMODE_DIRECT;
-		else {
-			logger(DEBUG_ALWAYS, LOG_ERR, "Invalid broadcast mode!");
-			return false;
-		}
-		free(bmode);
+	if(n) {
+		return true;
 	}
 
-#if !defined(SOL_IP) || !defined(IP_TOS)
-	if(priorityinheritance)
-		logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform", "PriorityInheritance");
-#endif
+	n = new_node();
+	n->name = xstrdup(name);
 
-	if(!get_config_int(lookup_config(config_tree, "MACExpire"), &macexpire))
-		macexpire = 600;
+	config_t config;
+	packmsg_input_t in;
 
-	if(get_config_int(lookup_config(config_tree, "MaxTimeout"), &maxtimeout)) {
-		if(maxtimeout <= 0) {
-			logger(DEBUG_ALWAYS, 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(DEBUG_ALWAYS, LOG_ERR, "Invalid address family!");
-			return false;
-		}
-		free(afname);
+	if(!node_get_config(mesh, n, &config, &in)) {
+		free_node(n);
+		return false;
 	}
 
-	get_config_bool(lookup_config(config_tree, "Hostnames"), &hostnames);
-
-	if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
-		keylifetime = 3600;
-
-	get_config_int(lookup_config(config_tree, "AutoConnect"), &autoconnect);
+	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;
+	}
 
-	get_config_bool(lookup_config(config_tree, "DisableBuggyPeers"), &disablebuggypeers);
+	config_free(&config);
 
-	read_invitation_key();
+	node_add(mesh, n);
 
 	return true;
 }
 
 /*
-  Configure node_t myself and set up the local sockets (listen only)
+  Add listening sockets.
 */
-static bool setup_myself(void) {
-	char *name, *hostname, *cipher, *digest, *type;
-	char *address = NULL;
+static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bindto) {
+	char *port = mesh->myport;
 
-	if(!(name = get_name())) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Name for tinc daemon required!");
-		return false;
-	}
+	if(address) {
+		char *space = strchr(address, ' ');
 
-	myself = new_node();
-	myself->connection = new_connection();
-	myself->name = name;
-	myself->connection->name = xstrdup(name);
-	read_host_config(config_tree, name);
-
-	if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
-		myport = xstrdup("655");
+		if(space) {
+			*space++ = 0;
+			port = space;
+		}
 
-	xasprintf(&myself->hostname, "MYSELF port %s", myport);
-	myself->connection->hostname = xstrdup(myself->hostname);
+		if(!strcmp(address, "*")) {
+			*address = 0;
+		}
+	}
 
-	myself->connection->options = 0;
-	myself->connection->protocol_major = PROT_MAJOR;
-	myself->connection->protocol_minor = PROT_MINOR;
+	struct addrinfo *ai;
 
-	myself->options |= PROT_MINOR << 24;
+	struct addrinfo hint = {
+		.ai_family = AF_UNSPEC,
+		.ai_socktype = SOCK_STREAM,
+		.ai_protocol = IPPROTO_TCP,
+		.ai_flags = AI_PASSIVE,
+	};
 
-	get_config_bool(lookup_config(config_tree, "ExperimentalProtocol"), &experimental);
+	int err = getaddrinfo(address && *address ? address : NULL, port, &hint, &ai);
 
-	if(experimental && !read_ecdsa_private_key())
-		return false;
+	free(address);
 
-	if(!read_rsa_private_key())
+	if(err || !ai) {
+		logger(mesh, MESHLINK_ERROR, "System call `%s' failed: %s", "getaddrinfo", err == EAI_SYSTEM ? strerror(err) : gai_strerror(err));
 		return false;
-
-	if(!atoi(myport)) {
-		struct addrinfo *ai = str2addrinfo("localhost", myport, SOCK_DGRAM);
-		sockaddr_t sa;
-		if(!ai || !ai->ai_addr)
-			return false;
-		free(myport);
-		memcpy(&sa, ai->ai_addr, ai->ai_addrlen);
-		sockaddr2str(&sa, NULL, &myport);
 	}
 
-	/* Read in all the subnets specified in the host configuration file */
-
-	for(config_t *cfg = lookup_config(config_tree, "Subnet"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
-		subnet_t *subnet;
+	bool success = false;
 
-		if(!get_config_subnet(cfg, &subnet))
-			return false;
-
-		subnet_add(myself, subnet);
-	}
+	for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
+		// Ignore duplicate addresses
+		bool found = false;
 
-	/* Check some options */
-
-	if(!setup_myself_reloadable())
-		return false;
-
-	get_config_bool(lookup_config(config_tree, "StrictSubnets"), &strictsubnets);
-	get_config_bool(lookup_config(config_tree, "TunnelServer"), &tunnelserver);
-	strictsubnets |= tunnelserver;
+		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(get_config_int(lookup_config(config_tree, "MaxConnectionBurst"), &max_connection_burst)) {
-		if(max_connection_burst <= 0) {
-			logger(DEBUG_ALWAYS, LOG_ERR, "MaxConnectionBurst cannot be negative!");
-			return false;
+		if(found) {
+			continue;
 		}
-	}
 
-	if(get_config_int(lookup_config(config_tree, "UDPRcvBuf"), &udp_rcvbuf)) {
-		if(udp_rcvbuf <= 0) {
-			logger(DEBUG_ALWAYS, LOG_ERR, "UDPRcvBuf cannot be negative!");
+		if(mesh->listen_sockets >= MAXSOCKETS) {
+			logger(mesh, MESHLINK_ERROR, "Too many listening sockets");
 			return false;
 		}
-	}
 
-	if(get_config_int(lookup_config(config_tree, "UDPSndBuf"), &udp_sndbuf)) {
-		if(udp_sndbuf <= 0) {
-			logger(DEBUG_ALWAYS, LOG_ERR, "UDPSndBuf cannot be negative!");
-			return false;
-		}
-	}
+		int tcp_fd = setup_listen_socket((sockaddr_t *) aip->ai_addr);
 
-	int replaywin_int;
-	if(get_config_int(lookup_config(config_tree, "ReplayWindow"), &replaywin_int)) {
-		if(replaywin_int < 0) {
-			logger(DEBUG_ALWAYS, LOG_ERR, "ReplayWindow cannot be negative!");
-			return false;
+		if(tcp_fd < 0) {
+			continue;
 		}
-		replaywin = (unsigned)replaywin_int;
-		sptps_replaywin = replaywin;
-	}
-
-	/* Generate packet encryption key */
 
-	if(!get_config_string(lookup_config(config_tree, "Cipher"), &cipher))
-		cipher = xstrdup("blowfish");
+		int udp_fd = setup_vpn_in_socket(mesh, (sockaddr_t *) aip->ai_addr);
 
-	if(!(myself->incipher = cipher_open_by_name(cipher))) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized cipher type!");
-		return false;
-	}
-
-	free(cipher);
-
-	send_key_changed();
-	timeout_add(&keyexpire_timeout, keyexpire_handler, &keyexpire_timeout, &(struct timeval){keylifetime, rand() % 100000});
+		if(udp_fd < 0) {
+			close(tcp_fd);
+			continue;
+		}
 
-	/* Check if we want to use message authentication codes... */
+		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);
 
-	int maclength = 4;
-	get_config_int(lookup_config(config_tree, "MACLength"), &maclength);
+		if(mesh->log_level >= MESHLINK_INFO) {
+			char *hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
+			logger(mesh, MESHLINK_INFO, "Listening on %s", hostname);
+			free(hostname);
+		}
 
-	if(maclength < 0) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Bogus MAC length!");
-		return false;
-	}
+		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(!get_config_string(lookup_config(config_tree, "Digest"), &digest))
-		digest = xstrdup("sha1");
+		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;
+		}
 
-	if(!(myself->indigest = digest_open_by_name(digest, maclength))) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized digest type!");
-		return false;
+		mesh->listen_sockets++;
+		success = true;
 	}
 
-	free(digest);
-
-	/* Compression */
+	freeaddrinfo(ai);
+	return success;
+}
 
-	if(get_config_int(lookup_config(config_tree, "Compression"), &myself->incompression)) {
-		if(myself->incompression < 0 || myself->incompression > 11) {
-			logger(DEBUG_ALWAYS, LOG_ERR, "Bogus compression level!");
-			return false;
-		}
-	} else
-		myself->incompression = 0;
+/*
+  Configure node_t mesh->self and set up the local sockets (listen only)
+*/
+bool setup_myself(meshlink_handle_t *mesh) {
+	/* Set some defaults */
 
-	myself->connection->outcompression = 0;
+	mesh->maxtimeout = 900;
 
 	/* Done */
 
-	myself->nexthop = myself;
-	myself->via = myself;
-	myself->status.reachable = true;
-	myself->last_state_change = now.tv_sec;
-	myself->status.sptps = experimental;
-	node_add(myself);
-
-	graph();
-
-	if(strictsubnets)
-		load_all_subnets();
-	else if(autoconnect)
-		load_all_nodes();
-
-	/* Open device */
-
-	devops = os_devops;
-
-	if(get_config_string(lookup_config(config_tree, "DeviceType"), &type)) {
-		if(!strcasecmp(type, "dummy"))
-			devops = dummy_devops;
-		else if(!strcasecmp(type, "raw_socket"))
-			devops = raw_socket_devops;
-		else if(!strcasecmp(type, "multicast"))
-			devops = multicast_devops;
-#ifdef ENABLE_UML
-		else if(!strcasecmp(type, "uml"))
-			devops = uml_devops;
-#endif
-#ifdef ENABLE_VDE
-		else if(!strcasecmp(type, "vde"))
-			devops = vde_devops;
-#endif
-	}
+	mesh->self->nexthop = mesh->self;
+	mesh->self->status.reachable = true;
+	mesh->self->last_state_change = mesh->loop.now.tv_sec;
 
-	if(!devops.setup())
-		return false;
+	node_add(mesh, mesh->self);
 
-	if(device_fd >= 0)
-		io_add(&device_io, handle_device_data, NULL, device_fd, IO_READ);
+	graph(mesh);
 
-	/* Run tinc-up script to further initialize the tap interface */
-	char *envp[5] = {NULL};
-	xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
-	xasprintf(&envp[1], "DEVICE=%s", device ? : "");
-	xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
-	xasprintf(&envp[3], "NAME=%s", myself->name);
-
-	execute_script("tinc-up", envp);
-
-	for(int i = 0; i < 4; i++)
-		free(envp[i]);
-
-	/* Run subnet-up scripts for our own subnets */
-
-	subnet_update(myself, NULL, true);
+	if(!config_scan_all(mesh, "current", "hosts", load_node, NULL)) {
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
 
 	/* Open sockets */
 
-	if(!do_detach && getenv("LISTEN_FDS")) {
-		sockaddr_t sa;
-		socklen_t salen;
+	mesh->listen_sockets = 0;
 
-		listen_sockets = atoi(getenv("LISTEN_FDS"));
-#ifdef HAVE_UNSETENV
-		unsetenv("LISTEN_FDS");
-#endif
+	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(listen_sockets > MAXSOCKETS) {
-			logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
-			return false;
-		}
-
-		for(int i = 0; i < listen_sockets; i++) {
-			salen = sizeof sa;
-			if(getsockname(i + 3, &sa.sa, &salen) < 0) {
-				logger(DEBUG_ALWAYS, LOG_ERR, "Could not get address of listen fd %d: %s", i + 3, sockstrerror(errno));
+			if(!mesh->myport) {
 				return false;
 			}
 
-#ifdef FD_CLOEXEC
-			fcntl(i + 3, F_SETFD, FD_CLOEXEC);
-#endif
-
-			int udp_fd = setup_vpn_in_socket(&sa);
-			if(udp_fd < 0)
+			if(!add_listen_address(mesh, NULL, NULL)) {
 				return false;
-
-			io_add(&listen_socket[i].tcp, (io_cb_t)handle_new_meta_connection, &listen_socket[i], i + 3, IO_READ);
-			io_add(&listen_socket[i].udp, (io_cb_t)handle_incoming_vpn_data, &listen_socket[i], udp_fd, IO_READ);
-
-			if(debug_level >= DEBUG_CONNECTIONS) {
-				hostname = sockaddr2hostname(&sa);
-				logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Listening on %s", hostname);
-				free(hostname);
 			}
-
-			memcpy(&listen_socket[i].sa, &sa, salen);
+		} else {
+			return false;
 		}
-	} else {
-		listen_sockets = 0;
-		config_t *cfg = lookup_config(config_tree, "BindToAddress");
-
-		do {
-			get_config_string(cfg, &address);
-			if(cfg)
-				cfg = lookup_config_next(config_tree, cfg);
-
-			char *port = myport;
-
-			if(address) {
-				char *space = strchr(address, ' ');
-				if(space) {
-					*space++ = 0;
-					port = space;
-				}
-
-				if(!strcmp(address, "*"))
-					*address = 0;
-			}
-
-			struct addrinfo *ai, hint = {0};
-			hint.ai_family = addressfamily;
-			hint.ai_socktype = SOCK_STREAM;
-			hint.ai_protocol = IPPROTO_TCP;
-			hint.ai_flags = AI_PASSIVE;
-
-			int err = getaddrinfo(address && *address ? address : NULL, port, &hint, &ai);
-			free(address);
-
-			if(err || !ai) {
-				logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "getaddrinfo", err == EAI_SYSTEM ? strerror(err) : gai_strerror(err));
-				return false;
-			}
-
-			for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
-				if(listen_sockets >= MAXSOCKETS) {
-					logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
-					return false;
-				}
-
-				int tcp_fd = setup_listen_socket((sockaddr_t *) aip->ai_addr);
-
-				if(tcp_fd < 0)
-					continue;
-
-				int udp_fd = setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
-
-				if(tcp_fd < 0) {
-					close(tcp_fd);
-					continue;
-				}
-
-				io_add(&listen_socket[listen_sockets].tcp, handle_new_meta_connection, &listen_socket[listen_sockets], tcp_fd, IO_READ);
-				io_add(&listen_socket[listen_sockets].udp, handle_incoming_vpn_data, &listen_socket[listen_sockets], udp_fd, IO_READ);
-
-				if(debug_level >= DEBUG_CONNECTIONS) {
-					hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
-					logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Listening on %s", hostname);
-					free(hostname);
-				}
-
-				memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
-				listen_sockets++;
-			}
-
-			freeaddrinfo(ai);
-		} while(cfg);
 	}
 
-	if(listen_sockets)
-		logger(DEBUG_ALWAYS, LOG_NOTICE, "Ready");
-	else {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Unable to create any listening socket!");
+	if(!mesh->listen_sockets) {
+		logger(mesh, MESHLINK_ERROR, "Unable to create any listening socket!");
 		return false;
 	}
 
-	last_config_check = now.tv_sec;
+	/* Done. */
+
+	mesh->last_config_check = mesh->loop.now.tv_sec;
 
 	return true;
 }
@@ -976,30 +442,16 @@ static bool setup_myself(void) {
 /*
   initialize network
 */
-bool setup_network(void) {
-	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 = 10 * 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;
+	}
 
 	return true;
 }
@@ -1007,52 +459,33 @@ bool setup_network(void) {
 /*
   close all open network connections
 */
-void close_network_connections(void) {
-	for(list_node_t *node = connection_list->head, *next; node; node = next) {
-		next = node->next;
-		connection_t *c = node->data;
-		/* Keep control connections open until the end, so they know when we really terminated */
-		if(c->status.control)
-			c->socket = -1;
-		c->outgoing = NULL;
-		terminate_connection(c, false);
-	}
-
-	list_delete_list(outgoing_list);
-
-	if(myself && myself->connection) {
-		subnet_update(myself, NULL, false);
-		terminate_connection(myself->connection, false);
-		free_connection(myself->connection);
+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);
+		}
 	}
 
-	for(int i = 0; i < listen_sockets; i++) {
-		io_del(&listen_socket[i].tcp);
-		io_del(&listen_socket[i].udp);
-		close(listen_socket[i].tcp.fd);
-		close(listen_socket[i].udp.fd);
+	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);
 	}
 
-	char *envp[5] = {NULL};
-	xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
-	xasprintf(&envp[1], "DEVICE=%s", device ? : "");
-	xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
-	xasprintf(&envp[3], "NAME=%s", myself->name);
-
-	exit_requests();
-	exit_edges();
-	exit_subnets();
-	exit_nodes();
-	exit_connections();
-
-	execute_script("tinc-down", envp);
-
-	if(myport) free(myport);
+	exit_requests(mesh);
+	exit_edges(mesh);
+	exit_nodes(mesh);
+	exit_submeshes(mesh);
+	exit_connections(mesh);
 
-	for(int i = 0; i < 4; i++)
-		free(envp[i]);
+	free(mesh->myport);
+	mesh->myport = NULL;
 
-	devops.close();
+	mesh->self = NULL;
 
 	return;
 }