X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_socket.c;h=a69612790852b2d7379ae8d781360c6722a852c6;hp=bafea64d4161c39c2dbf1b265ea0f16de0b8d7f4;hb=d6b45d005530496e48325a6174ecdd889a17bfc1;hpb=a31e1f03c4eff16403178695d971a0838996ba2e

diff --git a/src/net_socket.c b/src/net_socket.c
index bafea64d..a6961279 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -1,7 +1,7 @@
 /*
     net_socket.c -- Handle various kinds of sockets.
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2016 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2018 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
                   2009      Florian Forster <octo@verplant.org>
 
@@ -22,6 +22,7 @@
 
 #include "system.h"
 
+#include "address_cache.h"
 #include "conf.h"
 #include "connection.h"
 #include "control_common.h"
@@ -40,7 +41,8 @@ int maxtimeout = 900;
 int seconds_till_retry = 5;
 int udp_rcvbuf = 1024 * 1024;
 int udp_sndbuf = 1024 * 1024;
-int max_connection_burst = 100;
+int max_connection_burst = 10;
+int fwmark;
 
 listen_socket_t listen_socket[MAXSOCKETS];
 int listen_sockets;
@@ -58,29 +60,39 @@ static void configure_tcp(connection_t *c) {
 	int flags = fcntl(c->socket, F_GETFL);
 
 	if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "fcntl for %s: %s", c->hostname, strerror(errno));
+		logger(DEBUG_ALWAYS, LOG_ERR, "fcntl for %s fd %d: %s", c->hostname, c->socket, strerror(errno));
 	}
+
 #elif defined(WIN32)
 	unsigned long arg = 1;
 
 	if(ioctlsocket(c->socket, FIONBIO, &arg) != 0) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "ioctlsocket for %s: %s", c->hostname, sockstrerror(sockerrno));
+		logger(DEBUG_ALWAYS, LOG_ERR, "ioctlsocket for %s fd %d: %s", c->hostname, c->socket, sockstrerror(sockerrno));
 	}
+
 #endif
 
-#if defined(IPPROTO_TCP) && defined(TCP_NODELAY)
+#if defined(TCP_NODELAY)
 	option = 1;
-	setsockopt(c->socket, IPPROTO_TCP, TCP_NODELAY, (void *)&option, sizeof option);
+	setsockopt(c->socket, IPPROTO_TCP, TCP_NODELAY, (void *)&option, sizeof(option));
 #endif
 
-#if defined(IPPROTO_IP) && defined(IP_TOS) && defined(IPTOS_LOWDELAY)
+#if defined(IP_TOS) && defined(IPTOS_LOWDELAY)
 	option = IPTOS_LOWDELAY;
-	setsockopt(c->socket, IPPROTO_IP, IP_TOS, (void *)&option, sizeof option);
+	setsockopt(c->socket, IPPROTO_IP, IP_TOS, (void *)&option, sizeof(option));
 #endif
 
-#if defined(IPPROTO_IPV6) && defined(IPV6_TCLASS) && defined(IPTOS_LOWDELAY)
+#if defined(IPV6_TCLASS) && defined(IPTOS_LOWDELAY)
 	option = IPTOS_LOWDELAY;
-	setsockopt(c->socket, IPPROTO_IPV6, IPV6_TCLASS, (void *)&option, sizeof option);
+	setsockopt(c->socket, IPPROTO_IPV6, IPV6_TCLASS, (void *)&option, sizeof(option));
+#endif
+
+#if defined(SO_MARK)
+
+	if(fwmark) {
+		setsockopt(c->socket, SOL_SOCKET, SO_MARK, (void *)&fwmark, sizeof(fwmark));
+	}
+
 #endif
 }
 
@@ -92,8 +104,9 @@ static bool bind_to_interface(int sd) {
 	int status;
 #endif /* defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) */
 
-	if(!get_config_string (lookup_config (config_tree, "BindToInterface"), &iface))
+	if(!get_config_string(lookup_config(config_tree, "BindToInterface"), &iface)) {
 		return true;
+	}
 
 #if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
 	memset(&ifr, 0, sizeof(ifr));
@@ -101,12 +114,15 @@ static bool bind_to_interface(int sd) {
 	ifr.ifr_ifrn.ifrn_name[IFNAMSIZ - 1] = 0;
 
 	status = setsockopt(sd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr, sizeof(ifr));
+
 	if(status) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Can't bind to interface %s: %s", iface,
-				sockstrerror(sockerrno));
+		       sockstrerror(sockerrno));
 		return false;
 	}
+
 #else /* if !defined(SOL_SOCKET) || !defined(SO_BINDTODEVICE) */
+	(void)sd;
 	logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform", "BindToInterface");
 #endif
 
@@ -117,21 +133,28 @@ static bool bind_to_address(connection_t *c) {
 	int s = -1;
 
 	for(int i = 0; i < listen_sockets && listen_socket[i].bindto; i++) {
-		if(listen_socket[i].sa.sa.sa_family != c->address.sa.sa_family)
+		if(listen_socket[i].sa.sa.sa_family != c->address.sa.sa_family) {
 			continue;
-		if(s >= 0)
+		}
+
+		if(s >= 0) {
 			return false;
+		}
+
 		s = i;
 	}
 
-	if(s < 0)
+	if(s < 0) {
 		return false;
+	}
 
 	sockaddr_t sa = listen_socket[s].sa;
-	if(sa.sa.sa_family == AF_INET)
+
+	if(sa.sa.sa_family == AF_INET) {
 		sa.in.sin_port = 0;
-	else if(sa.sa.sa_family == AF_INET6)
+	} else if(sa.sa.sa_family == AF_INET6) {
 		sa.in6.sin6_port = 0;
+	}
 
 	if(bind(c->socket, &sa.sa, SALEN(sa.sa))) {
 		logger(DEBUG_CONNECTIONS, LOG_WARNING, "Can't bind outgoing socket: %s", sockstrerror(sockerrno));
@@ -161,27 +184,42 @@ int setup_listen_socket(const sockaddr_t *sa) {
 	/* Optimize TCP settings */
 
 	option = 1;
-	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof option);
+	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof(option));
+
+#if defined(IPV6_V6ONLY)
+
+	if(sa->sa.sa_family == AF_INET6) {
+		setsockopt(nfd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&option, sizeof(option));
+	}
+
+#else
+#warning IPV6_V6ONLY not defined
+#endif
+
+#if defined(SO_MARK)
+
+	if(fwmark) {
+		setsockopt(nfd, SOL_SOCKET, SO_MARK, (void *)&fwmark, sizeof(fwmark));
+	}
 
-#if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY)
-	if(sa->sa.sa_family == AF_INET6)
-		setsockopt(nfd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&option, sizeof option);
 #endif
 
 	if(get_config_string
-	   (lookup_config(config_tree, "BindToInterface"), &iface)) {
+	                (lookup_config(config_tree, "BindToInterface"), &iface)) {
 #if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
 		struct ifreq ifr;
 
-		memset(&ifr, 0, sizeof ifr);
+		memset(&ifr, 0, sizeof(ifr));
 		strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
+		ifr.ifr_ifrn.ifrn_name[IFNAMSIZ - 1] = 0;
 
-		if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr, sizeof ifr)) {
+		if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr, sizeof(ifr))) {
 			closesocket(nfd);
 			logger(DEBUG_ALWAYS, LOG_ERR, "Can't bind to interface %s: %s", iface,
-				   sockstrerror(sockerrno));
+			       sockstrerror(sockerrno));
 			return -1;
 		}
+
 #else
 		logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform", "BindToInterface");
 #endif
@@ -227,13 +265,14 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
 		if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
 			closesocket(nfd);
 			logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "fcntl",
-				   strerror(errno));
+			       strerror(errno));
 			return -1;
 		}
 	}
 #elif defined(WIN32)
 	{
 		unsigned long arg = 1;
+
 		if(ioctlsocket(nfd, FIONBIO, &arg) != 0) {
 			closesocket(nfd);
 			logger(DEBUG_ALWAYS, LOG_ERR, "Call to `%s' failed: %s", "ioctlsocket", sockstrerror(sockerrno));
@@ -243,49 +282,70 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
 #endif
 
 	option = 1;
-	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof option);
-	setsockopt(nfd, SOL_SOCKET, SO_BROADCAST, (void *)&option, sizeof option);
+	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof(option));
+	setsockopt(nfd, SOL_SOCKET, SO_BROADCAST, (void *)&option, sizeof(option));
 
-	if(udp_rcvbuf && setsockopt(nfd, SOL_SOCKET, SO_RCVBUF, (void *)&udp_rcvbuf, sizeof(udp_rcvbuf)))
+	if(udp_rcvbuf && setsockopt(nfd, SOL_SOCKET, SO_RCVBUF, (void *)&udp_rcvbuf, sizeof(udp_rcvbuf))) {
 		logger(DEBUG_ALWAYS, LOG_WARNING, "Can't set UDP SO_RCVBUF to %i: %s", udp_rcvbuf, sockstrerror(sockerrno));
+	}
 
-	if(udp_sndbuf && setsockopt(nfd, SOL_SOCKET, SO_SNDBUF, (void *)&udp_sndbuf, sizeof(udp_sndbuf)))
+	if(udp_sndbuf && setsockopt(nfd, SOL_SOCKET, SO_SNDBUF, (void *)&udp_sndbuf, sizeof(udp_sndbuf))) {
 		logger(DEBUG_ALWAYS, LOG_WARNING, "Can't set UDP SO_SNDBUF to %i: %s", udp_sndbuf, sockstrerror(sockerrno));
+	}
+
+#if defined(IPV6_V6ONLY)
+
+	if(sa->sa.sa_family == AF_INET6) {
+		setsockopt(nfd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&option, sizeof(option));
+	}
 
-#if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY)
-	if(sa->sa.sa_family == AF_INET6)
-		setsockopt(nfd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&option, sizeof option);
 #endif
 
 #if defined(IP_DONTFRAG) && !defined(IP_DONTFRAGMENT)
 #define IP_DONTFRAGMENT IP_DONTFRAG
 #endif
 
-#if defined(IPPROTO_IP) && defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO)
+#if defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO)
+
 	if(myself->options & OPTION_PMTU_DISCOVERY) {
 		option = IP_PMTUDISC_DO;
 		setsockopt(nfd, IPPROTO_IP, IP_MTU_DISCOVER, (void *)&option, sizeof(option));
 	}
-#elif defined(IPPROTO_IP) && defined(IP_DONTFRAGMENT)
+
+#elif defined(IP_DONTFRAGMENT)
+
 	if(myself->options & OPTION_PMTU_DISCOVERY) {
 		option = 1;
 		setsockopt(nfd, IPPROTO_IP, IP_DONTFRAGMENT, (void *)&option, sizeof(option));
 	}
+
 #endif
 
-#if defined(IPPROTO_IPV6) && defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
+#if defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
+
 	if(myself->options & OPTION_PMTU_DISCOVERY) {
 		option = IPV6_PMTUDISC_DO;
 		setsockopt(nfd, IPPROTO_IPV6, IPV6_MTU_DISCOVER, (void *)&option, sizeof(option));
 	}
-#elif defined(IPPROTO_IPV6) && defined(IPV6_DONTFRAG)
+
+#elif defined(IPV6_DONTFRAG)
+
 	if(myself->options & OPTION_PMTU_DISCOVERY) {
 		option = 1;
 		setsockopt(nfd, IPPROTO_IPV6, IPV6_DONTFRAG, (void *)&option, sizeof(option));
 	}
+
+#endif
+
+#if defined(SO_MARK)
+
+	if(fwmark) {
+		setsockopt(nfd, SOL_SOCKET, SO_MARK, (void *)&fwmark, sizeof(fwmark));
+	}
+
 #endif
 
-	if (!bind_to_interface(nfd)) {
+	if(!bind_to_interface(nfd)) {
 		closesocket(nfd);
 		return -1;
 	}
@@ -302,16 +362,19 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
 } /* int setup_vpn_in_socket */
 
 static void retry_outgoing_handler(void *data) {
-	setup_outgoing_connection(data);
+	setup_outgoing_connection(data, true);
 }
 
 void retry_outgoing(outgoing_t *outgoing) {
 	outgoing->timeout += 5;
 
-	if(outgoing->timeout > maxtimeout)
+	if(outgoing->timeout > maxtimeout) {
 		outgoing->timeout = maxtimeout;
+	}
 
-	timeout_add(&outgoing->ev, retry_outgoing_handler, outgoing, &(struct timeval){outgoing->timeout, rand() % 100000});
+	timeout_add(&outgoing->ev, retry_outgoing_handler, outgoing, &(struct timeval) {
+		outgoing->timeout, rand() % 100000
+	});
 
 	logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Trying to re-establish outgoing connection in %d seconds", outgoing->timeout);
 }
@@ -325,7 +388,7 @@ void finish_connecting(connection_t *c) {
 	send_id(c);
 }
 
-static void do_outgoing_pipe(connection_t *c, char *command) {
+static void do_outgoing_pipe(connection_t *c, const char *command) {
 #ifndef HAVE_MINGW
 	int fd[2];
 
@@ -358,31 +421,40 @@ static void do_outgoing_pipe(connection_t *c, char *command) {
 	setenv("REMOTEPORT", port, true);
 	setenv("NODE", c->name, true);
 	setenv("NAME", myself->name, true);
-	if(netname)
+
+	if(netname) {
 		setenv("NETNAME", netname, true);
+	}
 
 	int result = system(command);
-	if(result < 0)
+
+	if(result < 0) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Could not execute %s: %s", command, strerror(errno));
-	else if(result)
+	} else if(result) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "%s exited with non-zero status %d", command, result);
+	}
+
 	exit(result);
 #else
+	(void)c;
+	(void)command;
 	logger(DEBUG_ALWAYS, LOG_ERR, "Proxy type exec not supported on this platform!");
 	return;
 #endif
 }
 
 static void handle_meta_write(connection_t *c) {
-	if(c->outbuf.len <= c->outbuf.offset)
+	if(c->outbuf.len <= c->outbuf.offset) {
 		return;
+	}
 
 	ssize_t outlen = send(c->socket, c->outbuf.data + c->outbuf.offset, c->outbuf.len - c->outbuf.offset, 0);
+
 	if(outlen <= 0) {
 		if(!sockerrno || sockerrno == EPIPE) {
 			logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection closed by %s (%s)", c->name, c->hostname);
 		} else if(sockwouldblock(sockerrno)) {
-			logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Sending %d bytes to %s (%s) would block", c->outbuf.len - c->outbuf.offset, c->name, c->hostname);
+			logger(DEBUG_META, LOG_DEBUG, "Sending %d bytes to %s (%s) would block", c->outbuf.len - c->outbuf.offset, c->name, c->hostname);
 			return;
 		} else {
 			logger(DEBUG_CONNECTIONS, LOG_ERR, "Could not send %d bytes of data to %s (%s): %s", c->outbuf.len - c->outbuf.offset, c->name, c->hostname, sockstrerror(sockerrno));
@@ -393,8 +465,10 @@ static void handle_meta_write(connection_t *c) {
 	}
 
 	buffer_read(&c->outbuf, outlen);
-	if(!c->outbuf.len)
+
+	if(!c->outbuf.len) {
 		io_set(&c->io, IO_READ);
+	}
 }
 
 static void handle_meta_io(void *data, int flags) {
@@ -414,20 +488,25 @@ static void handle_meta_io(void *data, int flags) {
 		   | Successful | (success) | (success)   | (success) |
 		   +------------+-----------+-------------+-----------+
 		*/
-		if (send(c->socket, NULL, 0, 0) != 0) {
-			if (sockwouldblock(sockerrno))
+		if(send(c->socket, NULL, 0, 0) != 0) {
+			if(sockwouldblock(sockerrno)) {
 				return;
+			}
+
 			int socket_error;
-			if (!socknotconn(sockerrno))
+
+			if(!socknotconn(sockerrno)) {
 				socket_error = sockerrno;
-			else {
-				socklen_t len = sizeof socket_error;
+			} else {
+				socklen_t len = sizeof(socket_error);
 				getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&socket_error, &len);
 			}
-			if (socket_error) {
+
+			if(socket_error) {
 				logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Error while connecting to %s (%s): %s", c->name, c->hostname, sockstrerror(socket_error));
 				terminate_connection(c, false);
 			}
+
 			return;
 		}
 
@@ -435,60 +514,33 @@ static void handle_meta_io(void *data, int flags) {
 		finish_connecting(c);
 	}
 
-	if(flags & IO_WRITE)
+	if(flags & IO_WRITE) {
 		handle_meta_write(c);
-	else
+	} else {
 		handle_meta_connection_data(c);
+	}
 }
 
 bool do_outgoing_connection(outgoing_t *outgoing) {
-	char *address, *port, *space;
+	const sockaddr_t *sa;
 	struct addrinfo *proxyai = NULL;
 	int result;
 
 begin:
-	if(!outgoing->ai) {
-		if(!outgoing->cfg) {
-			logger(DEBUG_CONNECTIONS, LOG_ERR, "Could not set up a meta connection to %s", outgoing->name);
-			retry_outgoing(outgoing);
-			return false;
-		}
-
-		get_config_string(outgoing->cfg, &address);
+	sa = get_recent_address(outgoing->address_cache);
 
-		space = strchr(address, ' ');
-		if(space) {
-			port = xstrdup(space + 1);
-			*space = 0;
-		} else {
-			if(!get_config_string(lookup_config(outgoing->config_tree, "Port"), &port))
-				port = xstrdup("655");
-		}
-
-		outgoing->ai = str2addrinfo(address, port, SOCK_STREAM);
-		free(address);
-		free(port);
-
-		outgoing->aip = outgoing->ai;
-		outgoing->cfg = lookup_config_next(outgoing->config_tree, outgoing->cfg);
-	}
-
-	if(!outgoing->aip) {
-		if(outgoing->ai)
-			freeaddrinfo(outgoing->ai);
-		outgoing->ai = NULL;
-		goto begin;
+	if(!sa) {
+		logger(DEBUG_CONNECTIONS, LOG_ERR, "Could not set up a meta connection to %s", outgoing->node->name);
+		retry_outgoing(outgoing);
+		return false;
 	}
 
 	connection_t *c = new_connection();
 	c->outgoing = outgoing;
-
-	memcpy(&c->address, outgoing->aip->ai_addr, outgoing->aip->ai_addrlen);
-	outgoing->aip = outgoing->aip->ai_next;
-
+	memcpy(&c->address, sa, SALEN(sa->sa));
 	c->hostname = sockaddr2hostname(&c->address);
 
-	logger(DEBUG_CONNECTIONS, LOG_INFO, "Trying to connect to %s (%s)", outgoing->name, c->hostname);
+	logger(DEBUG_CONNECTIONS, LOG_INFO, "Trying to connect to %s (%s)", outgoing->node->name, c->hostname);
 
 	if(!proxytype) {
 		c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
@@ -497,10 +549,12 @@ begin:
 		do_outgoing_pipe(c, proxyhost);
 	} else {
 		proxyai = str2addrinfo(proxyhost, proxyport, SOCK_STREAM);
+
 		if(!proxyai) {
 			free_connection(c);
 			goto begin;
 		}
+
 		logger(DEBUG_CONNECTIONS, LOG_INFO, "Using proxy at %s port %s", proxyhost, proxyport);
 		c->socket = socket(proxyai->ai_family, SOCK_STREAM, IPPROTO_TCP);
 		configure_tcp(c);
@@ -517,10 +571,13 @@ begin:
 #endif
 
 	if(proxytype != PROXY_EXEC) {
-#if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY)
+#if defined(IPV6_V6ONLY)
 		int option = 1;
-		if(c->address.sa.sa_family == AF_INET6)
-			setsockopt(c->socket, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&option, sizeof option);
+
+		if(c->address.sa.sa_family == AF_INET6) {
+			setsockopt(c->socket, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&option, sizeof(option));
+		}
+
 #endif
 
 		bind_to_interface(c->socket);
@@ -534,12 +591,16 @@ begin:
 	} else if(proxytype == PROXY_EXEC) {
 		result = 0;
 	} else {
+		if(!proxyai) {
+			abort();
+		}
+
 		result = connect(c->socket, proxyai->ai_addr, proxyai->ai_addrlen);
 		freeaddrinfo(proxyai);
 	}
 
 	if(result == -1 && !sockinprogress(sockerrno)) {
-		logger(DEBUG_CONNECTIONS, LOG_ERR, "Could not connect to %s (%s): %s", outgoing->name, c->hostname, sockstrerror(sockerrno));
+		logger(DEBUG_CONNECTIONS, LOG_ERR, "Could not connect to %s (%s): %s", outgoing->node->name, c->hostname, sockstrerror(sockerrno));
 		free_connection(c);
 
 		goto begin;
@@ -549,7 +610,7 @@ begin:
 
 	c->last_ping_time = time(NULL);
 	c->status.connecting = true;
-	c->name = xstrdup(outgoing->name);
+	c->name = xstrdup(outgoing->node->name);
 #ifndef DISABLE_LEGACY
 	c->outcipher = myself->connection->outcipher;
 	c->outdigest = myself->connection->outdigest;
@@ -560,51 +621,20 @@ begin:
 
 	connection_add(c);
 
-	io_add(&c->io, handle_meta_io, c, c->socket, IO_READ|IO_WRITE);
+	io_add(&c->io, handle_meta_io, c, c->socket, IO_READ | IO_WRITE);
 
 	return true;
 }
 
-// Find edges pointing to this node, and use them to build a list of unique, known addresses.
-static struct addrinfo *get_known_addresses(node_t *n) {
-	struct addrinfo *ai = NULL;
-
-	for splay_each(edge_t, e, n->edge_tree) {
-		if(!e->reverse)
-			continue;
-
-		bool found = false;
-		for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
-			if(!sockaddrcmp(&e->reverse->address, (sockaddr_t *)aip->ai_addr)) {
-				found = true;
-				break;
-			}
-		}
-		if(found)
-			continue;
-
-		struct addrinfo *nai = xzalloc(sizeof *nai);
-		if(ai)
-			ai->ai_next = nai;
-		ai = nai;
-		ai->ai_family = e->reverse->address.sa.sa_family;
-		ai->ai_socktype = SOCK_STREAM;
-		ai->ai_protocol = IPPROTO_TCP;
-		ai->ai_addrlen = SALEN(e->reverse->address.sa);
-		ai->ai_addr = xmalloc(ai->ai_addrlen);
-		memcpy(ai->ai_addr, &e->reverse->address, ai->ai_addrlen);
-	}
-
-	return ai;
-}
-
-void setup_outgoing_connection(outgoing_t *outgoing) {
+void setup_outgoing_connection(outgoing_t *outgoing, bool verbose) {
+	(void)verbose;
 	timeout_del(&outgoing->ev);
 
-	node_t *n = lookup_node(outgoing->name);
+	node_t *n = outgoing->node;
+
+	if(n->connection) {
+		logger(DEBUG_CONNECTIONS, LOG_INFO, "Already connected to %s", n->name);
 
-	if(n && n->connection) {
-		logger(DEBUG_CONNECTIONS, LOG_INFO, "Already connected to %s", outgoing->name);
 		if(!n->connection->outgoing) {
 			n->connection->outgoing = outgoing;
 			return;
@@ -613,17 +643,8 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
 		}
 	}
 
-	init_configuration(&outgoing->config_tree);
-	read_host_config(outgoing->config_tree, outgoing->name);
-	outgoing->cfg = lookup_config(outgoing->config_tree, "Address");
-
-	if(!outgoing->cfg) {
-		if(n)
-			outgoing->aip = outgoing->ai = get_known_addresses(n);
-		if(!outgoing->ai) {
-			logger(DEBUG_ALWAYS, LOG_DEBUG, "No address known for %s", outgoing->name);
-			goto remove;
-		}
+	if(!outgoing->address_cache) {
+		outgoing->address_cache = open_address_cache(n);
 	}
 
 	do_outgoing_connection(outgoing);
@@ -638,11 +659,12 @@ remove:
   new connection
 */
 void handle_new_meta_connection(void *data, int flags) {
+	(void)flags;
 	listen_socket_t *l = data;
 	connection_t *c;
 	sockaddr_t sa;
 	int fd;
-	socklen_t len = sizeof sa;
+	socklen_t len = sizeof(sa);
 
 	fd = accept(l->tcp.fd, &sa.sa, &len);
 
@@ -656,49 +678,45 @@ void handle_new_meta_connection(void *data, int flags) {
 	// Check if we get many connections from the same host
 
 	static sockaddr_t prev_sa;
-	static int tarpit = -1;
-
-	if(tarpit >= 0) {
-		closesocket(tarpit);
-		tarpit = -1;
-	}
 
 	if(!sockaddrcmp_noport(&sa, &prev_sa)) {
 		static int samehost_burst;
 		static int samehost_burst_time;
 
-		if(now.tv_sec - samehost_burst_time > samehost_burst)
+		if(now.tv_sec - samehost_burst_time > samehost_burst) {
 			samehost_burst = 0;
-		else
+		} else {
 			samehost_burst -= now.tv_sec - samehost_burst_time;
+		}
 
 		samehost_burst_time = now.tv_sec;
 		samehost_burst++;
 
 		if(samehost_burst > max_connection_burst) {
-			tarpit = fd;
+			tarpit(fd);
 			return;
 		}
 	}
 
-	memcpy(&prev_sa, &sa, sizeof sa);
+	memcpy(&prev_sa, &sa, sizeof(sa));
 
 	// Check if we get many connections from different hosts
 
 	static int connection_burst;
 	static int connection_burst_time;
 
-	if(now.tv_sec - connection_burst_time > connection_burst)
+	if(now.tv_sec - connection_burst_time > connection_burst) {
 		connection_burst = 0;
-	else
+	} else {
 		connection_burst -= now.tv_sec - connection_burst_time;
+	}
 
 	connection_burst_time = now.tv_sec;
 	connection_burst++;
 
 	if(connection_burst >= max_connection_burst) {
 		connection_burst = max_connection_burst;
-		tarpit = fd;
+		tarpit(fd);
 		return;
 	}
 
@@ -727,7 +745,6 @@ void handle_new_meta_connection(void *data, int flags) {
 	connection_add(c);
 
 	c->allow_request = ID;
-	send_id(c);
 }
 
 #ifndef HAVE_MINGW
@@ -735,11 +752,12 @@ void handle_new_meta_connection(void *data, int flags) {
   accept a new UNIX socket connection
 */
 void handle_new_unix_connection(void *data, int flags) {
+	(void)flags;
 	io_t *io = data;
 	connection_t *c;
 	sockaddr_t sa;
 	int fd;
-	socklen_t len = sizeof sa;
+	socklen_t len = sizeof(sa);
 
 	fd = accept(io->fd, &sa.sa, &len);
 
@@ -764,22 +782,15 @@ void handle_new_unix_connection(void *data, int flags) {
 	connection_add(c);
 
 	c->allow_request = ID;
-
-	send_id(c);
 }
 #endif
 
 static void free_outgoing(outgoing_t *outgoing) {
 	timeout_del(&outgoing->ev);
 
-	if(outgoing->ai)
-		freeaddrinfo(outgoing->ai);
-
-	if(outgoing->config_tree)
-		exit_configuration(&outgoing->config_tree);
-
-	if(outgoing->name)
-		free(outgoing->name);
+	if(outgoing->address_cache) {
+		close_address_cache(outgoing->address_cache);
+	}
 
 	free(outgoing);
 }
@@ -790,8 +801,9 @@ void try_outgoing_connections(void) {
 	if(!outgoing_list) {
 		outgoing_list = list_alloc((list_action_t)free_outgoing);
 	} else {
-		for list_each(outgoing_t, outgoing, outgoing_list)
+		for list_each(outgoing_t, outgoing, outgoing_list) {
 			outgoing->timeout = -1;
+		}
 	}
 
 	/* Make sure there is one outgoing_t in the list for each ConnectTo. */
@@ -802,8 +814,8 @@ void try_outgoing_connections(void) {
 
 		if(!check_id(name)) {
 			logger(DEBUG_ALWAYS, LOG_ERR,
-				   "Invalid name for outgoing connection in %s line %d",
-				   cfg->file, cfg->line);
+			       "Invalid name for outgoing connection in %s line %d",
+			       cfg->file, cfg->line);
 			free(name);
 			continue;
 		}
@@ -816,7 +828,7 @@ void try_outgoing_connections(void) {
 		bool found = false;
 
 		for list_each(outgoing_t, outgoing, outgoing_list) {
-			if(!strcmp(outgoing->name, name)) {
+			if(!strcmp(outgoing->node->name, name)) {
 				found = true;
 				outgoing->timeout = 0;
 				break;
@@ -824,10 +836,18 @@ void try_outgoing_connections(void) {
 		}
 
 		if(!found) {
-			outgoing_t *outgoing = xzalloc(sizeof *outgoing);
-			outgoing->name = name;
+			outgoing_t *outgoing = xzalloc(sizeof(*outgoing));
+			node_t *n = lookup_node(name);
+
+			if(!n) {
+				n = new_node();
+				n->name = xstrdup(name);
+				node_add(n);
+			}
+
+			outgoing->node = n;
 			list_insert_tail(outgoing_list, outgoing);
-			setup_outgoing_connection(outgoing);
+			setup_outgoing_connection(outgoing, true);
 		}
 	}
 
@@ -844,6 +864,7 @@ void try_outgoing_connections(void) {
 	/* Delete outgoing_ts for which there is no ConnectTo. */
 
 	for list_each(outgoing_t, outgoing, outgoing_list)
-		if(outgoing->timeout == -1)
+		if(outgoing->timeout == -1) {
 			list_delete_node(outgoing_list, node);
+		}
 }