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 4a5c08c3b0d75434ebf8a8ad7a5e0a38e820b3f9..cc5d4752ddf16880667039f5f6873be1e700bb7b 100644 (file)
--- 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 98a9d2e694a99c4bf0d0a04f34addb28ace42129..60ebb9147523e96fbd73706b2d2fed43a45c8145 100644 (file)
--- 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