Changeset d47ca18

Timestamp:

06/21/17 15:41:47 (4 years ago)

Author:

Richard Sanger <rsanger@…>

Branches:

cachetimestamps, develop, dpdk-ndag, etsilive, master, ndag_format, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance

Children:

e9c089a

Parents:

f398c61

Message:

Fix issue #49 compile issues when missing BPF header file

If pcap was installed but somehow the BPF header was missing.
Libtrace was using two different macros HAVE_BPF and HAVE_BPF_FILTER
to determine if BPF was installed.

HAVE_BPF_FILTER was set if pcap was found, wereas HAVE_BPF was
set if the BPF header was found.

This removes and replaces HAVE_BPF_FILTER with HAVE_BPF.
It also adds ifdef blocks around formats that try to install
BPF filters directly as needed.

Files:

• configure.in (modified) (1 diff)
• lib/format_linux_common.c (modified) (4 diffs)
• lib/format_pcap.c (modified) (6 diffs)
• lib/trace.c (modified) (5 diffs)

configure.in

@@ -250 +250 @@
         LIBTRACE_LIBS="$LIBTRACE_LIBS -lpcap"
         AC_DEFINE([HAVE_LIBPCAP],1,[compile with libpcap support])
-        AC_DEFINE([HAVE_BPF_FILTER],1,[compile with bpf filter support])
 
         LIBS="-lpcap"

lib/format_linux_common.c

@@ -61 +61 @@
 static int linuxnative_configure_bpf(libtrace_t *libtrace,
                 libtrace_filter_t *filter) {
-#ifdef HAVE_LIBPCAP
+#if defined(HAVE_LIBPCAP) && defined(HAVE_BPF)
         struct ifreq ifr;
         unsigned int arphrd;
@@ -125 +125 @@
         return 0;
 #else
-        return -1
+        return -1;
 #endif
 }
@@ -404 +404 @@
          * pre-compiled.
          */
+#ifdef HAVE_BPF
         if (filter != NULL) {
                 /* Check if the filter was successfully compiled. If not,
@@ -424 +425 @@
                 }
         }
+#endif
 
         /* Consume any buffered packets that were received before the socket

lib/format_pcap.c

@@ -128 +128 @@
 
         /* If a filter has been configured, compile and apply it */
+#ifdef HAVE_BPF
         if (DATA(libtrace)->filter) {
                 if (DATA(libtrace)->filter->flag == 0) {
@@ -143 +144 @@
                 }
         }
+#endif
         return 0;
 }
@@ -152 +154 @@
         switch(option) {
                 case TRACE_OPTION_FILTER:
+#ifdef HAVE_BPF
                         DATA(libtrace)->filter=data;
                         return 0;
+#else
+                        return -1;
+#endif
                 case TRACE_OPTION_SNAPLEN:
                         /* Snapping isn't supported directly, so fall thru
@@ -211 +217 @@
         switch(option) {
                 case TRACE_OPTION_FILTER:
+#ifdef HAVE_BPF
                         DATA(libtrace)->filter=(libtrace_filter_t*)data;
                         return 0;
+#else
+                        return -1;
+#endif
                 case TRACE_OPTION_SNAPLEN:
                         DATA(libtrace)->snaplen=*(int*)data;
@@ -298 +308 @@
 #endif
         /* Set a filter if one is defined */
+#ifdef HAVE_BPF
         if (DATA(libtrace)->filter) {
                 struct pcap_pkthdr *pcap_hdr = NULL;
@@ -342 +353 @@
                         return -1;
         }
+#endif
         return 0; /* success */
 }

lib/trace.c

@@ -1350 +1350 @@
 trace_create_filter_from_bytecode(void *bf_insns, unsigned int bf_len)
 {
-#ifndef HAVE_BPF_FILTER
+#ifndef HAVE_BPF
         fprintf(stderr, "This version of libtrace does not have BPF support\n");
         return NULL;
@@ -1377 +1377 @@
  */
 DLLEXPORT libtrace_filter_t *trace_create_filter(const char *filterstring) {
-#ifdef HAVE_BPF_FILTER
+#ifdef HAVE_BPF
         libtrace_filter_t *filter = (libtrace_filter_t*)
                                 malloc(sizeof(libtrace_filter_t));
@@ -1392 +1392 @@
 DLLEXPORT void trace_destroy_filter(libtrace_filter_t *filter)
 {
-#ifdef HAVE_BPF_FILTER
+#ifdef HAVE_BPF
         free(filter->filterstring);
         if (filter->flag)
@@ -1417 +1417 @@
                 void *linkptr,
                 libtrace_linktype_t linktype    ) {
-#ifdef HAVE_BPF_FILTER
+#ifdef HAVE_BPF
         /* It just so happens that the underlying libs used by pthread arn't
          * thread safe, namely lex/flex thingys, so single threaded compile
@@ -1481 +1481 @@
 DLLEXPORT int trace_apply_filter(libtrace_filter_t *filter,
                         const libtrace_packet_t *packet) {
-#ifdef HAVE_BPF_FILTER
+#ifdef HAVE_BPF
         void *linkptr = 0;
         uint32_t clen = 0;