commit 0ef38bf955a9ed95222180476964bfe57c7a49c0
parent 52a3833b2aae38a96056ecf822cfd896490bd040
Author: Jordan Ritter <jpr5@darkridge.com>
Date: Wed, 18 Oct 2006 03:57:18 +0000
radiotap support
Diffstat:
2 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/config.h.in b/config.h.in
@@ -2,19 +2,20 @@
* $Id$
*/
-#define USE_PCRE @USE_PCRE@
-#define USE_IPv6 @USE_IPv6@
+#define USE_PCRE @USE_PCRE@
+#define USE_IPv6 @USE_IPv6@
-#define HAVE_DLT_RAW @HAVE_DLT_RAW@
-#define HAVE_DLT_LOOP @HAVE_DLT_LOOP@
-#define HAVE_DLT_LINUX_SLL @HAVE_DLT_LINUX_SLL@
-#define HAVE_DLT_IEEE802_11 @HAVE_DLT_IEEE802_11@
+#define HAVE_DLT_RAW @HAVE_DLT_RAW@
+#define HAVE_DLT_LOOP @HAVE_DLT_LOOP@
+#define HAVE_DLT_LINUX_SLL @HAVE_DLT_LINUX_SLL@
+#define HAVE_DLT_IEEE802_11 @HAVE_DLT_IEEE802_11@
+#define HAVE_DLT_IEEE802_11_RADIO @HAVE_DLT_IEEE802_11_RADIO@
-#define HAVE_DUMB_UDPHDR @HAVE_DUMB_UDPHDR@
+#define HAVE_DUMB_UDPHDR @HAVE_DUMB_UDPHDR@
-#define USE_PCAP_RESTART @USE_PCAP_RESTART@
-#define PCAP_RESTART_FUNC @PCAP_RESTART_FUNC@
+#define USE_PCAP_RESTART @USE_PCAP_RESTART@
+#define PCAP_RESTART_FUNC @PCAP_RESTART_FUNC@
-#define USE_DROPPRIVS @USE_DROPPRIVS@
-#define DROPPRIVS_USER @DROPPRIVS_USER@
+#define USE_DROPPRIVS @USE_DROPPRIVS@
+#define DROPPRIVS_USER @DROPPRIVS_USER@
diff --git a/configure.in b/configure.in
@@ -334,6 +334,7 @@ yes
],
[HAVE_DLT_LINUX_SLL="1" && echo yes], [HAVE_DLT_LINUX_SLL="0" && echo no])
+
present=""
AC_MSG_CHECKING(for DLT_LOOP in bpf.h)
AC_EGREP_CPP(yes,
@@ -359,6 +360,18 @@ yes
present=""
+AC_MSG_CHECKING(for DLT_IEEE802_11_RADIO in bpf.h)
+AC_EGREP_CPP(yes,
+[
+#include <$BPF>
+#ifdef DLT_IEEE802_11_RADIO
+yes
+#endif
+],
+[HAVE_DLT_IEEE802_11_RADIO="1" && echo yes], [HAVE_DLT_IEEE802_11_RADIO="0" && echo no])
+
+
+present=""
AC_MSG_CHECKING(for DLT_RAW in bpf.h)
AC_EGREP_CPP(yes,
[
@@ -375,20 +388,21 @@ dnl Now that we're past the OS-specific stuff, which could have
dnl modified our USE_* and other defines, define them all now.
dnl
-AC_DEFINE_UNQUOTED(USE_PCAP_RESTART, $USE_PCAP_RESTART, [whether to call pcap_restart() before subsequent invocations of pcap_compile() (default yes)])
+AC_DEFINE_UNQUOTED(USE_PCAP_RESTART, $USE_PCAP_RESTART, [whether to call pcap_restart() before subsequent invocations of pcap_compile() (default yes)])
-AC_DEFINE_UNQUOTED(USE_PCRE, $USE_PCRE, [whether to use PCRE (default GNU Regex)])
-AC_DEFINE_UNQUOTED(USE_IPv6, $USE_IPv6, [whether to use IPv6 (default off)])
+AC_DEFINE_UNQUOTED(USE_PCRE, $USE_PCRE, [whether to use PCRE (default GNU Regex)])
+AC_DEFINE_UNQUOTED(USE_IPv6, $USE_IPv6, [whether to use IPv6 (default off)])
-AC_DEFINE_UNQUOTED(USE_DROPPRIVS, $USE_DROPPRIVS, [whether to use privileges dropping (default yes)])
-AC_DEFINE_UNQUOTED(DROPPRIVS_USER, "$DROPPRIVS_USER", [pseudo-user for running ngrep (default "nobody")])
+AC_DEFINE_UNQUOTED(USE_DROPPRIVS, $USE_DROPPRIVS, [whether to use privileges dropping (default yes)])
+AC_DEFINE_UNQUOTED(DROPPRIVS_USER, "$DROPPRIVS_USER", [pseudo-user for running ngrep (default "nobody")])
-AC_DEFINE_UNQUOTED(HAVE_DUMB_UDPHDR, $HAVE_DUMB_UDPHDR, [whether to accommodate broken redhat-glibc udphdr declaration (default no)])
+AC_DEFINE_UNQUOTED(HAVE_DUMB_UDPHDR, $HAVE_DUMB_UDPHDR, [whether to accommodate broken redhat-glibc udphdr declaration (default no)])
-AC_DEFINE_UNQUOTED(HAVE_DLT_RAW, $HAVE_DLT_RAW, [presence of DLT_RAW in bpf.h])
-AC_DEFINE_UNQUOTED(HAVE_DLT_IEEE802_11, $HAVE_DLT_IEEE802_11, [presence of DLT_IEEE802_11 in bpf.h])
-AC_DEFINE_UNQUOTED(HAVE_DLT_LOOP, $HAVE_DLT_LOOP, [presence of DLT_LOOP in bpf.h])
-AC_DEFINE_UNQUOTED(HAVE_DLT_LINUX_SLL, $HAVE_DLT_LINUX_SLL, [presence of DLT_LINUX_SLL in bpf.h])
+AC_DEFINE_UNQUOTED(HAVE_DLT_RAW, $HAVE_DLT_RAW, [presence of DLT_RAW in bpf.h])
+AC_DEFINE_UNQUOTED(HAVE_DLT_IEEE802_11, $HAVE_DLT_IEEE802_11, [presence of DLT_IEEE802_11 in bpf.h])
+AC_DEFINE_UNQUOTED(HAVE_DLT_IEEE802_11_RADIO, $HAVE_DLT_IEEE802_11_RADIO, [presence of DLT_IEEE802_11_RADIO in bpf.h])
+AC_DEFINE_UNQUOTED(HAVE_DLT_LOOP, $HAVE_DLT_LOOP, [presence of DLT_LOOP in bpf.h])
+AC_DEFINE_UNQUOTED(HAVE_DLT_LINUX_SLL, $HAVE_DLT_LINUX_SLL, [presence of DLT_LINUX_SLL in bpf.h])
dnl