Make sure IPv6 sockets are IPv6 only.

This will get rid of the "Can't bind to 0.0.0.0 port 655/tcp: Address already
in use" message on Linux.

diff --git a/src/net_socket.c b/src/net_socket.c
index 753229b4fd01e90887e45118b0965697ab28c65c..2ed685da2470711d428ada5521e71f7286b58d91 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -102,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)
@@ -181,6 +186,11 @@ 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;
@@ -326,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);