]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Bug 4692: SslBump breaks intercepted IPv6 connections
authorTrever Adams <trever@middleearth.sapphiresunday.org>
Thu, 4 May 2017 09:32:52 +0000 (21:32 +1200)
committerAmos Jeffries <squid3@treenet.co.nz>
Thu, 4 May 2017 09:32:52 +0000 (21:32 +1200)
src/client_side.cc

index 9fab1f936563b93b04c55ed4bfbd0352b0fe77bf..bba6dfe007152022156d9673a4b639603688c70f 100644 (file)
@@ -3338,7 +3338,8 @@ ConnStateData::initiateTunneledRequest(HttpRequest::Pointer const &cause, Http::
 
     if (pinning.serverConnection != nullptr) {
         static char ip[MAX_IPSTRLEN];
-        connectHost.assign(pinning.serverConnection->remote.toStr(ip, sizeof(ip)));
+        pinning.serverConnection->remote.toHostStr(ip, sizeof(ip));
+        connectHost.assign(ip);
         connectPort = pinning.serverConnection->remote.port();
     } else if (cause && cause->method == Http::METHOD_CONNECT) {
         // We are inside a (not fully established) CONNECT request
@@ -3375,7 +3376,8 @@ ConnStateData::fakeAConnectRequest(const char *reason, const SBuf &payload)
 #endif
     {
         static char ip[MAX_IPSTRLEN];
-        connectHost.assign(clientConnection->local.toStr(ip, sizeof(ip)));
+        clientConnection->local.toHostStr(ip, sizeof(ip));
+        connectHost.assign(ip);
     }
 
     ClientHttpRequest *http = buildFakeRequest(Http::METHOD_CONNECT, connectHost, connectPort, payload);