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 7f60c64788cfc6ffd07fb2bd9cba5caf9c018eb6..ef499393a52ec2e091a98b918fb7e1b84316ad98 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2339,6 +2339,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 \
@@ -3150,7 +3151,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/ip/IpIntercept.cc b/src/ip/IpIntercept.cc
index 8d104bc75cbe9397b7d8390a2ab92e2cdfc6f936..dffdea90087dd9d38897be4ee2d0eac333bbe47d 100644 (file)
--- a/src/ip/IpIntercept.cc
+++ b/src/ip/IpIntercept.cc
@@ -79,7 +79,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 /* PF_TRANSPARENT required headers */
 
 #if LINUX_NETFILTER