X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=c033e22004564827aae5e447f98a6090d1a292bf;hb=6dfdb323612184529b4b83c1be914dda8262de47;hp=207ce42543b4c9da1c542aa4f7484b580953a425;hpb=3fba80174dbe29bcfe0d121a2a1d2e61be5ee57b;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index 207ce425..c033e220 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -46,6 +46,12 @@ char *myport;
 static struct event device_ev;
 devops_t devops;
 
+char *proxyhost;
+char *proxyport;
+char *proxyuser;
+char *proxypass;
+proxytype_t proxytype;
+
 bool node_read_ecdsa_public_key(node_t *n) {
 	if(ecdsa_active(&n->ecdsa))
 		return true;
@@ -56,7 +62,7 @@ bool node_read_ecdsa_public_key(node_t *n) {
 	char *p;
 	bool result = false;
 
-	xasprintf(&fname, "%s/hosts/%s", confbase, n->name);
+	xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, n->name);
 
 	init_configuration(&config_tree);
 	if(!read_config_file(config_tree, fname))
@@ -75,12 +81,12 @@ bool node_read_ecdsa_public_key(node_t *n) {
 	free(fname);
 
 	if(!get_config_string(lookup_config(config_tree, "ECDSAPublicKeyFile"), &fname))
-		xasprintf(&fname, "%s/hosts/%s", confbase, n->name);
+		xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, n->name);
 
 	fp = fopen(fname, "r");
 
 	if(!fp) {
-		logger(LOG_ERR, "Error reading ECDSA public key file `%s': %s", fname, strerror(errno));
+		logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA public key file `%s': %s", fname, strerror(errno));
 		goto exit;
 	}
 
@@ -110,12 +116,12 @@ bool read_ecdsa_public_key(connection_t *c) {
 	/* 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");
 
 	if(!fp) {
-		logger(LOG_ERR, "Error reading ECDSA public key file `%s': %s",
+		logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA public key file `%s': %s",
 			   fname, strerror(errno));
 		free(fname);
 		return false;
@@ -124,8 +130,8 @@ bool read_ecdsa_public_key(connection_t *c) {
 	result = ecdsa_read_pem_public_key(&c->ecdsa, fp);
 	fclose(fp);
 
-	if(!result) 
-		logger(LOG_ERR, "Reading ECDSA public key file `%s' failed: %s", fname, strerror(errno));
+	if(!result)
+		logger(DEBUG_ALWAYS, LOG_ERR, "Parsing ECDSA public key file `%s' failed.", fname);
 	free(fname);
 	return result;
 }
@@ -147,12 +153,12 @@ bool read_rsa_public_key(connection_t *c) {
 	/* 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");
 
 	if(!fp) {
-		logger(LOG_ERR, "Error reading RSA public key file `%s': %s", fname, strerror(errno));
+		logger(DEBUG_ALWAYS, LOG_ERR, "Error reading RSA public key file `%s': %s", fname, strerror(errno));
 		free(fname);
 		return false;
 	}
@@ -161,7 +167,7 @@ bool read_rsa_public_key(connection_t *c) {
 	fclose(fp);
 
 	if(!result) 
-		logger(LOG_ERR, "Reading RSA public key file `%s' failed: %s", fname, strerror(errno));
+		logger(DEBUG_ALWAYS, LOG_ERR, "Reading RSA public key file `%s' failed: %s", fname, strerror(errno));
 	free(fname);
 	return result;
 }
@@ -174,12 +180,12 @@ static bool read_ecdsa_private_key(void) {
 	/* 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(LOG_ERR, "Error reading ECDSA private key file `%s': %s", fname, strerror(errno));
+		logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA private key file `%s': %s", fname, strerror(errno));
 		free(fname);
 		return false;
 	}
@@ -188,20 +194,20 @@ static bool read_ecdsa_private_key(void) {
 	struct stat s;
 
 	if(fstat(fileno(fp), &s)) {
-		logger(LOG_ERR, "Could not stat ECDSA private key file `%s': %s'", fname, strerror(errno));
+		logger(DEBUG_ALWAYS, LOG_ERR, "Could not stat ECDSA 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 ECDSA private key file `%s'!", fname);
+		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);
 	fclose(fp);
 
 	if(!result) 
-		logger(LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", fname, strerror(errno));
+		logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", fname, strerror(errno));
 	free(fname);
 	return result;
 }
@@ -216,25 +222,25 @@ static bool read_rsa_private_key(void) {
 
 	if(get_config_string(lookup_config(config_tree, "PrivateKey"), &d)) {
 		if(!get_config_string(lookup_config(config_tree, "PublicKey"), &n)) {
-			logger(LOG_ERR, "PrivateKey used but no PublicKey found!");
+			logger(DEBUG_ALWAYS, LOG_ERR, "PrivateKey used but no PublicKey found!");
 			free(d);
 			return false;
 		}
 		result = rsa_set_hex_private_key(&myself->connection->rsa, n, "FFFF", d);
 		free(n);
 		free(d);
-		return true;
+		return result;
 	}
 
 	/* 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");
 
 	if(!fp) {
-		logger(LOG_ERR, "Error reading RSA private key file `%s': %s",
+		logger(DEBUG_ALWAYS, LOG_ERR, "Error reading RSA private key file `%s': %s",
 			   fname, strerror(errno));
 		free(fname);
 		return false;
@@ -244,20 +250,20 @@ static bool read_rsa_private_key(void) {
 	struct stat s;
 
 	if(fstat(fileno(fp), &s)) {
-		logger(LOG_ERR, "Could not stat RSA private key file `%s': %s'", fname, strerror(errno));
+		logger(DEBUG_ALWAYS, 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);
+		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);
 	fclose(fp);
 
 	if(!result) 
-		logger(LOG_ERR, "Reading RSA private key file `%s' failed: %s", fname, strerror(errno));
+		logger(DEBUG_ALWAYS, LOG_ERR, "Reading RSA private key file `%s' failed: %s", fname, strerror(errno));
 	free(fname);
 	return result;
 }
@@ -270,7 +276,7 @@ static void keyexpire_handler(int fd, short events, void *data) {
 
 void regenerate_key(void) {
 	if(timeout_initialized(&keyexpire_event)) {
-		ifdebug(STATUS) logger(LOG_INFO, "Expiring symmetric keys");
+		logger(DEBUG_STATUS, LOG_INFO, "Expiring symmetric keys");
 		event_del(&keyexpire_event);
 		send_key_changed();
 	} else {
@@ -292,12 +298,11 @@ void load_all_subnets(void) {
 	config_t *cfg;
 	subnet_t *s, *s2;
 	node_t *n;
-	bool result;
 
-	xasprintf(&dname, "%s/hosts", confbase);
+	xasprintf(&dname, "%s" SLASH "hosts", confbase);
 	dir = opendir(dname);
 	if(!dir) {
-		logger(LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
+		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
 		free(dname);
 		return;
 	}
@@ -312,12 +317,11 @@ void load_all_subnets(void) {
 		//	continue;
 		#endif
 
-		xasprintf(&fname, "%s/hosts/%s", confbase, ent->d_name);
+		xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, ent->d_name);
 		init_configuration(&config_tree);
-		result = read_config_file(config_tree, fname);
+		read_config_options(config_tree, ent->d_name);
+		read_config_file(config_tree, fname);
 		free(fname);
-		if(!result)
-			continue;
 
 		if(!n) {
 			n = new_node();
@@ -342,85 +346,113 @@ void load_all_subnets(void) {
 	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(LOG_ERR, "Name for tinc daemon required!");
-		return false;
+	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 myself!");
 		free(name);
 		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;
-
-	if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
-		myport = xstrdup("655");
-
-	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);
-	}
-
-	/* Read in all the subnets specified in the host configuration file */
+	return name;
+}
 
-	cfg = lookup_config(config_tree, "Subnet");
+bool setup_myself_reloadable(void) {
+	char *proxy = NULL;
+	char *mode = NULL;
+	char *afname = NULL;
+	char *space;
+	bool choice;
 
-	while(cfg) {
-		if(!get_config_subnet(cfg, &subnet))
+	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;
+		}
 
-		subnet_add(myself, subnet);
+		switch(proxytype) {
+			case PROXY_NONE:
+			default:
+				break;
+
+			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;
 
@@ -431,10 +463,8 @@ 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);
-	strictsubnets |= tunnelserver;
-
+	get_config_bool(lookup_config(config_tree, "LocalDiscovery"), &localdiscovery);
+	
 	if(get_config_string(lookup_config(config_tree, "Mode"), &mode)) {
 		if(!strcasecmp(mode, "router"))
 			routing_mode = RMODE_ROUTER;
@@ -443,7 +473,7 @@ static bool setup_myself(void) {
 		else if(!strcasecmp(mode, "hub"))
 			routing_mode = RMODE_HUB;
 		else {
-			logger(LOG_ERR, "Invalid routing mode!");
+			logger(DEBUG_ALWAYS, LOG_ERR, "Invalid routing mode!");
 			return false;
 		}
 		free(mode);
@@ -457,7 +487,7 @@ static bool setup_myself(void) {
 		else if(!strcasecmp(mode, "kernel"))
 			forwarding_mode = FMODE_KERNEL;
 		else {
-			logger(LOG_ERR, "Invalid forwarding mode!");
+			logger(DEBUG_ALWAYS, LOG_ERR, "Invalid forwarding mode!");
 			return false;
 		}
 		free(mode);
@@ -475,11 +505,23 @@ 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"), &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(DEBUG_ALWAYS, LOG_ERR, "Invalid broadcast mode!");
+			return false;
+		}
+		free(mode);
+	}
 
 #if !defined(SOL_IP) || !defined(IP_TOS)
 	if(priorityinheritance)
-		logger(LOG_WARNING, "%s not supported on this platform", "PriorityInheritance");
+		logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform", "PriorityInheritance");
 #endif
 
 	if(!get_config_int(lookup_config(config_tree, "MACExpire"), &macexpire))
@@ -487,63 +529,149 @@ static bool setup_myself(void) {
 
 	if(get_config_int(lookup_config(config_tree, "MaxTimeout"), &maxtimeout)) {
 		if(maxtimeout <= 0) {
-			logger(LOG_ERR, "Bogus maximum timeout!");
+			logger(DEBUG_ALWAYS, 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(DEBUG_ALWAYS, LOG_ERR, "Invalid address family!");
+			return false;
+		}
+		free(afname);
+	}
+
+	get_config_bool(lookup_config(config_tree, "Hostnames"), &hostnames);
+
+	if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
+		keylifetime = 3600;
+
+	return true;
+}
+
+/*
+  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, *cipher, *digest, *type;
+	char *fname = NULL;
+	char *address = NULL;
+	char *envp[5];
+	struct addrinfo *ai, *aip, hint = {0};
+	int i, err;
+	int replaywin_int;
+
+	myself = new_node();
+	myself->connection = new_connection();
+
+	if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
+		myport = xstrdup("655");
+
+	xasprintf(&myself->hostname, "MYSELF port %s", myport);
+	myself->connection->hostname = xstrdup(myself->hostname);
+
+	myself->connection->options = 0;
+	myself->connection->protocol_major = PROT_MAJOR;
+	myself->connection->protocol_minor = PROT_MINOR;
+
+	myself->options |= PROT_MINOR << 24;
+
+	if(!(name = get_name())) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Name for tinc daemon required!");
+		return false;
+	}
+
+	myself->name = name;
+	myself->connection->name = xstrdup(name);
+	xasprintf(&fname, "%s" SLASH "hosts" SLASH "%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;
+
+	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);
+	}
+
+	/* Read in all the subnets specified in the host configuration file */
+
+	cfg = lookup_config(config_tree, "Subnet");
+
+	while(cfg) {
+		if(!get_config_subnet(cfg, &subnet))
+			return false;
+
+		subnet_add(myself, subnet);
+
+		cfg = lookup_config_next(config_tree, cfg);
+	}
+
+	/* Check some options */
+
+	if(!setup_myself_reloadable())
+		return false;
+
+	get_config_bool(lookup_config(config_tree, "StrictSubnets"), &strictsubnets);
+	get_config_bool(lookup_config(config_tree, "TunnelServer"), &tunnelserver);
+	strictsubnets |= tunnelserver;
+
+
+
 	if(get_config_int(lookup_config(config_tree, "UDPRcvBuf"), &udp_rcvbuf)) {
 		if(udp_rcvbuf <= 0) {
-			logger(LOG_ERR, "UDPRcvBuf cannot be negative!");
+			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(LOG_ERR, "UDPSndBuf cannot be negative!");
+			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(LOG_ERR, "ReplayWindow cannot be negative!");
+			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;
-		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);
-	}
-
-	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(LOG_ERR, "Unrecognized cipher type!");
+		logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized cipher type!");
 		return false;
 	}
 
-	if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
-		keylifetime = 3600;
-
 	regenerate_key();
 
 	/* Check if we want to use message authentication codes... */
@@ -552,7 +680,7 @@ static bool setup_myself(void) {
 	get_config_int(lookup_config(config_tree, "MACLength"), &maclength);
 
 	if(maclength < 0) {
-		logger(LOG_ERR, "Bogus MAC length!");
+		logger(DEBUG_ALWAYS, LOG_ERR, "Bogus MAC length!");
 		return false;
 	}
 
@@ -560,7 +688,7 @@ static bool setup_myself(void) {
 		digest = xstrdup("sha1");
 
 	if(!digest_open_by_name(&myself->indigest, digest, maclength)) {
-		logger(LOG_ERR, "Unrecognized digest type!");
+		logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized digest type!");
 		return false;
 	}
 
@@ -568,7 +696,7 @@ static bool setup_myself(void) {
 
 	if(get_config_int(lookup_config(config_tree, "Compression"), &myself->incompression)) {
 		if(myself->incompression < 0 || myself->incompression > 11) {
-			logger(LOG_ERR, "Bogus compression level!");
+			logger(DEBUG_ALWAYS, LOG_ERR, "Bogus compression level!");
 			return false;
 		}
 	} else
@@ -581,6 +709,8 @@ static bool setup_myself(void) {
 	myself->nexthop = myself;
 	myself->via = myself;
 	myself->status.reachable = true;
+	myself->last_state_change = time(NULL);
+	myself->status.sptps = experimental;
 	node_add(myself);
 
 	graph();
@@ -597,6 +727,8 @@ static bool setup_myself(void) {
 			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;
@@ -614,7 +746,7 @@ static bool setup_myself(void) {
 		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));
+			logger(DEBUG_ALWAYS, LOG_ERR, "event_add failed: %s", strerror(errno));
 			devops.close();
 			return false;
 		}
@@ -638,86 +770,154 @@ static bool setup_myself(void) {
 
 	/* Open sockets */
 
-	listen_sockets = 0;
-	cfg = lookup_config(config_tree, "BindToAddress");
-
-	do {
-		get_config_string(cfg, &address);
-		if(cfg)
-			cfg = lookup_config_next(config_tree, cfg);
-
-		hint.ai_family = addressfamily;
-		hint.ai_socktype = SOCK_STREAM;
-		hint.ai_protocol = IPPROTO_TCP;
-		hint.ai_flags = AI_PASSIVE;
+	if(!do_detach && getenv("LISTEN_FDS")) {
+		sockaddr_t sa;
+		socklen_t salen;
 
-		err = getaddrinfo(address, myport, &hint, &ai);
-		free(address);
+		listen_sockets = atoi(getenv("LISTEN_FDS"));
+#ifdef HAVE_UNSETENV
+		unsetenv("LISTEN_FDS");
+#endif
 
-		if(err || !ai) {
-			logger(LOG_ERR, "System call `%s' failed: %s", "getaddrinfo",
-				   gai_strerror(err));
+		if(listen_sockets > MAXSOCKETS) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
 			return false;
 		}
 
-		for(aip = ai; aip; aip = aip->ai_next) {
-			if(listen_sockets >= MAXSOCKETS) {
-				logger(LOG_ERR, "Too many listening sockets");
+		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[listen_sockets].tcp =
-				setup_listen_socket((sockaddr_t *) aip->ai_addr);
-
-			if(listen_socket[listen_sockets].tcp < 0)
-				continue;
+			listen_socket[i].tcp = i + 3;
 
-			listen_socket[listen_sockets].udp =
-				setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
+#ifdef FD_CLOEXEC
+		        fcntl(i + 3, F_SETFD, FD_CLOEXEC);
+#endif
 
-			if(listen_socket[listen_sockets].udp < 0) {
-				close(listen_socket[listen_sockets].tcp);
-				continue;
-			}
+			listen_socket[i].udp = setup_vpn_in_socket(&sa);
+			if(listen_socket[i].udp < 0)
+				return false;
 
-			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_ERR, "event_add failed: %s", strerror(errno));
+			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();
 			}
 
-			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);
+			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(LOG_ERR, "event_add failed: %s", strerror(errno));
+				logger(DEBUG_ALWAYS, LOG_ERR, "event_add failed: %s", strerror(errno));
 				abort();
 			}
 
-			ifdebug(CONNECTIONS) {
-				hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
-				logger(LOG_NOTICE, "Listening on %s", hostname);
+			if(debug_level >= DEBUG_CONNECTIONS) {
+				hostname = sockaddr2hostname(&sa);
+				logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Listening on %s", hostname);
 				free(hostname);
 			}
 
-			memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
-			listen_sockets++;
+			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);
 
-		freeaddrinfo(ai);
-	} while(cfg);
+			char *port = myport;
+
+			if(address) {
+				char *space = strchr(address, ' ');
+				if(space) {
+					*space++ = 0;
+					port = space;
+				}
+
+				if(!strcmp(address, "*"))
+					*address = 0;
+			}
+
+			hint.ai_family = addressfamily;
+			hint.ai_socktype = SOCK_STREAM;
+			hint.ai_protocol = IPPROTO_TCP;
+			hint.ai_flags = AI_PASSIVE;
+
+			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",
+					   gai_strerror(err));
+				return false;
+			}
+
+			for(aip = ai; aip; aip = aip->ai_next) {
+				if(listen_sockets >= MAXSOCKETS) {
+					logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
+					return false;
+				}
+
+				listen_socket[listen_sockets].tcp =
+					setup_listen_socket((sockaddr_t *) aip->ai_addr);
+
+				if(listen_socket[listen_sockets].tcp < 0)
+					continue;
+
+				listen_socket[listen_sockets].udp =
+					setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
+
+				if(listen_socket[listen_sockets].udp < 0) {
+					close(listen_socket[listen_sockets].tcp);
+					continue;
+				}
+
+				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();
+				}
+
+				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();
+				}
+
+				if(debug_level >= DEBUG_CONNECTIONS) {
+					hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
+					logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Listening on %s", hostname);
+					free(hostname);
+				}
+
+				memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
+				listen_sockets++;
+			}
+
+			freeaddrinfo(ai);
+		} while(cfg);
+	}
 
 	if(listen_sockets)
-		logger(LOG_NOTICE, "Ready");
+		logger(DEBUG_ALWAYS, LOG_NOTICE, "Ready");
 	else {
-		logger(LOG_ERR, "Unable to create any listening socket!");
+		logger(DEBUG_ALWAYS, LOG_ERR, "Unable to create any listening socket!");
 		return false;
 	}
 
+	last_config_check = time(NULL);
+
 	return true;
 }