From 7a70200f0ff0340da8decbbea79f295c5b85c890 Mon Sep 17 00:00:00 2001
From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 9 Sep 2011 02:11:05 +1200
Subject: [PATCH] Bug 3335: ICAP service is down

---
 src/adaptation/icap/Xaction.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/adaptation/icap/Xaction.cc b/src/adaptation/icap/Xaction.cc
index 4a13a596c3..1f2d4f935a 100644
--- a/src/adaptation/icap/Xaction.cc
+++ b/src/adaptation/icap/Xaction.cc
@@ -161,6 +161,11 @@ Adaptation::Icap::Xaction::dnsLookupDone(const ipcache_addrs *ia)
     connection->remote = ia->in_addrs[ia->cur];
     connection->remote.SetPort(s.cfg().port);
     getOutgoingAddress(NULL, connection);
+    if (connection->remote.IsIPv4() && !connection->local.SetIPv4()) {
+        // This should never happen. getOutgoing should match by family or skip.
+        Must(connection->local.IsAnyAddr());
+        return;
+    }
 
     // TODO: service bypass status may differ from that of a transaction
     typedef CommCbMemFunT<Adaptation::Icap::Xaction, CommConnectCbParams> ConnectDialer;
-- 
2.47.3