Update THANKS and copyright information.

[tinc] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index 753229b..8a7a617 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-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
@@ -49,6 +49,7 @@ int seconds_till_retry = 5;
 
 listen_socket_t listen_socket[MAXSOCKETS];
 int listen_sockets;
+list_t *outgoing_list = NULL;
 
 /* Setup sockets */
 
@@ -102,6 +103,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)
@@ -181,11 +187,16 @@ int setup_vpn_in_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 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));
                }
@@ -196,7 +207,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));
                }
@@ -326,6 +337,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);
@@ -388,8 +405,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;
        }
 
@@ -448,14 +463,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);
 
@@ -469,6 +507,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);
        }
 }