Changeset 1c68a81

Timestamp:

12/30/07 11:44:58 (13 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:

7641ce8

Parents:

1066d75

Message:

Split "have bpf filtering" and "bpf socket" support apart

Files:

• config-win.h (modified) (1 diff)
• configure.in (modified) (5 diffs)
• lib/Makefile.am (modified) (1 diff)
• lib/trace.c (modified) (6 diffs)

config-win.h

@@ -12 +12 @@
 #define HAVE_LIBPCAP 1
 #define HAVE_PCAP 1
-#define HAVE_BPF 1
+#define HAVE_BPF_FILTER 1
 #define HAVE_PCAP_H 1
 #define HAVE_PCAP_BPF_H 1

configure.in

@@ -4 +4 @@
 # and in the README
 
-AC_INIT([libtrace],[3.0.3],[contact@wand.net.nz],[libtrace])
+AC_INIT([libtrace],[3.0.4],[contact@wand.net.nz],[libtrace])
 
 LIBTRACE_MAJOR=3
@@ -148 +148 @@
         ADD_LIBS="$ADD_LIBS -lpcap"
         AC_DEFINE([HAVE_LIBPCAP],1,[compile with libpcap support])
+        AC_DEFINE([HAVE_BPF_FILTER],1,[compile with bpf filter support])
 fi
 
@@ -245 +246 @@
 AC_CHECK_LIB(z, gzopen)
 
-AM_CONDITIONAL([HAVE_BPF], [test "$ac_cv_have_decl_BIOCSETIF" = yes ])
+AM_CONDITIONAL([HAVE_BPF_CAPTURE], [test "$ac_cv_have_decl_BIOCSETIF" = yes ])
 AM_CONDITIONAL([HAVE_DAG], [test "$libtrace_dag" = true])
 AM_CONDITIONAL([DAG2_4], [test "$libtrace_dag_version" = 24])
@@ -258 +259 @@
 
 AM_CONDITIONAL(HAS_DOXYGEN, [test x"$libtrace_doxygen" = xtrue])
-
 
 AC_SUBST([ADD_LIBS])
@@ -270 +270 @@
 AC_SUBST([LIBTRACE_MINOR])
 AC_SUBST([DAG_VERSION_NUM])
+AC_SUBST([HAVE_BPF_CAPTURE])
 dnl and finally, output our Makefiles
 AC_OUTPUT

lib/Makefile.am

@@ -9 +9 @@
 endif
 
-if HAVE_BPF
+if HAVE_BPF_CAPTURE
 BPFFORMATS=format_bpf.c
 else

lib/trace.c

@@ -231 +231 @@
                 pcap_constructor();
 #endif
-#ifdef HAVE_BIOCSETIF
+#if HAVE_DECL_BIOCSETIF
                 bpf_constructor();
 #endif
@@ -1008 +1008 @@
 trace_create_filter_from_bytecode(void *bf_insns, unsigned int bf_len)
 {
-#ifndef HAVE_BPF
+#ifndef HAVE_BPF_FILTER
         fprintf(stderr, "This version of libtrace does not have BPF support\n");
         return NULL;
@@ -1035 +1035 @@
  */
 DLLEXPORT libtrace_filter_t *trace_create_filter(const char *filterstring) {
-#ifdef HAVE_BPF
+#ifdef HAVE_BPF_FILTER
         libtrace_filter_t *filter = (libtrace_filter_t*)
                                 malloc(sizeof(libtrace_filter_t));
@@ -1049 +1049 @@
 DLLEXPORT void trace_destroy_filter(libtrace_filter_t *filter)
 {
-#ifdef HAVE_BPF
+#ifdef HAVE_BPF_FILTER
         free(filter->filterstring);
         if (filter->flag)
@@ -1066 +1066 @@
 int trace_bpf_compile(libtrace_filter_t *filter,
                 const libtrace_packet_t *packet ) {
-#ifdef HAVE_BPF
+#ifdef HAVE_BPF_FILTER
         void *linkptr = 0;
         libtrace_linktype_t linktype;
@@ -1120 +1120 @@
 DLLEXPORT int trace_apply_filter(libtrace_filter_t *filter,
                         const libtrace_packet_t *packet) {
-#ifdef HAVE_BPF
+#ifdef HAVE_BPF_FILTER
         void *linkptr = 0;
         uint32_t clen = 0;