Changeset 5551415 for lib

Timestamp:

10/25/06 18:38:23 (16 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:

7d952cb

Parents:

212a748

Message:

• wrapping lib/pcap*c with #ifdef HAVE_PCAP so they don't build if we don't have pcap
• changed some types and defines in linktypes.c to use libtrace internal representations rather than libpcap's, in case we don't have pcap.

Location:

lib

Files:

• linktypes.c (modified) (2 diffs)
• pcap_dump_flush.c (modified) (2 diffs)
• pcap_next_ex.c (modified) (2 diffs)

lib/linktypes.c

@@ -195 +195 @@
                 packet->payload=tmpbuffer+trace_get_framing_length(packet);
                 packet->type=pcap_dlt_to_rt(TRACE_DLT_LINUX_SLL);
-                ((struct pcap_pkthdr*) packet->header)->caplen+=
+                ((struct libtrace_pcapfile_pkt_hdr_t*) packet->header)->caplen+=
                         sizeof(libtrace_sll_header_t);
-                ((struct pcap_pkthdr*) packet->header)->len+=
+                ((struct libtrace_pcapfile_pkt_hdr_t*) packet->header)->wirelen+=
                         sizeof(libtrace_sll_header_t);
                 return;
@@ -259 +259 @@
                                         ->hatype)) {
                                 case ARPHRD_PPP:
-                                        packet->type=pcap_dlt_to_rt(DLT_NULL);
+                                        packet->type=pcap_dlt_to_rt(TRACE_DLT_NULL);
                                         break;
                                 case ARPHRD_ETHER:
-                                        packet->type=pcap_dlt_to_rt(DLT_EN10MB);
+                                        packet->type=pcap_dlt_to_rt(TRACE_DLT_EN10MB);
                                         break;
                                 default:

lib/pcap_dump_flush.c

@@ +1 @@
+#ifdef HAVE_PCAP
 #include "config.h"
 
@@ -17 +18 @@
 
 #endif
+
+#endif // HAVE_PCAP

lib/pcap_next_ex.c

@@ +1 @@
+#ifdef HAVE_PCAP
 #include "config.h"
 
@@ -55 +56 @@
 }
 #endif
+
+#endif //HAVE_PCAP