X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_socket.c;h=3047ccbd8bfedeae2debdeb717bdf441c7bb040f;hb=2fd608c4111ef4d48a649401d918f5981856cc44;hp=a74db196973c910ae54dc31d1740ee8c55c43363;hpb=ea294dac41365a08a77b64c62c0ba630292d7a07;p=meshlink

diff --git a/src/net_socket.c b/src/net_socket.c
index a74db196..3047ccbd 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -1,6 +1,6 @@
 /*
     net_socket.c -- Handle various kinds of sockets.
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014-2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -50,13 +50,17 @@ static void configure_tcp(connection_t *c) {
 #ifdef O_NONBLOCK
 	int flags = fcntl(c->socket, F_GETFL);
 
-	if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0)
+	if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) {
 		logger(c->mesh, MESHLINK_ERROR, "System call `%s' failed: %s", "fcntl", strerror(errno));
+	}
+
 #elif defined(WIN32)
 	unsigned long arg = 1;
 
-	if(ioctlsocket(c->socket, FIONBIO, &arg) != 0)
+	if(ioctlsocket(c->socket, FIONBIO, &arg) != 0) {
 		logger(c->mesh, MESHLINK_ERROR, "System call `%s' failed: %s", "ioctlsocket", sockstrerror(sockerrno));
+	}
+
 #endif
 
 #if defined(SOL_TCP) && defined(TCP_NODELAY)
@@ -64,9 +68,9 @@ static void configure_tcp(connection_t *c) {
 	setsockopt(c->socket, SOL_TCP, TCP_NODELAY, (void *)&nodelay, sizeof(nodelay));
 #endif
 
-#if defined(SOL_IP) && defined(IP_TOS) && defined(IPTOS_LOWDELAY)
+#if defined(IP_TOS) && defined(IPTOS_LOWDELAY)
 	int lowdelay = IPTOS_LOWDELAY;
-	setsockopt(c->socket, SOL_IP, IP_TOS, (void *)&lowdelay, sizeof(lowdelay));
+	setsockopt(c->socket, IPPROTO_IP, IP_TOS, (void *)&lowdelay, sizeof(lowdelay));
 #endif
 }
 
@@ -74,21 +78,28 @@ static bool bind_to_address(meshlink_handle_t *mesh, connection_t *c) {
 	int s = -1;
 
 	for(int i = 0; i < mesh->listen_sockets && mesh->listen_socket[i].bindto; i++) {
-		if(mesh->listen_socket[i].sa.sa.sa_family != c->address.sa.sa_family)
+		if(mesh->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 = mesh->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(mesh, MESHLINK_WARNING, "Can't bind outgoing socket: %s", strerror(errno));
@@ -119,9 +130,14 @@ int setup_listen_socket(const sockaddr_t *sa) {
 	option = 1;
 	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (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));
+#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(bind(nfd, &sa->sa, SALEN(sa->sa))) {
@@ -171,6 +187,7 @@ int setup_vpn_in_socket(meshlink_handle_t *mesh, const sockaddr_t *sa) {
 #elif defined(WIN32)
 	{
 		unsigned long arg = 1;
+
 		if(ioctlsocket(nfd, FIONBIO, &arg) != 0) {
 			closesocket(nfd);
 			logger(mesh, MESHLINK_ERROR, "Call to `%s' failed: %s", "ioctlsocket", sockstrerror(sockerrno));
@@ -183,39 +200,50 @@ int setup_vpn_in_socket(meshlink_handle_t *mesh, const sockaddr_t *sa) {
 	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof(option));
 	setsockopt(nfd, SOL_SOCKET, SO_BROADCAST, (void *)&option, sizeof(option));
 
-#if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY)
-	if(sa->sa.sa_family == AF_INET6)
+#if 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(mesh->self->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(mesh->self->options & OPTION_PMTU_DISCOVERY) {
 		option = 1;
 		setsockopt(nfd, IPPROTO_IP, IP_DONTFRAGMENT, (void *)&option, sizeof(option));
 	}
+
 #else
 #warning No way to disable IPv4 fragmentation
 #endif
 
-#if defined(SOL_IPV6) && defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
+#if defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
+
 	if(mesh->self->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(mesh->self->options & OPTION_PMTU_DISCOVERY) {
 		option = 1;
 		setsockopt(nfd, IPPROTO_IPV6, IPV6_DONTFRAG, (void *)&option, sizeof(option));
 	}
+
 #else
 #warning No way to disable IPv6 fragmentation
 #endif
@@ -240,8 +268,9 @@ static void retry_outgoing_handler(event_loop_t *loop, void *data) {
 void retry_outgoing(meshlink_handle_t *mesh, outgoing_t *outgoing) {
 	outgoing->timeout += 5;
 
-	if(outgoing->timeout > mesh->maxtimeout)
+	if(outgoing->timeout > mesh->maxtimeout) {
 		outgoing->timeout = mesh->maxtimeout;
+	}
 
 	timeout_add(&mesh->loop, &outgoing->ev, retry_outgoing_handler, outgoing, &(struct timeval) {
 		outgoing->timeout, rand() % 100000
@@ -259,73 +288,32 @@ void finish_connecting(meshlink_handle_t *mesh, connection_t *c) {
 	send_id(mesh, c);
 }
 
-static void do_outgoing_pipe(meshlink_handle_t *mesh, connection_t *c, char *command) {
-#ifndef HAVE_MINGW
-	int fd[2];
-
-	if(socketpair(AF_UNIX, SOCK_STREAM, 0, fd)) {
-		logger(mesh, MESHLINK_ERROR, "Could not create socketpair: %s", strerror(errno));
-		return;
-	}
-
-	if(fork()) {
-		c->socket = fd[0];
-		close(fd[1]);
-		logger(mesh, MESHLINK_DEBUG, "Using proxy %s", command);
-		return;
-	}
-
-	close(0);
-	close(1);
-	close(fd[0]);
-	dup2(fd[1], 0);
-	dup2(fd[1], 1);
-	close(fd[1]);
-
-	// Other filedescriptors should be closed automatically by CLOEXEC
-
-	char *host = NULL;
-	char *port = NULL;
-
-	sockaddr2str(&c->address, &host, &port);
-	setenv("REMOTEADDRESS", host, true);
-	setenv("REMOTEPORT", port, true);
-	setenv("NODE", c->name, true);
-	setenv("NAME", mesh->self->name, true);
-
-	int result = system(command);
-	if(result < 0)
-		logger(mesh, MESHLINK_ERROR, "Could not execute %s: %s", command, strerror(errno));
-	else if(result)
-		logger(mesh, MESHLINK_ERROR, "%s exited with non-zero status %d", command, result);
-	exit(result);
-#else
-	logger(mesh, MESHLINK_ERROR, "Proxy type exec not supported on this platform!");
-	return;
-#endif
-}
-
 static void handle_meta_write(meshlink_handle_t *mesh, 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, MSG_NOSIGNAL);
+
 	if(outlen <= 0) {
-		if(!errno || errno == EPIPE)
+		if(!errno || errno == EPIPE) {
 			logger(mesh, MESHLINK_INFO, "Connection closed by %s", c->name);
-		else if(sockwouldblock(sockerrno)) {
-			logger(mesh, MESHLINK_DEBUG, "Sending %d bytes to %s would block", c->outbuf.len - c->outbuf.offset, c->name);
+		} else if(sockwouldblock(sockerrno)) {
+			logger(mesh, MESHLINK_DEBUG, "Sending %lu bytes to %s would block", (unsigned long)(c->outbuf.len - c->outbuf.offset), c->name);
 			return;
-		} else
-			logger(mesh, MESHLINK_ERROR, "Could not send %d bytes of data to %s: %s", c->outbuf.len - c->outbuf.offset, c->name, strerror(errno));
+		} else {
+			logger(mesh, MESHLINK_ERROR, "Could not send %lu bytes of data to %s: %s", (unsigned long)(c->outbuf.len - c->outbuf.offset), c->name, strerror(errno));
+		}
 
 		terminate_connection(mesh, c, c->status.active);
 		return;
 	}
 
 	buffer_read(&c->outbuf, outlen);
-	if(!c->outbuf.len)
+
+	if(!c->outbuf.len) {
 		io_set(&mesh->loop, &c->io, IO_READ);
+	}
 }
 
 static void handle_meta_io(event_loop_t *loop, void *data, int flags) {
@@ -339,19 +327,20 @@ static void handle_meta_io(event_loop_t *loop, void *data, int flags) {
 		socklen_t len = sizeof(result);
 		getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len);
 
-		if(!result)
+		if(!result) {
 			finish_connecting(mesh, c);
-		else {
+		} else {
 			logger(mesh, MESHLINK_DEBUG, "Error while connecting to %s: %s", c->name, sockstrerror(result));
 			terminate_connection(mesh, c, false);
 			return;
 		}
 	}
 
-	if(flags & IO_WRITE)
+	if(flags & IO_WRITE) {
 		handle_meta_write(mesh, c);
-	else
+	} else {
 		handle_meta_connection_data(mesh, c);
+	}
 }
 
 // Find edges pointing to this node, and use them to build a list of unique, known addresses.
@@ -359,18 +348,22 @@ 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)
+		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;
+		}
 
 		// Create a new struct addrinfo, and put it at the head of the list.
 		struct addrinfo *nai = xzalloc(sizeof(*nai) + SALEN(e->reverse->address.sa));
@@ -396,59 +389,143 @@ static void free_known_addresses(struct addrinfo *ai) {
 	}
 }
 
-bool do_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) {
-	char *address, *port, *space;
-	struct addrinfo *proxyai = NULL;
-	int result;
+static bool get_recent(meshlink_handle_t *mesh, outgoing_t *outgoing) {
+	node_t *n = lookup_node(mesh, outgoing->name);
 
-begin:
-	if(!outgoing->ai && !outgoing->nai) {
-		if(!outgoing->cfg) {
-			logger(mesh, MESHLINK_ERROR, "Could not set up a meta connection to %s", outgoing->name);
-			retry_outgoing(mesh, outgoing);
-			return false;
-		}
+	if(!n) {
+		return false;
+	}
 
-		get_config_string(outgoing->cfg, &address);
+	outgoing->ai = get_known_addresses(n);
+	outgoing->aip = outgoing->ai;
+	return outgoing->aip;
+}
 
-		space = strchr(address, ' ');
-		if(space) {
-			port = xstrdup(space + 1);
-			*space = 0;
-		} else {
-			// TODO: Only allow Address statements?
-			if(!get_config_string(lookup_config(outgoing->config_tree, "Port"), &port)) {
-				logger(mesh, MESHLINK_ERROR, "No Port known for %s", outgoing->name);
-				retry_outgoing(mesh, outgoing);
-				return false;
+static bool get_next_ai(meshlink_handle_t *mesh, outgoing_t *outgoing) {
+	if(!outgoing->ai) {
+		char *address = NULL;
+
+		if(get_config_string(outgoing->cfg, &address)) {
+			char *port;
+			char *space = strchr(address, ' ');
+
+			if(space) {
+				port = xstrdup(space + 1);
+				*space = 0;
+			} else {
+				if(!get_config_string(lookup_config(outgoing->config_tree, "Port"), &port)) {
+					logger(mesh, MESHLINK_ERROR, "No Port known for %s", outgoing->name);
+					return false;
+				}
 			}
-		}
 
-		outgoing->ai = str2addrinfo(address, port, SOCK_STREAM);
-		free(address);
-		free(port);
+			outgoing->ai = str2addrinfo(address, port, SOCK_STREAM);
+			free(port);
+			free(address);
+		}
 
 		outgoing->aip = outgoing->ai;
+	} else {
+		outgoing->aip = outgoing->aip->ai_next;
+	}
+
+	return outgoing->aip;
+}
+
+static bool get_next_cfg(meshlink_handle_t *mesh, outgoing_t *outgoing, char *variable) {
+	(void)mesh;
+
+	if(!outgoing->cfg) {
+		outgoing->cfg = lookup_config(outgoing->config_tree, variable);
+	} else {
 		outgoing->cfg = lookup_config_next(outgoing->config_tree, outgoing->cfg);
 	}
 
-	if(!outgoing->aip) {
-		if(outgoing->ai)
-			freeaddrinfo(outgoing->ai);
-		outgoing->ai = NULL;
+	return outgoing->cfg;
+}
 
-		if(outgoing->nai)
-			free_known_addresses(outgoing->nai);
-		outgoing->nai = NULL;
+static bool get_next_outgoing_address(meshlink_handle_t *mesh, outgoing_t *outgoing) {
+	bool start = false;
 
-		goto begin;
+	if(outgoing->state == OUTGOING_START) {
+		start = true;
+		outgoing->state = OUTGOING_CANONICAL;
+	}
+
+	if(outgoing->state == OUTGOING_CANONICAL) {
+		while(outgoing->aip || get_next_cfg(mesh, outgoing, "CanonicalAddress")) {
+			if(get_next_ai(mesh, outgoing)) {
+				return true;
+			} else {
+				freeaddrinfo(outgoing->ai);
+				outgoing->ai = NULL;
+				outgoing->aip = NULL;
+			}
+		}
+
+		outgoing->state = OUTGOING_RECENT;
+	}
+
+	if(outgoing->state == OUTGOING_RECENT) {
+		while(outgoing->aip || get_next_cfg(mesh, outgoing, "Address")) {
+			if(get_next_ai(mesh, outgoing)) {
+				return true;
+			} else {
+				freeaddrinfo(outgoing->ai);
+				outgoing->ai = NULL;
+				outgoing->aip = NULL;
+			}
+		}
+
+		outgoing->state = OUTGOING_KNOWN;
+	}
+
+	if(outgoing->state == OUTGOING_KNOWN) {
+		if(!outgoing->aip) {
+			get_recent(mesh, outgoing);
+		} else {
+			outgoing->aip = outgoing->aip->ai_next;
+		}
+
+		if(outgoing->aip) {
+			return true;
+		} else {
+			free_known_addresses(outgoing->ai);
+			outgoing->ai = NULL;
+			outgoing->aip = NULL;
+		}
+
+		outgoing->state = OUTGOING_END;
+	}
+
+	if(start) {
+		outgoing->state = OUTGOING_NO_KNOWN_ADDRESSES;
+	}
+
+	return false;
+}
+
+bool do_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) {
+	struct addrinfo *proxyai = NULL;
+	int result;
+
+begin:
+
+	if(!get_next_outgoing_address(mesh, outgoing)) {
+		if(outgoing->state == OUTGOING_NO_KNOWN_ADDRESSES) {
+			logger(mesh, MESHLINK_ERROR, "No known addresses for %s", outgoing->name);
+		} else {
+			logger(mesh, MESHLINK_ERROR, "Could not set up a meta connection to %s", outgoing->name);
+			retry_outgoing(mesh, 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;
 
 	char *hostname = sockaddr2hostname(&c->address);
 
@@ -457,22 +534,22 @@ begin:
 	if(!mesh->proxytype) {
 		c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
 		configure_tcp(c);
-	} else if(mesh->proxytype == PROXY_EXEC)
-		do_outgoing_pipe(mesh, c, mesh->proxyhost);
-	else {
+	} else {
 		proxyai = str2addrinfo(mesh->proxyhost, mesh->proxyport, SOCK_STREAM);
+
 		if(!proxyai) {
 			free_connection(c);
 			free(hostname);
 			goto begin;
 		}
+
 		logger(mesh, MESHLINK_INFO, "Using proxy at %s port %s", mesh->proxyhost, mesh->proxyport);
 		c->socket = socket(proxyai->ai_family, SOCK_STREAM, IPPROTO_TCP);
 		configure_tcp(c);
 	}
 
 	if(c->socket == -1) {
-		logger(mesh, MESHLINK_ERROR, "Creating socket for %s at %s failed: %s", c->name, c->hostname, sockstrerror(sockerrno));
+		logger(mesh, MESHLINK_ERROR, "Creating socket for %s at %s failed: %s", c->name, hostname, sockstrerror(sockerrno));
 		free_connection(c);
 		free(hostname);
 		goto begin;
@@ -484,23 +561,22 @@ begin:
 	fcntl(c->socket, F_SETFD, FD_CLOEXEC);
 #endif
 
-	if(mesh->proxytype != PROXY_EXEC) {
-#if defined(SOL_IPV6) && 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));
-#endif
+#if defined(IPV6_V6ONLY)
 
-		bind_to_address(mesh, c);
+	if(c->address.sa.sa_family == AF_INET6) {
+		static const int option = 1;
+		setsockopt(c->socket, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&option, sizeof(option));
 	}
 
+#endif
+
+	bind_to_address(mesh, c);
+
 	/* Connect */
 
-	if(!mesh->proxytype)
+	if(!mesh->proxytype) {
 		result = connect(c->socket, &c->address.sa, SALEN(c->address.sa));
-	else if(mesh->proxytype == PROXY_EXEC)
-		result = 0;
-	else {
+	} else {
 		result = connect(c->socket, proxyai->ai_addr, proxyai->ai_addrlen);
 		freeaddrinfo(proxyai);
 	}
@@ -539,35 +615,62 @@ void setup_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) {
 		return;
 	}
 
+
+	if(outgoing->ai) {
+		if(outgoing->state == OUTGOING_KNOWN) {
+			free_known_addresses(outgoing->ai);
+		} else {
+			freeaddrinfo(outgoing->ai);
+		}
+	}
+
+	outgoing->cfg = NULL;
+
 	exit_configuration(&outgoing->config_tree); // discard old configuration if present
 	init_configuration(&outgoing->config_tree);
 	read_host_config(mesh, outgoing->config_tree, outgoing->name);
-	outgoing->cfg = lookup_config(outgoing->config_tree, "Address");
-
 	get_config_bool(lookup_config(outgoing->config_tree, "blacklisted"), &blacklisted);
-	if(blacklisted) return;
 
-	if(!outgoing->cfg) {
-		if(n)
-			outgoing->aip = outgoing->nai = get_known_addresses(n);
-		if(!outgoing->nai) {
-			logger(mesh, MESHLINK_ERROR, "No address known for %s", outgoing->name);
-			return;
-		}
+	outgoing->state = OUTGOING_START;
+
+	if(blacklisted) {
+		return;
+	}
+
+	if(mesh->connection_try_cb) {
+		node_t *n = lookup_node(mesh, outgoing->name);
+		mesh->connection_try_cb(mesh, (struct meshlink_node *)n);
 	}
 
 	do_outgoing_connection(mesh, outgoing);
 }
 
+/// Delayed close of a filedescriptor.
+static void tarpit(int fd) {
+	static int pits[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
+	static int next_pit = 0;
+
+	if(pits[next_pit] != -1) {
+		closesocket(pits[next_pit]);
+	}
+
+	pits[next_pit++] = fd;
+
+	if(next_pit >= (int)(sizeof pits / sizeof pits[0])) {
+		next_pit = 0;
+	}
+}
+
 /*
   accept a new tcp connect and create a
   new connection
 */
 void handle_new_meta_connection(event_loop_t *loop, void *data, int flags) {
+	(void)flags;
 	meshlink_handle_t *mesh = loop->data;
 	listen_socket_t *l = data;
 	connection_t *c;
-	sockaddr_t sa;
+	sockaddr_t sa = {0};
 	int fd;
 	socklen_t len = sizeof(sa);
 
@@ -585,55 +688,23 @@ void handle_new_meta_connection(event_loop_t *loop, void *data, int flags) {
 
 	sockaddrunmap(&sa);
 
-	// 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(mesh->loop.now.tv_sec - samehost_burst_time > samehost_burst)
-			samehost_burst = 0;
-		else
-			samehost_burst -= mesh->loop.now.tv_sec - samehost_burst_time;
-
-		samehost_burst_time = mesh->loop.now.tv_sec;
-		samehost_burst++;
-
-		if(samehost_burst > max_connection_burst) {
-			tarpit = fd;
-			return;
-		}
-	}
-
-	memcpy(&prev_sa, &sa, sizeof(sa));
-
-	// Check if we get many connections from different hosts
+	/* Rate limit incoming connections to max_connection_burst/second. */
 
 	static int connection_burst;
 	static int connection_burst_time;
 
-	if(mesh->loop.now.tv_sec - connection_burst_time > connection_burst)
+	if(mesh->loop.now.tv_sec != connection_burst_time) {
+		connection_burst_time = mesh->loop.now.tv_sec;
 		connection_burst = 0;
-	else
-		connection_burst -= mesh->loop.now.tv_sec - connection_burst_time;
-
-	connection_burst_time = mesh->loop.now.tv_sec;
-	connection_burst++;
+	}
 
 	if(connection_burst >= max_connection_burst) {
-		connection_burst = max_connection_burst;
-		tarpit = fd;
+		tarpit(fd);
 		return;
 	}
 
+	connection_burst++;
+
 	// Accept the new connection
 
 	c = new_connection();
@@ -645,7 +716,7 @@ void handle_new_meta_connection(event_loop_t *loop, void *data, int flags) {
 	c->last_ping_time = mesh->loop.now.tv_sec;
 
 	char *hostname = sockaddr2hostname(&sa);
-	logger(mesh, MESHLINK_INFO, "Connection from %s", c->hostname);
+	logger(mesh, MESHLINK_INFO, "Connection from %s", hostname);
 	free(hostname);
 
 	io_add(&mesh->loop, &c->io, handle_meta_io, c, c->socket, IO_READ);
@@ -663,17 +734,21 @@ static void free_outgoing(outgoing_t *outgoing) {
 
 	timeout_del(&mesh->loop, &outgoing->ev);
 
-	if(outgoing->ai)
-		freeaddrinfo(outgoing->ai);
-
-	if(outgoing->nai)
-		free_known_addresses(outgoing->nai);
+	if(outgoing->ai) {
+		if(outgoing->state == OUTGOING_KNOWN) {
+			free_known_addresses(outgoing->ai);
+		} else {
+			freeaddrinfo(outgoing->ai);
+		}
+	}
 
-	if(outgoing->config_tree)
+	if(outgoing->config_tree) {
 		exit_configuration(&outgoing->config_tree);
+	}
 
-	if(outgoing->name)
+	if(outgoing->name) {
 		free(outgoing->name);
+	}
 
 	free(outgoing);
 }
@@ -681,11 +756,12 @@ static void free_outgoing(outgoing_t *outgoing) {
 void try_outgoing_connections(meshlink_handle_t *mesh) {
 	/* If there is no outgoing list yet, create one. Otherwise, mark all outgoings as deleted. */
 
-	if(!mesh->outgoings)
+	if(!mesh->outgoings) {
 		mesh->outgoings = list_alloc((list_action_t)free_outgoing);
-	else {
-		for list_each(outgoing_t, outgoing, mesh->outgoings)
+	} else {
+		for list_each(outgoing_t, outgoing, mesh->outgoings) {
 			outgoing->timeout = -1;
+		}
 	}
 
 	/* Make sure there is one outgoing_t in the list for each ConnectTo. */
@@ -697,8 +773,8 @@ void try_outgoing_connections(meshlink_handle_t *mesh) {
 
 		if(!check_id(name)) {
 			logger(mesh, MESHLINK_ERROR,
-			       "Invalid name for outgoing connection in %s line %d",
-			       cfg->file, cfg->line);
+			       "Invalid name for outgoing connection in line %d",
+			       cfg->line);
 			free(name);
 			continue;
 		}
@@ -735,6 +811,7 @@ void try_outgoing_connections(meshlink_handle_t *mesh) {
 	/* Delete outgoing_ts for which there is no ConnectTo. */
 
 	for list_each(outgoing_t, outgoing, mesh->outgoings)
-		if(outgoing->timeout == -1)
+		if(outgoing->timeout == -1) {
 			list_delete_node(mesh->outgoings, node);
+		}
 }