From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 22 May 2010 05:59:58 +0000 (+1200)
Subject: Wrap extra IPv6 comm failover cases properly.
X-Git-Tag: SQUID_3_2_0_1~206
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa6a39d77386194eba27a8847c60c2c0b832b7d4;p=thirdparty%2Fsquid.git

Wrap extra IPv6 comm failover cases properly.
---

diff --git a/src/comm.cc b/src/comm.cc
index 3c0d020dce..99245001bb 100644
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1221,8 +1221,9 @@ comm_connect_addr(int sock, const Ip::Address &address)
 
     assert(address.GetPort() != 0);
 
-    debugs(5, 9, "comm_connect_addr: connecting socket " << sock << " to " << address << " (want family: " << F->sock_family << ")");
+    debugs(5, 9, HERE << "connecting socket FD " << sock << " to " << address << " (want family: " << F->sock_family << ")");
 
+#if USE_IPV6
     /* Handle IPv6 over IPv4-only socket case.
      * this case must presently be handled here since the GetAddrInfo asserts on bad mappings.
      * NP: because commResetFD is private to ConnStateData we have to return an error and
@@ -1244,6 +1245,7 @@ comm_connect_addr(int sock, const Ip::Address &address)
         errno = ENETUNREACH;
         return COMM_ERR_PROTOCOL;
     }
+#endif /* USE_IPV6 */
 
     address.GetAddrInfo(AI, F->sock_family);