diff options
| author | Tim Waugh <twaugh@redhat.com> | 2014-11-17 14:04:07 +0000 |
|---|---|---|
| committer | Tim Waugh <twaugh@redhat.com> | 2014-11-17 14:04:07 +0000 |
| commit | 698371a65002c8785c34481635044fddc217d3f1 (patch) | |
| tree | ab96f252fd7c02ea6e71bad252c7c81995d5164b | |
| parent | 6abf3f4c87a0309d5e7d436e4b72d26a08631ebf (diff) | |
| download | tigervnc-698371a65002c8785c34481635044fddc217d3f1.tar.gz tigervnc-698371a65002c8785c34481635044fddc217d3f1.zip | |
Added more #ifdefs for IPv6.
| -rw-r--r-- | common/network/TcpSocket.cxx | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/common/network/TcpSocket.cxx b/common/network/TcpSocket.cxx index 65a1a993..72f1545d 100644 --- a/common/network/TcpSocket.cxx +++ b/common/network/TcpSocket.cxx @@ -358,7 +358,7 @@ TcpListener::TcpListener(const char *listenaddr, int port, bool localhostOnly, bool use_ipv6; int af; -#ifdef AF_INET6 +#ifdef HAVE_GETADDRINFO use_ipv6 = true; af = AF_INET6; #else @@ -380,9 +380,14 @@ TcpListener::TcpListener(const char *listenaddr, int port, bool localhostOnly, } else { // - Socket creation succeeded if (use_ipv6) { +#ifdef IPV6_V6ONLY // - We made an IPv6-capable socket, and we need it to do IPv4 too int opt = 0; setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &opt, sizeof(opt)); +#else + vlog.error("IPV6_V6ONLY support is missing. " + "IPv4 clients may not be able to connect."); +#endif } } @@ -401,9 +406,13 @@ TcpListener::TcpListener(const char *listenaddr, int port, bool localhostOnly, // - Bind it to the desired port struct sockaddr_in addr; +#ifdef HAVE_GETADDRINFO struct sockaddr_in6 addr6; +#endif struct sockaddr *sa; int sa_len; + +#ifdef HAVE_GETADDRINFO if (use_ipv6) { memset(&addr6, 0, (sa_len = sizeof(addr6))); addr6.sin6_family = af; @@ -424,6 +433,7 @@ TcpListener::TcpListener(const char *listenaddr, int port, bool localhostOnly, if (use_ipv6) sa = (struct sockaddr *)&addr6; } +#endif if (!use_ipv6) { memset(&addr, 0, (sa_len = sizeof(addr))); |