From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 22 Jun 2014 04:23:42 +0000 (-0700)
Subject: Fix v1 port parsing
X-Git-Tag: SQUID_3_5_0_1~75^2~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2217ef79726695a61ca552d7426b27646192349e;p=thirdparty%2Fsquid.git

Fix v1 port parsing

The original code avoiding ntohs() was correct.
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 48c5d567f9..57fe557c49 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -3006,12 +3006,12 @@ ConnStateData::parseProxyProtocolMagic()
                 return false;
 
             if (porta > 0 && porta <= 0xFFFF) // max uint16_t
-                originalClient.port(ntohs(static_cast<uint16_t>(porta)));
+                originalClient.port(static_cast<uint16_t>(porta));
             else
                 return proxyProtocolError(true);
 
             if (portb > 0 && portb <= 0xFFFF) // max uint16_t
-                originalDest.port(ntohs(static_cast<uint16_t>(portb)));
+                originalDest.port(static_cast<uint16_t>(portb));
             else
                 return proxyProtocolError(true);