Replace asprintf() by xasprintf().
[tinc] / src / net_socket.c
index bf5130d..8df9f38 100644 (file)
@@ -1,7 +1,7 @@
 /*
     net_socket.c -- Handle various kinds of sockets.
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2007 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 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
@@ -34,6 +34,8 @@
 #include "utils.h"
 #include "xalloc.h"
 
+#include <assert.h>
+
 #ifdef WSAEINPROGRESS
 #define EINPROGRESS WSAEINPROGRESS
 #endif
@@ -49,6 +51,7 @@ int seconds_till_retry = 5;
 
 listen_socket_t listen_socket[MAXSOCKETS];
 int listen_sockets;
+list_t *outgoing_list = NULL;
 
 /* Setup sockets */
 
@@ -81,6 +84,93 @@ static void configure_tcp(connection_t *c)
 #endif
 }
 
+static bool bind_to_interface(int sd) { /* {{{ */
+       char *iface;
+
+#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
+       struct ifreq ifr;
+       int status;
+#endif /* defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) */
+
+       if(!get_config_string (lookup_config (config_tree, "BindToInterface"), &iface))
+               return true;
+
+#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
+       memset(&ifr, 0, sizeof(ifr));
+       strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
+       ifr.ifr_ifrn.ifrn_name[IFNAMSIZ - 1] = 0;
+
+       status = setsockopt(sd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr));
+       if(status) {
+               logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface,
+                               strerror(errno));
+               return false;
+       }
+#else /* if !defined(SOL_SOCKET) || !defined(SO_BINDTODEVICE) */
+       logger(LOG_WARNING, _("%s not supported on this platform"), "BindToInterface");
+#endif
+
+       return true;
+} /* }}} bool bind_to_interface */
+
+static bool bind_to_address(connection_t *c) { /* {{{ */
+       char *node;
+       struct addrinfo *ai_list;
+       struct addrinfo *ai_ptr;
+       struct addrinfo ai_hints;
+       int status;
+
+       assert(c != NULL);
+       assert(c->socket >= 0);
+
+       node = NULL;
+       if(!get_config_string(lookup_config(config_tree, "BindToAddress"),
+                               &node))
+               return true;
+
+       assert(node != NULL);
+
+       memset(&ai_hints, 0, sizeof(ai_hints));
+       ai_hints.ai_family = c->address.sa.sa_family;
+       /* We're called from `do_outgoing_connection' only. */
+       ai_hints.ai_socktype = SOCK_STREAM;
+       ai_hints.ai_protocol = IPPROTO_TCP;
+
+       ai_list = NULL;
+
+       status = getaddrinfo(node, /* service = */ NULL,
+                       &ai_hints, &ai_list);
+       if(status) {
+               free(node);
+               logger(LOG_WARNING, _("Error looking up %s port %s: %s"),
+                               node, _("any"), gai_strerror(status));
+               return false;
+       }
+       assert(ai_list != NULL);
+
+       status = -1;
+       for(ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next) {
+               status = bind(c->socket,
+                               ai_list->ai_addr, ai_list->ai_addrlen);
+               if(!status)
+                       break;
+       }
+
+
+       if(status) {
+               logger(LOG_ERR, _("Can't bind to %s/tcp: %s"), node,
+                               strerror(errno));
+       } else ifdebug(CONNECTIONS) {
+               logger(LOG_DEBUG, "Successfully bound outgoing "
+                               "TCP socket to %s", node);
+       }
+
+       free(node);
+       freeaddrinfo(ai_list);
+
+       return status ? false : true;
+} /* }}} bool bind_to_address */
+
 int setup_listen_socket(const sockaddr_t *sa)
 {
        int nfd;
@@ -102,6 +192,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)
@@ -117,7 +212,7 @@ int setup_listen_socket(const sockaddr_t *sa)
                        return -1;
                }
 #else
-               logger(LOG_WARNING, _("BindToInterface not supported on this platform"));
+               logger(LOG_WARNING, _("%s not supported on this platform"), "BindToInterface");
 #endif
        }
 
@@ -181,46 +276,29 @@ int setup_vpn_in_socket(const sockaddr_t *sa)
        option = 1;
        setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
 
-#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO)
-       {
-               bool choice;
+#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_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice) && choice) {
-                       option = IP_PMTUDISC_DO;
-                       setsockopt(nfd, SOL_IP, IP_MTU_DISCOVER, &option, sizeof(option));
-               }
+#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO)
+       if(myself->options & OPTION_PMTU_DISCOVERY) {
+               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));
-               }
+       if(myself->options & OPTION_PMTU_DISCOVERY) {
+               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;
-                       }
-               }
+       if (!bind_to_interface(nfd)) {
+               closesocket(nfd);
+               return -1;
        }
-#endif
 
        if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
                closesocket(nfd);
@@ -232,7 +310,7 @@ int setup_vpn_in_socket(const sockaddr_t *sa)
        }
 
        return nfd;
-}
+} /* int setup_vpn_in_socket */
 
 void retry_outgoing(outgoing_t *outgoing)
 {
@@ -289,7 +367,7 @@ begin:
                get_config_string(c->outgoing->cfg, &address);
 
                if(!get_config_string(lookup_config(c->config_tree, "Port"), &port))
-                       asprintf(&port, "655");
+                       xasprintf(&port, "655");
 
                c->outgoing->ai = str2addrinfo(address, port, SOCK_STREAM);
                free(address);
@@ -300,7 +378,8 @@ begin:
        }
 
        if(!c->outgoing->aip) {
-               freeaddrinfo(c->outgoing->ai);
+               if(c->outgoing->ai)
+                       freeaddrinfo(c->outgoing->ai);
                c->outgoing->ai = NULL;
                goto begin;
        }
@@ -325,6 +404,15 @@ 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
+
+       bind_to_interface(c->socket);
+       bind_to_address(c);
+
        /* Optimize TCP settings */
 
        configure_tcp(c);
@@ -387,8 +475,6 @@ void setup_outgoing_connection(outgoing_t *outgoing)
        if(!outgoing->cfg) {
                logger(LOG_ERR, _("No address specified for %s"), c->name);
                free_connection(c);
-               free(outgoing->name);
-               free(outgoing);
                return;
        }
 
@@ -447,14 +533,37 @@ bool handle_new_meta_connection(int sock)
        return true;
 }
 
+void free_outgoing(outgoing_t *outgoing) {
+       if(outgoing->ai)
+               freeaddrinfo(outgoing->ai);
+
+       if(outgoing->name)
+               free(outgoing->name);
+
+       free(outgoing);
+}
+
 void try_outgoing_connections(void)
 {
        static config_t *cfg = NULL;
        char *name;
        outgoing_t *outgoing;
-
+       connection_t *c;
+       avl_node_t *node;
+       
        cp();
 
+       if(outgoing_list) {
+               for(node = connection_tree->head; node; node = node->next) {
+                       c = node->data;
+                       c->outgoing = NULL;
+               }
+
+               list_delete_list(outgoing_list);
+       }
+
+       outgoing_list = list_alloc((list_action_t)free_outgoing);
+                       
        for(cfg = lookup_config(config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
                get_config_string(cfg, &name);
 
@@ -468,6 +577,7 @@ void try_outgoing_connections(void)
 
                outgoing = xmalloc_and_zero(sizeof(*outgoing));
                outgoing->name = name;
+               list_insert_tail(outgoing_list, outgoing);
                setup_outgoing_connection(outgoing);
        }
 }