Changeset dce95f3 for lib/trace.c

Timestamp:

11/19/04 12:45:04 (17 years ago)

Author:

Daniel Lawson <dlawson@…>

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:

1f284e7

Parents:

79ffccd

Message:

fixed part of the conditional codepath for pcap

File:

• lib/trace.c (modified) (5 diffs)

lib/trace.c

@@ -81 +81 @@
 #include "libtrace.h"
 #include "fifo.h"
+
+#define HAVE_BPF 0
+#define HAVE_PCAP 0
+#define HAVE_ZLIB 0
+#define DAGDEVICE 0
 
 #if HAVE_PCAP_BPF_H
@@ -368 +373 @@
         struct sockaddr_in remote;
         struct sockaddr_un unix_sock;
+#if HAVE_PCAP
         char errbuf[PCAP_ERRBUF_SIZE];
+#endif
 
         if(init_trace(&libtrace,uri) == 0) {
@@ -620 +627 @@
         int size;
         char buf[RP_BUFSIZE];
+#if HAVE_PCAP
         struct pcap_pkthdr pcaphdr;
+        const u_char *pcappkt;
+#endif
         dag_record_t *erfptr;
-        const u_char *pcappkt;
         int read_required = 0;
 
@@ -976 +985 @@
                         timestamp = erfptr->ts;
                         break;
+#if HAVE_PCAP
                 case PCAPINT:
                 case PCAP:
@@ -982 +992 @@
                                 (pcapptr->ts.tv_usec*UINT_MAX/1000000));
                         break;
+#endif
                 case WAGINT:
                 case WAG: