X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=cb14c5179fb3489c37e3a05abf16a166becf78ae;hb=6debc6c79ba385d35f646e0958f84ace5b8f4b4d;hp=279feaefd24a7b1c1f21e48cd69dfc0e70597e35;hpb=1b2846d907adfc8472fc9da0c951c3243c7ee143;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index 279feaef..43895dda 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -1,7 +1,7 @@
 /*
     net_setup.c -- Setup.
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2011 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2021 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
                   2010      Brandon Black <blblack@gmail.com>
 
@@ -22,231 +22,165 @@
 
 #include "system.h"
 
-#include <openssl/pem.h>
-#include <openssl/rsa.h>
-#include <openssl/rand.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-
-#include "avl_tree.h"
+#include "cipher.h"
+#include "conf_net.h"
 #include "conf.h"
 #include "connection.h"
+#include "compression.h"
+#include "control.h"
+#include "crypto.h"
 #include "device.h"
-#include "event.h"
+#include "digest.h"
+#include "ecdsa.h"
 #include "graph.h"
 #include "logger.h"
+#include "names.h"
 #include "net.h"
 #include "netutl.h"
 #include "process.h"
 #include "protocol.h"
 #include "route.h"
+#include "script.h"
 #include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
+#include "keys.h"
+
+#ifdef HAVE_MINIUPNPC
+#include "upnp.h"
+#endif
 
 char *myport;
+static io_t device_io;
 devops_t devops;
+bool device_standby = false;
 
-bool read_rsa_public_key(connection_t *c) {
-	FILE *fp;
-	char *fname;
-	char *key;
+char *proxyhost = NULL;
+char *proxyport = NULL;
+char *proxyuser = NULL;
+char *proxypass = NULL;
 
-	if(!c->rsa_key) {
-		c->rsa_key = RSA_new();
-//		RSA_blinding_on(c->rsa_key, NULL);
-	}
+proxytype_t proxytype;
+bool autoconnect;
+bool disablebuggypeers;
 
-	/* First, check for simple PublicKey statement */
+char *scriptinterpreter;
+char *scriptextension;
 
-	if(get_config_string(lookup_config(c->config_tree, "PublicKey"), &key)) {
-		BN_hex2bn(&c->rsa_key->n, key);
-		BN_hex2bn(&c->rsa_key->e, "FFFF");
-		free(key);
+bool node_read_ecdsa_public_key(node_t *n) {
+	if(ecdsa_active(n->ecdsa)) {
 		return true;
 	}
 
-	/* Else, check for PublicKeyFile statement and read it */
-
-	if(get_config_string(lookup_config(c->config_tree, "PublicKeyFile"), &fname)) {
-		fp = fopen(fname, "r");
-
-		if(!fp) {
-			logger(LOG_ERR, "Error reading RSA public key file `%s': %s",
-				   fname, strerror(errno));
-			free(fname);
-			return false;
-		}
-
-		free(fname);
-		c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
-		fclose(fp);
-
-		if(c->rsa_key)
-			return true;		/* Woohoo. */
-
-		/* If it fails, try PEM_read_RSA_PUBKEY. */
-		fp = fopen(fname, "r");
-
-		if(!fp) {
-			logger(LOG_ERR, "Error reading RSA public key file `%s': %s",
-				   fname, strerror(errno));
-			free(fname);
-			return false;
-		}
-
-		free(fname);
-		c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
-		fclose(fp);
+	FILE *fp;
+	char *pubname = NULL;
+	char *p;
 
-		if(c->rsa_key) {
-//				RSA_blinding_on(c->rsa_key, NULL);
-			return true;
-		}
+	splay_tree_t config;
+	init_configuration(&config);
 
-		logger(LOG_ERR, "Reading RSA public key file `%s' failed: %s",
-			   fname, strerror(errno));
-		return false;
+	if(!read_host_config(&config, n->name, true)) {
+		goto exit;
 	}
 
-	/* Else, check if a harnessed public key is in the config file */
-
-	xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-	fp = fopen(fname, "r");
+	/* First, check for simple Ed25519PublicKey statement */
 
-	if(!fp) {
-		logger(LOG_ERR, "Error reading RSA public key file `%s': %s", fname, strerror(errno));
-		free(fname);
-		return false;
+	if(get_config_string(lookup_config(&config, "Ed25519PublicKey"), &p)) {
+		n->ecdsa = ecdsa_set_base64_public_key(p);
+		free(p);
+		goto exit;
 	}
 
-	c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
-	fclose(fp);
-	free(fname);
+	/* Else, check for Ed25519PublicKeyFile statement and read it */
 
-	if(c->rsa_key)
-		return true;
-
-	/* Try again with PEM_read_RSA_PUBKEY. */
+	if(!get_config_string(lookup_config(&config, "Ed25519PublicKeyFile"), &pubname)) {
+		xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, n->name);
+	}
 
-	xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-	fp = fopen(fname, "r");
+	fp = fopen(pubname, "r");
 
 	if(!fp) {
-		logger(LOG_ERR, "Error reading RSA public key file `%s': %s", fname, strerror(errno));
-		free(fname);
-		return false;
+		goto exit;
 	}
 
-	c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
-//	RSA_blinding_on(c->rsa_key, NULL);
+	n->ecdsa = ecdsa_read_pem_public_key(fp);
 	fclose(fp);
-	free(fname);
-
-	if(c->rsa_key)
-		return true;
-
-	logger(LOG_ERR, "No public key for %s specified!", c->name);
 
-	return false;
+exit:
+	splay_empty_tree(&config);
+	free(pubname);
+	return n->ecdsa;
 }
 
-static bool read_rsa_private_key(void) {
+static bool read_invitation_key(void) {
 	FILE *fp;
-	char *fname, *key, *pubkey;
-	struct stat s;
+	char fname[PATH_MAX];
 
-	if(get_config_string(lookup_config(config_tree, "PrivateKey"), &key)) {
-		if(!get_config_string(lookup_config(config_tree, "PublicKey"), &pubkey)) {
-			logger(LOG_ERR, "PrivateKey used but no PublicKey found!");
-			return false;
-		}
-		myself->connection->rsa_key = RSA_new();
-//		RSA_blinding_on(myself->connection->rsa_key, NULL);
-		BN_hex2bn(&myself->connection->rsa_key->d, key);
-		BN_hex2bn(&myself->connection->rsa_key->n, pubkey);
-		BN_hex2bn(&myself->connection->rsa_key->e, "FFFF");
-		free(key);
-		free(pubkey);
-		return true;
+	if(invitation_key) {
+		ecdsa_free(invitation_key);
+		invitation_key = NULL;
 	}
 
-	if(!get_config_string(lookup_config(config_tree, "PrivateKeyFile"), &fname))
-		xasprintf(&fname, "%s/rsa_key.priv", confbase);
+	snprintf(fname, sizeof(fname), "%s" SLASH "invitations" SLASH "ed25519_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);
-		return false;
-	}
+	if(fp) {
+		invitation_key = ecdsa_read_pem_private_key(fp);
+		fclose(fp);
 
-#if !defined(HAVE_MINGW) && !defined(HAVE_CYGWIN)
-	if(fstat(fileno(fp), &s)) {
-		logger(LOG_ERR, "Could not stat RSA private key file `%s': %s'",
-				fname, strerror(errno));
-		free(fname);
-		return false;
+		if(!invitation_key) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Reading Ed25519 private key file `%s' failed", fname);
+		}
 	}
 
-	if(s.st_mode & ~0100700)
-		logger(LOG_WARNING, "Warning: insecure file permissions for RSA private key file `%s'!", fname);
+	return invitation_key;
+}
+
+#ifndef DISABLE_LEGACY
+static timeout_t keyexpire_timeout;
+
+static void keyexpire_handler(void *data) {
+	regenerate_key();
+	timeout_set(data, &(struct timeval) {
+		keylifetime, jitter()
+	});
+}
 #endif
 
-	myself->connection->rsa_key = PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
-	fclose(fp);
+void regenerate_key(void) {
+	logger(DEBUG_STATUS, LOG_INFO, "Expiring symmetric keys");
+	send_key_changed();
 
-	if(!myself->connection->rsa_key) {
-		logger(LOG_ERR, "Reading RSA private key file `%s' failed: %s",
-			   fname, strerror(errno));
-		free(fname);
-		return false;
+	for splay_each(node_t, n, &node_tree) {
+		n->status.validkey_in = false;
 	}
-
-	free(fname);
-	return true;
 }
 
-/*
-  Read Subnets from all host config files
-*/
-void load_all_subnets(void) {
+void load_all_nodes(void) {
 	DIR *dir;
 	struct dirent *ent;
-	char *dname;
-	char *fname;
-	avl_tree_t *config_tree;
-	config_t *cfg;
-	subnet_t *s, *s2;
-	node_t *n;
-	bool result;
-
-	xasprintf(&dname, "%s/hosts", confbase);
+	char dname[PATH_MAX];
+
+	snprintf(dname, sizeof(dname), "%s" SLASH "hosts", confbase);
 	dir = opendir(dname);
+
 	if(!dir) {
-		logger(LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
-		free(dname);
+		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
 		return;
 	}
 
 	while((ent = readdir(dir))) {
-		if(!check_id(ent->d_name))
+		if(!check_id(ent->d_name)) {
 			continue;
+		}
 
-		n = lookup_node(ent->d_name);
-		#ifdef _DIRENT_HAVE_D_TYPE
-		//if(ent->d_type != DT_REG)
-		//	continue;
-		#endif
-
-		xasprintf(&fname, "%s/hosts/%s", confbase, ent->d_name);
-		init_configuration(&config_tree);
-		result = read_config_file(config_tree, fname);
-		free(fname);
-		if(!result)
-			continue;
+		node_t *n = lookup_node(ent->d_name);
+
+		splay_tree_t config;
+		init_configuration(&config);
+		read_config_options(&config, ent->d_name);
+		read_host_config(&config, ent->d_name, true);
 
 		if(!n) {
 			n = new_node();
@@ -254,390 +188,922 @@ void load_all_subnets(void) {
 			node_add(n);
 		}
 
-		for(cfg = lookup_config(config_tree, "Subnet"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
-			if(!get_config_subnet(cfg, &s))
-				continue;
+		if(strictsubnets) {
+			for(config_t *cfg = lookup_config(&config, "Subnet"); cfg; cfg = lookup_config_next(&config, 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);
+				if((s2 = lookup_subnet(n, s))) {
+					s2->expires = -1;
+					free(s);
+				} else {
+					subnet_add(n, s);
+				}
 			}
 		}
 
-		exit_configuration(&config_tree);
+		if(lookup_config(&config, "Address")) {
+			n->status.has_address = true;
+		}
+
+		splay_empty_tree(&config);
 	}
 
 	closedir(dir);
 }
 
-/*
-  Configure node_t myself and set up the local sockets (listen only)
-*/
-static bool setup_myself(void) {
-	config_t *cfg;
-	subnet_t *subnet;
-	char *name, *hostname, *mode, *afname, *cipher, *digest, *type;
-	char *fname = NULL;
-	char *address = NULL;
-	char *envp[5];
-	struct addrinfo *ai, *aip, hint = {0};
-	bool choice;
-	int i, err;
-	int replaywin_int;
+char *get_name(void) {
+	char *name = NULL;
+	char *returned_name;
 
-	myself = new_node();
-	myself->connection = new_connection();
+	get_config_string(lookup_config(&config_tree, "Name"), &name);
 
-	myself->hostname = xstrdup("MYSELF");
-	myself->connection->hostname = xstrdup("MYSELF");
+	if(!name) {
+		return NULL;
+	}
 
-	myself->connection->options = 0;
-	myself->connection->protocol_version = PROT_CURRENT;
+	returned_name = replace_name(name);
+	free(name);
+	return returned_name;
+}
 
-	if(!get_config_string(lookup_config(config_tree, "Name"), &name)) {	/* Not acceptable */
-		logger(LOG_ERR, "Name for tinc daemon required!");
-		return false;
-	}
+bool setup_myself_reloadable(void) {
+	free(scriptinterpreter);
+	scriptinterpreter = NULL;
 
-	if(!check_id(name)) {
-		logger(LOG_ERR, "Invalid name for myself!");
-		free(name);
-		return false;
+	get_config_string(lookup_config(&config_tree, "ScriptsInterpreter"), &scriptinterpreter);
+
+	free(scriptextension);
+
+	if(!get_config_string(lookup_config(&config_tree, "ScriptsExtension"), &scriptextension)) {
+		scriptextension = xstrdup("");
 	}
 
-	myself->name = name;
-	myself->connection->name = xstrdup(name);
-	xasprintf(&fname, "%s/hosts/%s", confbase, name);
-	read_config_options(config_tree, name);
-	read_config_file(config_tree, fname);
-	free(fname);
+	char *proxy = NULL;
 
-	if(!read_rsa_private_key())
-		return false;
+	get_config_string(lookup_config(&config_tree, "Proxy"), &proxy);
 
-	if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
-		myport = xstrdup("655");
+	if(proxy) {
+		char *space;
 
-	if(!atoi(myport)) {
-		struct addrinfo *ai = str2addrinfo("localhost", myport, SOCK_DGRAM);
-		sockaddr_t sa;
-		if(!ai || !ai->ai_addr)
+		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);
+			free(proxy);
 			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 */
+		free(proxyhost);
+		proxyhost = NULL;
 
-	cfg = lookup_config(config_tree, "Subnet");
+		free(proxyport);
+		proxyport = NULL;
 
-	while(cfg) {
-		if(!get_config_subnet(cfg, &subnet))
-			return false;
+		free(proxyuser);
+		proxyuser = NULL;
 
-		subnet_add(myself, subnet);
+		free(proxypass);
+		proxypass = NULL;
 
-		cfg = lookup_config_next(config_tree, cfg);
+		switch(proxytype) {
+		case PROXY_NONE:
+		default:
+			break;
+
+		case PROXY_EXEC:
+			if(!space || !*space) {
+				logger(DEBUG_ALWAYS, LOG_ERR, "Argument expected for proxy type exec!");
+				free(proxy);
+				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(!proxyhost || !*proxyhost || !proxyport || !*proxyport) {
+				logger(DEBUG_ALWAYS, LOG_ERR, "Host and port argument expected for proxy!");
+				proxyport = NULL;
+				proxyhost = NULL;
+				free(proxy);
+				return false;
+			}
+
+			if(space && (space = strchr(space, ' '))) {
+				*space++ = 0, proxyuser = space;
+			}
+
+			if(space && (space = strchr(space, ' '))) {
+				*space++ = 0, proxypass = space;
+			}
+
+			proxyhost = xstrdup(proxyhost);
+			proxyport = xstrdup(proxyport);
+
+			if(proxyuser && *proxyuser) {
+				proxyuser = xstrdup(proxyuser);
+			}
+
+			if(proxypass && *proxypass) {
+				proxypass = xstrdup(proxypass);
+			}
+
+			break;
+		}
+
+		free(proxy);
 	}
 
-	/* Check some options */
+	bool choice;
 
-	if(get_config_bool(lookup_config(config_tree, "IndirectData"), &choice) && choice)
+	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)
+	if(get_config_bool(lookup_config(&config_tree, "TCPOnly"), &choice) && choice) {
 		myself->options |= OPTION_TCPONLY;
+	}
 
-	if(myself->options & OPTION_TCPONLY)
+	if(myself->options & OPTION_TCPONLY) {
 		myself->options |= OPTION_INDIRECT;
+	}
 
-	get_config_bool(lookup_config(config_tree, "DirectOnly"), &directonly);
-	get_config_bool(lookup_config(config_tree, "StrictSubnets"), &strictsubnets);
-	get_config_bool(lookup_config(config_tree, "TunnelServer"), &tunnelserver);
-	strictsubnets |= tunnelserver;
+	get_config_bool(lookup_config(&config_tree, "UDPDiscovery"), &udp_discovery);
+	get_config_int(lookup_config(&config_tree, "UDPDiscoveryKeepaliveInterval"), &udp_discovery_keepalive_interval);
+	get_config_int(lookup_config(&config_tree, "UDPDiscoveryInterval"), &udp_discovery_interval);
+	get_config_int(lookup_config(&config_tree, "UDPDiscoveryTimeout"), &udp_discovery_timeout);
+
+	get_config_int(lookup_config(&config_tree, "MTUInfoInterval"), &mtu_info_interval);
+	get_config_int(lookup_config(&config_tree, "UDPInfoInterval"), &udp_info_interval);
+
+	get_config_bool(lookup_config(&config_tree, "DirectOnly"), &directonly);
+	get_config_bool(lookup_config(&config_tree, "LocalDiscovery"), &localdiscovery);
+
+	char *rmode = NULL;
 
-	if(get_config_string(lookup_config(config_tree, "Mode"), &mode)) {
-		if(!strcasecmp(mode, "router"))
+	if(get_config_string(lookup_config(&config_tree, "Mode"), &rmode)) {
+		if(!strcasecmp(rmode, "router")) {
 			routing_mode = RMODE_ROUTER;
-		else if(!strcasecmp(mode, "switch"))
+		} else if(!strcasecmp(rmode, "switch")) {
 			routing_mode = RMODE_SWITCH;
-		else if(!strcasecmp(mode, "hub"))
+		} else if(!strcasecmp(rmode, "hub")) {
 			routing_mode = RMODE_HUB;
-		else {
-			logger(LOG_ERR, "Invalid routing mode!");
+		} else {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Invalid routing mode!");
+			free(rmode);
 			return false;
 		}
-		free(mode);
+
+		free(rmode);
 	}
 
-	if(get_config_string(lookup_config(config_tree, "Forwarding"), &mode)) {
-		if(!strcasecmp(mode, "off"))
+	char *fmode = NULL;
+
+	if(get_config_string(lookup_config(&config_tree, "Forwarding"), &fmode)) {
+		if(!strcasecmp(fmode, "off")) {
 			forwarding_mode = FMODE_OFF;
-		else if(!strcasecmp(mode, "internal"))
+		} else if(!strcasecmp(fmode, "internal")) {
 			forwarding_mode = FMODE_INTERNAL;
-		else if(!strcasecmp(mode, "kernel"))
+		} else if(!strcasecmp(fmode, "kernel")) {
 			forwarding_mode = FMODE_KERNEL;
-		else {
-			logger(LOG_ERR, "Invalid forwarding mode!");
+		} else {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Invalid forwarding mode!");
+			free(fmode);
 			return false;
 		}
-		free(mode);
+
+		free(fmode);
 	}
 
-	choice = true;
-	get_config_bool(lookup_config(config_tree, "PMTUDiscovery"), &choice);
-	if(choice)
+	choice = !(myself->options & OPTION_TCPONLY);
+	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, "ClampMSS"), &choice);
 
-	get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
+	if(choice) {
+		myself->options |= OPTION_CLAMP_MSS;
+	}
 
-#if !defined(SOL_IP) || !defined(IP_TOS)
-	if(priorityinheritance)
-		logger(LOG_WARNING, "%s not supported on this platform", "PriorityInheritance");
-#endif
+	get_config_bool(lookup_config(&config_tree, "PriorityInheritance"), &priorityinheritance);
+	get_config_bool(lookup_config(&config_tree, "DecrementTTL"), &decrement_ttl);
 
-	if(!get_config_int(lookup_config(config_tree, "MACExpire"), &macexpire))
-		macexpire = 600;
+	char *bmode = NULL;
 
-	if(get_config_int(lookup_config(config_tree, "MaxTimeout"), &maxtimeout)) {
-		if(maxtimeout <= 0) {
-			logger(LOG_ERR, "Bogus maximum timeout!");
+	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!");
+			free(bmode);
 			return false;
 		}
-	} else
-		maxtimeout = 900;
 
-	if(get_config_int(lookup_config(config_tree, "UDPRcvBuf"), &udp_rcvbuf)) {
-		if(udp_rcvbuf <= 0) {
-			logger(LOG_ERR, "UDPRcvBuf cannot be negative!");
-			return false;
+		free(bmode);
+	}
+
+	/* Delete all broadcast subnets before re-adding them */
+
+	for splay_each(subnet_t, s, &subnet_tree) {
+		if(!s->owner) {
+			splay_delete_node(&subnet_tree, node);
 		}
 	}
 
-	if(get_config_int(lookup_config(config_tree, "UDPSndBuf"), &udp_sndbuf)) {
-		if(udp_sndbuf <= 0) {
-			logger(LOG_ERR, "UDPSndBuf cannot be negative!");
-			return false;
+	const char *const DEFAULT_BROADCAST_SUBNETS[] = { "ff:ff:ff:ff:ff:ff", "255.255.255.255", "224.0.0.0/4", "ff00::/8" };
+
+	for(size_t i = 0; i < sizeof(DEFAULT_BROADCAST_SUBNETS) / sizeof(*DEFAULT_BROADCAST_SUBNETS); i++) {
+		subnet_t *s = new_subnet();
+
+		if(!str2net(s, DEFAULT_BROADCAST_SUBNETS[i])) {
+			abort();
 		}
+
+		subnet_add(NULL, s);
 	}
 
-	if(get_config_int(lookup_config(config_tree, "ReplayWindow"), &replaywin_int)) {
-		if(replaywin_int < 0) {
-			logger(LOG_ERR, "ReplayWindow cannot be negative!");
+	for(config_t *cfg = lookup_config(&config_tree, "BroadcastSubnet"); cfg; cfg = lookup_config_next(&config_tree, cfg)) {
+		subnet_t *s;
+
+		if(!get_config_subnet(cfg, &s)) {
+			continue;
+		}
+
+		subnet_add(NULL, s);
+	}
+
+#if !defined(IP_TOS)
+
+	if(priorityinheritance) {
+		logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform for IPv4 connections", "PriorityInheritance");
+	}
+
+#endif
+
+#if !defined(IPV6_TCLASS)
+
+	if(priorityinheritance) {
+		logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform for IPv6 connections", "PriorityInheritance");
+	}
+
+#endif
+
+	if(!get_config_int(lookup_config(&config_tree, "MACExpire"), &macexpire)) {
+		macexpire = 600;
+	}
+
+	if(get_config_int(lookup_config(&config_tree, "MaxTimeout"), &maxtimeout)) {
+		if(maxtimeout <= 0) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Bogus maximum timeout!");
 			return false;
 		}
-		replaywin = (unsigned)replaywin_int;
+	} else {
+		maxtimeout = 900;
 	}
 
-	if(get_config_string(lookup_config(config_tree, "AddressFamily"), &afname)) {
-		if(!strcasecmp(afname, "IPv4"))
+	char *afname = NULL;
+
+	if(get_config_string(lookup_config(&config_tree, "AddressFamily"), &afname)) {
+		if(!strcasecmp(afname, "IPv4")) {
 			addressfamily = AF_INET;
-		else if(!strcasecmp(afname, "IPv6"))
+		} else if(!strcasecmp(afname, "IPv6")) {
 			addressfamily = AF_INET6;
-		else if(!strcasecmp(afname, "any"))
+		} else if(!strcasecmp(afname, "any")) {
 			addressfamily = AF_UNSPEC;
-		else {
-			logger(LOG_ERR, "Invalid address family!");
+		} else {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Invalid address family!");
+			free(afname);
 			return false;
 		}
+
 		free(afname);
 	}
 
-	get_config_bool(lookup_config(config_tree, "Hostnames"), &hostnames);
+	get_config_bool(lookup_config(&config_tree, "Hostnames"), &hostnames);
 
-	/* Generate packet encryption key */
+	if(!get_config_int(lookup_config(&config_tree, "KeyExpire"), &keylifetime)) {
+		keylifetime = 3600;
+	}
 
-	if(get_config_string
-	   (lookup_config(config_tree, "Cipher"), &cipher)) {
-		if(!strcasecmp(cipher, "none")) {
-			myself->incipher = NULL;
-		} else {
-			myself->incipher = EVP_get_cipherbyname(cipher);
+	if(!get_config_bool(lookup_config(&config_tree, "AutoConnect"), &autoconnect)) {
+		autoconnect = true;
+	}
 
-			if(!myself->incipher) {
-				logger(LOG_ERR, "Unrecognized cipher type!");
-				return false;
-			}
+	get_config_bool(lookup_config(&config_tree, "DisableBuggyPeers"), &disablebuggypeers);
+
+	if(!get_config_int(lookup_config(&config_tree, "InvitationExpire"), &invitation_lifetime)) {
+		invitation_lifetime = 604800;        // 1 week
+	}
+
+	read_invitation_key();
+
+	return true;
+}
+
+/*
+  Add listening sockets.
+*/
+static bool add_listen_address(char *address, bool bindto) {
+	char *port = myport;
+
+	if(address) {
+		char *space = strchr(address, ' ');
+
+		if(space) {
+			*space++ = 0;
+			port = space;
 		}
-	} else
-		myself->incipher = EVP_bf_cbc();
 
-	if(myself->incipher)
-		myself->inkeylength = myself->incipher->key_len + myself->incipher->iv_len;
-	else
-		myself->inkeylength = 1;
+		if(!strcmp(address, "*")) {
+			*address = 0;
+		}
+	}
 
-	myself->connection->outcipher = EVP_bf_ofb();
+	struct addrinfo *ai, hint = {0};
 
-	if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
-		keylifetime = 3600;
+	hint.ai_family = addressfamily;
 
-	keyexpires = now + keylifetime;
-	
-	/* Check if we want to use message authentication codes... */
+	hint.ai_socktype = SOCK_STREAM;
 
-	if(get_config_string(lookup_config(config_tree, "Digest"), &digest)) {
-		if(!strcasecmp(digest, "none")) {
-			myself->indigest = NULL;
-		} else {
-			myself->indigest = EVP_get_digestbyname(digest);
+	hint.ai_protocol = IPPROTO_TCP;
 
-			if(!myself->indigest) {
-				logger(LOG_ERR, "Unrecognized digest type!");
-				return false;
+	hint.ai_flags = AI_PASSIVE;
+
+#if HAVE_DECL_RES_INIT
+	res_init();
+
+#endif
+	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) {
+		// Ignore duplicate addresses
+		bool found = false;
+
+		for(int i = 0; i < listen_sockets; i++)
+			if(!memcmp(&listen_socket[i].sa, aip->ai_addr, aip->ai_addrlen)) {
+				found = true;
+				break;
 			}
+
+		if(found) {
+			continue;
 		}
-	} else
-		myself->indigest = EVP_sha1();
 
-	myself->connection->outdigest = EVP_sha1();
+		if(listen_sockets >= MAXSOCKETS) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
+			freeaddrinfo(ai);
+			return false;
+		}
 
-	if(get_config_int(lookup_config(config_tree, "MACLength"), &myself->inmaclength)) {
-		if(myself->indigest) {
-			if(myself->inmaclength > myself->indigest->md_size) {
-				logger(LOG_ERR, "MAC length exceeds size of digest!");
-				return false;
-			} else if(myself->inmaclength < 0) {
-				logger(LOG_ERR, "Bogus MAC length!");
+		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(udp_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) {
+			char *hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
+			logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Listening on %s", hostname);
+			free(hostname);
+		}
+
+		listen_socket[listen_sockets].bindto = bindto;
+		memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
+		listen_sockets++;
+	}
+
+	freeaddrinfo(ai);
+	return true;
+}
+
+void device_enable(void) {
+	if(devops.enable) {
+		devops.enable();
+	}
+
+	/* Run tinc-up script to further initialize the tap interface */
+
+	environment_t env;
+	environment_init(&env);
+	execute_script("tinc-up", &env);
+	environment_exit(&env);
+}
+
+void device_disable(void) {
+	environment_t env;
+	environment_init(&env);
+	execute_script("tinc-down", &env);
+	environment_exit(&env);
+
+	if(devops.disable) {
+		devops.disable();
+	}
+}
+
+/*
+  Configure node_t myself and set up the local sockets (listen only)
+*/
+static bool setup_myself(void) {
+	char *name, *hostname, *type;
+	char *address = NULL;
+	bool port_specified = false;
+
+	if(!(name = get_name())) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Name for tinc daemon required!");
+		return false;
+	}
+
+	myname = xstrdup(name);
+	myself = new_node();
+	myself->connection = new_connection();
+	myself->name = name;
+	myself->connection->name = xstrdup(name);
+	read_host_config(&config_tree, name, true);
+
+	if(!get_config_string(lookup_config(&config_tree, "Port"), &myport)) {
+		myport = xstrdup("655");
+	} else {
+		port_specified = true;
+	}
+
+	myself->connection->options = 0;
+	myself->connection->protocol_major = PROT_MAJOR;
+	myself->connection->protocol_minor = PROT_MINOR;
+
+	myself->options |= PROT_MINOR << 24;
+
+#ifdef DISABLE_LEGACY
+	myself->connection->ecdsa = read_ecdsa_private_key(&config_tree, NULL);
+	experimental = myself->connection->ecdsa != NULL;
+
+	if(!experimental) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "No private key available, cannot start tinc!");
+		return false;
+	}
+
+#else
+
+	if(!get_config_bool(lookup_config(&config_tree, "ExperimentalProtocol"), &experimental)) {
+		myself->connection->ecdsa = read_ecdsa_private_key(&config_tree, NULL);
+		experimental = myself->connection->ecdsa != NULL;
+
+		if(!experimental) {
+			logger(DEBUG_ALWAYS, LOG_WARNING, "Support for SPTPS disabled.");
+		}
+	} else {
+		if(experimental) {
+			myself->connection->ecdsa = read_ecdsa_private_key(&config_tree, NULL);
+
+			if(!myself->connection->ecdsa) {
 				return false;
 			}
 		}
-	} else
-		myself->inmaclength = 4;
+	}
+
+	myself->connection->rsa = read_rsa_private_key(&config_tree, NULL);
+
+	if(!myself->connection->rsa) {
+		if(experimental) {
+			logger(DEBUG_ALWAYS, LOG_WARNING, "Support for legacy protocol disabled.");
+		} else {
+			logger(DEBUG_ALWAYS, LOG_ERR, "No private keys available, cannot start tinc!");
+			return false;
+		}
+	}
+
+#endif
+
+	/* Ensure myport is numeric */
+
+	if(!atoi(myport)) {
+		struct addrinfo *ai = str2addrinfo("localhost", myport, SOCK_DGRAM);
+		sockaddr_t sa;
+
+		if(!ai || !ai->ai_addr) {
+			return false;
+		}
 
-	myself->connection->outmaclength = 0;
+		free(myport);
+		memcpy(&sa, ai->ai_addr, ai->ai_addrlen);
+		freeaddrinfo(ai);
+		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;
+
+		if(!get_config_subnet(cfg, &subnet)) {
+			return false;
+		}
+
+		subnet_add(myself, subnet);
+	}
+
+	/* 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;
+
+	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(get_config_int(lookup_config(&config_tree, "UDPRcvBuf"), &udp_rcvbuf)) {
+		if(udp_rcvbuf < 0) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "UDPRcvBuf cannot be negative!");
+			return false;
+		}
+
+		udp_rcvbuf_warnings = true;
+	}
+
+	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;
+		}
+
+		udp_sndbuf_warnings = true;
+	}
+
+	get_config_int(lookup_config(&config_tree, "FWMark"), &fwmark);
+#ifndef SO_MARK
+
+	if(fwmark) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "FWMark not supported on this platform!");
+		return false;
+	}
+
+#endif
+
+	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;
+		}
+
+		replaywin = (unsigned)replaywin_int;
+		sptps_replaywin = replaywin;
+	}
+
+#ifndef DISABLE_LEGACY
+	/* Generate packet encryption key */
+
+	char *cipher;
+
+	if(!get_config_string(lookup_config(&config_tree, "Cipher"), &cipher)) {
+		cipher = xstrdup("aes-256-cbc");
+	}
+
+	if(!strcasecmp(cipher, "none")) {
+		myself->incipher = NULL;
+	} else {
+		myself->incipher = cipher_alloc();
+
+		if(!cipher_open_by_name(myself->incipher, cipher)) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized cipher type!");
+			cipher_free(&myself->incipher);
+			free(cipher);
+			return false;
+		}
+	}
+
+	free(cipher);
+
+	timeout_add(&keyexpire_timeout, keyexpire_handler, &keyexpire_timeout, &(struct timeval) {
+		keylifetime, jitter()
+	});
+
+	/* Check if we want to use message authentication codes... */
+
+	int maclength = 4;
+	get_config_int(lookup_config(&config_tree, "MACLength"), &maclength);
+
+	if(maclength < 0) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Bogus MAC length!");
+		return false;
+	}
+
+	char *digest;
+
+	if(!get_config_string(lookup_config(&config_tree, "Digest"), &digest)) {
+		digest = xstrdup("sha256");
+	}
+
+	if(!strcasecmp(digest, "none")) {
+		myself->indigest = NULL;
+	} else {
+		myself->indigest = digest_alloc();
+
+		if(!digest_open_by_name(myself->indigest, digest, maclength)) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized digest type!");
+			digest_free(&myself->indigest);
+			free(digest);
+			return false;
+		}
+	}
+
+	free(digest);
+#endif
 
 	/* Compression */
+	if(get_config_int(lookup_config(&config_tree, "Compression"), &myself->incompression)) {
+		switch(myself->incompression) {
+		case COMPRESS_LZ4:
+#ifdef HAVE_LZ4
+			break;
+#else
+			logger(DEBUG_ALWAYS, LOG_ERR, "Bogus compression level!");
+			logger(DEBUG_ALWAYS, LOG_ERR, "LZ4 compression is unavailable on this node.");
+			return false;
+#endif
+
+		case COMPRESS_LZO_HI:
+		case COMPRESS_LZO_LO:
+#ifdef HAVE_LZO
+			break;
+#else
+			logger(DEBUG_ALWAYS, LOG_ERR, "Bogus compression level!");
+			logger(DEBUG_ALWAYS, LOG_ERR, "LZO compression is unavailable on this node.");
+			return false;
+#endif
+
+		case COMPRESS_ZLIB_9:
+		case COMPRESS_ZLIB_8:
+		case COMPRESS_ZLIB_7:
+		case COMPRESS_ZLIB_6:
+		case COMPRESS_ZLIB_5:
+		case COMPRESS_ZLIB_4:
+		case COMPRESS_ZLIB_3:
+		case COMPRESS_ZLIB_2:
+		case COMPRESS_ZLIB_1:
+#ifdef HAVE_ZLIB
+			break;
+#else
+			logger(DEBUG_ALWAYS, LOG_ERR, "Bogus compression level!");
+			logger(DEBUG_ALWAYS, LOG_ERR, "ZLIB compression is unavailable on this node.");
+			return false;
+#endif
+
+		case COMPRESS_NONE:
+			break;
 
-	if(get_config_int(lookup_config(config_tree, "Compression"), &myself->incompression)) {
-		if(myself->incompression < 0 || myself->incompression > 11) {
-			logger(LOG_ERR, "Bogus compression level!");
+		default:
+			logger(DEBUG_ALWAYS, LOG_ERR, "Bogus compression level!");
+			logger(DEBUG_ALWAYS, LOG_ERR, "Compression level %i is unrecognized by this node.", myself->incompression);
 			return false;
 		}
-	} else
-		myself->incompression = 0;
+	} else {
+		myself->incompression = COMPRESS_NONE;
+	}
 
-	myself->connection->outcompression = 0;
+	myself->connection->outcompression = COMPRESS_NONE;
 
 	/* 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();
+	load_all_nodes();
 
 	/* Open device */
 
-	if(get_config_string(lookup_config(config_tree, "DeviceType"), &type)) {
-		if(!strcasecmp(type, "dummy"))
+	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"))
+		} else if(!strcasecmp(type, "raw_socket")) {
 			devops = raw_socket_devops;
+		} else if(!strcasecmp(type, "multicast")) {
+			devops = multicast_devops;
+		}
+
+#ifdef HAVE_SYS_UN_H
+		else if(!strcasecmp(type, "fd")) {
+			devops = fd_devops;
+		}
+
+#endif
 #ifdef ENABLE_UML
-		else if(!strcasecmp(type, "uml"))
+		else if(!strcasecmp(type, "uml")) {
 			devops = uml_devops;
+		}
+
 #endif
 #ifdef ENABLE_VDE
-		else if(!strcasecmp(type, "vde"))
+		else if(!strcasecmp(type, "vde")) {
 			devops = vde_devops;
-#endif
-		else {
-			logger(LOG_ERR, "Unknown device type %s!", type);
-			return false;
 		}
-	} else {
-		devops = os_devops;
+
+#endif
+		free(type);
 	}
 
-	if(!devops.setup())
+	get_config_bool(lookup_config(&config_tree, "DeviceStandby"), &device_standby);
+
+	if(!devops.setup()) {
 		return false;
+	}
 
-	/* Run tinc-up script to further initialize the tap interface */
-	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);
-	envp[4] = NULL;
+	if(device_fd >= 0) {
+		io_add(&device_io, handle_device_data, NULL, device_fd, IO_READ);
+	}
 
-	execute_script("tinc-up", envp);
+	/* Open sockets */
 
-	for(i = 0; i < 5; i++)
-		free(envp[i]);
+	if(!do_detach && getenv("LISTEN_FDS")) {
+		sockaddr_t sa;
+		socklen_t salen;
 
-	/* Run subnet-up scripts for our own subnets */
+		listen_sockets = atoi(getenv("LISTEN_FDS"));
+#ifdef HAVE_UNSETENV
+		unsetenv("LISTEN_FDS");
+#endif
 
-	subnet_update(myself, NULL, true);
+		if(listen_sockets > MAXSOCKETS) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
+			return false;
+		}
 
-	/* Open sockets */
+		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(sockerrno));
+				return false;
+			}
+
+#ifdef FD_CLOEXEC
+			fcntl(i + 3, F_SETFD, FD_CLOEXEC);
+#endif
 
-	cfg = lookup_config(config_tree, "BindToAddress");
+			int udp_fd = setup_vpn_in_socket(&sa);
 
-	do {
-		get_config_string(cfg, &address);
-		if(cfg)
-			cfg = lookup_config_next(config_tree, cfg);
+			if(udp_fd < 0) {
+				return false;
+			}
 
-		hint.ai_family = addressfamily;
-		hint.ai_socktype = SOCK_STREAM;
-		hint.ai_protocol = IPPROTO_TCP;
-		hint.ai_flags = AI_PASSIVE;
+			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);
 
-		err = getaddrinfo(address, myport, &hint, &ai);
-		free(address);
+			if(debug_level >= DEBUG_CONNECTIONS) {
+				hostname = sockaddr2hostname(&sa);
+				logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Listening on %s", hostname);
+				free(hostname);
+			}
 
-		if(err || !ai) {
-			logger(LOG_ERR, "System call `%s' failed: %s", "getaddrinfo",
-				   gai_strerror(err));
-			return false;
+			memcpy(&listen_socket[i].sa, &sa, salen);
 		}
-
+	} else {
 		listen_sockets = 0;
+		int cfgs = 0;
 
-		for(aip = ai; aip; aip = aip->ai_next) {
-			listen_socket[listen_sockets].tcp =
-				setup_listen_socket((sockaddr_t *) aip->ai_addr);
+		for(config_t *cfg = lookup_config(&config_tree, "BindToAddress"); cfg; cfg = lookup_config_next(&config_tree, cfg)) {
+			cfgs++;
+			get_config_string(cfg, &address);
 
-			if(listen_socket[listen_sockets].tcp < 0)
-				continue;
+			if(!add_listen_address(address, true)) {
+				return false;
+			}
+		}
 
-			listen_socket[listen_sockets].udp =
-				setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
+		for(config_t *cfg = lookup_config(&config_tree, "ListenAddress"); cfg; cfg = lookup_config_next(&config_tree, cfg)) {
+			cfgs++;
+			get_config_string(cfg, &address);
 
-			if(listen_socket[listen_sockets].udp < 0)
-				continue;
+			if(!add_listen_address(address, false)) {
+				return false;
+			}
+		}
 
-			ifdebug(CONNECTIONS) {
-				hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
-				logger(LOG_NOTICE, "Listening on %s", hostname);
-				free(hostname);
+		if(!cfgs)
+			if(!add_listen_address(address, NULL)) {
+				return false;
+			}
+	}
+
+	if(!listen_sockets) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Unable to create any listening socket!");
+		return false;
+	}
+
+	/* If no Port option was specified, set myport to the port used by the first listening socket. */
+
+	if(!port_specified || atoi(myport) == 0) {
+		sockaddr_t sa;
+		socklen_t salen = sizeof(sa);
+
+		if(!getsockname(listen_socket[0].udp.fd, &sa.sa, &salen)) {
+			free(myport);
+			sockaddr2str(&sa, NULL, &myport);
+
+			if(!myport) {
+				myport = xstrdup("655");
 			}
+		}
+	}
+
+	xasprintf(&myself->hostname, "MYSELF port %s", myport);
+	myself->connection->hostname = xstrdup(myself->hostname);
+
+	char *upnp = NULL;
+	get_config_string(lookup_config(&config_tree, "UPnP"), &upnp);
+	bool upnp_tcp = false;
+	bool upnp_udp = false;
 
-			memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
-			listen_sockets++;
+	if(upnp) {
+		if(!strcasecmp(upnp, "yes")) {
+			upnp_tcp = upnp_udp = true;
+		} else if(!strcasecmp(upnp, "udponly")) {
+			upnp_udp = true;
 		}
 
-		freeaddrinfo(ai);
-	} while(cfg);
+		free(upnp);
+	}
 
-	if(listen_sockets)
-		logger(LOG_NOTICE, "Ready");
-	else {
-		logger(LOG_ERR, "Unable to create any listening socket!");
-		return false;
+	if(upnp_tcp || upnp_udp) {
+#ifdef HAVE_MINIUPNPC
+		upnp_init(upnp_tcp, upnp_udp);
+#else
+		logger(DEBUG_ALWAYS, LOG_WARNING, "UPnP was requested, but tinc isn't built with miniupnpc support!");
+#endif
 	}
 
+	/* Done. */
+
+	last_config_check = now.tv_sec;
+
 	return true;
 }
 
@@ -645,32 +1111,44 @@ static bool setup_myself(void) {
   initialize network
 */
 bool setup_network(void) {
-	now = time(NULL);
-
-	init_events();
 	init_connections();
 	init_subnets();
-	init_nodes();
-	init_edges();
-	init_requests();
 
-	if(get_config_int(lookup_config(config_tree, "PingInterval"), &pinginterval)) {
+	if(get_config_int(lookup_config(&config_tree, "PingInterval"), &pinginterval)) {
 		if(pinginterval < 1) {
 			pinginterval = 86400;
 		}
-	} else
+	} else {
 		pinginterval = 60;
+	}
 
-	if(!get_config_int(lookup_config(config_tree, "PingTimeout"), &pingtimeout))
+	if(!get_config_int(lookup_config(&config_tree, "PingTimeout"), &pingtimeout)) {
 		pingtimeout = 5;
-	if(pingtimeout < 1 || pingtimeout > pinginterval)
+	}
+
+	if(pingtimeout < 1 || pingtimeout > pinginterval) {
 		pingtimeout = pinginterval;
+	}
 
-	if(!get_config_int(lookup_config(config_tree, "MaxOutputBufferSize"), &maxoutbufsize))
+	if(!get_config_int(lookup_config(&config_tree, "MaxOutputBufferSize"), &maxoutbufsize)) {
 		maxoutbufsize = 10 * MTU;
+	}
 
-	if(!setup_myself())
+	if(!setup_myself()) {
 		return false;
+	}
+
+	if(!init_control()) {
+		return false;
+	}
+
+	if(!device_standby) {
+		device_enable();
+	}
+
+	/* Run subnet-up scripts for our own subnets */
+
+	subnet_update(myself, NULL, true);
 
 	return true;
 }
@@ -679,59 +1157,57 @@ bool setup_network(void) {
   close all open network connections
 */
 void close_network_connections(void) {
-	avl_node_t *node, *next;
-	connection_t *c;
-	char *envp[5];
-	int i;
-
-	for(node = connection_tree->head; node; node = next) {
+	for(list_node_t *node = connection_list.head, *next; node; node = next) {
 		next = node->next;
-		c = node->data;
-		c->outgoing = NULL;
-		terminate_connection(c, false);
-	}
+		connection_t *c = node->data;
 
-	for(list_node_t *node = outgoing_list->head; node; node = node->next) {
-		outgoing_t *outgoing = node->data;
+		/* Keep control connections open until the end, so they know when we really terminated */
+		if(c->status.control) {
+			c->socket = -1;
+		}
 
-		if(outgoing->event)
-			event_del(outgoing->event);
+		c->outgoing = NULL;
+		terminate_connection(c, false);
 	}
 
-	list_delete_list(outgoing_list);
+	list_empty_list(&outgoing_list);
 
 	if(myself && myself->connection) {
 		subnet_update(myself, NULL, false);
-		terminate_connection(myself->connection, false);
 		free_connection(myself->connection);
 	}
 
-	for(i = 0; i < listen_sockets; i++) {
-		close(listen_socket[i].tcp);
-		close(listen_socket[i].udp);
+	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);
 	}
 
-	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);
-	envp[4] = NULL;
-
 	exit_requests();
 	exit_edges();
 	exit_subnets();
 	exit_nodes();
 	exit_connections();
-	exit_events();
 
-	execute_script("tinc-down", envp);
+	if(!device_standby) {
+		device_disable();
+	}
+
+	free(myport);
 
-	if(myport) free(myport);
+	if(device_fd >= 0) {
+		io_del(&device_io);
+	}
+
+	if(devops.close) {
+		devops.close();
+	}
 
-	for(i = 0; i < 4; i++)
-		free(envp[i]);
+	exit_control();
 
-	devops.close();
+	free(scriptextension);
+	free(scriptinterpreter);
 
 	return;
 }