X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_socket.c;h=9a67bb3cebb63e1c0529c09fc50f21c6f83e5094;hp=f1628cddee3111a5a001ecd515cdb65595112c87;hb=d7be59a9dc6540f7ae6b7d5d6e595265f5f8b3cc;hpb=627f7c22b447bd464b536cd016278545674df93d

diff --git a/src/net_socket.c b/src/net_socket.c
index f1628cdd..9a67bb3c 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -1,7 +1,9 @@
 /*
     net_socket.c -- Handle various kinds of sockets.
-    Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl>,
-                  2000-2002 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1998-2005 Ivo Timmermans,
+                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
+                  2006      Scott Lamb <slamb@slamb.org>
+                  2009      Florian Forster <octo@verplant.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -13,485 +15,573 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id: net_socket.c,v 1.1.2.16 2002/06/21 10:11:12 guus Exp $
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "config.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#ifdef HAVE_NETINET_IN_SYSTM_H
- #include <netinet/in_systm.h>
-#endif
-#ifdef HAVE_NETINET_IP_H
- #include <netinet/ip.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
- #include <netinet/tcp.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <syslog.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-/* SunOS really wants sys/socket.h BEFORE net/if.h,
-   and FreeBSD wants these lines below the rest. */
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <net/if.h>
-
-#include <utils.h>
-#include <xalloc.h>
-#include <avl_tree.h>
-#include <list.h>
+#include "system.h"
 
+#include "avl_tree.h"
 #include "conf.h"
 #include "connection.h"
+#include "event.h"
+#include "logger.h"
 #include "meta.h"
 #include "net.h"
 #include "netutl.h"
-#include "process.h"
 #include "protocol.h"
-#include "subnet.h"
-#include "graph.h"
-#include "process.h"
-#include "route.h"
-#include "device.h"
-#include "event.h"
+#include "utils.h"
+#include "xalloc.h"
 
-#include "system.h"
-
-#ifndef HAVE_RAND_PSEUDO_BYTES
-#define RAND_pseudo_bytes RAND_bytes
+/* Needed on Mac OS/X */
+#ifndef SOL_TCP
+#define SOL_TCP IPPROTO_TCP
 #endif
 
-int addressfamily = AF_INET;
+int addressfamily = AF_UNSPEC;
 int maxtimeout = 900;
 int seconds_till_retry = 5;
+int udp_rcvbuf = 0;
+int udp_sndbuf = 0;
 
 listen_socket_t listen_socket[MAXSOCKETS];
 int listen_sockets;
+list_t *outgoing_list = NULL;
 
 /* Setup sockets */
 
-int setup_listen_socket(sockaddr_t *sa)
-{
-  int nfd, flags;
-  char *addrstr;
-  int option;
-#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
-  char *interface;
-  struct ifreq ifr;
+static void configure_tcp(connection_t *c) {
+	int option;
+
+#ifdef O_NONBLOCK
+	int flags = fcntl(c->socket, F_GETFL);
+
+	if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) {
+		logger(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(LOG_ERR, "ioctlsocket for %s: %s", c->hostname, sockstrerror(sockerrno));
+	}
 #endif
-cp
-  if((nfd = socket(sa->sa.sa_family, SOCK_STREAM, IPPROTO_TCP)) < 0)
-    {
-      syslog(LOG_ERR, _("Creating metasocket failed: %s"), strerror(errno));
-      return -1;
-    }
-
-  flags = fcntl(nfd, F_GETFL);
-  if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
-    {
-      close(nfd);
-      syslog(LOG_ERR, _("System call `%s' failed: %s"), "fcntl", strerror(errno));
-      return -1;
-    }
-
-  /* Optimize TCP settings */
-
-  option = 1;
-  setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
 
 #if defined(SOL_TCP) && defined(TCP_NODELAY)
-  setsockopt(nfd, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
+	option = 1;
+	setsockopt(c->socket, SOL_TCP, TCP_NODELAY, (void *)&option, sizeof(option));
 #endif
 
 #if defined(SOL_IP) && defined(IP_TOS) && defined(IPTOS_LOWDELAY)
-  option = IPTOS_LOWDELAY;
-  setsockopt(nfd, SOL_IP, IP_TOS, &option, sizeof(option));
+	option = IPTOS_LOWDELAY;
+	setsockopt(c->socket, SOL_IP, IP_TOS, (void *)&option, sizeof(option));
 #endif
+}
+
+static bool bind_to_interface(int sd) {
+	char *iface;
 
-  if(get_config_string(lookup_config(config_tree, "BindToInterface"), &interface))
-    {
 #if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
-      memset(&ifr, 0, sizeof(ifr));
-      strncpy(ifr.ifr_ifrn.ifrn_name, interface, IFNAMSIZ);
-      if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr)))
-	{
-          close(nfd);
-          syslog(LOG_ERR, _("Can't bind to interface %s: %s"), interface, strerror(errno));
-          return -1;
+	struct ifreq ifr;
+	int status;
+#endif /* defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) */
+
+	if(!get_config_string(lookup_config (config_tree, "BindToInterface"), &iface))
+		return true;
+
+#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
+	memset(&ifr, 0, sizeof(ifr));
+	strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
+	ifr.ifr_ifrn.ifrn_name[IFNAMSIZ - 1] = 0;
+	free(iface);
+
+	status = setsockopt(sd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr, sizeof(ifr));
+	if(status) {
+		logger(LOG_ERR, "Can't bind to interface %s: %s", ifr.ifr_ifrn.ifrn_name, strerror(errno));
+		return false;
 	}
-#else
-      syslog(LOG_WARNING, _("BindToDevice not supported on this platform"));
+
+#else /* if !defined(SOL_SOCKET) || !defined(SO_BINDTODEVICE) */
+	logger(LOG_WARNING, "%s not supported on this platform", "BindToInterface");
 #endif
-    }
-
-  if(bind(nfd, &sa->sa, SALEN(sa->sa)))
-    {
-      close(nfd);
-      addrstr = sockaddr2hostname(sa);
-      syslog(LOG_ERR, _("Can't bind to %s/tcp: %s"), addrstr, strerror(errno));
-      free(addrstr);
-      return -1;
-    }
-
-  if(listen(nfd, 3))
-    {
-      close(nfd);
-      syslog(LOG_ERR, _("System call `%s' failed: %s"), "listen", strerror(errno));
-      return -1;
-    }
-cp
-  return nfd;
+
+	return true;
 }
 
-int setup_vpn_in_socket(sockaddr_t *sa)
-{
-  int nfd, flags;
-  char *addrstr;
-  int option;
-#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
-  char *interface;
-  struct ifreq ifr;
+int setup_listen_socket(const sockaddr_t *sa) {
+	int nfd;
+	char *addrstr;
+	int option;
+	char *iface;
+
+	nfd = socket(sa->sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
+
+	if(nfd < 0) {
+		ifdebug(STATUS) logger(LOG_ERR, "Creating metasocket failed: %s", sockstrerror(sockerrno));
+		return -1;
+	}
+
+#ifdef FD_CLOEXEC
+	fcntl(nfd, F_SETFD, FD_CLOEXEC);
 #endif
-cp
-  if((nfd = socket(sa->sa.sa_family, SOCK_DGRAM, IPPROTO_UDP)) < 0)
-    {
-      syslog(LOG_ERR, _("Creating UDP socket failed: %s"), strerror(errno));
-      return -1;
-    }
-
-  flags = fcntl(nfd, F_GETFL);
-  if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
-    {
-      close(nfd);
-      syslog(LOG_ERR, _("System call `%s' failed: %s"), "fcntl", strerror(errno));
-      return -1;
-    }
-
-  option = 1;
-  setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
 
+	/* Optimize TCP settings */
+
+	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);
+#endif
+
+	if(get_config_string(lookup_config(config_tree, "BindToInterface"), &iface)) {
 #if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
-  if(get_config_string(lookup_config(config_tree, "BindToInterface"), &interface))
-    {
-      memset(&ifr, 0, sizeof(ifr));
-      strncpy(ifr.ifr_ifrn.ifrn_name, interface, IFNAMSIZ);
-      if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr)))
-	{
-          close(nfd);
-          syslog(LOG_ERR, _("Can't bind to interface %s: %s"), interface, strerror(errno));
-          return -1;
-	}
-    }
+		struct ifreq ifr;
+
+		memset(&ifr, 0, sizeof(ifr));
+		strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
+		ifr.ifr_ifrn.ifrn_name[IFNAMSIZ - 1] = 0;
+		free(iface);
+
+		if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr, sizeof(ifr))) {
+			closesocket(nfd);
+			logger(LOG_ERR, "Can't bind to interface %s: %s", ifr.ifr_ifrn.ifrn_name, strerror(sockerrno));
+			return -1;
+		}
+
+#else
+		logger(LOG_WARNING, "%s not supported on this platform", "BindToInterface");
 #endif
+	}
 
-  if(bind(nfd, &sa->sa, SALEN(sa->sa)))
-    {
-      close(nfd);
-      addrstr = sockaddr2hostname(sa);
-      syslog(LOG_ERR, _("Can't bind to %s/udp: %s"), addrstr, strerror(errno));
-      free(addrstr);
-      return -1;
-    }
-cp
-  return nfd;
-}
+	if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
+		closesocket(nfd);
+		addrstr = sockaddr2hostname(sa);
+		logger(LOG_ERR, "Can't bind to %s/tcp: %s", addrstr, sockstrerror(sockerrno));
+		free(addrstr);
+		return -1;
+	}
+
+	if(listen(nfd, 3)) {
+		closesocket(nfd);
+		logger(LOG_ERR, "System call `%s' failed: %s", "listen", sockstrerror(sockerrno));
+		return -1;
+	}
 
-void retry_outgoing(outgoing_t *outgoing)
-{
-  event_t *event;
-cp
-  outgoing->timeout += 5;
-  if(outgoing->timeout > maxtimeout)
-    outgoing->timeout = maxtimeout;
-
-  event = new_event();
-  event->handler = (event_handler_t)setup_outgoing_connection;
-  event->time = now + outgoing->timeout;
-  event->data = outgoing;
-  event_add(event);
-
-  if(debug_lvl >= DEBUG_CONNECTIONS)
-    syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), outgoing->timeout);
-cp
+	return nfd;
 }
 
-int setup_outgoing_socket(connection_t *c)
-{
-  int option;
-cp
-  if(debug_lvl >= DEBUG_CONNECTIONS)
-    syslog(LOG_INFO, _("Trying to connect to %s (%s)"), c->name, c->hostname);
+int setup_vpn_in_socket(const sockaddr_t *sa) {
+	int nfd;
+	char *addrstr;
+	int option;
 
-  c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
+	nfd = socket(sa->sa.sa_family, SOCK_DGRAM, IPPROTO_UDP);
 
-  if(c->socket == -1)
-    {
-      syslog(LOG_ERR, _("Creating socket for %s failed: %s"), c->hostname, strerror(errno));
-      return -1;
-    }
+	if(nfd < 0) {
+		logger(LOG_ERR, "Creating UDP socket failed: %s", sockstrerror(sockerrno));
+		return -1;
+	}
 
-  /* Optimize TCP settings */
+#ifdef FD_CLOEXEC
+	fcntl(nfd, F_SETFD, FD_CLOEXEC);
+#endif
 
-#if defined(SOL_TCP) && defined(TCP_NODELAY)
-  option = 1;
-  setsockopt(c->socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
+#ifdef O_NONBLOCK
+	{
+		int flags = fcntl(nfd, F_GETFL);
+
+		if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
+			closesocket(nfd);
+			logger(LOG_ERR, "System call `%s' failed: %s", "fcntl",
+				   strerror(errno));
+			return -1;
+		}
+	}
+#elif defined(WIN32)
+	{
+		unsigned long arg = 1;
+		if(ioctlsocket(nfd, FIONBIO, &arg) != 0) {
+			closesocket(nfd);
+			logger(LOG_ERR, "Call to `%s' failed: %s", "ioctlsocket", sockstrerror(sockerrno));
+			return -1;
+		}
+	}
 #endif
 
-#if defined(SOL_IP) && defined(IP_TOS)
-  option = IPTOS_LOWDELAY;
-  setsockopt(c->socket, SOL_IP, IP_TOS, &option, sizeof(option));
+	option = 1;
+	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)))
+		logger(LOG_WARNING, "Can't set UDP SO_RCVBUF to %i: %s", udp_rcvbuf, strerror(errno));
+
+	if(udp_sndbuf && setsockopt(nfd, SOL_SOCKET, SO_SNDBUF, (void *)&udp_sndbuf, sizeof(udp_sndbuf)))
+		logger(LOG_WARNING, "Can't set UDP SO_SNDBUF to %i: %s", udp_sndbuf, strerror(errno));
+
+#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
 
-  /* Connect */
+#if defined(IP_DONTFRAG) && !defined(IP_DONTFRAGMENT)
+#define IP_DONTFRAGMENT IP_DONTFRAG
+#endif
 
-  if(connect(c->socket, &c->address.sa, SALEN(c->address.sa)) == -1)
-    {
-      close(c->socket);
-      syslog(LOG_ERR, _("Error while connecting to %s (%s): %s"), c->name, c->hostname, strerror(errno));
-      return -1;
-    }
+#if defined(SOL_IP) && 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));
+	}
+#elif defined(IPPROTO_IP) && defined(IP_DONTFRAGMENT)
+	if(myself->options & OPTION_PMTU_DISCOVERY) {
+		option = 1;
+		setsockopt(nfd, IPPROTO_IP, IP_DONTFRAGMENT, (void *)&option, sizeof(option));
+	}
+#endif
 
-  if(debug_lvl >= DEBUG_CONNECTIONS)
-    syslog(LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname);
-cp
-  return 0;
-}
+#if defined(SOL_IPV6) && 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));
+	}
+#elif defined(IPPROTO_IPV6) && 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)) {
+		closesocket(nfd);
+		return -1;
+	}
+
+	if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
+		closesocket(nfd);
+		addrstr = sockaddr2hostname(sa);
+		logger(LOG_ERR, "Can't bind to %s/udp: %s", addrstr, sockstrerror(sockerrno));
+		free(addrstr);
+		return -1;
+	}
 
+	return nfd;
+} /* int setup_vpn_in_socket */
 
-void finish_connecting(connection_t *c)
-{
-cp
-  if(debug_lvl >= DEBUG_CONNECTIONS)
-    syslog(LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname);
+void retry_outgoing(outgoing_t *outgoing) {
+	outgoing->timeout += 5;
 
-  c->last_ping_time = now;
+	if(outgoing->timeout > maxtimeout)
+		outgoing->timeout = maxtimeout;
 
-  send_id(c);
-cp
+	if(outgoing->event)
+		event_del(outgoing->event);
+	outgoing->event = new_event();
+	outgoing->event->handler = (event_handler_t) setup_outgoing_connection;
+	outgoing->event->time = now + outgoing->timeout;
+	outgoing->event->data = outgoing;
+	event_add(outgoing->event);
+
+	ifdebug(CONNECTIONS) logger(LOG_NOTICE,
+			   "Trying to re-establish outgoing connection in %d seconds",
+			   outgoing->timeout);
 }
 
-void do_outgoing_connection(connection_t *c)
-{
-  char *address, *port;
-  int option, result, flags;
-cp
-begin:
-  if(!c->outgoing->ai)
-    {
-      if(!c->outgoing->cfg)
-        {
-          if(debug_lvl >= DEBUG_CONNECTIONS)
-            syslog(LOG_ERR, _("Could not set up a meta connection to %s"), c->name);
-          c->status.remove = 1;
-	  retry_outgoing(c->outgoing);
-	  return;
-        }
+void finish_connecting(connection_t *c) {
+	ifdebug(CONNECTIONS) logger(LOG_INFO, "Connected to %s (%s)", c->name, c->hostname);
 
-      get_config_string(c->outgoing->cfg, &address);
+	c->last_ping_time = now;
 
-      if(!get_config_string(lookup_config(c->config_tree, "Port"), &port))
-	asprintf(&port, "655");
+	send_id(c);
+}
 
-      c->outgoing->ai = str2addrinfo(address, port, SOCK_STREAM);
-      free(address);
-      free(port);
+static void do_outgoing_pipe(connection_t *c, char *command) {
+#ifndef HAVE_MINGW
+	int fd[2];
 
-      c->outgoing->aip = c->outgoing->ai;
-      c->outgoing->cfg = lookup_config_next(c->config_tree, c->outgoing->cfg);
-    }
+	if(socketpair(AF_UNIX, SOCK_STREAM, 0, fd)) {
+		logger(LOG_ERR, "Could not create socketpair: %s\n", strerror(errno));
+		return;
+	}
 
-  if(!c->outgoing->aip)
-    {
-      freeaddrinfo(c->outgoing->ai);
-      c->outgoing->ai = NULL;
-      goto begin;
-    }
+	if(fork()) {
+		c->socket = fd[0];
+		close(fd[1]);
+		ifdebug(CONNECTIONS) logger(LOG_DEBUG, "Using proxy %s", command);
+		return;
+	}
 
-  memcpy(&c->address, c->outgoing->aip->ai_addr, c->outgoing->aip->ai_addrlen);
-  c->outgoing->aip = c->outgoing->aip->ai_next;
+	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", myself->name, true);
+	if(netname)
+		setenv("NETNAME", netname, true);
+
+	int result = system(command);
+	if(result < 0)
+		logger(LOG_ERR, "Could not execute %s: %s\n", command, strerror(errno));
+	else if(result)
+		logger(LOG_ERR, "%s exited with non-zero status %d", command, result);
+	exit(result);
+#else
+	logger(LOG_ERR, "Proxy type exec not supported on this platform!");
+	return;
+#endif
+}
 
-  if(c->hostname)
-    free(c->hostname);
+void do_outgoing_connection(connection_t *c) {
+	char *address, *port, *space;
+	struct addrinfo *proxyai = NULL;
+	int result;
 
-  c->hostname = sockaddr2hostname(&c->address);
+	if(!c->outgoing) {
+		logger(LOG_ERR, "do_outgoing_connection() for %s called without c->outgoing", c->name);
+		abort();
+	}
 
-  if(debug_lvl >= DEBUG_CONNECTIONS)
-    syslog(LOG_INFO, _("Trying to connect to %s (%s)"), c->name, c->hostname);
+begin:
+	if(!c->outgoing->ai) {
+		if(!c->outgoing->cfg) {
+			ifdebug(CONNECTIONS) logger(LOG_ERR, "Could not set up a meta connection to %s",
+					   c->name);
+			c->status.remove = true;
+			retry_outgoing(c->outgoing);
+			c->outgoing = NULL;
+			return;
+		}
+
+		get_config_string(c->outgoing->cfg, &address);
+
+		space = strchr(address, ' ');
+		if(space) {
+			port = xstrdup(space + 1);
+			*space = 0;
+		} else {
+			if(!get_config_string(lookup_config(c->config_tree, "Port"), &port))
+				port = xstrdup("655");
+		}
+
+		c->outgoing->ai = str2addrinfo(address, port, SOCK_STREAM);
+		free(address);
+		free(port);
+
+		c->outgoing->aip = c->outgoing->ai;
+		c->outgoing->cfg = lookup_config_next(c->config_tree, c->outgoing->cfg);
+	}
 
-  c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
+	if(!c->outgoing->aip) {
+		if(c->outgoing->ai)
+			freeaddrinfo(c->outgoing->ai);
+		c->outgoing->ai = NULL;
+		goto begin;
+	}
 
-  if(c->socket == -1)
-    {
-      if(debug_lvl >= DEBUG_CONNECTIONS)
-        syslog(LOG_ERR, _("Creating socket for %s failed: %s"), c->hostname, strerror(errno));
+	memcpy(&c->address, c->outgoing->aip->ai_addr, c->outgoing->aip->ai_addrlen);
+	c->outgoing->aip = c->outgoing->aip->ai_next;
 
-      goto begin;
-    }
+	if(c->hostname)
+		free(c->hostname);
 
-  /* Optimize TCP settings */
+	c->hostname = sockaddr2hostname(&c->address);
 
-#if defined(SOL_TCP) && defined(TCP_NODELAY)
-  option = 1;
-  setsockopt(c->socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
+	ifdebug(CONNECTIONS) logger(LOG_INFO, "Trying to connect to %s (%s)", c->name,
+			   c->hostname);
+
+	if(!proxytype) {
+		c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
+	} else if(proxytype == PROXY_EXEC) {
+		do_outgoing_pipe(c, proxyhost);
+	} else {
+		proxyai = str2addrinfo(proxyhost, proxyport, SOCK_STREAM);
+		if(!proxyai)
+			goto begin;
+		ifdebug(CONNECTIONS) logger(LOG_INFO, "Using proxy at %s port %s", proxyhost, proxyport);
+		c->socket = socket(proxyai->ai_family, SOCK_STREAM, IPPROTO_TCP);
+	}
+
+	if(c->socket == -1) {
+		ifdebug(CONNECTIONS) logger(LOG_ERR, "Creating socket for %s failed: %s", c->hostname, sockstrerror(sockerrno));
+		goto begin;
+	}
+
+	if(proxytype != PROXY_EXEC)
+		configure_tcp(c);
+
+#ifdef FD_CLOEXEC
+	fcntl(c->socket, F_SETFD, FD_CLOEXEC);
 #endif
 
-#if defined(SOL_IP) && defined(IP_TOS)
-  option = IPTOS_LOWDELAY;
-  setsockopt(c->socket, SOL_IP, IP_TOS, &option, sizeof(option));
+	if(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
 
-  /* Non-blocking */
+		bind_to_interface(c->socket);
+	}
+
+	/* Connect */
 
-  flags = fcntl(c->socket, F_GETFL);
+	if(!proxytype) {
+		result = connect(c->socket, &c->address.sa, SALEN(c->address.sa));
+	} else if(proxytype == PROXY_EXEC) {
+		result = 0;
+	} else {
+		result = connect(c->socket, proxyai->ai_addr, proxyai->ai_addrlen);
+		freeaddrinfo(proxyai);
+	}
 
-  if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0)
-    {
-      syslog(LOG_ERR, _("fcntl for %s: %s"), c->hostname, strerror(errno));
-    }
+	if(result == -1) {
+		if(sockinprogress(sockerrno)) {
+			c->status.connecting = true;
+			return;
+		}
 
-  /* Connect */
+		closesocket(c->socket);
 
-  result = connect(c->socket, &c->address.sa, SALEN(c->address.sa));
+		ifdebug(CONNECTIONS) logger(LOG_ERR, "%s: %s", c->hostname, sockstrerror(sockerrno));
 
-  if(result == -1)
-    {
-      if(errno == EINPROGRESS)
-        {
-          c->status.connecting = 1;
-	  return;
+		goto begin;
 	}
 
-      close(c->socket);
+	finish_connecting(c);
+
+	return;
+}
 
-      if(debug_lvl >= DEBUG_CONNECTIONS)
-        syslog(LOG_ERR, _("%s: %s"), c->hostname, strerror(errno));
+void setup_outgoing_connection(outgoing_t *outgoing) {
+	connection_t *c;
+	node_t *n;
 
-      goto begin;
-    }
+	outgoing->event = NULL;
 
-  finish_connecting(c);
-  return;
-cp
-}
+	n = lookup_node(outgoing->name);
+
+	if(n)
+		if(n->connection) {
+			ifdebug(CONNECTIONS) logger(LOG_INFO, "Already connected to %s", outgoing->name);
+
+			n->connection->outgoing = outgoing;
+			return;
+		}
+
+	c = new_connection();
+	c->name = xstrdup(outgoing->name);
+	c->outcipher = myself->connection->outcipher;
+	c->outdigest = myself->connection->outdigest;
+	c->outmaclength = myself->connection->outmaclength;
+	c->outcompression = myself->connection->outcompression;
+
+	init_configuration(&c->config_tree);
+	read_connection_config(c);
 
-void setup_outgoing_connection(outgoing_t *outgoing)
-{
-  connection_t *c;
-  node_t *n;
-cp
-  n = lookup_node(outgoing->name);
-  
-  if(n)
-    if(n->connection)
-      {
-        if(debug_lvl >= DEBUG_CONNECTIONS)       
-          syslog(LOG_INFO, _("Already connected to %s"), outgoing->name);
-        n->connection->outgoing = outgoing;
-        return;
-      }
-
-  c = new_connection();
-  c->name = xstrdup(outgoing->name);
-  c->outcipher = myself->connection->outcipher;
-  c->outdigest = myself->connection->outdigest;
-  c->outmaclength = myself->connection->outmaclength;
-  c->outcompression = myself->connection->outcompression;
-
-  init_configuration(&c->config_tree);
-  read_connection_config(c);
-  
-  outgoing->cfg = lookup_config(c->config_tree, "Address");
-  
-  if(!outgoing->cfg)
-    {
-      syslog(LOG_ERR, _("No address specified for %s"), c->name);
-      free_connection(c);
-      free(outgoing->name);
-      free(outgoing);
-      return;
-    }
-  
-  c->outgoing = outgoing;
-  c->last_ping_time = now;
-
-  connection_add(c);
-
-  do_outgoing_connection(c);
+	outgoing->cfg = lookup_config(c->config_tree, "Address");
+
+	if(!outgoing->cfg) {
+		logger(LOG_ERR, "No address specified for %s", c->name);
+		free_connection(c);
+		return;
+	}
+
+	c->outgoing = outgoing;
+	c->last_ping_time = now;
+
+	connection_add(c);
+
+	do_outgoing_connection(c);
 }
 
 /*
   accept a new tcp connect and create a
   new connection
 */
-int handle_new_meta_connection(int sock)
-{
-  connection_t *c;
-  sockaddr_t sa;
-  int fd, len = sizeof(sa);
-cp
-  if((fd = accept(sock, &sa.sa, &len)) < 0)
-    {
-      syslog(LOG_ERR, _("Accepting a new connection failed: %s"), strerror(errno));
-      return -1;
-    }
-
-  sockaddrunmap(&sa);
-
-  c = new_connection();
-  c->outcipher = myself->connection->outcipher;
-  c->outdigest = myself->connection->outdigest;
-  c->outmaclength = myself->connection->outmaclength;
-  c->outcompression = myself->connection->outcompression;
-
-  c->address = sa;
-  c->hostname = sockaddr2hostname(&sa);
-  c->socket = fd;
-  c->last_ping_time = now;
-
-  if(debug_lvl >= DEBUG_CONNECTIONS)
-    syslog(LOG_NOTICE, _("Connection from %s"), c->hostname);
-
-  connection_add(c);
-
-  c->allow_request = ID;
-  send_id(c);
-cp
-  return 0;
+bool handle_new_meta_connection(int sock) {
+	connection_t *c;
+	sockaddr_t sa;
+	int fd;
+	socklen_t len = sizeof(sa);
+
+	fd = accept(sock, &sa.sa, &len);
+
+	if(fd < 0) {
+		logger(LOG_ERR, "Accepting a new connection failed: %s", sockstrerror(sockerrno));
+		return false;
+	}
+
+	sockaddrunmap(&sa);
+
+	c = new_connection();
+	c->name = xstrdup("<unknown>");
+	c->outcipher = myself->connection->outcipher;
+	c->outdigest = myself->connection->outdigest;
+	c->outmaclength = myself->connection->outmaclength;
+	c->outcompression = myself->connection->outcompression;
+
+	c->address = sa;
+	c->hostname = sockaddr2hostname(&sa);
+	c->socket = fd;
+	c->last_ping_time = now;
+
+	ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection from %s", c->hostname);
+
+	configure_tcp(c);
+
+	connection_add(c);
+
+	c->allow_request = ID;
+	send_id(c);
+
+	return true;
 }
 
-void try_outgoing_connections(void)
-{
-  static config_t *cfg = NULL;
-  char *name;
-  outgoing_t *outgoing;
-cp
-  for(cfg = lookup_config(config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(config_tree, cfg))
-    {
-      get_config_string(cfg, &name);
-
-      if(check_id(name))
-        {
-          syslog(LOG_ERR, _("Invalid name for outgoing connection in %s line %d"), cfg->file, cfg->line);
-          free(name);
-          continue;
-        }
-
-      outgoing = xmalloc_and_zero(sizeof(*outgoing));
-      outgoing->name = name;
-      setup_outgoing_connection(outgoing);
-    }
+static void free_outgoing(outgoing_t *outgoing) {
+	if(outgoing->ai)
+		freeaddrinfo(outgoing->ai);
+
+	if(outgoing->name)
+		free(outgoing->name);
+
+	free(outgoing);
+}
+
+void try_outgoing_connections(void) {
+	static config_t *cfg = NULL;
+	char *name;
+	outgoing_t *outgoing;
+	
+	outgoing_list = list_alloc((list_action_t)free_outgoing);
+			
+	for(cfg = lookup_config(config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
+		get_config_string(cfg, &name);
+
+		if(!check_id(name)) {
+			logger(LOG_ERR,
+				   "Invalid name for outgoing connection in %s line %d",
+				   cfg->file, cfg->line);
+			free(name);
+			continue;
+		}
+
+		outgoing = xmalloc_and_zero(sizeof(*outgoing));
+		outgoing->name = name;
+		list_insert_tail(outgoing_list, outgoing);
+		setup_outgoing_connection(outgoing);
+	}
 }