X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_setup.c;h=ce9a59ad230b0723e5bafeed12f312fed629b4a5;hb=f2b21858a8e77663a02c2d586b21c5568fb435a0;hp=a28ab7ad147c7e3989bba3c3231861028098d1c4;hpb=c4940a5c888d85b4c477b6face5e9a618e64718d;p=meshlink

diff --git a/src/net_setup.c b/src/net_setup.c
index a28ab7ad..ce9a59ad 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,226 +19,120 @@
 
 #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 "conf.h"
 #include "connection.h"
-#include "device.h"
-#include "event.h"
+#include "ecdsa.h"
 #include "graph.h"
 #include "logger.h"
+#include "meshlink_internal.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;
-devops_t devops;
+int autoconnect = 3;
 
-char *proxyhost;
-char *proxyport;
-char *proxyuser;
-char *proxypass;
-proxytype_t proxytype;
+bool node_read_ecdsa_public_key(meshlink_handle_t *mesh, node_t *n) {
+	if(ecdsa_active(n->ecdsa))
+		return true;
 
-bool read_rsa_public_key(connection_t *c) {
-	FILE *fp;
-	char *fname;
-	char *key;
+	splay_tree_t *config_tree;
+	char *p;
 
-	if(!c->rsa_key) {
-		c->rsa_key = RSA_new();
-//		RSA_blinding_on(c->rsa_key, NULL);
-	}
+	init_configuration(&config_tree);
+	if(!read_host_config(mesh, config_tree, n->name))
+		goto exit;
 
-	/* First, check for simple PublicKey statement */
+	/* First, check for simple ECDSAPublicKey statement */
 
-	if(get_config_string(lookup_config(c->config_tree, "PublicKey"), &key)) {
-		if(BN_hex2bn(&c->rsa_key->n, key) != strlen(key)) {
-			logger(LOG_ERR, "Invalid PublicKey for %s!", c->name);
-			return false;
-		}
-		BN_hex2bn(&c->rsa_key->e, "FFFF");
-		free(key);
-		return true;
+	if(get_config_string(lookup_config(config_tree, "ECDSAPublicKey"), &p)) {
+		n->ecdsa = ecdsa_set_base64_public_key(p);
+		free(p);
 	}
 
-	/* 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);
+exit:
+	exit_configuration(&config_tree);
+	return n->ecdsa;
+}
 
-		if(c->rsa_key)
-			return true;		/* Woohoo. */
+bool read_ecdsa_public_key(meshlink_handle_t *mesh, connection_t *c) {
+	if(ecdsa_active(c->ecdsa))
+		return true;
 
-		/* If it fails, try PEM_read_RSA_PUBKEY. */
-		fp = fopen(fname, "r");
+	char *p;
 
-		if(!fp) {
-			logger(LOG_ERR, "Error reading RSA public key file `%s': %s",
-				   fname, strerror(errno));
-			free(fname);
+	if(!c->config_tree) {
+		init_configuration(&c->config_tree);
+		if(!read_host_config(mesh, c->config_tree, c->name))
 			return false;
-		}
-
-		free(fname);
-		c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
-		fclose(fp);
-
-		if(c->rsa_key) {
-//				RSA_blinding_on(c->rsa_key, NULL);
-			return true;
-		}
-
-		logger(LOG_ERR, "Reading RSA public key file `%s' failed: %s",
-			   fname, strerror(errno));
-		return false;
 	}
 
-	/* Else, check if a harnessed public key is in the config file */
+	/* First, check for simple ECDSAPublicKey statement */
 
-	xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-	fp = fopen(fname, "r");
-
-	if(!fp) {
-		logger(LOG_ERR, "Error reading RSA public key file `%s': %s", fname, strerror(errno));
-		free(fname);
-		return false;
+	if(get_config_string(lookup_config(c->config_tree, "ECDSAPublicKey"), &p)) {
+		c->ecdsa = ecdsa_set_base64_public_key(p);
+		free(p);
+		return c->ecdsa;
 	}
 
-	c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
-	fclose(fp);
-	free(fname);
-
-	if(c->rsa_key)
-		return true;
+	return false;
+}
 
-	/* Try again with PEM_read_RSA_PUBKEY. */
+bool read_ecdsa_private_key(meshlink_handle_t *mesh) {
+	FILE *fp;
+	char filename[PATH_MAX];
 
-	xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-	fp = fopen(fname, "r");
+	snprintf(filename,PATH_MAX, "%s" SLASH "ecdsa_key.priv", mesh->confbase);
+	fp = fopen(filename, "r");
 
 	if(!fp) {
-		logger(LOG_ERR, "Error reading RSA public key file `%s': %s", fname, strerror(errno));
-		free(fname);
+		logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA private key file: %s", strerror(errno));
 		return false;
 	}
 
-	c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
-//	RSA_blinding_on(c->rsa_key, NULL);
+	mesh->self->connection->ecdsa = ecdsa_read_pem_private_key(fp);
 	fclose(fp);
-	free(fname);
 
-	if(c->rsa_key)
-		return true;
-
-	logger(LOG_ERR, "No public key for %s specified!", c->name);
+	if(!mesh->self->connection->ecdsa)
+		logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file failed: %s", strerror(errno));
 
-	return false;
+	return mesh->self->connection->ecdsa;
 }
 
-static bool read_rsa_private_key(void) {
+static bool read_invitation_key(meshlink_handle_t *mesh) {
 	FILE *fp;
-	char *fname, *key, *pubkey;
-	struct stat s;
-
-	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);
-		if(BN_hex2bn(&myself->connection->rsa_key->d, key) != strlen(key)) {
-			logger(LOG_ERR, "Invalid PrivateKey for myself!");
-			return false;
-		}
-		if(BN_hex2bn(&myself->connection->rsa_key->n, pubkey) != strlen(pubkey)) {
-			logger(LOG_ERR, "Invalid PublicKey for myself!");
-			return false;
-		}
-		BN_hex2bn(&myself->connection->rsa_key->e, "FFFF");
-		free(key);
-		free(pubkey);
-		return true;
-	}
-
-	if(!get_config_string(lookup_config(config_tree, "PrivateKeyFile"), &fname))
-		xasprintf(&fname, "%s/rsa_key.priv", confbase);
-
-	fp = fopen(fname, "r");
-
-	if(!fp) {
-		logger(LOG_ERR, "Error reading RSA private key file `%s': %s",
-			   fname, strerror(errno));
-		free(fname);
-		return false;
-	}
+	char filename[PATH_MAX];
 
-#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(mesh->invitation_key) {
+		ecdsa_free(mesh->invitation_key);
+		mesh->invitation_key = NULL;
 	}
 
-	if(s.st_mode & ~0100700)
-		logger(LOG_WARNING, "Warning: insecure file permissions for RSA private key file `%s'!", fname);
-#endif
+	snprintf(filename,PATH_MAX, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase);
 
-	myself->connection->rsa_key = PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
-	fclose(fp);
+	fp = fopen(filename, "r");
 
-	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) {
+		mesh->invitation_key = ecdsa_read_pem_private_key(fp);
+		fclose(fp);
+		if(!mesh->invitation_key)
+			logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", filename, strerror(errno));
 	}
 
-	free(fname);
-	return true;
+	return mesh->invitation_key;
 }
 
-/*
-  Read Subnets from all host config files
-*/
-void load_all_subnets(void) {
+void load_all_nodes(meshlink_handle_t *mesh) {
 	DIR *dir;
 	struct dirent *ent;
-	char *dname;
-	char *fname;
-	avl_tree_t *config_tree;
-	config_t *cfg;
-	subnet_t *s, *s2;
-	node_t *n;
-
-	xasprintf(&dname, "%s/hosts", confbase);
+	char dname[PATH_MAX];
+
+	snprintf(dname,PATH_MAX, "%s" SLASH "hosts", mesh->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;
 	}
 
@@ -249,574 +140,216 @@ 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(mesh, ent->d_name);
+		if(n)
+			continue;
 
-		exit_configuration(&config_tree);
+		n = new_node();
+		n->name = xstrdup(ent->d_name);
+		node_add(mesh, n);
 	}
 
 	closedir(dir);
 }
 
-char *get_name(void) {
+
+char *get_name(meshlink_handle_t *mesh) {
 	char *name = NULL;
 
-	get_config_string(lookup_config(config_tree, "Name"), &name);
+	get_config_string(lookup_config(mesh->config, "Name"), &name);
 
 	if(!name)
 		return NULL;
 
-	if(*name == '$') {
-		char *envname = getenv(name + 1);
-		if(!envname) {
-			if(strcmp(name + 1, "HOST")) {
-				fprintf(stderr, "Invalid Name: environment variable %s does not exist\n", name + 1);
-				return false;
-			}
-			envname = alloca(32);
-			if(gethostname(envname, 32)) {
-				fprintf(stderr, "Could not get hostname: %s\n", strerror(errno));
-				return false;
-			}
-			envname[31] = 0;
-		}
-		free(name);
-		name = xstrdup(envname);
-		for(char *c = name; *c; c++)
-			if(!isalnum(*c))
-				*c = '_';
-	}
-
 	if(!check_id(name)) {
-		logger(LOG_ERR, "Invalid name for myself!");
+		logger(DEBUG_ALWAYS, LOG_ERR, "Invalid name for mesh->self!");
 		free(name);
-		return false;
+		return NULL;
 	}
 
 	return name;
 }
 
-/*
-  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 *proxy = NULL;
-	char *space;
-	char *envp[5];
-	struct addrinfo *ai, *aip, hint = {0};
-	bool choice;
-	int i, err;
-	int replaywin_int;
-
-	myself = new_node();
-	myself->connection = new_connection();
-
-	myself->hostname = xstrdup("MYSELF");
-	myself->connection->hostname = xstrdup("MYSELF");
-
-	myself->connection->options = 0;
-	myself->connection->protocol_version = PROT_CURRENT;
-
-	if(!(name = get_name())) {
-		logger(LOG_ERR, "Name for tinc daemon required!");
-		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);
+bool setup_myself_reloadable(meshlink_handle_t *mesh) {
+	mesh->localdiscovery = true;
+	keylifetime = 3600; // TODO: check if this can be removed as well
+	mesh->maxtimeout = 900;
+	autoconnect = 3;
+	mesh->self->options |= OPTION_PMTU_DISCOVERY;
 
-	if(!read_rsa_private_key())
-		return false;
+	read_invitation_key(mesh);
 
-	if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
-		myport = xstrdup("655");
+	return true;
+}
 
-	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);
-	}
+/*
+  Add listening sockets.
+*/
+static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bindto) {
+	char *port = mesh->myport;
 
-	get_config_string(lookup_config(config_tree, "Proxy"), &proxy);
-	if(proxy) {
-		if((space = strchr(proxy, ' ')))
+	if(address) {
+		char *space = strchr(address, ' ');
+		if(space) {
 			*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(LOG_ERR, "Unknown proxy type %s!", proxy);
-			return false;
-		}
-
-		switch(proxytype) {
-			case PROXY_NONE:
-			default:
-				break;
-
-			case PROXY_EXEC:
-				if(!space || !*space) {
-					logger(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(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;
+			port = space;
 		}
 
-		free(proxy);
+		if(!strcmp(address, "*"))
+			*address = 0;
 	}
 
-	/* Read in all the subnets specified in the host configuration file */
+	struct addrinfo *ai, hint = {0};
+	hint.ai_family = addressfamily;
+	hint.ai_socktype = SOCK_STREAM;
+	hint.ai_protocol = IPPROTO_TCP;
+	hint.ai_flags = AI_PASSIVE;
 
-	cfg = lookup_config(config_tree, "Subnet");
+	int err = getaddrinfo(address && *address ? address : NULL, port, &hint, &ai);
+	free(address);
 
-	while(cfg) {
-		if(!get_config_subnet(cfg, &subnet))
-			return false;
-
-		subnet_add(myself, subnet);
-
-		cfg = lookup_config_next(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;
-
-	if(get_config_bool(lookup_config(config_tree, "TCPOnly"), &choice) && choice)
-		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);
-	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"))
-			routing_mode = RMODE_ROUTER;
-		else if(!strcasecmp(mode, "switch"))
-			routing_mode = RMODE_SWITCH;
-		else if(!strcasecmp(mode, "hub"))
-			routing_mode = RMODE_HUB;
-		else {
-			logger(LOG_ERR, "Invalid routing mode!");
-			return false;
-		}
-		free(mode);
-	}
+		for(int i = 0; i < mesh->listen_sockets; i++)
+			if(!memcmp(&mesh->listen_socket[i].sa, aip->ai_addr, aip->ai_addrlen)) {
+				found = true;
+				break;
+			}
 
-	if(get_config_string(lookup_config(config_tree, "Forwarding"), &mode)) {
-		if(!strcasecmp(mode, "off"))
-			forwarding_mode = FMODE_OFF;
-		else if(!strcasecmp(mode, "internal"))
-			forwarding_mode = FMODE_INTERNAL;
-		else if(!strcasecmp(mode, "kernel"))
-			forwarding_mode = FMODE_KERNEL;
-		else {
-			logger(LOG_ERR, "Invalid forwarding mode!");
-			return false;
-		}
-		free(mode);
-	}
+		if(found)
+			continue;
 
-	choice = true;
-	get_config_bool(lookup_config(config_tree, "PMTUDiscovery"), &choice);
-	if(choice)
-		myself->options |= OPTION_PMTU_DISCOVERY;
-
-	choice = true;
-	get_config_bool(lookup_config(config_tree, "ClampMSS"), &choice);
-	if(choice)
-		myself->options |= OPTION_CLAMP_MSS;
-
-	get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
-	get_config_bool(lookup_config(config_tree, "DecrementTTL"), &decrement_ttl);
-	if(get_config_string(lookup_config(config_tree, "Broadcast"), &mode)) {
-		if(!strcasecmp(mode, "no"))
-			broadcast_mode = BMODE_NONE;
-		else if(!strcasecmp(mode, "yes") || !strcasecmp(mode, "mst"))
-			broadcast_mode = BMODE_MST;
-		else if(!strcasecmp(mode, "direct"))
-			broadcast_mode = BMODE_DIRECT;
-		else {
-			logger(LOG_ERR, "Invalid broadcast mode!");
+		if(mesh->listen_sockets >= MAXSOCKETS) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
 			return false;
 		}
-		free(mode);
-	}
 
-#if !defined(SOL_IP) || !defined(IP_TOS)
-	if(priorityinheritance)
-		logger(LOG_WARNING, "%s not supported on this platform", "PriorityInheritance");
-#endif
+		int tcp_fd = setup_listen_socket((sockaddr_t *) aip->ai_addr);
 
-	if(!get_config_int(lookup_config(config_tree, "MACExpire"), &macexpire))
-		macexpire = 600;
+		if(tcp_fd < 0)
+			continue;
 
-	if(get_config_int(lookup_config(config_tree, "MaxTimeout"), &maxtimeout)) {
-		if(maxtimeout <= 0) {
-			logger(LOG_ERR, "Bogus maximum timeout!");
-			return false;
-		}
-	} else
-		maxtimeout = 900;
+		int udp_fd = setup_vpn_in_socket(mesh, (sockaddr_t *) aip->ai_addr);
 
-	if(get_config_int(lookup_config(config_tree, "UDPRcvBuf"), &udp_rcvbuf)) {
-		if(udp_rcvbuf <= 0) {
-			logger(LOG_ERR, "UDPRcvBuf cannot be negative!");
-			return false;
+		if(tcp_fd < 0) {
+			close(tcp_fd);
+			continue;
 		}
-	}
 
-	if(get_config_int(lookup_config(config_tree, "UDPSndBuf"), &udp_sndbuf)) {
-		if(udp_sndbuf <= 0) {
-			logger(LOG_ERR, "UDPSndBuf cannot be negative!");
-			return false;
-		}
-	}
+		io_add(&mesh->loop, &mesh->listen_socket[mesh->listen_sockets].tcp, handle_new_meta_connection, &mesh->listen_socket[mesh->listen_sockets], tcp_fd, IO_READ);
+		io_add(&mesh->loop, &mesh->listen_socket[mesh->listen_sockets].udp, handle_incoming_vpn_data, &mesh->listen_socket[mesh->listen_sockets], udp_fd, IO_READ);
 
-	if(get_config_int(lookup_config(config_tree, "ReplayWindow"), &replaywin_int)) {
-		if(replaywin_int < 0) {
-			logger(LOG_ERR, "ReplayWindow cannot be negative!");
-			return false;
+		if(mesh->debug_level >= DEBUG_CONNECTIONS) {
+			char *hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
+			logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Listening on %s", hostname);
+			free(hostname);
 		}
-		replaywin = (unsigned)replaywin_int;
-	}
 
-	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);
+		mesh->listen_socket[mesh->listen_sockets].bindto = bindto;
+		memcpy(&mesh->listen_socket[mesh->listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
+		mesh->listen_sockets++;
 	}
 
-	get_config_bool(lookup_config(config_tree, "Hostnames"), &hostnames);
-
-	/* Generate packet encryption key */
-
-	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(!myself->incipher) {
-				logger(LOG_ERR, "Unrecognized cipher type!");
-				return false;
-			}
-		}
-	} else
-		myself->incipher = EVP_bf_cbc();
-
-	if(myself->incipher)
-		myself->inkeylength = myself->incipher->key_len + myself->incipher->iv_len;
-	else
-		myself->inkeylength = 1;
-
-	myself->connection->outcipher = EVP_bf_ofb();
-
-	if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
-		keylifetime = 3600;
-
-	keyexpires = now + keylifetime;
-	
-	/* Check if we want to use message authentication codes... */
-
-	if(get_config_string(lookup_config(config_tree, "Digest"), &digest)) {
-		if(!strcasecmp(digest, "none")) {
-			myself->indigest = NULL;
-		} else {
-			myself->indigest = EVP_get_digestbyname(digest);
-
-			if(!myself->indigest) {
-				logger(LOG_ERR, "Unrecognized digest type!");
-				return false;
-			}
-		}
-	} else
-		myself->indigest = EVP_sha1();
-
-	myself->connection->outdigest = EVP_sha1();
-
-	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!");
-				return false;
-			}
-		}
-	} else
-		myself->inmaclength = 4;
-
-	myself->connection->outmaclength = 0;
-
-	/* Compression */
-
-	if(get_config_int(lookup_config(config_tree, "Compression"), &myself->incompression)) {
-		if(myself->incompression < 0 || myself->incompression > 11) {
-			logger(LOG_ERR, "Bogus compression level!");
-			return false;
-		}
-	} else
-		myself->incompression = 0;
-
-	myself->connection->outcompression = 0;
-
-	/* Done */
+	freeaddrinfo(ai);
+	return true;
+}
 
-	myself->nexthop = myself;
-	myself->via = myself;
-	myself->status.reachable = true;
-	node_add(myself);
-
-	graph();
-
-	if(strictsubnets)
-		load_all_subnets();
-
-	/* Open device */
-
-	devops = os_devops;
-
-	if(get_config_string(lookup_config(config_tree, "DeviceType"), &type)) {
-		if(!strcasecmp(type, "dummy"))
-			devops = dummy_devops;
-		else if(!strcasecmp(type, "raw_socket"))
-			devops = raw_socket_devops;
-		else if(!strcasecmp(type, "multicast"))
-			devops = multicast_devops;
-#ifdef ENABLE_UML
-		else if(!strcasecmp(type, "uml"))
-			devops = uml_devops;
-#endif
-#ifdef ENABLE_VDE
-		else if(!strcasecmp(type, "vde"))
-			devops = vde_devops;
-#endif
-	}
+/*
+  Configure node_t mesh->self and set up the local sockets (listen only)
+*/
+bool setup_myself(meshlink_handle_t *mesh) {
+	char *name;
+	char *address = NULL;
 
-	if(!devops.setup())
+	if(!(name = get_name(mesh))) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Name for MeshLink instance 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;
+	mesh->self = new_node();
+	mesh->self->connection = new_connection();
+	mesh->self->name = name;
+	mesh->self->connection->name = xstrdup(name);
+	read_host_config(mesh, mesh->config, name);
 
-	execute_script("tinc-up", envp);
+	if(!get_config_string(lookup_config(mesh->config, "Port"), &mesh->myport))
+		mesh->myport = xstrdup("655");
 
-	for(i = 0; i < 5; i++)
-		free(envp[i]);
+	mesh->self->connection->options = 0;
+	mesh->self->connection->protocol_major = PROT_MAJOR;
+	mesh->self->connection->protocol_minor = PROT_MINOR;
 
-	/* Run subnet-up scripts for our own subnets */
+	mesh->self->options |= PROT_MINOR << 24;
 
-	subnet_update(myself, NULL, true);
+	if(!read_ecdsa_private_key(mesh))
+		return false;
 
-	/* Open sockets */
+	/* Ensure mesh->myport is numeric */
 
-	if(!do_detach && getenv("LISTEN_FDS")) {
+	if(!atoi(mesh->myport)) {
+		struct addrinfo *ai = str2addrinfo("localhost", mesh->myport, SOCK_DGRAM);
 		sockaddr_t sa;
-		socklen_t salen;
-
-		listen_sockets = atoi(getenv("LISTEN_FDS"));
-#ifdef HAVE_UNSETENV
-		unsetenv("LISTEN_FDS");
-#endif
-
-		if(listen_sockets > MAXSOCKETS) {
-			logger(LOG_ERR, "Too many listening sockets");
+		if(!ai || !ai->ai_addr)
 			return false;
-		}
-
-		for(i = 0; i < listen_sockets; i++) {
-			salen = sizeof sa;
-			if(getsockname(i + 3, &sa.sa, &salen) < 0) {
-				logger(LOG_ERR, "Could not get address of listen fd %d: %s", i + 3, sockstrerror(errno));
-				return false;
-			}
+		free(mesh->myport);
+		memcpy(&sa, ai->ai_addr, ai->ai_addrlen);
+		sockaddr2str(&sa, NULL, &mesh->myport);
+	}
 
-			listen_socket[i].tcp = i + 3;
+	/* Check some options */
 
-#ifdef FD_CLOEXEC
-		        fcntl(i + 3, F_SETFD, FD_CLOEXEC);
-#endif
+	if(!setup_myself_reloadable(mesh))
+		return false;
 
-			listen_socket[i].udp = setup_vpn_in_socket(&sa);
-			if(listen_socket[i].udp < 0)
-				return false;
+	/* Compression */
 
-			ifdebug(CONNECTIONS) {
-				hostname = sockaddr2hostname(&sa);
-				logger(LOG_NOTICE, "Listening on %s", hostname);
-				free(hostname);
-			}
+	// TODO: drop compression in the packet layer?
+	mesh->self->incompression = 0;
+	mesh->self->connection->outcompression = 0;
 
-			memcpy(&listen_socket[i].sa, &sa, salen);
-		}
-	} else {
-		listen_sockets = 0;
-		cfg = lookup_config(config_tree, "BindToAddress");
-
-		do {
-			get_config_string(cfg, &address);
-			if(cfg)
-				cfg = lookup_config_next(config_tree, cfg);
-
-			char *port = myport;
-
-			if(address) {
-				char *space = strchr(address, ' ');
-				if(space) {
-					*space++ = 0;
-					port = space;
-				}
-
-				if(!strcmp(address, "*"))
-					*address = 0;
-			}
+	/* Done */
 
-			hint.ai_family = addressfamily;
-			hint.ai_socktype = SOCK_STREAM;
-			hint.ai_protocol = IPPROTO_TCP;
-			hint.ai_flags = AI_PASSIVE;
+	mesh->self->nexthop = mesh->self;
+	mesh->self->via = mesh->self;
+	mesh->self->status.reachable = true;
+	mesh->self->last_state_change = mesh->loop.now.tv_sec;
+	node_add(mesh, mesh->self);
 
-			err = getaddrinfo(address && *address ? address : NULL, port, &hint, &ai);
-			free(address);
+	graph(mesh);
 
-			if(err || !ai) {
-				logger(LOG_ERR, "System call `%s' failed: %s", "getaddrinfo",
-					   gai_strerror(err));
-				return false;
-			}
+	if(autoconnect)
+		load_all_nodes(mesh);
 
-			for(aip = ai; aip; aip = aip->ai_next) {
-				if(listen_sockets >= MAXSOCKETS) {
-					logger(LOG_ERR, "Too many listening sockets");
-					return false;
-				}
+	/* Open sockets */
 
-				listen_socket[listen_sockets].tcp =
-					setup_listen_socket((sockaddr_t *) aip->ai_addr);
+	mesh->listen_sockets = 0;
 
-				if(listen_socket[listen_sockets].tcp < 0)
-					continue;
+	if(!add_listen_address(mesh, address, NULL))
+		return false;
 
-				listen_socket[listen_sockets].udp =
-					setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
+	if(!mesh->listen_sockets) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Unable to create any listening socket!");
+		return false;
+	}
 
-				if(listen_socket[listen_sockets].udp < 0)
-					continue;
+	// TODO: require Port to be set? Or use "0" and use getsockname()?
 
-				ifdebug(CONNECTIONS) {
-					hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
-					logger(LOG_NOTICE, "Listening on %s", hostname);
-					free(hostname);
-				}
+	if(!mesh->myport)
+		mesh->myport = xstrdup("655");
 
-				memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
-				listen_sockets++;
-			}
+	xasprintf(&mesh->self->hostname, "MYSELF port %s", mesh->myport);
+	mesh->self->connection->hostname = xstrdup(mesh->self->hostname);
 
-			freeaddrinfo(ai);
-		} while(cfg);
-	}
+	/* Done. */
 
-	if(listen_sockets)
-		logger(LOG_NOTICE, "Ready");
-	else {
-		logger(LOG_ERR, "Unable to create any listening socket!");
-		return false;
-	}
+	mesh->last_config_check = mesh->loop.now.tv_sec;
 
 	return true;
 }
@@ -824,32 +357,17 @@ 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(pinginterval < 1) {
-			pinginterval = 86400;
-		}
-	} else
-		pinginterval = 60;
+bool setup_network(meshlink_handle_t *mesh) {
+	init_connections(mesh);
+	init_nodes(mesh);
+	init_edges(mesh);
+	init_requests(mesh);
 
-	if(!get_config_int(lookup_config(config_tree, "PingTimeout"), &pingtimeout))
-		pingtimeout = 5;
-	if(pingtimeout < 1 || pingtimeout > pinginterval)
-		pingtimeout = pinginterval;
+	mesh->pinginterval = 60;
+	mesh->pingtimeout = 5;
+	maxoutbufsize = 10 * MTU;
 
-	if(!get_config_int(lookup_config(config_tree, "MaxOutputBufferSize"), &maxoutbufsize))
-		maxoutbufsize = 10 * MTU;
-
-	if(!setup_myself())
+	if(!setup_myself(mesh))
 		return false;
 
 	return true;
@@ -858,60 +376,37 @@ 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) {
-		next = node->next;
-		c = node->data;
-		c->outgoing = NULL;
-		terminate_connection(c, false);
-	}
-
-	for(list_node_t *node = outgoing_list->head; node; node = node->next) {
-		outgoing_t *outgoing = node->data;
-
-		if(outgoing->event)
-			event_del(outgoing->event);
+void close_network_connections(meshlink_handle_t *mesh) {
+	if(mesh->connections) {
+		for(list_node_t *node = mesh->connections->head, *next; node; node = next) {
+			next = node->next;
+			connection_t *c = node->data;
+			c->outgoing = NULL;
+			terminate_connection(mesh, c, false);
+		}
 	}
 
-	list_delete_list(outgoing_list);
+	if(mesh->outgoings)
+		list_delete_list(mesh->outgoings);
 
-	if(myself && myself->connection) {
-		subnet_update(myself, NULL, false);
-		terminate_connection(myself->connection, false);
-		free_connection(myself->connection);
+	if(mesh->self && mesh->self->connection) {
+		terminate_connection(mesh, mesh->self->connection, false);
+		free_connection(mesh->self->connection);
 	}
 
-	for(i = 0; i < listen_sockets; i++) {
-		close(listen_socket[i].tcp);
-		close(listen_socket[i].udp);
+	for(int i = 0; i < mesh->listen_sockets; i++) {
+		io_del(&mesh->loop, &mesh->listen_socket[i].tcp);
+		io_del(&mesh->loop, &mesh->listen_socket[i].udp);
+		close(mesh->listen_socket[i].tcp.fd);
+		close(mesh->listen_socket[i].udp.fd);
 	}
 
-	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(myport) free(myport);
-
-	for(i = 0; i < 4; i++)
-		free(envp[i]);
+	exit_requests(mesh);
+	exit_edges(mesh);
+	exit_nodes(mesh);
+	exit_connections(mesh);
 
-	devops.close();
+	if(mesh->myport) free(mesh->myport);
 
 	return;
 }