Add some additional PF actions, from OpenBSD - but do so only if they're

defined on the platform on which we're compiling.

diff --git a/config.h.in b/config.h.in
index bda5e91dc3309ca701e8ce6995b619a454632f1f..ab22f38a6f275213577cf5a491c8675e06363f6a 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -68,6 +68,9 @@
 /* Define to 1 if you have the <paths.h> header file. */
 #undef HAVE_PATHS_H
 
+/* define if net/pfvar.h defines PF_NAT through PF_NORDR */
+#undef HAVE_PF_NAT_THROUGH_PF_NORDR
+
 /* define if you have a /proc/net/dev */
 #undef HAVE_PROC_NET_DEV
 

diff --git a/configure b/configure
index 719375aee05b979d9d4119f5dedf3bc0371d7986..03a3d9b7b62f814f9325c5e136a280157dbdb0ce 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.140 .
+# From configure.in Revision: 1.141 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -3732,6 +3732,70 @@ fi
 
 done
 
+if test "$ac_cv_header_net_pfvar_h" == yes; then
+       #
+       # Check for various PF actions.
+       #
+       echo "$as_me:$LINENO: checking whether net/pfvar.h defines PF_NAT through PF_NORDR" >&5
+echo $ECHO_N "checking whether net/pfvar.h defines PF_NAT through PF_NORDR... $ECHO_C" >&6
+       cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+           #include <sys/socket.h>
+           #include <net/if.h>
+           #include <net/pfvar.h>
+int
+main ()
+{
+return PF_NAT+PF_NONAT+PF_BINAT+PF_NOBINAT+PF_RDR+PF_NORDR;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+               echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_PF_NAT_THROUGH_PF_NORDR 1
+_ACEOF
+
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
 
 for ac_header in netinet/if_ether.h
 do

diff --git a/configure.in b/configure.in
index 337f8ce56f87a29630f07db4ebfe77bfe50e61b7..7e8f84921ee6b62e7cdcd6f8c4dce9ee1d08f603 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.140 2007-10-30 10:16:45 guy Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.141 2007-11-14 00:54:35 guy Exp $ (LBL)
 dnl
 dnl Copyright (c) 1994, 1995, 1996, 1997
 dnl    The Regents of the University of California.  All rights reserved.
@@ -6,7 +6,7 @@ dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
 
-AC_REVISION($Revision: 1.140 $)
+AC_REVISION($Revision: 1.141 $)
 AC_PREREQ(2.50)
 AC_INIT(pcap.c)
 
@@ -30,6 +30,24 @@ AC_CHECK_HEADERS(sys/ioccom.h sys/sockio.h limits.h paths.h)
 AC_CHECK_HEADERS(net/pfvar.h, , , [#include <sys/types.h>
 #include <sys/socket.h>
 #include <net/if.h>])
+if test "$ac_cv_header_net_pfvar_h" == yes; then
+       #
+       # Check for various PF actions.
+       #
+       AC_MSG_CHECKING(whether net/pfvar.h defines PF_NAT through PF_NORDR)
+       AC_TRY_COMPILE(
+           [#include <sys/types.h>
+           #include <sys/socket.h>
+           #include <net/if.h>
+           #include <net/pfvar.h>],
+           [return PF_NAT+PF_NONAT+PF_BINAT+PF_NOBINAT+PF_RDR+PF_NORDR;],
+           [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_PF_NAT_THROUGH_PF_NORDR, 1,
+                   [define if net/pfvar.h defines PF_NAT through PF_NORDR])
+           ],
+           AC_MSG_RESULT(no))
+fi
 AC_CHECK_HEADERS(netinet/if_ether.h, , , [#include <sys/types.h>
 #include <sys/socket.h>])
 if test "$ac_cv_header_netinet_if_ether_h" != yes; then

diff --git a/grammar.y b/grammar.y
index c6b73e9c86cf7b8760b98ce95f08232af4d33118..bc0f529116d1c3dac0d299e7b57e4a777c0e45ad 100644 (file)
--- a/grammar.y
+++ b/grammar.y
@@ -22,7 +22,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.99 2007-09-27 17:58:34 gianluca Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.100 2007-11-14 00:54:35 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -118,6 +118,16 @@ pfaction_to_num(const char *action)
        else if (pcap_strcasecmp(action, "drop") == 0 ||
                pcap_strcasecmp(action, "block") == 0)
                return (PF_DROP);
+#if HAVE_PF_NAT_THROUGH_PF_NORDR
+       else if (pcap_strcasecmp(action, "rdr") == 0)
+               return (PF_RDR);
+       else if (pcap_strcasecmp(action, "nat") == 0)
+               return (PF_NAT);
+       else if (pcap_strcasecmp(action, "binat") == 0)
+               return (PF_BINAT);
+       else if (pcap_strcasecmp(action, "nordr") == 0)
+               return (PF_NORDR);
+#endif
        else {
                bpf_error("unknown PF action");
                /*NOTREACHED*/