X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_socket.c;h=979e84b93631a19d0e89143d8254be6424cbd540;hb=0b2361a9399944cd57def87226f2be7f92646aa5;hp=1bf9d16afe03588c079af6aad0c9a1946f202369;hpb=53036a58790168e18f524bd923f9a7d34691ba2d;p=tinc

diff --git a/src/net_socket.c b/src/net_socket.c
index 1bf9d16a..979e84b9 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-2014 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2017 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
                   2009      Florian Forster <octo@verplant.org>
 
@@ -35,16 +35,11 @@
 #include "utils.h"
 #include "xalloc.h"
 
-/* Needed on Mac OS/X */
-#ifndef SOL_TCP
-#define SOL_TCP IPPROTO_TCP
-#endif
-
 int addressfamily = AF_UNSPEC;
 int maxtimeout = 900;
 int seconds_till_retry = 5;
-int udp_rcvbuf = 0;
-int udp_sndbuf = 0;
+int udp_rcvbuf = 1024 * 1024;
+int udp_sndbuf = 1024 * 1024;
 int max_connection_burst = 100;
 
 listen_socket_t listen_socket[MAXSOCKETS];
@@ -65,22 +60,29 @@ static void configure_tcp(connection_t *c) {
 	if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "fcntl for %s: %s", c->hostname, 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));
 	}
+
 #endif
 
-#if defined(SOL_TCP) && defined(TCP_NODELAY)
+#if defined(TCP_NODELAY)
 	option = 1;
-	setsockopt(c->socket, SOL_TCP, TCP_NODELAY, (void *)&option, sizeof option);
+	setsockopt(c->socket, IPPROTO_TCP, TCP_NODELAY, (void *)&option, sizeof(option));
+#endif
+
+#if defined(IP_TOS) && defined(IPTOS_LOWDELAY)
+	option = IPTOS_LOWDELAY;
+	setsockopt(c->socket, IPPROTO_IP, IP_TOS, (void *)&option, sizeof(option));
 #endif
 
-#if defined(SOL_IP) && defined(IP_TOS) && defined(IPTOS_LOWDELAY)
+#if defined(IPV6_TCLASS) && defined(IPTOS_LOWDELAY)
 	option = IPTOS_LOWDELAY;
-	setsockopt(c->socket, SOL_IP, IP_TOS, (void *)&option, sizeof option);
+	setsockopt(c->socket, IPPROTO_IPV6, IPV6_TCLASS, (void *)&option, sizeof(option));
 #endif
 }
 
@@ -92,8 +94,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,11 +104,13 @@ 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) */
 	logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform", "BindToInterface");
 #endif
@@ -117,21 +122,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 +173,33 @@ 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));
+	}
 
-#if defined(SOL_IPV6) && defined(IPV6_V6ONLY)
-	if(sa->sa.sa_family == AF_INET6)
-		setsockopt(nfd, SOL_IPV6, IPV6_V6ONLY, (void *)&option, sizeof option);
+#else
+#warning IPV6_V6ONLY not defined
 #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);
 
-		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 +245,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 +262,62 @@ 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(SOL_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, SOL_IP, IP_MTU_DISCOVER, (void *)&option, sizeof(option));
+		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(SOL_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, SOL_IPV6, IPV6_MTU_DISCOVER, (void *)&option, sizeof(option));
+		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 (!bind_to_interface(nfd)) {
+	if(!bind_to_interface(nfd)) {
 		closesocket(nfd);
 		return -1;
 	}
@@ -302,16 +334,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);
 }
@@ -358,14 +393,19 @@ 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
 	logger(DEBUG_ALWAYS, LOG_ERR, "Proxy type exec not supported on this platform!");
@@ -374,15 +414,17 @@ static void do_outgoing_pipe(connection_t *c, char *command) {
 }
 
 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 +435,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 +458,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,10 +484,18 @@ 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);
+	}
+}
+
+static void free_known_addresses(struct addrinfo *ai) {
+	for(struct addrinfo *aip = ai, *next; aip; aip = next) {
+		next = aip->ai_next;
+		free(aip);
+	}
 }
 
 bool do_outgoing_connection(outgoing_t *outgoing) {
@@ -447,7 +504,8 @@ bool do_outgoing_connection(outgoing_t *outgoing) {
 	int result;
 
 begin:
-	if(!outgoing->ai) {
+
+	if(!outgoing->ai && !outgoing->kai) {
 		if(!outgoing->cfg) {
 			logger(DEBUG_CONNECTIONS, LOG_ERR, "Could not set up a meta connection to %s", outgoing->name);
 			retry_outgoing(outgoing);
@@ -457,12 +515,14 @@ begin:
 		get_config_string(outgoing->cfg, &address);
 
 		space = strchr(address, ' ');
+
 		if(space) {
 			port = xstrdup(space + 1);
 			*space = 0;
 		} else {
-			if(!get_config_string(lookup_config(outgoing->config_tree, "Port"), &port))
+			if(!get_config_string(lookup_config(outgoing->config_tree, "Port"), &port)) {
 				port = xstrdup("655");
+			}
 		}
 
 		outgoing->ai = str2addrinfo(address, port, SOCK_STREAM);
@@ -474,9 +534,18 @@ begin:
 	}
 
 	if(!outgoing->aip) {
-		if(outgoing->ai)
+		if(outgoing->ai) {
 			freeaddrinfo(outgoing->ai);
+		}
+
 		outgoing->ai = NULL;
+
+		if(outgoing->kai) {
+			free_known_addresses(outgoing->kai);
+		}
+
+		outgoing->kai = NULL;
+
 		goto begin;
 	}
 
@@ -497,10 +566,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 +588,13 @@ begin:
 #endif
 
 	if(proxytype != PROXY_EXEC) {
-#if defined(SOL_IPV6) && defined(IPV6_V6ONLY)
+#if defined(IPV6_V6ONLY)
 		int option = 1;
-		if(c->address.sa.sa_family == AF_INET6)
-			setsockopt(c->socket, SOL_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,6 +608,10 @@ begin:
 	} else if(proxytype == PROXY_EXEC) {
 		result = 0;
 	} else {
+		if(!proxyai) {
+			abort();
+		}
+
 		result = connect(c->socket, proxyai->ai_addr, proxyai->ai_addrlen);
 		freeaddrinfo(proxyai);
 	}
@@ -547,17 +625,20 @@ begin:
 
 	/* Now that there is a working socket, fill in the rest and register this connection. */
 
+	c->last_ping_time = time(NULL);
 	c->status.connecting = true;
 	c->name = xstrdup(outgoing->name);
+#ifndef DISABLE_LEGACY
 	c->outcipher = myself->connection->outcipher;
 	c->outdigest = myself->connection->outdigest;
+#endif
 	c->outmaclength = myself->connection->outmaclength;
 	c->outcompression = myself->connection->outcompression;
 	c->last_ping_time = now.tv_sec;
 
 	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;
 }
@@ -565,37 +646,41 @@ begin:
 // 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;
+	struct addrinfo *oai = NULL;
 
 	for splay_each(edge_t, e, n->edge_tree) {
-		if(!e->reverse)
+		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)
+
+		if(found) {
 			continue;
+		}
 
-		struct addrinfo *nai = xzalloc(sizeof *nai);
-		if(ai)
-			ai->ai_next = nai;
-		ai = nai;
+		oai = ai;
+		ai = xzalloc(sizeof(*ai));
 		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);
+		ai->ai_next = oai;
 	}
 
 	return ai;
 }
 
-void setup_outgoing_connection(outgoing_t *outgoing) {
+void setup_outgoing_connection(outgoing_t *outgoing, bool verbose) {
 	timeout_del(&outgoing->ev);
 
 	node_t *n = lookup_node(outgoing->name);
@@ -603,24 +688,34 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
 	if(n && n->connection) {
 		logger(DEBUG_CONNECTIONS, LOG_INFO, "Already connected to %s", outgoing->name);
 
-		n->connection->outgoing = outgoing;
-		return;
+		if(!n->connection->outgoing) {
+			n->connection->outgoing = outgoing;
+			return;
+		} else {
+			goto remove;
+		}
 	}
 
 	init_configuration(&outgoing->config_tree);
-	read_host_config(outgoing->config_tree, outgoing->name);
+	read_host_config(outgoing->config_tree, outgoing->name, verbose);
 	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_ERR, "No address known for %s", outgoing->name);
-			return;
+		if(n) {
+			outgoing->aip = outgoing->kai = get_known_addresses(n);
+		}
+
+		if(!outgoing->kai) {
+			logger(verbose ? DEBUG_ALWAYS : DEBUG_CONNECTIONS, LOG_DEBUG, "No address known for %s", outgoing->name);
+			goto remove;
 		}
 	}
 
 	do_outgoing_connection(outgoing);
+	return;
+
+remove:
+	list_delete(outgoing_list, outgoing);
 }
 
 /*
@@ -632,7 +727,7 @@ void handle_new_meta_connection(void *data, int flags) {
 	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);
 
@@ -657,10 +752,11 @@ void handle_new_meta_connection(void *data, int flags) {
 		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++;
@@ -671,17 +767,18 @@ void handle_new_meta_connection(void *data, int flags) {
 		}
 	}
 
-	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++;
@@ -696,8 +793,10 @@ void handle_new_meta_connection(void *data, int flags) {
 
 	c = new_connection();
 	c->name = xstrdup("<unknown>");
+#ifndef DISABLE_LEGACY
 	c->outcipher = myself->connection->outcipher;
 	c->outdigest = myself->connection->outdigest;
+#endif
 	c->outmaclength = myself->connection->outmaclength;
 	c->outcompression = myself->connection->outcompression;
 
@@ -727,7 +826,7 @@ void handle_new_unix_connection(void *data, int flags) {
 	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);
 
@@ -760,14 +859,21 @@ void handle_new_unix_connection(void *data, int flags) {
 static void free_outgoing(outgoing_t *outgoing) {
 	timeout_del(&outgoing->ev);
 
-	if(outgoing->ai)
+	if(outgoing->ai) {
 		freeaddrinfo(outgoing->ai);
+	}
+
+	if(outgoing->kai) {
+		free_known_addresses(outgoing->kai);
+	}
 
-	if(outgoing->config_tree)
+	if(outgoing->config_tree) {
 		exit_configuration(&outgoing->config_tree);
+	}
 
-	if(outgoing->name)
+	if(outgoing->name) {
 		free(outgoing->name);
+	}
 
 	free(outgoing);
 }
@@ -778,8 +884,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. */
@@ -790,8 +897,13 @@ 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;
+		}
+
+		if(!strcmp(name, myself->name)) {
 			free(name);
 			continue;
 		}
@@ -807,10 +919,10 @@ void try_outgoing_connections(void) {
 		}
 
 		if(!found) {
-			outgoing_t *outgoing = xzalloc(sizeof *outgoing);
+			outgoing_t *outgoing = xzalloc(sizeof(*outgoing));
 			outgoing->name = name;
 			list_insert_tail(outgoing_list, outgoing);
-			setup_outgoing_connection(outgoing);
+			setup_outgoing_connection(outgoing, true);
 		}
 	}
 
@@ -827,6 +939,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);
+		}
 }