X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_setup.c;h=2b177c1398bdd175c3d1966f9c70f66a4eebec3e;hp=5243b1e9a757d91c0d6b35cda5c0fc4914d93195;hb=4c85542894f7fca823b119b05e07179deb24229a;hpb=6f9f6779e6bd1dd7bb795b42dad550863a386ca8

diff --git a/src/net_setup.c b/src/net_setup.c
index 5243b1e9..2b177c13 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -1,7 +1,7 @@
 /*
     net_setup.c -- Setup.
-    Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl>,
-                  2000-2002 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1998-2005 Ivo Timmermans,
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
 
     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,80 +13,46 @@
     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: net_setup.c,v 1.1.2.26 2002/09/09 22:32:44 guus Exp $
+    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 "config.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#ifdef HAVE_NETINET_IN_SYSTM_H
-#include <netinet/in_systm.h>
-#endif
-#ifdef HAVE_NETINET_IP_H
-#include <netinet/ip.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <syslog.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-/* SunOS really wants sys/socket.h BEFORE net/if.h,
-   and FreeBSD wants these lines below the rest. */
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <net/if.h>
+#include "system.h"
 
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
 #include <openssl/rand.h>
+#include <openssl/err.h>
+#include <openssl/evp.h>
 
-#include <utils.h>
-#include <xalloc.h>
-#include <avl_tree.h>
-#include <list.h>
-
+#include "avl_tree.h"
 #include "conf.h"
 #include "connection.h"
-#include "meta.h"
+#include "device.h"
+#include "event.h"
+#include "graph.h"
+#include "logger.h"
 #include "net.h"
 #include "netutl.h"
 #include "process.h"
 #include "protocol.h"
-#include "subnet.h"
-#include "graph.h"
-#include "process.h"
 #include "route.h"
-#include "device.h"
-#include "event.h"
-
-#include "system.h"
+#include "subnet.h"
+#include "utils.h"
+#include "xalloc.h"
 
 char *myport;
 
-int read_rsa_public_key(connection_t *c)
-{
+bool read_rsa_public_key(connection_t *c) {
 	FILE *fp;
 	char *fname;
 	char *key;
 
-	cp();
-
-	if(!c->rsa_key)
+	if(!c->rsa_key) {
 		c->rsa_key = RSA_new();
+//		RSA_blinding_on(c->rsa_key, NULL);
+	}
 
 	/* First, check for simple PublicKey statement */
 
@@ -94,59 +60,55 @@ int read_rsa_public_key(connection_t *c)
 		BN_hex2bn(&c->rsa_key->n, key);
 		BN_hex2bn(&c->rsa_key->e, "FFFF");
 		free(key);
-		return 0;
+		return true;
 	}
 
 	/* Else, check for PublicKeyFile statement and read it */
 
-	if(get_config_string
-	   (lookup_config(c->config_tree, "PublicKeyFile"), &fname)) {
-		if(is_safe_path(fname)) {
-			fp = fopen(fname, "r");
-
-			if(!fp) {
-				syslog(LOG_ERR, _("Error reading RSA public key file `%s': %s"),
-					   fname, strerror(errno));
-				free(fname);
-				return -1;
-			}
+	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);
-			c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
-			fclose(fp);
+			return false;
+		}
 
-			if(c->rsa_key)
-				return 0;		/* Woohoo. */
+		free(fname);
+		c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
+		fclose(fp);
 
-			/* If it fails, try PEM_read_RSA_PUBKEY. */
-			fp = fopen(fname, "r");
+		if(c->rsa_key)
+			return true;		/* Woohoo. */
 
-			if(!fp) {
-				syslog(LOG_ERR, _("Error reading RSA public key file `%s': %s"),
-					   fname, strerror(errno));
-				free(fname);
-				return -1;
-			}
+		/* If it fails, try PEM_read_RSA_PUBKEY. */
+		fp = fopen(fname, "r");
 
+		if(!fp) {
+			logger(LOG_ERR, "Error reading RSA public key file `%s': %s",
+				   fname, strerror(errno));
 			free(fname);
-			c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
-			fclose(fp);
+			return false;
+		}
 
-			if(c->rsa_key)
-				return 0;
+		free(fname);
+		c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
+		fclose(fp);
 
-			syslog(LOG_ERR, _("Reading RSA public key file `%s' failed: %s"),
-				   fname, strerror(errno));
-			return -1;
-		} else {
-			free(fname);
-			return -1;
+		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 */
 
-	asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+	xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
 	fp = fopen(fname, "r");
 
 	if(fp) {
@@ -157,126 +119,134 @@ int read_rsa_public_key(connection_t *c)
 	free(fname);
 
 	if(c->rsa_key)
-		return 0;
+		return true;
 
 	/* Try again with PEM_read_RSA_PUBKEY. */
 
-	asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+	xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
 	fp = fopen(fname, "r");
 
 	if(fp) {
 		c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
+//		RSA_blinding_on(c->rsa_key, NULL);
 		fclose(fp);
 	}
 
 	free(fname);
 
 	if(c->rsa_key)
-		return 0;
+		return true;
 
-	syslog(LOG_ERR, _("No public key for %s specified!"), c->name);
+	logger(LOG_ERR, "No public key for %s specified!", c->name);
 
-	return -1;
+	return false;
 }
 
-int read_rsa_private_key(void)
-{
+bool read_rsa_private_key(void) {
 	FILE *fp;
-	char *fname, *key;
-
-	cp();
+	char *fname, *key, *pubkey;
+	struct stat s;
 
 	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);
-		return 0;
+		free(pubkey);
+		return true;
 	}
 
 	if(!get_config_string(lookup_config(config_tree, "PrivateKeyFile"), &fname))
-		asprintf(&fname, "%s/rsa_key.priv", confbase);
+		xasprintf(&fname, "%s/rsa_key.priv", confbase);
 
-	if(is_safe_path(fname)) {
-		fp = fopen(fname, "r");
+	fp = fopen(fname, "r");
 
-		if(!fp) {
-			syslog(LOG_ERR, _("Error reading RSA private key file `%s': %s"),
-				   fname, strerror(errno));
-			free(fname);
-			return -1;
-		}
+	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);
-		myself->connection->rsa_key =
-			PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
-		fclose(fp);
+		return false;
+	}
 
-		if(!myself->connection->rsa_key) {
-			syslog(LOG_ERR, _("Reading RSA private key file `%s' failed: %s"),
-				   fname, strerror(errno));
-			return -1;
-		}
+	if(s.st_mode & ~0100700)
+		logger(LOG_WARNING, "Warning: insecure file permissions for RSA private key file `%s'!", fname);
+#endif
 
-		return 0;
+	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;
 	}
 
 	free(fname);
-	return -1;
+	return true;
 }
 
 /*
   Configure node_t myself and set up the local sockets (listen only)
 */
-int setup_myself(void)
-{
+bool setup_myself(void) {
 	config_t *cfg;
 	subnet_t *subnet;
 	char *name, *hostname, *mode, *afname, *cipher, *digest;
 	char *address = NULL;
-	struct addrinfo hint, *ai, *aip;
-	int choice, err;
-
-	cp();
+	char *envp[5];
+	struct addrinfo *ai, *aip, hint = {0};
+	bool choice;
+	int i, err;
 
 	myself = new_node();
 	myself->connection = new_connection();
 	init_configuration(&myself->connection->config_tree);
 
-	asprintf(&myself->hostname, _("MYSELF"));
-	asprintf(&myself->connection->hostname, _("MYSELF"));
+	xasprintf(&myself->hostname, "MYSELF");
+	xasprintf(&myself->connection->hostname, "MYSELF");
 
 	myself->connection->options = 0;
 	myself->connection->protocol_version = PROT_CURRENT;
 
 	if(!get_config_string(lookup_config(config_tree, "Name"), &name)) {	/* Not acceptable */
-		syslog(LOG_ERR, _("Name for tinc daemon required!"));
-		return -1;
+		logger(LOG_ERR, "Name for tinc daemon required!");
+		return false;
 	}
 
-	if(check_id(name)) {
-		syslog(LOG_ERR, _("Invalid name for myself!"));
+	if(!check_id(name)) {
+		logger(LOG_ERR, "Invalid name for myself!");
 		free(name);
-		return -1;
+		return false;
 	}
 
 	myself->name = name;
 	myself->connection->name = xstrdup(name);
 
-	if(read_rsa_private_key())
-		return -1;
-
-	if(read_connection_config(myself->connection)) {
-		syslog(LOG_ERR, _("Cannot open host configuration file for myself!"));
-		return -1;
+	if(!read_connection_config(myself->connection)) {
+		logger(LOG_ERR, "Cannot open host configuration file for myself!");
+		return false;
 	}
 
-	if(read_rsa_public_key(myself->connection))
-		return -1;
+	if(!read_rsa_private_key())
+		return false;
 
-	if(!get_config_string
-	   (lookup_config(myself->connection->config_tree, "Port"), &myport))
-		asprintf(&myport, "655");
+	if(!get_config_string(lookup_config(myself->connection->config_tree, "Port"), &myport))
+		xasprintf(&myport, "655");
 
 	/* Read in all the subnets specified in the host configuration file */
 
@@ -284,7 +254,7 @@ int setup_myself(void)
 
 	while(cfg) {
 		if(!get_config_subnet(cfg, &subnet))
-			return -1;
+			return false;
 
 		subnet_add(myself, subnet);
 
@@ -293,28 +263,23 @@ int setup_myself(void)
 
 	/* Check some options */
 
-	if(get_config_bool(lookup_config(config_tree, "IndirectData"), &choice))
-		if(choice)
-			myself->options |= OPTION_INDIRECT;
+	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))
-		if(choice)
-			myself->options |= OPTION_TCPONLY;
+	if(get_config_bool(lookup_config(config_tree, "TCPOnly"), &choice) && choice)
+		myself->options |= OPTION_TCPONLY;
 
-	if(get_config_bool
-	   (lookup_config(myself->connection->config_tree, "IndirectData"),
-		&choice))
-		if(choice)
-			myself->options |= OPTION_INDIRECT;
+	if(get_config_bool(lookup_config(myself->connection->config_tree, "IndirectData"), &choice) && choice)
+		myself->options |= OPTION_INDIRECT;
 
-	if(get_config_bool
-	   (lookup_config(myself->connection->config_tree, "TCPOnly"), &choice))
-		if(choice)
-			myself->options |= OPTION_TCPONLY;
+	if(get_config_bool(lookup_config(myself->connection->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, "TunnelServer"), &tunnelserver);
+
 	if(get_config_string(lookup_config(config_tree, "Mode"), &mode)) {
 		if(!strcasecmp(mode, "router"))
 			routing_mode = RMODE_ROUTER;
@@ -323,29 +288,34 @@ int setup_myself(void)
 		else if(!strcasecmp(mode, "hub"))
 			routing_mode = RMODE_HUB;
 		else {
-			syslog(LOG_ERR, _("Invalid routing mode!"));
-			return -1;
+			logger(LOG_ERR, "Invalid routing mode!");
+			return false;
 		}
 		free(mode);
 	} else
 		routing_mode = RMODE_ROUTER;
 
-	get_config_bool(lookup_config(config_tree, "PriorityInheritance"),
-					&priorityinheritance);
+	// Enable PMTUDiscovery by default if we are in router mode.
+
+	choice = routing_mode == RMODE_ROUTER;
+	get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice);
+	if(choice)	
+		myself->options |= OPTION_PMTU_DISCOVERY;
+
+	get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
+
 #if !defined(SOL_IP) || !defined(IP_TOS)
 	if(priorityinheritance)
-		syslog(LOG_WARNING, _("PriorityInheritance not supported on this platform"));
+		logger(LOG_WARNING, "%s not supported on this platform", "PriorityInheritance");
 #endif
 
 	if(!get_config_int(lookup_config(config_tree, "MACExpire"), &macexpire))
 		macexpire = 600;
 
-	if(get_config_int
-	   (lookup_config(myself->connection->config_tree, "MaxTimeout"),
-		&maxtimeout)) {
+	if(get_config_int(lookup_config(config_tree, "MaxTimeout"), &maxtimeout)) {
 		if(maxtimeout <= 0) {
-			syslog(LOG_ERR, _("Bogus maximum timeout!"));
-			return -1;
+			logger(LOG_ERR, "Bogus maximum timeout!");
+			return false;
 		}
 	} else
 		maxtimeout = 900;
@@ -358,12 +328,11 @@ int setup_myself(void)
 		else if(!strcasecmp(afname, "any"))
 			addressfamily = AF_UNSPEC;
 		else {
-			syslog(LOG_ERR, _("Invalid address family!"));
-			return -1;
+			logger(LOG_ERR, "Invalid address family!");
+			return false;
 		}
 		free(afname);
-	} else
-		addressfamily = AF_INET;
+	}
 
 	get_config_bool(lookup_config(config_tree, "Hostnames"), &hostnames);
 
@@ -372,80 +341,72 @@ int setup_myself(void)
 	if(get_config_string
 	   (lookup_config(myself->connection->config_tree, "Cipher"), &cipher)) {
 		if(!strcasecmp(cipher, "none")) {
-			myself->cipher = NULL;
+			myself->incipher = NULL;
 		} else {
-			myself->cipher = EVP_get_cipherbyname(cipher);
+			myself->incipher = EVP_get_cipherbyname(cipher);
 
-			if(!myself->cipher) {
-				syslog(LOG_ERR, _("Unrecognized cipher type!"));
-				return -1;
+			if(!myself->incipher) {
+				logger(LOG_ERR, "Unrecognized cipher type!");
+				return false;
 			}
 		}
 	} else
-		myself->cipher = EVP_bf_cbc();
+		myself->incipher = EVP_aes_256_cbc();
 
-	if(myself->cipher)
-		myself->keylength = myself->cipher->key_len + myself->cipher->iv_len;
+	if(myself->incipher)
+		myself->inkeylength = myself->incipher->key_len + myself->incipher->iv_len;
 	else
-		myself->keylength = 1;
-
-	myself->connection->outcipher = EVP_bf_ofb();
+		myself->inkeylength = 1;
 
-	myself->key = (char *) xmalloc(myself->keylength);
-	RAND_pseudo_bytes(myself->key, myself->keylength);
+	myself->connection->outcipher = EVP_aes_256_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(myself->connection->config_tree, "Digest"), &digest)) {
+	if(get_config_string(lookup_config(myself->connection->config_tree, "Digest"), &digest)) {
 		if(!strcasecmp(digest, "none")) {
-			myself->digest = NULL;
+			myself->indigest = NULL;
 		} else {
-			myself->digest = EVP_get_digestbyname(digest);
+			myself->indigest = EVP_get_digestbyname(digest);
 
-			if(!myself->digest) {
-				syslog(LOG_ERR, _("Unrecognized digest type!"));
-				return -1;
+			if(!myself->indigest) {
+				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) {
-				syslog(LOG_ERR, _("MAC length exceeds size of digest!"));
-				return -1;
-			} else if(myself->maclength < 0) {
-				syslog(LOG_ERR, _("Bogus MAC length!"));
-				return -1;
+		myself->indigest = EVP_sha256();
+
+	myself->connection->outdigest = EVP_sha256();
+
+	if(get_config_int(lookup_config(myself->connection->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->maclength = 4;
+		myself->inmaclength = 4;
 
 	myself->connection->outmaclength = 0;
 
 	/* Compression */
 
-	if(get_config_int
-	   (lookup_config(myself->connection->config_tree, "Compression"),
-		&myself->compression)) {
-		if(myself->compression < 0 || myself->compression > 9) {
-			syslog(LOG_ERR, _("Bogus compression level!"));
-			return -1;
+	if(get_config_int(lookup_config(myself->connection->config_tree, "Compression"), &myself->incompression)) {
+		if(myself->incompression < 0 || myself->incompression > 11) {
+			logger(LOG_ERR, "Bogus compression level!");
+			return false;
 		}
 	} else
-		myself->compression = 0;
+		myself->incompression = 0;
 
 	myself->connection->outcompression = 0;
 
@@ -453,15 +414,33 @@ int setup_myself(void)
 
 	myself->nexthop = myself;
 	myself->via = myself;
-	myself->status.active = 1;
-	myself->status.reachable = 1;
+	myself->status.reachable = true;
 	node_add(myself);
 
 	graph();
 
-	/* Open sockets */
+	/* Open device */
 
-	memset(&hint, 0, sizeof(hint));
+	if(!setup_device())
+		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;
+
+	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);
+
+	/* Open sockets */
 
 	get_config_string(lookup_config(config_tree, "BindToAddress"), &address);
 
@@ -473,9 +452,9 @@ int setup_myself(void)
 	err = getaddrinfo(address, myport, &hint, &ai);
 
 	if(err || !ai) {
-		syslog(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo",
+		logger(LOG_ERR, "System call `%s' failed: %s", "getaddrinfo",
 			   gai_strerror(err));
-		return -1;
+		return false;
 	}
 
 	listen_sockets = 0;
@@ -493,119 +472,108 @@ int setup_myself(void)
 		if(listen_socket[listen_sockets].udp < 0)
 			continue;
 
-		if(debug_lvl >= DEBUG_CONNECTIONS) {
+		ifdebug(CONNECTIONS) {
 			hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
-			syslog(LOG_NOTICE, _("Listening on %s"), hostname);
+			logger(LOG_NOTICE, "Listening on %s", hostname);
 			free(hostname);
 		}
 
-		listen_socket[listen_sockets].sa.sa = *aip->ai_addr;
+		memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
 		listen_sockets++;
 	}
 
 	freeaddrinfo(ai);
 
 	if(listen_sockets)
-		syslog(LOG_NOTICE, _("Ready"));
+		logger(LOG_NOTICE, "Ready");
 	else {
-		syslog(LOG_ERR, _("Unable to create any listening socket!"));
-		return -1;
+		logger(LOG_ERR, "Unable to create any listening socket!");
+		return false;
 	}
 
-	return 0;
+	return true;
 }
 
 /*
-  setup all initial network connections
+  initialize network
 */
-int setup_network_connections(void)
-{
-	char *envp[4];
-	int i;
-
-	cp();
-
+bool setup_network(void) {
 	now = time(NULL);
 
+	init_events();
 	init_connections();
 	init_subnets();
 	init_nodes();
 	init_edges();
-	init_events();
 	init_requests();
 
-	if(get_config_int(lookup_config(config_tree, "PingTimeout"), &pingtimeout)) {
-		if(pingtimeout < 1) {
-			pingtimeout = 86400;
+	if(get_config_int(lookup_config(config_tree, "PingInterval"), &pinginterval)) {
+		if(pinginterval < 1) {
+			pinginterval = 86400;
 		}
 	} else
-		pingtimeout = 60;
+		pinginterval = 60;
 
-	if(setup_device() < 0)
-		return -1;
+	if(!get_config_int(lookup_config(config_tree, "PingTimeout"), &pingtimeout))
+		pingtimeout = 5;
+	if(pingtimeout < 1 || pingtimeout > pinginterval)
+		pingtimeout = pinginterval;
 
-	/* 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", interface ? : "");
-	envp[3] = NULL;
+	if(!get_config_int(lookup_config(config_tree, "MaxOutputBufferSize"), &maxoutbufsize))
+		maxoutbufsize = 10 * MTU;
 
-	execute_script("tinc-up", envp);
+	if(!setup_myself())
+		return false;
 
-	for(i = 0; i < 4; i++)
-		free(envp[i]);
-
-	if(setup_myself() < 0)
-		return -1;
-
-	try_outgoing_connections();
-
-	return 0;
+	return true;
 }
 
 /*
   close all open network connections
 */
-void close_network_connections(void)
-{
+void close_network_connections(void) {
 	avl_node_t *node, *next;
 	connection_t *c;
-	char *envp[4];
+	char *envp[5];
 	int i;
 
-	cp();
-
 	for(node = connection_tree->head; node; node = next) {
 		next = node->next;
-		c = (connection_t *) node->data;
-
-		if(c->outgoing)
-			free(c->outgoing->name), free(c->outgoing), c->outgoing = NULL;
-		terminate_connection(c, 0);
+		c = node->data;
+		c->outgoing = false;
+		terminate_connection(c, false);
 	}
 
-	if(myself && myself->connection)
-		terminate_connection(myself->connection, 0);
+	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++) {
 		close(listen_socket[i].tcp);
 		close(listen_socket[i].udp);
 	}
 
+	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_events();
 	exit_edges();
 	exit_subnets();
 	exit_nodes();
 	exit_connections();
-
-	asprintf(&envp[0], "NETNAME=%s", netname ? : "");
-	asprintf(&envp[1], "DEVICE=%s", device ? : "");
-	asprintf(&envp[2], "INTERFACE=%s", interface ? : "");
-	envp[3] = NULL;
+	exit_events();
 
 	execute_script("tinc-down", envp);
 
+	if(myport) free(myport);
+
 	for(i = 0; i < 4; i++)
 		free(envp[i]);