X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_setup.c;h=2cc7ddf55a46c5555cd5a93ba0ecf54e1e214705;hb=a7ebfcff0fe55596cb18a3cb488d14c73aacbe5f;hp=814d698f8ef3834da433ebf0f46bbeb29fb1aa38;hpb=7e1117197ca4fc62af93fda50e28e0ff06cb736c;p=meshlink

diff --git a/src/net_setup.c b/src/net_setup.c
index 814d698f..2cc7ddf5 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -1,7 +1,6 @@
 /*
     net_setup.c -- Setup.
-    Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -13,442 +12,336 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
 
-#include <openssl/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.h"
 #include "connection.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 "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
 
 char *myport;
-static struct event device_ev;
 
-bool read_rsa_public_key(connection_t *c)
-{
-	FILE *fp;
-	char *fname;
-	char *key;
-
-	cp();
-
-	if(!c->rsa_key) {
-		c->rsa_key = RSA_new();
-//		RSA_blinding_on(c->rsa_key, NULL);
-	}
+char *proxyhost;
+char *proxyport;
+char *proxyuser;
+char *proxypass;
+proxytype_t proxytype;
+int autoconnect;
+bool disablebuggypeers;
 
-	/* First, check for simple PublicKey statement */
-
-	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;
-		}
+	splay_tree_t *config_tree;
+	char *p;
 
-		free(fname);
-		c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
-		fclose(fp);
+	init_configuration(&config_tree);
+	if(!read_host_config(config_tree, n->name))
+		goto exit;
 
-		if(c->rsa_key)
-			return true;		/* Woohoo. */
+	/* First, check for simple ECDSAPublicKey statement */
 
-		/* If it fails, try PEM_read_RSA_PUBKEY. */
-		fp = fopen(fname, "r");
+	if(get_config_string(lookup_config(config_tree, "ECDSAPublicKey"), &p)) {
+		n->ecdsa = ecdsa_set_base64_public_key(p);
+		free(p);
+	}
 
-		if(!fp) {
-			logger(LOG_ERR, _("Error reading RSA public key file `%s': %s"),
-				   fname, strerror(errno));
-			free(fname);
-			return false;
-		}
+exit:
+	exit_configuration(&config_tree);
+	return n->ecdsa;
+}
 
-		free(fname);
-		c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
-		fclose(fp);
+bool read_ecdsa_public_key(connection_t *c) {
+	if(ecdsa_active(c->ecdsa))
+		return true;
 
-		if(c->rsa_key) {
-//				RSA_blinding_on(c->rsa_key, NULL);
-			return true;
-		}
+	char *p;
 
-		logger(LOG_ERR, _("Reading RSA public key file `%s' failed: %s"),
-			   fname, strerror(errno));
-		return false;
+	if(!c->config_tree) {
+		init_configuration(&c->config_tree);
+		if(!read_host_config(c->config_tree, c->name))
+			return false;
 	}
 
-	/* Else, check if a harnessed public key is in the config file */
+	/* First, check for simple ECDSAPublicKey statement */
 
-	asprintf(&fname, "%s/hosts/%s", confbase, c->name);
-	fp = fopen(fname, "r");
-
-	if(fp) {
-		c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
-		fclose(fp);
+	if(get_config_string(lookup_config(c->config_tree, "ECDSAPublicKey"), &p)) {
+		c->ecdsa = ecdsa_set_base64_public_key(p);
+		free(p);
+		return c->ecdsa;
 	}
 
-	free(fname);
-
-	if(c->rsa_key)
-		return true;
+	return false;
+}
 
-	/* Try again with PEM_read_RSA_PUBKEY. */
+static bool read_ecdsa_private_key(void) {
+	FILE *fp;
+	char *fname;
 
-	asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+	xasprintf(&fname, "%s" SLASH "ecdsa_key.priv", confbase);
 	fp = fopen(fname, "r");
+	free(fname);
 
-	if(fp) {
-		c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
-//		RSA_blinding_on(c->rsa_key, NULL);
-		fclose(fp);
+	if(!fp) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA private key file: %s", strerror(errno));
+		return false;
 	}
 
-	free(fname);
-
-	if(c->rsa_key)
-		return true;
+	myself->connection->ecdsa = ecdsa_read_pem_private_key(fp);
+	fclose(fp);
 
-	logger(LOG_ERR, _("No public key for %s specified!"), c->name);
+	if(!myself->connection->ecdsa)
+		logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file failed: %s", strerror(errno));
 
-	return false;
+	return myself->connection->ecdsa;
 }
 
-bool read_rsa_private_key(void)
-{
+static bool read_invitation_key(void) {
 	FILE *fp;
-	char *fname, *key, *pubkey;
-	struct stat s;
-
-	cp();
+	char *fname;
 
-	if(get_config_string(lookup_config(config_tree, "PrivateKey"), &key)) {
-		if(!get_config_string(lookup_config(myself->connection->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))
-		asprintf(&fname, "%s/rsa_key.priv", confbase);
+	xasprintf(&fname, "%s" SLASH "invitations" SLASH "ecdsa_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 !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(s.st_mode & ~0100700)
-		logger(LOG_WARNING, _("Warning: insecure file permissions for RSA private key file `%s'!"), fname);
-#endif
-
-	myself->connection->rsa_key = PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
-	fclose(fp);
-
-	if(!myself->connection->rsa_key) {
-		logger(LOG_ERR, _("Reading RSA private key file `%s' failed: %s"),
-			   fname, strerror(errno));
-		free(fname);
-		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(fname);
-	return true;
+	return invitation_key;
 }
 
-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() {
-	RAND_pseudo_bytes((unsigned char *)myself->key, myself->keylength);
+void regenerate_key(void) {
+	logger(DEBUG_STATUS, LOG_INFO, "Expiring symmetric keys");
+	send_key_changed();
+}
 
-	if(timeout_initialized(&keyexpire_event)) {
-		ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
-		event_del(&keyexpire_event);
-		send_key_changed(broadcast, myself);
-	} else {
-		timeout_set(&keyexpire_event, keyexpire_handler, NULL);
+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;
 	}
 
-	event_add(&keyexpire_event, &(struct timeval){keylifetime, 0});
+	while((ent = readdir(dir))) {
+		if(!check_id(ent->d_name))
+			continue;
 
-	if(myself->cipher) {
-		EVP_CIPHER_CTX_init(&packet_ctx);
-		if(!EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, (unsigned char *)myself->key, (unsigned char *)myself->key + myself->cipher->key_len)) {
-			logger(LOG_ERR, _("Error during initialisation of cipher for %s (%s): %s"),
-					myself->name, myself->hostname, ERR_error_string(ERR_get_error(), NULL));
-			abort();
-		}
+		node_t *n = lookup_node(ent->d_name);
+		if(n)
+			continue;
 
+		n = new_node();
+		n->name = xstrdup(ent->d_name);
+		node_add(n);
 	}
-}
 
-/*
-  Configure node_t myself and set up the local sockets (listen only)
-*/
-bool setup_myself(void)
-{
-	config_t *cfg;
-	subnet_t *subnet;
-	char *name, *hostname, *mode, *afname, *cipher, *digest;
-	char *address = NULL;
-	char *envp[5];
-	struct addrinfo *ai, *aip, hint = {0};
-	bool choice;
-	int i, err;
+	closedir(dir);
+}
 
-	cp();
 
-	myself = new_node();
-	myself->connection = new_connection();
-	init_configuration(&myself->connection->config_tree);
+char *get_name(void) {
+	char *name = NULL;
 
-	asprintf(&myself->hostname, _("MYSELF"));
-	asprintf(&myself->connection->hostname, _("MYSELF"));
+	get_config_string(lookup_config(config_tree, "Name"), &name);
 
-	myself->connection->options = 0;
-	myself->connection->protocol_version = PROT_CURRENT;
-
-	if(!get_config_string(lookup_config(config_tree, "Name"), &name)) {	/* Not acceptable */
-		logger(LOG_ERR, _("Name for tinc daemon required!"));
-		return false;
-	}
+	if(!name)
+		return NULL;
 
 	if(!check_id(name)) {
-		logger(LOG_ERR, _("Invalid name for myself!"));
+		logger(DEBUG_ALWAYS, LOG_ERR, "Invalid name for myself!");
 		free(name);
-		return false;
+		return NULL;
 	}
 
-	myself->name = name;
-	myself->connection->name = xstrdup(name);
+	return name;
+}
 
-	if(!read_connection_config(myself->connection)) {
-		logger(LOG_ERR, _("Cannot open host configuration file for myself!"));
-		return false;
-	}
+bool setup_myself_reloadable(void) {
+	localdiscovery = true;
+	keylifetime = 3600; // TODO: check if this can be removed as well
+	maxtimeout = 900;
+	autoconnect = 3;
+	myself->options |= OPTION_PMTU_DISCOVERY;
 
-	if(!read_rsa_private_key())
-		return false;
+	read_invitation_key();
 
-	if(!get_config_string(lookup_config(myself->connection->config_tree, "Port"), &myport))
-		asprintf(&myport, "655");
+	return true;
+}
 
-	/* Read in all the subnets specified in the host configuration file */
+/*
+  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;
+		}
 
-	cfg = lookup_config(myself->connection->config_tree, "Subnet");
+		if(!strcmp(address, "*"))
+			*address = 0;
+	}
 
-	while(cfg) {
-		if(!get_config_subnet(cfg, &subnet))
-			return false;
+	struct addrinfo *ai, hint = {0};
+	hint.ai_family = addressfamily;
+	hint.ai_socktype = SOCK_STREAM;
+	hint.ai_protocol = IPPROTO_TCP;
+	hint.ai_flags = AI_PASSIVE;
 
-		subnet_add(myself, subnet);
+	int err = getaddrinfo(address && *address ? address : NULL, port, &hint, &ai);
+	free(address);
 
-		cfg = lookup_config_next(myself->connection->config_tree, cfg);
+	if(err || !ai) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "getaddrinfo", err == EAI_SYSTEM ? strerror(err) : gai_strerror(err));
+		return false;
 	}
 
-	/* Check some options */
+	for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
+		// Ignore duplicate addresses
+		bool found = false;
 
-	if(get_config_bool(lookup_config(config_tree, "IndirectData"), &choice) && choice)
-		myself->options |= OPTION_INDIRECT;
+		for(int i = 0; i < listen_sockets; i++)
+			if(!memcmp(&listen_socket[i].sa, aip->ai_addr, aip->ai_addrlen)) {
+				found = true;
+				break;
+			}
 
-	if(get_config_bool(lookup_config(config_tree, "TCPOnly"), &choice) && choice)
-		myself->options |= OPTION_TCPONLY;
+		if(found)
+			continue;
 
-	if(get_config_bool(lookup_config(myself->connection->config_tree, "IndirectData"), &choice) && choice)
-		myself->options |= OPTION_INDIRECT;
+		if(listen_sockets >= MAXSOCKETS) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
+			return false;
+		}
 
-	if(get_config_bool(lookup_config(myself->connection->config_tree, "TCPOnly"), &choice) && choice)
-		myself->options |= OPTION_TCPONLY;
+		int tcp_fd = setup_listen_socket((sockaddr_t *) aip->ai_addr);
 
-	if(get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice) && choice)
-		myself->options |= OPTION_PMTU_DISCOVERY;
+		if(tcp_fd < 0)
+			continue;
 
-	if(myself->options & OPTION_TCPONLY)
-		myself->options |= OPTION_INDIRECT;
+		int udp_fd = setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
 
-	get_config_bool(lookup_config(config_tree, "TunnelServer"), &tunnelserver);
+		if(tcp_fd < 0) {
+			close(tcp_fd);
+			continue;
+		}
 
-	if(get_config_string(lookup_config(config_tree, "Mode"), &mode)) {
-		if(!strcasecmp(mode, "router"))
-			routing_mode = RMODE_ROUTER;
-		else if(!strcasecmp(mode, "switch"))
-			routing_mode = RMODE_SWITCH;
-		else if(!strcasecmp(mode, "hub"))
-			routing_mode = RMODE_HUB;
-		else {
-			logger(LOG_ERR, _("Invalid routing mode!"));
-			return false;
+		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);
 		}
-		free(mode);
-	} else
-		routing_mode = RMODE_ROUTER;
 
-	get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
+		listen_socket[listen_sockets].bindto = bindto;
+		memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
+		listen_sockets++;
+	}
 
-#if !defined(SOL_IP) || !defined(IP_TOS)
-	if(priorityinheritance)
-		logger(LOG_WARNING, _("PriorityInheritance not supported on this platform"));
-#endif
+	freeaddrinfo(ai);
+	return true;
+}
 
-	if(!get_config_int(lookup_config(config_tree, "MACExpire"), &macexpire))
-		macexpire = 600;
+/*
+  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(get_config_int(lookup_config(config_tree, "MaxTimeout"), &maxtimeout)) {
-		if(maxtimeout <= 0) {
-			logger(LOG_ERR, _("Bogus maximum timeout!"));
-			return false;
-		}
-	} else
-		maxtimeout = 900;
-
-	if(get_config_string(lookup_config(config_tree, "AddressFamily"), &afname)) {
-		if(!strcasecmp(afname, "IPv4"))
-			addressfamily = AF_INET;
-		else if(!strcasecmp(afname, "IPv6"))
-			addressfamily = AF_INET6;
-		else if(!strcasecmp(afname, "any"))
-			addressfamily = AF_UNSPEC;
-		else {
-			logger(LOG_ERR, _("Invalid address family!"));
-			return false;
-		}
-		free(afname);
+	if(!(name = get_name())) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Name for tinc daemon required!");
+		return false;
 	}
 
-	get_config_bool(lookup_config(config_tree, "Hostnames"), &hostnames);
+	myself = new_node();
+	myself->connection = new_connection();
+	myself->name = name;
+	myself->connection->name = xstrdup(name);
+	read_host_config(config_tree, name);
 
-	/* Generate packet encryption key */
+	if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
+		myport = xstrdup("655");
+	else
+		port_specified = true;
 
-	if(get_config_string
-	   (lookup_config(myself->connection->config_tree, "Cipher"), &cipher)) {
-		if(!strcasecmp(cipher, "none")) {
-			myself->cipher = NULL;
-		} else {
-			myself->cipher = EVP_get_cipherbyname(cipher);
+	myself->connection->options = 0;
+	myself->connection->protocol_major = PROT_MAJOR;
+	myself->connection->protocol_minor = PROT_MINOR;
 
-			if(!myself->cipher) {
-				logger(LOG_ERR, _("Unrecognized cipher type!"));
-				return false;
-			}
-		}
-	} else
-		myself->cipher = EVP_bf_cbc();
+	myself->options |= PROT_MINOR << 24;
 
-	if(myself->cipher)
-		myself->keylength = myself->cipher->key_len + myself->cipher->iv_len;
-	else
-		myself->keylength = 1;
+	if(!read_ecdsa_private_key())
+		return false;
 
-	myself->connection->outcipher = EVP_bf_ofb();
+	/* Ensure myport is numeric */
 
-	myself->key = xmalloc(myself->keylength);
+	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);
+	}
 
-	if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
-		keylifetime = 3600;
+	/* Check some options */
 
-	regenerate_key();
-	/* Check if we want to use message authentication codes... */
-
-	if(get_config_string
-	   (lookup_config(myself->connection->config_tree, "Digest"), &digest)) {
-		if(!strcasecmp(digest, "none")) {
-			myself->digest = NULL;
-		} else {
-			myself->digest = EVP_get_digestbyname(digest);
-
-			if(!myself->digest) {
-				logger(LOG_ERR, _("Unrecognized digest type!"));
-				return false;
-			}
-		}
-	} else
-		myself->digest = EVP_sha1();
-
-	myself->connection->outdigest = EVP_sha1();
-
-	if(get_config_int(lookup_config(myself->connection->config_tree, "MACLength"),
-		&myself->maclength)) {
-		if(myself->digest) {
-			if(myself->maclength > myself->digest->md_size) {
-				logger(LOG_ERR, _("MAC length exceeds size of digest!"));
-				return false;
-			} else if(myself->maclength < 0) {
-				logger(LOG_ERR, _("Bogus MAC length!"));
-				return false;
-			}
-		}
-	} else
-		myself->maclength = 4;
+	if(!setup_myself_reloadable())
+		return false;
 
-	myself->connection->outmaclength = 0;
+	// TODO: check whether this is used at all
+	timeout_add(&keyexpire_timeout, keyexpire_handler, &keyexpire_timeout, &(struct timeval){keylifetime, rand() % 100000});
 
 	/* Compression */
 
-	if(get_config_int(lookup_config(myself->connection->config_tree, "Compression"),
-		&myself->compression)) {
-		if(myself->compression < 0 || myself->compression > 11) {
-			logger(LOG_ERR, _("Bogus compression level!"));
-			return false;
-		}
-	} else
-		myself->compression = 0;
-
+	// TODO: drop compression in the packet layer?
+	myself->incompression = 0;
 	myself->connection->outcompression = 0;
 
 	/* Done */
@@ -456,218 +349,93 @@ bool setup_myself(void)
 	myself->nexthop = myself;
 	myself->via = myself;
 	myself->status.reachable = true;
+	myself->last_state_change = now.tv_sec;
 	node_add(myself);
 
 	graph();
 
-	/* Open device */
-
-	if(!setup_device())
-		return false;
-
-	event_set(&device_ev, device_fd, EV_READ|EV_PERSIST,
-			  handle_device_data, NULL);
-	if (event_add(&device_ev, NULL) < 0) {
-		logger(LOG_ERR, _("event_add failed: %s"), strerror(errno));
-		close_device();
-		return false;
-	}
-
-	/* Run tinc-up script to further initialize the tap interface */
-	asprintf(&envp[0], "NETNAME=%s", netname ? : "");
-	asprintf(&envp[1], "DEVICE=%s", device ? : "");
-	asprintf(&envp[2], "INTERFACE=%s", iface ? : "");
-	asprintf(&envp[3], "NAME=%s", myself->name);
-	envp[4] = NULL;
-
-	execute_script("tinc-up", envp);
-
-	for(i = 0; i < 5; i++)
-		free(envp[i]);
-
-	/* Run subnet-up scripts for our own subnets */
-
-	subnet_update(myself, NULL, true);
+	if(autoconnect)
+		load_all_nodes();
 
 	/* Open sockets */
 
-	get_config_string(lookup_config(config_tree, "BindToAddress"), &address);
-
-	hint.ai_family = addressfamily;
-	hint.ai_socktype = SOCK_STREAM;
-	hint.ai_protocol = IPPROTO_TCP;
-	hint.ai_flags = AI_PASSIVE;
+	listen_sockets = 0;
+	int cfgs = 0;
 
-	err = getaddrinfo(address, myport, &hint, &ai);
+	if(!add_listen_address(address, NULL))
+		return false;
 
-	if(err || !ai) {
-		logger(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo",
-			   gai_strerror(err));
+	if(!listen_sockets) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Unable to create any listening socket!");
 		return false;
 	}
 
-	listen_sockets = 0;
-
-	for(aip = ai; aip; aip = aip->ai_next) {
-		listen_socket[listen_sockets].tcp =
-			setup_listen_socket((sockaddr_t *) aip->ai_addr);
+	// TODO: require Port to be set? Or use "0" and use getsockname()?
 
-		if(listen_socket[listen_sockets].tcp < 0)
-			continue;
+	if(!myport)
+		myport = xstrdup("655");
 
-		listen_socket[listen_sockets].udp =
-			setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
+	xasprintf(&myself->hostname, "MYSELF port %s", myport);
+	myself->connection->hostname = xstrdup(myself->hostname);
 
-		if(listen_socket[listen_sockets].udp < 0) {
-			close(listen_socket[listen_sockets].tcp);
-			continue;
-		}
+	/* Done. */
 
-		event_set(&listen_socket[listen_sockets].ev_tcp,
-				  listen_socket[listen_sockets].tcp,
-				  EV_READ|EV_PERSIST,
-				  handle_new_meta_connection, NULL);
-		if(event_add(&listen_socket[listen_sockets].ev_tcp, NULL) < 0) {
-			logger(LOG_WARNING, _("event_add failed: %s"), strerror(errno));
-			close(listen_socket[listen_sockets].tcp);
-			close(listen_socket[listen_sockets].udp);
-			continue;
-		}
-
-		event_set(&listen_socket[listen_sockets].ev_udp,
-				  listen_socket[listen_sockets].udp,
-				  EV_READ|EV_PERSIST,
-				  handle_incoming_vpn_data, NULL);
-		if(event_add(&listen_socket[listen_sockets].ev_udp, NULL) < 0) {
-			logger(LOG_WARNING, _("event_add failed: %s"), strerror(errno));
-			close(listen_socket[listen_sockets].tcp);
-			close(listen_socket[listen_sockets].udp);
-			event_del(&listen_socket[listen_sockets].ev_tcp);
-			continue;
-		}
-
-		ifdebug(CONNECTIONS) {
-			hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
-			logger(LOG_NOTICE, _("Listening on %s"), hostname);
-			free(hostname);
-		}
-
-		memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
-		listen_sockets++;
-
-		if(listen_sockets >= MAXSOCKETS) {
-			logger(LOG_WARNING, _("Maximum of %d listening sockets reached"), MAXSOCKETS);
-			break;
-		}
-	}
-
-	freeaddrinfo(ai);
-
-	if(listen_sockets)
-		logger(LOG_NOTICE, _("Ready"));
-	else {
-		logger(LOG_ERR, _("Unable to create any listening socket!"));
-		return false;
-	}
+	last_config_check = now.tv_sec;
 
 	return true;
 }
 
 /*
-  setup all initial network connections
+  initialize network
 */
-bool setup_network_connections(void)
-{
-	cp();
-
-	now = time(NULL);
-
+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 = 4 * MTU;
+	pinginterval = 60;
+	pingtimeout = 5;
+	maxoutbufsize = 10 * MTU;
 
 	if(!setup_myself())
 		return false;
 
-	try_outgoing_connections();
-
 	return true;
 }
 
 /*
   close all open network connections
 */
-void close_network_connections(void)
-{
-	avl_node_t *node, *next;
-	connection_t *c;
-	char *envp[5];
-	int i;
-
-	cp();
-
-	for(node = connection_tree->head; node; node = next) {
+void close_network_connections(void) {
+	for(list_node_t *node = connection_list->head, *next; node; node = next) {
 		next = node->next;
-		c = node->data;
-
-		if(c->outgoing) {
-			if(c->outgoing->ai)
-				freeaddrinfo(c->outgoing->ai);
-			free(c->outgoing->name);
-			free(c->outgoing);
-			c->outgoing = NULL;
-		}
-
+		connection_t *c = node->data;
+		c->outgoing = NULL;
 		terminate_connection(c, false);
 	}
 
+	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);
 	}
 
-	asprintf(&envp[0], "NETNAME=%s", netname ? : "");
-	asprintf(&envp[1], "DEVICE=%s", device ? : "");
-	asprintf(&envp[2], "INTERFACE=%s", iface ? : "");
-	asprintf(&envp[3], "NAME=%s", myself->name);
-	envp[4] = NULL;
-
 	exit_requests();
 	exit_edges();
-	exit_subnets();
 	exit_nodes();
 	exit_connections();
 
-	execute_script("tinc-down", envp);
-
-	for(i = 0; i < 4; i++)
-		free(envp[i]);
-
-	close_device();
+	if(myport) free(myport);
 
 	return;
 }