From fc7f34be001c292f977b535b030af4e0cf02009e Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Fri, 10 Apr 2009 17:06:33 +1200 Subject: [PATCH] Real quiet cache.log when TPROXY and NAT both active --- src/ip/IpIntercept.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ip/IpIntercept.cc b/src/ip/IpIntercept.cc index a4fa9ad18e..8d104bc75c 100644 --- a/src/ip/IpIntercept.cc +++ b/src/ip/IpIntercept.cc @@ -378,6 +378,11 @@ IpIntercept::NatLookup(int fd, const IpAddress &me, const IpAddress &peer, IpAdd debugs(89, 5, HERE << "address BEGIN: me= " << me << ", client= " << client << ", dst= " << dst << ", peer= " << peer); + /* NP: try TPROXY first, its much quieter than NAT when non-matching */ + if (transparent_active) { + if ( NetfilterTransparent(fd, me, dst, silent) == 0) return 0; + } + if (intercept_active) { /* NAT methods that use sock-opts to return client address */ if ( NetfilterInterception(fd, me, client, silent) == 0) return 0; @@ -387,9 +392,6 @@ IpIntercept::NatLookup(int fd, const IpAddress &me, const IpAddress &peer, IpAdd if ( PfInterception(fd, me, client, dst, silent) == 0) return 0; if ( IpfInterception(fd, me, client, dst, silent) == 0) return 0; } - if (transparent_active) { - if ( NetfilterTransparent(fd, me, dst, silent) == 0) return 0; - } #else /* none of the transparent options configured */ debugs(89, DBG_IMPORTANT, "WARNING: transparent proxying not supported"); -- 2.47.3