From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 25 Apr 2009 02:17:26 +0000 (+1200)
Subject: Author: Hasso Tepper <hasso@estpak.ee>
X-Git-Tag: SQUID_3_0_STABLE15~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f92aff03cdd602c6103a3f953a7fdb3fe256a07b;p=thirdparty%2Fsquid.git

Author: Hasso Tepper <hasso@estpak.ee>
DragonFly Support for PF

Received via NetBSD project.

NetBSD Maintainer says:
 "pfvar.h part came from DragonFly people."


Their CVS log attributes says, the fix is from hasso@estpak.ee:

| Fix two problems reported by Hasso Tepper via PR pkg/39554.
|
| * DragonFly support.

(other not relevant to this patch)
---

diff --git a/configure.in b/configure.in
index 4a5c08c3b0..cc5d4752dd 100644
--- a/configure.in
+++ b/configure.in
@@ -1972,6 +1972,7 @@ AC_CHECK_HEADERS( \
 	netinet/ip_icmp.h\
 	netinet/ipl.h \
 	netinet/ip_nat.h\
+	net/pf/pfvar.h \
 	net/pfvar.h \
 	sys/mount.h\
 	resolv.h,,,SQUID_BSDNET_INCLUDES)
@@ -2841,7 +2842,7 @@ dnl PF support requires a header file.
 if test "$PF_TRANSPARENT" ; then
     AC_MSG_CHECKING(if PF header file is installed)
     # hold on to your hats...
-    if test "$ac_cv_header_net_pfvar_h" = "yes"; then
+    if test "$ac_cv_header_net_pfvar_h" = "yes" || test "$ac_cv_header_net_pf_pfvar_h" = "yes"; then
         PF_TRANSPARENT="yes"
         AC_DEFINE(PF_TRANSPARENT, 1)
     else
diff --git a/src/IPInterception.cc b/src/IPInterception.cc
index 98a9d2e694..60ebb91475 100644
--- a/src/IPInterception.cc
+++ b/src/IPInterception.cc
@@ -81,7 +81,12 @@
 #include <sys/fcntl.h>
 #include <net/if.h>
 #include <netinet/in.h>
+#ifdef HAVE_NET_PF_PFVAR_H
+#include <net/pf/pfvar.h>
+#endif /* HAVE_NET_PF_PFVAR_H */
+#ifdef HAVE_NET_PFVAR_H
 #include <net/pfvar.h>
+#endif /* HAVE_NET_PFVAR_H */
 #endif
 
 #if LINUX_NETFILTER