Make sure IPv6 sockets are IPv6 only.

[tinc] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index d235ee3..2ed685d 100644 (file)
--- 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-2005 Ivo Timmermans,
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2007 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
@@ -62,6 +62,12 @@ static void configure_tcp(connection_t *c)
        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: WSA error %d"), c->hostname, WSAGetLastError());
+       }
 #endif
 
 #if defined(SOL_TCP) && defined(TCP_NODELAY)
@@ -96,6 +102,11 @@ int setup_listen_socket(const sockaddr_t *sa)
        option = 1;
        setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
 
+#if defined(SOL_IPV6) && defined(IPV6_V6ONLY)
+       if(sa->sa.sa_family == AF_INET6)
+               setsockopt(nfd, SOL_IPV6, IPV6_V6ONLY, &option, sizeof option);
+#endif
+
        if(get_config_string
           (lookup_config(config_tree, "BindToInterface"), &iface)) {
 #if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
@@ -160,11 +171,26 @@ int setup_vpn_in_socket(const sockaddr_t *sa)
                        return -1;
                }
        }
+#elif defined(WIN32)
+       {
+               unsigned long arg = 1;
+               if(ioctlsocket(nfd, FIONBIO, &arg) != 0) {
+                       closesocket(nfd);
+                       logger(LOG_ERR, _("Call to `%s' failed: WSA error %d"), "ioctlsocket",
+                               WSAGetLastError());
+                       return -1;
+               }
+       }
 #endif
 
        option = 1;
        setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
 
+#if defined(SOL_IPV6) && defined(IPV6_V6ONLY)
+       if(sa->sa.sa_family == AF_INET6)
+               setsockopt(nfd, SOL_IPV6, IPV6_V6ONLY, &option, sizeof option);
+#endif
+
 #if defined(SOL_IP) && defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO)
        {
                bool choice;
@@ -284,7 +310,8 @@ begin:
        }
 
        if(!c->outgoing->aip) {
-               freeaddrinfo(c->outgoing->ai);
+               if(c->outgoing->ai)
+                       freeaddrinfo(c->outgoing->ai);
                c->outgoing->ai = NULL;
                goto begin;
        }
@@ -309,6 +336,12 @@ begin:
                goto begin;
        }
 
+#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, &option, sizeof option);
+#endif
+
        /* Optimize TCP settings */
 
        configure_tcp(c);
@@ -318,7 +351,11 @@ begin:
        result = connect(c->socket, &c->address.sa, SALEN(c->address.sa));
 
        if(result == -1) {
-               if(errno == EINPROGRESS) {
+               if(errno == EINPROGRESS
+#if defined(WIN32) && !defined(O_NONBLOCK)
+                  || WSAGetLastError() == WSAEWOULDBLOCK
+#endif
+               ) {
                        c->status.connecting = true;
                        return;
                }
@@ -386,7 +423,6 @@ void setup_outgoing_connection(outgoing_t *outgoing)
 */
 bool handle_new_meta_connection(int sock)
 {
-       int option;
        connection_t *c;
        sockaddr_t sa;
        int fd;
@@ -405,7 +441,7 @@ bool handle_new_meta_connection(int sock)
        sockaddrunmap(&sa);
 
        c = new_connection();
-       c->name = NULL;
+       c->name = xstrdup("<unknown>");
        c->outcipher = myself->connection->outcipher;
        c->outdigest = myself->connection->outdigest;
        c->outmaclength = myself->connection->outmaclength;