From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 10 Apr 2008 10:57:44 +0000 (+1200)
Subject: peer parameter was unused in the specific functions.
X-Git-Tag: SQUID_3_1_0_1~49^2~276^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca45fe65019ea029d180a5cfbf74e6394a96be90;p=thirdparty%2Fsquid.git

peer parameter was unused in the specific functions.
---

diff --git a/src/IPInterception.cc b/src/IPInterception.cc
index cd6f22fa77..d8d0bcefe0 100644
--- a/src/IPInterception.cc
+++ b/src/IPInterception.cc
@@ -342,11 +342,11 @@ IPIntercept::NatLookup(int fd, const IPAddress &me, const IPAddress &peer, IPAdd
     if( !peer.IsIPv4() ) return -1;
 
     if(intercept_active) {
-        if( NetfilterInterception(fd, me, peer, dst, silent) == 0) return 0;
-        if( IPFWInterception(fd, me, peer, dst, silent) == 0) return 0;
+        if( NetfilterInterception(fd, me, dst, silent) == 0) return 0;
+        if( IPFWInterception(fd, me, dst, silent) == 0) return 0;
     }
     if(transparent_active) {
-        if( NetfilterTransparent(fd, me, peer, dst) == 0) return 0;
+        if( NetfilterTransparent(fd, me, dst, silent) == 0) return 0;
     }
 
     return -1;
diff --git a/src/IPInterception.h b/src/IPInterception.h
index 7347b0d3c3..036dbb9af5 100644
--- a/src/IPInterception.h
+++ b/src/IPInterception.h
@@ -86,7 +86,7 @@ private:
      \retval 0     Successfuly located the new address.
      \retval -1    An error occured during NAT lookups.
      */
-    int NetfilterInterception(int fd, const IPAddress &me, const IPAddress &peer, IPAddress &dst, int silent);
+    int NetfilterInterception(int fd, const IPAddress &me, IPAddress &dst, int silent);
 
     /**
      * perform Lookups on Netfilter fully-transparent interception targets (TPROXY).
@@ -95,7 +95,7 @@ private:
      \retval 0     Successfuly located the new address.
      \retval -1    An error occured during NAT lookups.
      */
-    int NetfilterTransparent(int fd, const IPAddress &me, const IPAddress &peer, IPAddress &dst, int silent);
+    int NetfilterTransparent(int fd, const IPAddress &me, IPAddress &dst, int silent);
 
     /**
      * perform Lookups on IPFW interception.
@@ -104,7 +104,7 @@ private:
      \retval 0     Successfuly located the new address.
      \retval -1    An error occured during NAT lookups.
      */
-    int IPFWInterception(int fd, const IPAddress &me, const IPAddress &peer, IPAddress &dst, int silent);
+    int IPFWInterception(int fd, const IPAddress &me, IPAddress &dst, int silent);
 
 
     int transparent_active;