X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_socket.c;h=ab2d79d2af5037269e7fa22f92c4ddc0da8cf8dc;hp=9ce3fae000638927205bbd99de497bc20712c96c;hb=a5a4d2b865879b8694760c0a5b5909c9a3675027;hpb=c6d01588312bec7691e72b42cf20c59ffe2749c2

diff --git a/src/net_socket.c b/src/net_socket.c
index 9ce3fae0..ab2d79d2 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-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
-                  2000-2002 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 1998-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+                  2000-2005 Guus Sliepen <guus@tinc-vpn.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
@@ -17,448 +17,442 @@
     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.2 2002/02/20 19:25:09 guus Exp $
+    $Id$
 */
 
-#include "config.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#ifdef HAVE_LINUX
- #include <netinet/ip.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"
+#ifdef WSAEINPROGRESS
+#define EINPROGRESS WSAEINPROGRESS
+#endif
+
+/* 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;
+bool blockingtcp = false;
+
+listen_socket_t listen_socket[MAXSOCKETS];
+int listen_sockets;
 
-int tcp_socket = -1;
-int udp_socket = -1;
 /* Setup sockets */
 
-int setup_listen_socket(sockaddr_t *sa)
+static void configure_tcp(connection_t *c)
 {
-  int nfd, flags;
-  char *addrstr;
-  int option;
-#ifdef HAVE_LINUX
-  char *interface;
+	int option;
+
+#ifdef O_NONBLOCK
+	if(!blockingtcp) {
+		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));
+		}
+	}
 #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));
-#ifdef HAVE_LINUX
-  setsockopt(nfd, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
-
-  option = IPTOS_LOWDELAY;
-  setsockopt(nfd, SOL_IP, IP_TOS, &option, sizeof(option));
-
-  if(get_config_string(lookup_config(config_tree, "BindToInterface"), &interface))
-    if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, interface, strlen(interface)))
-      {
-        close(nfd);
-        syslog(LOG_ERR, _("Can't bind to interface %s: %s"), interface, strerror(errno));
-        return -1;
-      }
+
+#if defined(SOL_TCP) && defined(TCP_NODELAY)
+	option = 1;
+	setsockopt(c->socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
 #endif
 
-  if(bind(nfd, &sa->sa, sizeof(*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;
+#if defined(SOL_IP) && defined(IP_TOS) && defined(IPTOS_LOWDELAY)
+	option = IPTOS_LOWDELAY;
+	setsockopt(c->socket, SOL_IP, IP_TOS, &option, sizeof(option));
+#endif
 }
 
-int setup_vpn_in_socket(sockaddr_t *sa)
+int setup_listen_socket(const sockaddr_t *sa)
 {
-  int nfd, flags;
-  char *addrstr;
-  int option;
-#ifdef HAVE_LINUX
-  char *interface;
-#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));
-#ifdef HAVE_LINUX
-  if(get_config_string(lookup_config(config_tree, "BindToInterface"), &interface))
-    if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, interface, strlen(interface)))
-      {
-        close(nfd);
-        syslog(LOG_ERR, _("Can't bind to interface %s: %s"), interface, strerror(errno));
-        return -1;
-      }
+	int nfd;
+	char *addrstr;
+	int option;
+	char *iface;
+
+	cp();
+
+	nfd = socket(sa->sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
+
+	if(nfd < 0) {
+		ifdebug(STATUS) logger(LOG_ERR, _("Creating metasocket failed: %s"), strerror(errno));
+		return -1;
+	}
+
+	/* Optimize TCP settings */
+
+	option = 1;
+	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
+
+	if(get_config_string
+	   (lookup_config(config_tree, "BindToInterface"), &iface)) {
+#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
+		struct ifreq ifr;
+
+		memset(&ifr, 0, sizeof(ifr));
+		strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
+
+		if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
+			closesocket(nfd);
+			logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface,
+				   strerror(errno));
+			return -1;
+		}
+#else
+		logger(LOG_WARNING, _("BindToInterface not supported on this platform"));
 #endif
+	}
 
-  if(bind(nfd, &sa->sa, sizeof(*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,
+			   strerror(errno));
+		free(addrstr);
+		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 = time(NULL) + 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
+	if(listen(nfd, 3)) {
+		closesocket(nfd);
+		logger(LOG_ERR, _("System call `%s' failed: %s"), "listen",
+			   strerror(errno));
+		return -1;
+	}
+
+	return nfd;
 }
 
-int setup_outgoing_socket(connection_t *c)
+int setup_vpn_in_socket(const sockaddr_t *sa)
 {
-  int option;
-cp
-  if(debug_lvl >= DEBUG_CONNECTIONS)
-    syslog(LOG_INFO, _("Trying to connect to %s (%s)"), c->name, c->hostname);
+	int nfd;
+	char *addrstr;
+	int option;
+
+	cp();
+
+	nfd = socket(sa->sa.sa_family, SOCK_DGRAM, IPPROTO_UDP);
 
-  c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
+	if(nfd < 0) {
+		logger(LOG_ERR, _("Creating UDP socket failed: %s"), strerror(errno));
+		return -1;
+	}
+
+#ifdef O_NONBLOCK
+	{
+		int flags = fcntl(nfd, F_GETFL);
 
-  if(c->socket == -1)
-    {
-      syslog(LOG_ERR, _("Creating socket for %s failed: %s"), c->hostname, strerror(errno));
-      return -1;
-    }
+		if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
+			closesocket(nfd);
+			logger(LOG_ERR, _("System call `%s' failed: %s"), "fcntl",
+				   strerror(errno));
+			return -1;
+		}
+	}
+#endif
 
-  /* Optimize TCP settings */
+	option = 1;
+	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
 
-#ifdef HAVE_LINUX
-  option = 1;
-  setsockopt(c->socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
+#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO)
+	{
+		bool choice;
 
-  option = IPTOS_LOWDELAY;
-  setsockopt(c->socket, SOL_IP, IP_TOS, &option, sizeof(option));
+		if(get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice) && choice) {
+			option = IP_PMTUDISC_DO;
+			setsockopt(nfd, SOL_IP, IP_MTU_DISCOVER, &option, sizeof(option));
+		}
+	}
 #endif
 
-  /* Connect */
+#if defined(SOL_IPV6) && defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
+	{
+		bool choice;
 
-  if(connect(c->socket, &c->address.sa, sizeof(c->address)) == -1)
-    {
-      close(c->socket);
-      syslog(LOG_ERR, _("%s: %s"), c->hostname, strerror(errno));
-      return -1;
-    }
+		if(get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice) && choice) {
+			option = IPV6_PMTUDISC_DO;
+			setsockopt(nfd, SOL_IPV6, IPV6_MTU_DISCOVER, &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_SOCKET) && defined(SO_BINDTODEVICE)
+	{
+		char *iface;
+		struct ifreq ifr;
+
+		if(get_config_string(lookup_config(config_tree, "BindToInterface"), &iface)) {
+			memset(&ifr, 0, sizeof(ifr));
+			strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
+
+			if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
+				closesocket(nfd);
+				logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface,
+					   strerror(errno));
+				return -1;
+			}
+		}
+	}
+#endif
+
+	if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
+		closesocket(nfd);
+		addrstr = sockaddr2hostname(sa);
+		logger(LOG_ERR, _("Can't bind to %s/udp: %s"), addrstr,
+			   strerror(errno));
+		free(addrstr);
+		return -1;
+	}
+
+	return nfd;
 }
 
+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);
+
+	ifdebug(CONNECTIONS) logger(LOG_NOTICE,
+			   _("Trying to re-establish outgoing connection in %d seconds"),
+			   outgoing->timeout);
+}
 
 void finish_connecting(connection_t *c)
 {
-cp
-  if(debug_lvl >= DEBUG_CONNECTIONS)
-    syslog(LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname);
+	int option;
+
+	cp();
+
+	ifdebug(CONNECTIONS) logger(LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname);
 
-  c->last_ping_time = time(NULL);
+	configure_tcp(c);
 
-  send_id(c);
-cp
+	c->last_ping_time = now;
+
+	send_id(c);
 }
 
 void do_outgoing_connection(connection_t *c)
 {
-  char *address, *port;
-  int option, result, flags;
-cp
+	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;
-	  do_prune = 1;
-	  retry_outgoing(c->outgoing);
-	  return;
-        }
+	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);
+			return;
+		}
+
+		get_config_string(c->outgoing->cfg, &address);
+
+		if(!get_config_string(lookup_config(c->config_tree, "Port"), &port))
+			asprintf(&port, "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);
+	}
 
-      get_config_string(c->outgoing->cfg, &address);
+	if(!c->outgoing->aip) {
+		freeaddrinfo(c->outgoing->ai);
+		c->outgoing->ai = NULL;
+		goto begin;
+	}
 
-      if(!get_config_string(lookup_config(c->config_tree, "Port"), &port))
-	asprintf(&port, "655");
+	memcpy(&c->address, c->outgoing->aip->ai_addr, c->outgoing->aip->ai_addrlen);
+	c->outgoing->aip = c->outgoing->aip->ai_next;
 
-      c->outgoing->ai = str2addrinfo(address, port, SOCK_STREAM);
-      free(address);
-      free(port);
+	if(c->hostname)
+		free(c->hostname);
 
-      c->outgoing->aip = c->outgoing->ai;
-      c->outgoing->cfg = lookup_config_next(c->config_tree, c->outgoing->cfg);
-    }
+	c->hostname = sockaddr2hostname(&c->address);
 
-  if(!c->outgoing->aip)
-    {
-      freeaddrinfo(c->outgoing->ai);
-      c->outgoing->ai = NULL;
-      goto begin;
-    }
+	ifdebug(CONNECTIONS) logger(LOG_INFO, _("Trying to connect to %s (%s)"), c->name,
+			   c->hostname);
 
-  memcpy(&c->address, c->outgoing->aip->ai_addr, c->outgoing->aip->ai_addrlen);
-  c->outgoing->aip = c->outgoing->aip->ai_next;
+	c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
 
-  if(c->hostname)
-    free(c->hostname);
+	if(c->socket == -1) {
+		ifdebug(CONNECTIONS) logger(LOG_ERR, _("Creating socket for %s failed: %s"), c->hostname,
+				   strerror(errno));
 
-  c->hostname = sockaddr2hostname(&c->address);
+		goto begin;
+	}
 
-  if(debug_lvl >= DEBUG_CONNECTIONS)
-    syslog(LOG_INFO, _("Trying to connect to %s (%s)"), c->name, c->hostname);
+	/* Optimize TCP settings */
 
-  c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
+	configure_tcp(c);
 
-  if(c->socket == -1)
-    {
-      if(debug_lvl >= DEBUG_CONNECTIONS)
-        syslog(LOG_ERR, _("Creating socket for %s failed: %s"), c->hostname, strerror(errno));
+	/* Connect */
 
-      goto begin;
-    }
+	result = connect(c->socket, &c->address.sa, SALEN(c->address.sa));
 
-  /* Optimize TCP settings */
+	if(result == -1) {
+		if(errno == EINPROGRESS) {
+			c->status.connecting = true;
+			return;
+		}
 
-#ifdef HAVE_LINUX
-  option = 1;
-  setsockopt(c->socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
+		closesocket(c->socket);
 
-  option = IPTOS_LOWDELAY;
-  setsockopt(c->socket, SOL_IP, IP_TOS, &option, sizeof(option));
-#endif
+		ifdebug(CONNECTIONS) logger(LOG_ERR, _("%s: %s"), c->hostname, strerror(errno));
+
+		goto begin;
+	}
+
+	finish_connecting(c);
+
+	return;
+}
 
-  /* Non-blocking */
+void setup_outgoing_connection(outgoing_t *outgoing)
+{
+	connection_t *c;
+	node_t *n;
 
-  flags = fcntl(c->socket, F_GETFL);
+	cp();
 
-  if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0)
-    {
-      syslog(LOG_ERR, _("fcntl for %s: %s"), c->hostname, strerror(errno));
-    }
+	n = lookup_node(outgoing->name);
 
-  /* Connect */
+	if(n)
+		if(n->connection) {
+			ifdebug(CONNECTIONS) logger(LOG_INFO, _("Already connected to %s"), outgoing->name);
 
-  result = connect(c->socket, &c->address.sa, sizeof(c->address));
+			n->connection->outgoing = outgoing;
+			return;
+		}
 
-  if(result == -1)
-    {
-      if(errno == EINPROGRESS)
-        {
-          c->status.connecting = 1;
-	  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;
 
-      close(c->socket);
+	init_configuration(&c->config_tree);
+	read_connection_config(c);
 
-      if(debug_lvl >= DEBUG_CONNECTIONS)
-        syslog(LOG_ERR, _("%s: %s"), c->hostname, strerror(errno));
+	outgoing->cfg = lookup_config(c->config_tree, "Address");
 
-      goto begin;
-    }
+	if(!outgoing->cfg) {
+		logger(LOG_ERR, _("No address specified for %s"), c->name);
+		free_connection(c);
+		free(outgoing->name);
+		free(outgoing);
+		return;
+	}
 
-  finish_connecting(c);
-  return;
-cp
-}
+	c->outgoing = outgoing;
+	c->last_ping_time = now;
 
-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 = time(NULL);
-
-  connection_add(c);
-
-  do_outgoing_connection(c);
+	connection_add(c);
+
+	do_outgoing_connection(c);
 }
 
 /*
   accept a new tcp connect and create a
   new connection
 */
-int handle_new_meta_connection()
+bool handle_new_meta_connection(int sock)
 {
-  connection_t *c;
-  sockaddr_t sa;
-  int fd, len = sizeof(sa);
-cp
-  if((fd = accept(tcp_socket, &sa.sa, &len)) < 0)
-    {
-      syslog(LOG_ERR, _("Accepting a new connection failed: %s"), strerror(errno));
-      return -1;
-    }
-
-  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 = time(NULL);
-
-  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;
+	int option;
+	connection_t *c;
+	sockaddr_t sa;
+	int fd, len = sizeof(sa);
+
+	cp();
+
+	fd = accept(sock, &sa.sa, &len);
+
+	if(fd < 0) {
+		logger(LOG_ERR, _("Accepting a new connection failed: %s"),
+			   strerror(errno));
+		return false;
+	}
+
+	sockaddrunmap(&sa);
+
+	c = new_connection();
+	c->name = NULL;
+	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 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)) {
+			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;
+		setup_outgoing_connection(outgoing);
+	}
 }