X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_setup.c;h=32946dab14ac021654c312311af9993ac94d8c50;hb=158cbe99f972a1613b7d4d95abfe5fe48e019e67;hp=4afb31b9c3ec5819e904762d600ba43cb7454086;hpb=8792b9a9f343e751dc3cfd789db9528da609ba9f;p=meshlink

diff --git a/src/net_setup.c b/src/net_setup.c
index 4afb31b9..32946dab 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-2012 Guus Sliepen <guus@tinc-vpn.org>
-                  2006      Scott Lamb <slamb@slamb.org>
-                  2010      Brandon Black <blblack@gmail.com>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,95 +19,97 @@
 
 #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 "net.h"
 #include "netutl.h"
-#include "process.h"
 #include "protocol.h"
 #include "route.h"
 #include "rsa.h"
-#include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
 
 char *myport;
-static struct event device_ev;
-devops_t devops;
+
+char *proxyhost;
+char *proxyport;
+char *proxyuser;
+char *proxypass;
+proxytype_t proxytype;
+int autoconnect;
+bool disablebuggypeers;
 
 bool node_read_ecdsa_public_key(node_t *n) {
-	if(ecdsa_active(&n->ecdsa))
+	if(ecdsa_active(n->ecdsa))
 		return true;
 
 	splay_tree_t *config_tree;
 	FILE *fp;
-	char *fname;
+	char *pubname = NULL;
 	char *p;
-	bool result = false;
-
-	xasprintf(&fname, "%s/hosts/%s", confbase, n->name);
 
 	init_configuration(&config_tree);
-	if(!read_config_file(config_tree, fname))
+	if(!read_host_config(config_tree, n->name))
 		goto exit;
 
 	/* First, check for simple ECDSAPublicKey statement */
 
 	if(get_config_string(lookup_config(config_tree, "ECDSAPublicKey"), &p)) {
-		result = ecdsa_set_base64_public_key(&n->ecdsa, p);
+		n->ecdsa = ecdsa_set_base64_public_key(p);
 		free(p);
 		goto exit;
 	}
 
 	/* Else, check for ECDSAPublicKeyFile statement and read it */
 
-	free(fname);
-
-	if(!get_config_string(lookup_config(config_tree, "ECDSAPublicKeyFile"), &fname))
-		xasprintf(&fname, "%s/hosts/%s", confbase, n->name);
+	if(!get_config_string(lookup_config(config_tree, "ECDSAPublicKeyFile"), &pubname))
+		xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, n->name);
 
-	fp = fopen(fname, "r");
+	fp = fopen(pubname, "r");
 
-	if(!fp) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA public key file `%s': %s", fname, strerror(errno));
+	if(!fp)
 		goto exit;
-	}
 
-	result = ecdsa_read_pem_public_key(&n->ecdsa, fp);
+	n->ecdsa = ecdsa_read_pem_public_key(fp);
 	fclose(fp);
 
 exit:
 	exit_configuration(&config_tree);
-	free(fname);
-	return result;
+	free(pubname);
+	return n->ecdsa;
 }
 
 bool read_ecdsa_public_key(connection_t *c) {
+	if(ecdsa_active(c->ecdsa))
+		return true;
+
 	FILE *fp;
 	char *fname;
 	char *p;
-	bool result;
+
+	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 */
 
 	if(get_config_string(lookup_config(c->config_tree, "ECDSAPublicKey"), &p)) {
-		result = ecdsa_set_base64_public_key(&c->ecdsa, p);
+		c->ecdsa = ecdsa_set_base64_public_key(p);
 		free(p);
-		return result;
+		return c->ecdsa;
 	}
 
 	/* Else, check for ECDSAPublicKeyFile statement and read it */
 
 	if(!get_config_string(lookup_config(c->config_tree, "ECDSAPublicKeyFile"), &fname))
-		xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
+		xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, c->name);
 
 	fp = fopen(fname, "r");
 
@@ -121,33 +120,35 @@ bool read_ecdsa_public_key(connection_t *c) {
 		return false;
 	}
 
-	result = ecdsa_read_pem_public_key(&c->ecdsa, fp);
+	c->ecdsa = ecdsa_read_pem_public_key(fp);
 	fclose(fp);
 
-	if(!result)
+	if(!c->ecdsa)
 		logger(DEBUG_ALWAYS, LOG_ERR, "Parsing ECDSA public key file `%s' failed.", fname);
 	free(fname);
-	return result;
+	return c->ecdsa;
 }
 
 bool read_rsa_public_key(connection_t *c) {
+	if(ecdsa_active(c->ecdsa))
+		return true;
+
 	FILE *fp;
 	char *fname;
 	char *n;
-	bool result;
 
 	/* First, check for simple PublicKey statement */
 
 	if(get_config_string(lookup_config(c->config_tree, "PublicKey"), &n)) {
-		result = rsa_set_hex_public_key(&c->rsa, n, "FFFF");
+		c->rsa = rsa_set_hex_public_key(n, "FFFF");
 		free(n);
-		return result;
+		return c->rsa;
 	}
 
 	/* Else, check for PublicKeyFile statement and read it */
 
 	if(!get_config_string(lookup_config(c->config_tree, "PublicKeyFile"), &fname))
-		xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
+		xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, c->name);
 
 	fp = fopen(fname, "r");
 
@@ -157,29 +158,30 @@ bool read_rsa_public_key(connection_t *c) {
 		return false;
 	}
 
-	result = rsa_read_pem_public_key(&c->rsa, fp);
+	c->rsa = rsa_read_pem_public_key(fp);
 	fclose(fp);
 
-	if(!result) 
+	if(!c->rsa)
 		logger(DEBUG_ALWAYS, LOG_ERR, "Reading RSA public key file `%s' failed: %s", fname, strerror(errno));
 	free(fname);
-	return result;
+	return c->rsa;
 }
 
 static bool read_ecdsa_private_key(void) {
 	FILE *fp;
 	char *fname;
-	bool result;
 
 	/* Check for PrivateKeyFile statement and read it */
 
 	if(!get_config_string(lookup_config(config_tree, "ECDSAPrivateKeyFile"), &fname))
-		xasprintf(&fname, "%s/ecdsa_key.priv", confbase);
+		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 generate-ecdsa-keys'.");
 		free(fname);
 		return false;
 	}
@@ -197,20 +199,43 @@ static bool read_ecdsa_private_key(void) {
 		logger(DEBUG_ALWAYS, LOG_WARNING, "Warning: insecure file permissions for ECDSA private key file `%s'!", fname);
 #endif
 
-	result = ecdsa_read_pem_private_key(&myself->connection->ecdsa, fp);
+	myself->connection->ecdsa = ecdsa_read_pem_private_key(fp);
 	fclose(fp);
 
-	if(!result) 
+	if(!myself->connection->ecdsa)
 		logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", fname, strerror(errno));
 	free(fname);
-	return result;
+	return myself->connection->ecdsa;
+}
+
+static bool read_invitation_key(void) {
+	FILE *fp;
+	char *fname;
+
+	if(invitation_key) {
+		ecdsa_free(invitation_key);
+		invitation_key = NULL;
+	}
+
+	xasprintf(&fname, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", confbase);
+
+	fp = fopen(fname, "r");
+
+	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(fname);
+	return invitation_key;
 }
 
 static bool read_rsa_private_key(void) {
 	FILE *fp;
 	char *fname;
 	char *n, *d;
-	bool result;
 
 	/* First, check for simple PrivateKey statement */
 
@@ -220,16 +245,16 @@ static bool read_rsa_private_key(void) {
 			free(d);
 			return false;
 		}
-		result = rsa_set_hex_private_key(&myself->connection->rsa, n, "FFFF", d);
+		myself->connection->rsa = rsa_set_hex_private_key(n, "FFFF", d);
 		free(n);
 		free(d);
-		return true;
+		return myself->connection->rsa;
 	}
 
 	/* Else, check for PrivateKeyFile statement and read it */
 
 	if(!get_config_string(lookup_config(config_tree, "PrivateKeyFile"), &fname))
-		xasprintf(&fname, "%s/rsa_key.priv", confbase);
+		xasprintf(&fname, "%s" SLASH "rsa_key.priv", confbase);
 
 	fp = fopen(fname, "r");
 
@@ -253,47 +278,33 @@ static bool read_rsa_private_key(void) {
 		logger(DEBUG_ALWAYS, LOG_WARNING, "Warning: insecure file permissions for RSA private key file `%s'!", fname);
 #endif
 
-	result = rsa_read_pem_private_key(&myself->connection->rsa, fp);
+	myself->connection->rsa = rsa_read_pem_private_key(fp);
 	fclose(fp);
 
-	if(!result) 
+	if(!myself->connection->rsa)
 		logger(DEBUG_ALWAYS, LOG_ERR, "Reading RSA private key file `%s' failed: %s", fname, strerror(errno));
 	free(fname);
-	return result;
+	return myself->connection->rsa;
 }
 
-static struct event keyexpire_event;
+static timeout_t keyexpire_timeout;
 
-static void keyexpire_handler(int fd, short events, void *data) {
+static void keyexpire_handler(void *data) {
 	regenerate_key();
+	timeout_set(data, &(struct timeval){keylifetime, rand() % 100000});
 }
 
 void regenerate_key(void) {
-	if(timeout_initialized(&keyexpire_event)) {
-		logger(DEBUG_STATUS, LOG_INFO, "Expiring symmetric keys");
-		event_del(&keyexpire_event);
-		send_key_changed();
-	} else {
-		timeout_set(&keyexpire_event, keyexpire_handler, NULL);
-	}
-
-	event_add(&keyexpire_event, &(struct timeval){keylifetime, 0});
+	logger(DEBUG_STATUS, LOG_INFO, "Expiring symmetric keys");
+	send_key_changed();
 }
 
-/*
-  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;
-	splay_tree_t *config_tree;
-	config_t *cfg;
-	subnet_t *s, *s2;
-	node_t *n;
 
-	xasprintf(&dname, "%s/hosts", confbase);
+	xasprintf(&dname, "%s" SLASH "hosts", confbase);
 	dir = opendir(dname);
 	if(!dir) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
@@ -305,69 +316,47 @@ void load_all_subnets(void) {
 		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);
-		read_config_options(config_tree, ent->d_name);
-		read_config_file(config_tree, fname);
-		free(fname);
-
-		if(!n) {
-			n = new_node();
-			n->name = xstrdup(ent->d_name);
-			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((s2 = lookup_subnet(n, s))) {
-				s2->expires = -1;
-			} else {
-				subnet_add(n, s);
-			}
-		}
+		node_t *n = lookup_node(ent->d_name);
+		if(n)
+			continue;
 
-		exit_configuration(&config_tree);
+		n = new_node();
+		n->name = xstrdup(ent->d_name);
+		node_add(n);
 	}
 
 	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;
 
-	myself = new_node();
-	myself->connection = new_connection();
+char *get_name(void) {
+	char *name = NULL;
 
-	myself->hostname = xstrdup("MYSELF");
-	myself->connection->hostname = xstrdup("MYSELF");
+	get_config_string(lookup_config(config_tree, "Name"), &name);
 
-	myself->connection->options = 0;
-	myself->connection->protocol_major = PROT_MAJOR;
-	myself->connection->protocol_minor = PROT_MINOR;
+	if(!name)
+		return NULL;
 
-	if(!get_config_string(lookup_config(config_tree, "Name"), &name)) {	/* Not acceptable */
-		logger(DEBUG_ALWAYS, LOG_ERR, "Name for tinc daemon required!");
-		return false;
+	if(*name == '$') {
+		char *envname = getenv(name + 1);
+		char hostname[32] = "";
+		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;
+			}
+			if(gethostname(hostname, sizeof hostname) || !*hostname) {
+				logger(DEBUG_ALWAYS, LOG_ERR, "Could not get hostname: %s\n", strerror(errno));
+				return false;
+			}
+			hostname[31] = 0;
+			envname = hostname;
+		}
+		free(name);
+		name = xstrdup(envname);
+		for(char *c = name; *c; c++)
+			if(!isalnum(*c))
+				*c = '_';
 	}
 
 	if(!check_id(name)) {
@@ -376,49 +365,81 @@ static bool setup_myself(void) {
 		return false;
 	}
 
-	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);
-
-	get_config_bool(lookup_config(config_tree, "ExperimentalProtocol"), &experimental);
-
-	if(experimental && !read_ecdsa_private_key())
-		return false;
-
-	if(!read_rsa_private_key())
-		return false;
+	return name;
+}
 
-	if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
-		myport = xstrdup("655");
+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;
 
-	if(!atoi(myport)) {
-		struct addrinfo *ai = str2addrinfo("localhost", myport, SOCK_DGRAM);
-		sockaddr_t sa;
-		if(!ai || !ai->ai_addr)
+	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;
-		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 */
+		}
 
-	cfg = lookup_config(config_tree, "Subnet");
+		switch(proxytype) {
+			case PROXY_NONE:
+			default:
+				break;
 
-	while(cfg) {
-		if(!get_config_subnet(cfg, &subnet))
-			return false;
-
-		subnet_add(myself, subnet);
+			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;
+		}
 
-		cfg = lookup_config_next(config_tree, cfg);
+		free(proxy);
 	}
 
-	/* Check some options */
-
 	if(get_config_bool(lookup_config(config_tree, "IndirectData"), &choice) && choice)
 		myself->options |= OPTION_INDIRECT;
 
@@ -429,37 +450,44 @@ static bool setup_myself(void) {
 		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);
 	get_config_bool(lookup_config(config_tree, "LocalDiscovery"), &localdiscovery);
-	strictsubnets |= tunnelserver;
 
-	if(get_config_string(lookup_config(config_tree, "Mode"), &mode)) {
-		if(!strcasecmp(mode, "router"))
+	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(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(DEBUG_ALWAYS, LOG_ERR, "Invalid routing mode!");
 			return false;
 		}
-		free(mode);
+		free(rmode);
 	}
 
-	if(get_config_string(lookup_config(config_tree, "Forwarding"), &mode)) {
-		if(!strcasecmp(mode, "off"))
+	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(DEBUG_ALWAYS, LOG_ERR, "Invalid forwarding mode!");
 			return false;
 		}
-		free(mode);
+		free(fmode);
 	}
 
 	choice = true;
@@ -474,7 +502,19 @@ static bool setup_myself(void) {
 
 	get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
 	get_config_bool(lookup_config(config_tree, "DecrementTTL"), &decrement_ttl);
-	get_config_bool(lookup_config(config_tree, "Broadcast"), &broadcast);
+	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 !defined(SOL_IP) || !defined(IP_TOS)
 	if(priorityinheritance)
@@ -492,28 +532,6 @@ static bool setup_myself(void) {
 	} else
 		maxtimeout = 900;
 
-	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;
-		}
-	}
-
-	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;
-		}
-	}
-
-	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;
-	}
-
 	if(get_config_string(lookup_config(config_tree, "AddressFamily"), &afname)) {
 		if(!strcasecmp(afname, "IPv4"))
 			addressfamily = AF_INET;
@@ -530,261 +548,287 @@ static bool setup_myself(void) {
 
 	get_config_bool(lookup_config(config_tree, "Hostnames"), &hostnames);
 
-	/* Generate packet encryption key */
-
-	if(!get_config_string(lookup_config(config_tree, "Cipher"), &cipher))
-		cipher = xstrdup("blowfish");
-
-	if(!cipher_open_by_name(&myself->incipher, cipher)) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized cipher type!");
-		return false;
-	}
-
 	if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
 		keylifetime = 3600;
 
-	regenerate_key();
+	get_config_int(lookup_config(config_tree, "AutoConnect"), &autoconnect);
+	if(autoconnect < 0)
+		autoconnect = 0;
 
-	/* Check if we want to use message authentication codes... */
+	get_config_bool(lookup_config(config_tree, "DisableBuggyPeers"), &disablebuggypeers);
 
-	int maclength = 4;
-	get_config_int(lookup_config(config_tree, "MACLength"), &maclength);
+	read_invitation_key();
 
-	if(maclength < 0) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Bogus MAC length!");
-		return false;
+	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;
+		}
+
+		if(!strcmp(address, "*"))
+			*address = 0;
 	}
 
-	if(!get_config_string(lookup_config(config_tree, "Digest"), &digest))
-		digest = xstrdup("sha1");
+	struct addrinfo *ai, hint = {0};
+	hint.ai_family = addressfamily;
+	hint.ai_socktype = SOCK_STREAM;
+	hint.ai_protocol = IPPROTO_TCP;
+	hint.ai_flags = AI_PASSIVE;
 
-	if(!digest_open_by_name(&myself->indigest, digest, maclength)) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized digest type!");
+	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;
 	}
 
-	/* Compression */
+	for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
+		// Ignore duplicate addresses
+		bool found = false;
 
-	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!");
+		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;
+
+		if(listen_sockets >= MAXSOCKETS) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
 			return false;
 		}
-	} else
-		myself->incompression = 0;
 
-	myself->connection->outcompression = 0;
+		int tcp_fd = setup_listen_socket((sockaddr_t *) aip->ai_addr);
 
-	/* Done */
+		if(tcp_fd < 0)
+			continue;
 
-	myself->nexthop = myself;
-	myself->via = myself;
-	myself->status.reachable = true;
-	node_add(myself);
+		int udp_fd = setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
 
-	graph();
-
-	if(strictsubnets)
-		load_all_subnets();
+		if(tcp_fd < 0) {
+			close(tcp_fd);
+			continue;
+		}
 
-	/* Open device */
+		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);
 
-	devops = os_devops;
+		if(debug_level >= DEBUG_CONNECTIONS) {
+			char *hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
+			logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Listening on %s", hostname);
+			free(hostname);
+		}
 
-	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
+		listen_socket[listen_sockets].bindto = bindto;
+		memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
+		listen_sockets++;
 	}
 
-	if(!devops.setup())
-		return false;
+	freeaddrinfo(ai);
+	return true;
+}
 
-	if(device_fd >= 0) {
-		event_set(&device_ev, device_fd, EV_READ|EV_PERSIST, handle_device_data, NULL);
+/*
+  Configure node_t myself and set up the local sockets (listen only)
+*/
+bool setup_myself(void) {
+	char *name, *hostname, *cipher, *digest, *type;
+	char *address = NULL;
+	bool port_specified = false;
 
-		if (event_add(&device_ev, NULL) < 0) {
-			logger(DEBUG_ALWAYS, LOG_ERR, "event_add failed: %s", strerror(errno));
-			devops.close();
-			return false;
-		}
+	if(!(name = get_name())) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Name for tinc daemon required!");
+		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;
+	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");
+	else
+		port_specified = true;
 
-	execute_script("tinc-up", envp);
+	myself->connection->options = 0;
+	myself->connection->protocol_major = PROT_MAJOR;
+	myself->connection->protocol_minor = PROT_MINOR;
 
-	for(i = 0; i < 4; i++)
-		free(envp[i]);
+	myself->options |= PROT_MINOR << 24;
 
-	/* Run subnet-up scripts for our own subnets */
+	if(!get_config_bool(lookup_config(config_tree, "ExperimentalProtocol"), &experimental)) {
+		experimental = read_ecdsa_private_key();
+		if(!experimental)
+			logger(DEBUG_ALWAYS, LOG_WARNING, "Support for SPTPS disabled.");
+	} else {
+		if(experimental && !read_ecdsa_private_key())
+			return false;
+	}
 
-	subnet_update(myself, NULL, true);
+	if(!read_rsa_private_key())
+		return false;
 
-	/* Open sockets */
+	/* Ensure myport is numeric */
 
-	if(!do_detach && getenv("LISTEN_FDS")) {
+	if(!atoi(myport)) {
+		struct addrinfo *ai = str2addrinfo("localhost", myport, SOCK_DGRAM);
 		sockaddr_t sa;
-		socklen_t salen;
+		if(!ai || !ai->ai_addr)
+			return false;
+		free(myport);
+		memcpy(&sa, ai->ai_addr, ai->ai_addrlen);
+		sockaddr2str(&sa, NULL, &myport);
+	}
 
-		listen_sockets = atoi(getenv("LISTEN_FDS"));
-#ifdef HAVE_UNSETENV
-		unsetenv("LISTEN_FDS");
-#endif
+	/* Check some options */
 
-		if(listen_sockets > MAXSOCKETS) {
-			logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
+	if(!setup_myself_reloadable())
+		return false;
+
+	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;
 		}
+	}
 
-		for(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));
-				return false;
-			}
-
-			listen_socket[i].tcp = i + 3;
-
-#ifdef FD_CLOEXEC
-		        fcntl(i + 3, F_SETFD, FD_CLOEXEC);
-#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;
+	}
 
-			listen_socket[i].udp = setup_vpn_in_socket(&sa);
-			if(listen_socket[i].udp < 0)
-				return false;
+	/* Generate packet encryption key */
 
-			event_set(&listen_socket[i].ev_tcp, listen_socket[i].tcp, EV_READ|EV_PERSIST, handle_new_meta_connection, NULL);
-			if(event_add(&listen_socket[i].ev_tcp, NULL) < 0) {
-				logger(DEBUG_ALWAYS, LOG_ERR, "event_add failed: %s", strerror(errno));
-				abort();
-			}
+	if(!get_config_string(lookup_config(config_tree, "Cipher"), &cipher))
+		cipher = xstrdup("blowfish");
 
-			event_set(&listen_socket[i].ev_udp, listen_socket[i].udp, EV_READ|EV_PERSIST, handle_incoming_vpn_data, (void *)(intptr_t)listen_sockets);
-			if(event_add(&listen_socket[listen_sockets].ev_udp, NULL) < 0) {
-				logger(DEBUG_ALWAYS, LOG_ERR, "event_add failed: %s", strerror(errno));
-				abort();
-			}
+	if(!strcasecmp(cipher, "none")) {
+		myself->incipher = NULL;
+	} else if(!(myself->incipher = cipher_open_by_name(cipher))) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized cipher type!");
+		return false;
+	}
 
-			if(debug_level >= DEBUG_CONNECTIONS) {
-				hostname = sockaddr2hostname(&sa);
-				logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Listening on %s", hostname);
-				free(hostname);
-			}
+	free(cipher);
 
-			memcpy(&listen_socket[i].sa, &sa, salen);
-		}
-	} else {
-		listen_sockets = 0;
-		cfg = lookup_config(config_tree, "BindToAddress");
+	timeout_add(&keyexpire_timeout, keyexpire_handler, &keyexpire_timeout, &(struct timeval){keylifetime, rand() % 100000});
 
-		do {
-			get_config_string(cfg, &address);
-			if(cfg)
-				cfg = lookup_config_next(config_tree, cfg);
+	/* Check if we want to use message authentication codes... */
 
-			char *port = myport;
+	int maclength = 4;
+	get_config_int(lookup_config(config_tree, "MACLength"), &maclength);
 
-			if(address) {
-				char *space = strchr(address, ' ');
-				if(space) {
-					*space++ = 0;
-					port = space;
-				}
+	if(maclength < 0) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Bogus MAC length!");
+		return false;
+	}
 
-				if(!strcmp(address, "*"))
-					*address = 0;
-			}
+	if(!get_config_string(lookup_config(config_tree, "Digest"), &digest))
+		digest = xstrdup("sha1");
 
-			hint.ai_family = addressfamily;
-			hint.ai_socktype = SOCK_STREAM;
-			hint.ai_protocol = IPPROTO_TCP;
-			hint.ai_flags = AI_PASSIVE;
+	if(!strcasecmp(digest, "none")) {
+		myself->indigest = NULL;
+	} else if(!(myself->indigest = digest_open_by_name(digest, maclength))) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized digest type!");
+		return false;
+	}
 
-			err = getaddrinfo(address && *address ? address : NULL, port, &hint, &ai);
-			free(address);
+	free(digest);
 
-			if(err || !ai) {
-				logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "getaddrinfo",
-					   gai_strerror(err));
-				return false;
-			}
+	/* Compression */
 
-			for(aip = ai; aip; aip = aip->ai_next) {
-				if(listen_sockets >= MAXSOCKETS) {
-					logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
-					return false;
-				}
+	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;
 
-				listen_socket[listen_sockets].tcp =
-					setup_listen_socket((sockaddr_t *) aip->ai_addr);
+	myself->connection->outcompression = 0;
 
-				if(listen_socket[listen_sockets].tcp < 0)
-					continue;
+	/* Done */
 
-				listen_socket[listen_sockets].udp =
-					setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
+	myself->nexthop = myself;
+	myself->via = myself;
+	myself->status.reachable = true;
+	myself->last_state_change = now.tv_sec;
+	myself->status.sptps = experimental;
+	node_add(myself);
 
-				if(listen_socket[listen_sockets].udp < 0) {
-					close(listen_socket[listen_sockets].tcp);
-					continue;
-				}
+	graph();
 
-				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(DEBUG_ALWAYS, LOG_ERR, "event_add failed: %s", strerror(errno));
-					abort();
-				}
+	if(autoconnect)
+		load_all_nodes();
 
-				event_set(&listen_socket[listen_sockets].ev_udp,
-						  listen_socket[listen_sockets].udp,
-						  EV_READ|EV_PERSIST,
-						  handle_incoming_vpn_data, (void *)(intptr_t)listen_sockets);
-				if(event_add(&listen_socket[listen_sockets].ev_udp, NULL) < 0) {
-					logger(DEBUG_ALWAYS, LOG_ERR, "event_add failed: %s", strerror(errno));
-					abort();
-				}
+	/* Open sockets */
 
-				if(debug_level >= DEBUG_CONNECTIONS) {
-					hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
-					logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Listening on %s", hostname);
-					free(hostname);
-				}
+	listen_sockets = 0;
+	int cfgs = 0;
 
-				memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
-				listen_sockets++;
-			}
+	for(config_t *cfg = lookup_config(config_tree, "BindToAddress"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
+		cfgs++;
+		get_config_string(cfg, &address);
+		if(!add_listen_address(address, true))
+			return false;
+	}
 
-			freeaddrinfo(ai);
-		} while(cfg);
+	for(config_t *cfg = lookup_config(config_tree, "ListenAddress"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
+		cfgs++;
+		get_config_string(cfg, &address);
+		if(!add_listen_address(address, false))
+			return false;
 	}
 
-	if(listen_sockets)
-		logger(DEBUG_ALWAYS, LOG_NOTICE, "Ready");
-	else {
+	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) {
+		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);
+
+	/* Done. */
+
+	last_config_check = now.tv_sec;
+
 	return true;
 }
 
@@ -793,7 +837,6 @@ static bool setup_myself(void) {
 */
 bool setup_network(void) {
 	init_connections();
-	init_subnets();
 	init_nodes();
 	init_edges();
 	init_requests();
@@ -823,53 +866,34 @@ bool setup_network(void) {
   close all open network connections
 */
 void close_network_connections(void) {
-	splay_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;
+		connection_t *c = node->data;
 		c->outgoing = NULL;
 		terminate_connection(c, false);
 	}
 
-	list_delete_list(outgoing_list);
+	if(outgoing_list)
+		list_delete_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++) {
-		event_del(&listen_socket[i].ev_tcp);
-		event_del(&listen_socket[i].ev_udp);
-		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();
 
-	execute_script("tinc-down", envp);
-
 	if(myport) free(myport);
 
-	for(i = 0; i < 4; i++)
-		free(envp[i]);
-
-	devops.close();
-
 	return;
 }