Only send packets via UDP if UDP communication is possible.

[oweals/tinc.git] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index ab2d79d2af5037269e7fa22f92c4ddc0da8cf8dc..f7781bc4513a77c02cace6df3ae7fa89ab02d8fe 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 <ivo@tinc-vpn.org>,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 1998-2005 Ivo Timmermans,
+                  2000-2008 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
@@ -46,7 +46,6 @@
 int addressfamily = AF_UNSPEC;
 int maxtimeout = 900;
 int seconds_till_retry = 5;
-bool blockingtcp = false;
 
 listen_socket_t listen_socket[MAXSOCKETS];
 int listen_sockets;
@@ -58,12 +57,16 @@ static void configure_tcp(connection_t *c)
        int option;
 
 #ifdef O_NONBLOCK
-       if(!blockingtcp) {
-               int flags = fcntl(c->socket, F_GETFL);
+       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));
-               }
+       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
 
@@ -99,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)
@@ -163,16 +171,31 @@ 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;
 
-               if(get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice) && choice) {
+               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));
                }
@@ -183,7 +206,7 @@ int setup_vpn_in_socket(const sockaddr_t *sa)
        {
                bool choice;
 
-               if(get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice) && 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));
                }
@@ -245,8 +268,6 @@ void retry_outgoing(outgoing_t *outgoing)
 
 void finish_connecting(connection_t *c)
 {
-       int option;
-
        cp();
 
        ifdebug(CONNECTIONS) logger(LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname);
@@ -261,7 +282,7 @@ void finish_connecting(connection_t *c)
 void do_outgoing_connection(connection_t *c)
 {
        char *address, *port;
-       int option, result, flags;
+       int result;
 
        cp();
 
@@ -289,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;
        }
@@ -314,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);
@@ -323,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;
                }
@@ -391,10 +423,10 @@ void setup_outgoing_connection(outgoing_t *outgoing)
 */
 bool handle_new_meta_connection(int sock)
 {
-       int option;
        connection_t *c;
        sockaddr_t sa;
-       int fd, len = sizeof(sa);
+       int fd;
+       socklen_t len = sizeof(sa);
 
        cp();
 
@@ -409,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;