X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_socket.c;h=9095d575c6a0caa633ab5bb9e5ffc64897ee7412;hp=bb5208f8cbab46f317dbab98edddeaff92827f82;hb=4fe7aff4d1b8605d4997b842481cc78bd062fe2a;hpb=e449d94caef963809d417f16497f6f978e10d731

diff --git a/src/net_socket.c b/src/net_socket.c
index bb5208f8..9095d575 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-2003 Ivo Timmermans <ivo@o2w.nl>,
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1998-2004 Ivo Timmermans <ivo@tinc-vpn.org>,
+                  2000-2004 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,7 +17,7 @@
     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.27 2003/07/17 15:06:26 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -34,42 +34,48 @@
 #include "utils.h"
 #include "xalloc.h"
 
+#ifdef WSAEINPROGRESS
+#define EINPROGRESS WSAEINPROGRESS
+#endif
+
 int addressfamily = AF_UNSPEC;
 int maxtimeout = 900;
 int seconds_till_retry = 5;
+bool blockingtcp = false;
 
 listen_socket_t listen_socket[MAXSOCKETS];
 int listen_sockets;
 
 /* Setup sockets */
 
-int setup_listen_socket(sockaddr_t *sa)
+int setup_listen_socket(const sockaddr_t *sa)
 {
-	int nfd, flags;
+	int nfd;
 	char *addrstr;
 	int option;
-#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
-	char *interface;
-	struct ifreq ifr;
-#endif
+	char *iface;
 
 	cp();
 
 	nfd = socket(sa->sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
 
 	if(nfd < 0) {
-		logger(LOG_ERR, _("Creating metasocket failed: %s"), strerror(errno));
+		ifdebug(STATUS) logger(LOG_ERR, _("Creating metasocket failed: %s"), strerror(errno));
 		return -1;
 	}
 
-	flags = fcntl(nfd, F_GETFL);
+#ifdef O_NONBLOCK
+	{
+		int flags = fcntl(nfd, F_GETFL);
 
-	if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
-		close(nfd);
-		logger(LOG_ERR, _("System call `%s' failed: %s"), "fcntl",
-			   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 */
 
@@ -86,14 +92,16 @@ int setup_listen_socket(sockaddr_t *sa)
 #endif
 
 	if(get_config_string
-	   (lookup_config(config_tree, "BindToInterface"), &interface)) {
+	   (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, interface, IFNAMSIZ);
+		strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
 
 		if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
-			close(nfd);
-			logger(LOG_ERR, _("Can't bind to interface %s: %s"), interface,
+			closesocket(nfd);
+			logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface,
 				   strerror(errno));
 			return -1;
 		}
@@ -103,7 +111,7 @@ int setup_listen_socket(sockaddr_t *sa)
 	}
 
 	if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
-		close(nfd);
+		closesocket(nfd);
 		addrstr = sockaddr2hostname(sa);
 		logger(LOG_ERR, _("Can't bind to %s/tcp: %s"), addrstr,
 			   strerror(errno));
@@ -112,7 +120,7 @@ int setup_listen_socket(sockaddr_t *sa)
 	}
 
 	if(listen(nfd, 3)) {
-		close(nfd);
+		closesocket(nfd);
 		logger(LOG_ERR, _("System call `%s' failed: %s"), "listen",
 			   strerror(errno));
 		return -1;
@@ -121,15 +129,11 @@ int setup_listen_socket(sockaddr_t *sa)
 	return nfd;
 }
 
-int setup_vpn_in_socket(sockaddr_t *sa)
+int setup_vpn_in_socket(const sockaddr_t *sa)
 {
-	int nfd, flags;
+	int nfd;
 	char *addrstr;
 	int option;
-#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
-	char *interface;
-	struct ifreq ifr;
-#endif
 
 	cp();
 
@@ -140,34 +144,65 @@ int setup_vpn_in_socket(sockaddr_t *sa)
 		return -1;
 	}
 
-	flags = fcntl(nfd, F_GETFL);
-	if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
-		close(nfd);
-		logger(LOG_ERR, _("System call `%s' failed: %s"), "fcntl",
-			   strerror(errno));
-		return -1;
+#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;
+		}
 	}
+#endif
 
 	option = 1;
 	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
 
-#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 defined(SOL_IP) && defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO)
+	{
+		bool choice;
 
-		if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
-			close(nfd);
-			logger(LOG_ERR, _("Can't bind to interface %s: %s"), interface,
-				   strerror(errno));
-			return -1;
+		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
+
+#if defined(SOL_IPV6) && defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
+	{
+		bool choice;
+
+		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 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))) {
-		close(nfd);
+		closesocket(nfd);
 		addrstr = sockaddr2hostname(sa);
 		logger(LOG_ERR, _("Can't bind to %s/udp: %s"), addrstr,
 			   strerror(errno));
@@ -206,6 +241,16 @@ void finish_connecting(connection_t *c)
 
 	ifdebug(CONNECTIONS) logger(LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname);
 
+#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
+
 	c->last_ping_time = now;
 
 	send_id(c);
@@ -223,7 +268,7 @@ begin:
 		if(!c->outgoing->cfg) {
 			ifdebug(CONNECTIONS) logger(LOG_ERR, _("Could not set up a meta connection to %s"),
 					   c->name);
-			c->status.remove = 1;
+			c->status.remove = true;
 			retry_outgoing(c->outgoing);
 			return;
 		}
@@ -247,8 +292,7 @@ begin:
 		goto begin;
 	}
 
-	memcpy(&c->address, c->outgoing->aip->ai_addr,
-		   c->outgoing->aip->ai_addrlen);
+	memcpy(&c->address, c->outgoing->aip->ai_addr, c->outgoing->aip->ai_addrlen);
 	c->outgoing->aip = c->outgoing->aip->ai_next;
 
 	if(c->hostname)
@@ -282,11 +326,13 @@ begin:
 
 	/* Non-blocking */
 
+#ifdef O_NONBLOCK
 	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
 
 	/* Connect */
 
@@ -294,11 +340,11 @@ begin:
 
 	if(result == -1) {
 		if(errno == EINPROGRESS) {
-			c->status.connecting = 1;
+			c->status.connecting = true;
 			return;
 		}
 
-		close(c->socket);
+		closesocket(c->socket);
 
 		ifdebug(CONNECTIONS) logger(LOG_ERR, _("%s: %s"), c->hostname, strerror(errno));
 
@@ -359,7 +405,7 @@ void setup_outgoing_connection(outgoing_t *outgoing)
   accept a new tcp connect and create a
   new connection
 */
-int handle_new_meta_connection(int sock)
+bool handle_new_meta_connection(int sock)
 {
 	connection_t *c;
 	sockaddr_t sa;
@@ -372,7 +418,7 @@ int handle_new_meta_connection(int sock)
 	if(fd < 0) {
 		logger(LOG_ERR, _("Accepting a new connection failed: %s"),
 			   strerror(errno));
-		return -1;
+		return false;
 	}
 
 	sockaddrunmap(&sa);
@@ -390,12 +436,22 @@ int handle_new_meta_connection(int sock)
 
 	ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection from %s"), c->hostname);
 
+#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
+
 	connection_add(c);
 
 	c->allow_request = ID;
 	send_id(c);
 
-	return 0;
+	return true;
 }
 
 void try_outgoing_connections(void)
@@ -410,7 +466,7 @@ void try_outgoing_connections(void)
 		cfg = lookup_config_next(config_tree, cfg)) {
 		get_config_string(cfg, &name);
 
-		if(check_id(name)) {
+		if(!check_id(name)) {
 			logger(LOG_ERR,
 				   _("Invalid name for outgoing connection in %s line %d"),
 				   cfg->file, cfg->line);