projects / tinc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
More sensible name, and try to set PMTU discovery on IPv6 sockets as well.
[tinc] / src / net_socket.c
diff --git a/src/net_socket.c b/src/net_socket.c
index 98f5d1a..b90dcf5 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -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.30 2003/07/22 20:55:20 guus Exp $
+    $Id: net_socket.c,v 1.1.2.37 2003/12/20 21:09:33 guus Exp $
 */
 
 #include "system.h"
@@ -34,6 +34,10 @@
 #include "utils.h"
 #include "xalloc.h"
 
+#ifdef WSAEINPROGRESS
+#define EINPROGRESS WSAEINPROGRESS
+#endif
+
 int addressfamily = AF_UNSPEC;
 int maxtimeout = 900;
 int seconds_till_retry = 5;
@@ -43,31 +47,34 @@ 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;
        char *iface;
-       struct ifreq ifr;
 
        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,11 +93,13 @@ int setup_listen_socket(sockaddr_t *sa)
        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))) {
-                       close(nfd);
+                       closesocket(nfd);
                        logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface,
                                   strerror(errno));
                        return -1;
@@ -101,7 +110,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));
@@ -110,7 +119,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;
@@ -119,15 +128,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 *iface;
-       struct ifreq ifr;
-#endif
 
        cp();
 
@@ -138,34 +143,73 @@ 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"), &iface)) {
-               memset(&ifr, 0, sizeof(ifr));
-               strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
+#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO)
+       {
+               bool choice;
+
+               if(sa->sa.sa_family == AF_INET && get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice) && choice) {
+                       option = IP_PMTUDISC_DO;
+                       if(setsockopt(nfd, SOL_IP, IP_MTU_DISCOVER, &option, sizeof(option))) {
+                               closesocket(nfd);
+                               logger(LOG_ERR, _("Can't set PMTU discovery mode: %s"), strerror(errno));
+                               return -1;
+                       }
+               }
+       }
+#endif
 
-               if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
-                       close(nfd);
-                       logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface,
-                                  strerror(errno));
-                       return -1;
+#if defined(SOL_IPV6) && defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
+       {
+               bool choice;
+
+               if(sa->sa.sa_family == AF_INET6 && get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice) && choice) {
+                       option = IPV6_PMTUDISC_DO;
+                       if(setsockopt(nfd, SOL_IPV6, IPV6_MTU_DISCOVER, &option, sizeof(option))) {
+                               closesocket(nfd);
+                               logger(LOG_ERR, _("Can't set PMTU discovery mode: %s"), strerror(errno));
+                               return -1;
+                       }
+               }
+       }
+#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));
@@ -245,8 +289,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)
@@ -280,11 +323,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 */
 
@@ -296,7 +341,7 @@ begin:
                        return;
                }
 
-               close(c->socket);
+               closesocket(c->socket);
 
                ifdebug(CONNECTIONS) logger(LOG_ERR, _("%s: %s"), c->hostname, strerror(errno));
 
tinc, the VPN daemon