From: amosjeffries <>
Date: Fri, 15 Feb 2008 16:45:57 +0000 (+0000)
Subject: Boost debugging on IP-conversion halt to critical info.
X-Git-Tag: BASIC_TPROXY4~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f4251d9822d15c6d7b987a50c445762bf487191;p=thirdparty%2Fsquid.git

Boost debugging on IP-conversion halt to critical info.
---

diff --git a/lib/IPAddress.cc b/lib/IPAddress.cc
index 47e104c282..d248311777 100644
--- a/lib/IPAddress.cc
+++ b/lib/IPAddress.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: IPAddress.cc,v 1.3 2007/12/27 00:48:06 hno Exp $
+ * $Id: IPAddress.cc,v 1.4 2008/02/15 09:45:57 amosjeffries Exp $
  *
  * DEBUG: section 14   IP Storage and Handling
  * AUTHOR: Amos Jeffries
@@ -1076,7 +1076,7 @@ void IPAddress::GetSockAddr(struct sockaddr_in &buf) const
         Map6to4( m_SocketAddr.sin6_addr, buf.sin_addr);
     } else
     {
-        debugs(14,1, HERE << "IPAddress::GetSockAddr : Cannot convert non-IPv4 to IPv4.");
+        debugs(14, DBG_CRITICAL, HERE << "IPAddress::GetSockAddr : Cannot convert non-IPv4 to IPv4. from " << *this );
 
         memset(&buf,0xFFFFFFFF,sizeof(struct sockaddr_in));
         assert(false);
diff --git a/src/comm.cc b/src/comm.cc
index d0b038d353..c7442878d2 100644
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.cc,v 1.445 2008/02/12 22:58:29 rousskov Exp $
+ * $Id: comm.cc,v 1.446 2008/02/15 09:45:57 amosjeffries Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -1140,6 +1140,7 @@ comm_connect_addr(int sock, const IPAddress &address)
 
     debugs(5, 9, "comm_connect_addr: connecting socket " << sock << " to " << address << " (want family: " << F->sock_family << ")");
 
+    /* FIXME INET6 : Bug 2222: when sock is an IPv4-only socket IPv6 traffic will crash. */
     address.GetAddrInfo(AI, F->sock_family);
 
     /* Establish connection. */