Changeset 755e794

Timestamp:

09/18/06 21:03:34 (15 years ago)

Author:

Perry Lorier <perry@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

eecda9f

Parents:

103cc3b

Message:

Add /dev/bpf capture support for the ThreeBSD's

Files:

• configure.in (modified) (5 diffs)
• lib/Makefile.am (modified) (2 diffs)
• lib/format_bpf.c (added)
• lib/libtrace.h.in (modified) (1 diff)
• lib/trace.c (modified) (1 diff)

configure.in

@@ -29 +29 @@
 
 
-AC_CONFIG_HEADERS([config.h])
+AM_CONFIG_HEADER([config.h])
 dnl Checks for programs.
 AC_PROG_CC
@@ -128 +128 @@
 AC_REPLACE_FUNCS(pcap_next_ex)
 AC_CHECK_FUNCS(pcap_inject pcap_sendpacket pcap_setnonblock)
+AC_CHECK_DECLS([BIOCSETIF],,,[
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/ioctl.h>
+#include <net/bpf.h>
+])
 
 # configure time options for man pages
 AC_ARG_WITH(man,
-            AS_HELP_STRING(--with-man,install man pages by default),
+            #AS_HELP_STRING(--with-man,install man pages by default),
 
              if test "$withval" = yes
@@ -146 +152 @@
 # borrowed from libpcap!
 AC_ARG_WITH(dag, 
-            AS_HELP_STRING(--with-dag[=DIR],include DAG support (located in directory DIR, if supplied)),
+#           AS_HELP_STRING(--with-dag[=DIR],include DAG support (located in directory DIR, if supplied)),
 [
         if test "$withval" = no
@@ -229 +235 @@
 fi
 
+AM_CONDITIONAL([HAVE_BPF], [test "$ac_cv_have_decl_BIOCSETIF" = yes ])
 AM_CONDITIONAL([HAVE_DAG], [test "$libtrace_dag" = true])
 AM_CONDITIONAL([DAG2_4], [test "$libtrace_dag2_4" = true])
@@ -280 +287 @@
 
 if test x"$libtrace_swig" = xtrue; then
+H
         if test x"$libtrace_python" = xtrue; then
                 AC_MSG_NOTICE([Building swig bindings for: python])

lib/Makefile.am

@@ -7 +7 @@
 else
 NATIVEFORMATS=
+endif
+
+if HAVE_BPF
+BPFFORMATS=format_bpf.c
+else
+BPFFORMATS=
 endif
 
@@ -18 +24 @@
                 format_erf.c format_pcap.c format_wag.c format_legacy.c \
                 format_rt.c format_helper.c format_helper.h format_pcapfile.c \
-                format_duck.c $(NATIVEFORMATS) \
+                format_duck.c $(NATIVEFORMATS) $(BPFFORMATS) \
                 parse_cmd.c parse_cmd.h libtrace_int.h lt_inttypes.h \
                 linktypes.c protocols.c libtraceio.h link_wireless.c 

lib/libtrace.h.in

@@ -1316 +1316 @@
         TRACE_FORMAT_LEGACY_ETH   =8,
         TRACE_FORMAT_LINUX_NATIVE =9,
-        TRACE_FORMAT_DUCK         =10
+        TRACE_FORMAT_DUCK         =10,
+        TRACE_FORMAT_BPF          =11,
 };
 

lib/trace.c

@@ -231 +231 @@
                 pcap_constructor();
 #endif
+#if HAVE_BIOCSETIF
+                bpf_constructor();
+#endif
                 pcapfile_constructor();
                 rt_constructor();