Changeset 64b6517

Timestamp:

04/08/06 01:33:04 (16 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:

0220eb1

Parents:

7b4b5ab

Message:

Fix pcap dependancies

Location:

lib

Files:

• protocols.c (modified) (2 diffs)
• rt_protocol.h (modified) (3 diffs)

lib/protocols.c

@@ -7 +7 @@
 #include "wag.h"
 #include <assert.h>
+#include <stdio.h>
 
 
@@ -181 +182 @@
                 case TRACE_TYPE_ATM:
                         return trace_get_payload_from_atm(link,type,remaining);
-                default:
-                        fprintf(stderr,"Don't understand link layer type %i in trace_get_ip6()\n",
-                                linktype);
-                        return NULL;
-        }
+        }
+        fprintf(stderr,"Don't understand link layer type %i in trace_get_ip6()\n",
+                linktype);
+        return NULL;
 }
 

lib/rt_protocol.h

@@ -3 +3 @@
 
 #include "libtrace.h"
+#ifdef HAVE_PCAP
 #include <pcap.h>
+#endif
 
 #define CAPTURE_PORT 3434
@@ -59 +61 @@
  RT_DATA_LEGACY_ETH     =RT_DATA_SIMPLE + TRACE_FORMAT_LEGACY_ETH, 
 
+#ifdef HAVE_PCAP
  RT_DATA_PCAP_NULL              =RT_DATA_PCAP + DLT_NULL,
  RT_DATA_PCAP_EN10MB            =RT_DATA_PCAP + DLT_EN10MB,
@@ -68 +71 @@
 #ifdef DLT_PFLOG
  RT_DATA_PCAP_PFLOG             =RT_DATA_PCAP + DLT_PFLOG,
+#endif
 #endif
  RT_LAST = 3000