fix compile errors

diff --git a/src/IPInterception.h b/src/IPInterception.h
index ab988d3edba01953baf23e7c1dd3ef34299b60ef..b9aeafa786e3ccbf3ea6ab9bf1f82297600dba38 100644 (file)
--- a/src/IPInterception.h
+++ b/src/IPInterception.h
@@ -29,7 +29,7 @@ public:
     ~IPIntercept() {};
 
     /** Perform NAT lookups */
-    int NatLookup(int fd, const IPAddress &me, const IPAddress &peer, IPAddress &dst);
+    int NatLookup(int fd, const IPAddress &me, const IPAddress &peer, IPAddress &client, IPAddress &dst);
 
 #if LINUX_TPROXY2
     // only relevant to TPROXY v2 connections.
@@ -89,7 +89,7 @@ private:
      \retval 0     Successfuly located the new address.
      \retval -1    An error occured during NAT lookups.
      */
-    int NetfilterInterception(int fd, const IPAddress &me, IPAddress &dst, int silent);
+    int NetfilterInterception(int fd, const IPAddress &me, IPAddress &client, int silent);
 
     /**
      * perform Lookups on Netfilter fully-transparent interception targets (TPROXY).
@@ -107,7 +107,7 @@ private:
      \retval 0     Successfuly located the new address.
      \retval -1    An error occured during NAT lookups.
      */
-    int IPFWInterception(int fd, const IPAddress &me, IPAddress &dst, int silent);
+    int IPFWInterception(int fd, const IPAddress &me, IPAddress &client, int silent);
 
 
     int transparent_active;

diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index b2984a7723c5fa1750adccc0b6ec064612db0f72..9e7b2b16ce2c14740a4c38210827d176567461d1 100644 (file)
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -1865,7 +1865,7 @@ clientReplyContext::sendMoreData (StoreIOBuffer result)
         int tos = 0;
         if (Config.zph_tos_peer && 
              (http->request->hier.code==SIBLING_HIT || 
-                Config.onoff.zph_tos_parent && http->request->hier.code==PARENT_HIT) )
+                (Config.onoff.zph_tos_parent && http->request->hier.code==PARENT_HIT) ) )
         {
             tos = Config.zph_tos_peer;
             debugs(33, 2, "ZPH: Peer hit with hier.code="<<http->request->hier.code<<", TOS="<<tos);