From 698371a65002c8785c34481635044fddc217d3f1 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Mon, 17 Nov 2014 14:04:07 +0000
Subject: Added more #ifdefs for IPv6.

---
 common/network/TcpSocket.cxx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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)));
-- 
cgit v1.2.3