Changeset 2f3a25e for lib

Timestamp:

11/01/06 10:33:29 (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:

7ca2c7d

Parents:

19c6cbe

Message:

Use DLT_RAW instead of DLT_NULL when writing out raw IP.
Also don't strip the 4 byte FCS off non-ethernet traces.

Location:

lib

Files:

• format_pcapfile.c (modified) (1 diff)
• libtrace.h.in (modified) (1 diff)
• linktypes.c (modified) (3 diffs)

lib/format_pcapfile.c

@@ -305 +305 @@
         hdr.caplen = trace_get_capture_length(packet);
         /* PCAP doesn't include the FCS, we do */
-        hdr.wirelen = trace_get_wire_length(packet)-4; 
+        if (trace_get_link_type(packet)==TRACE_TYPE_ETH)
+                if (trace_get_wire_length(packet) >= 4) {
+                        hdr.wirelen =
+                                        trace_get_wire_length(packet)-4;
+                }
+                else {
+                        hdr.wirelen = 0;
+                }
+        else
+                hdr.wirelen = trace_get_wire_length(packet);
+
 
         numbytes=libtrace_io_write(DATAOUT(out)->file,

lib/libtrace.h.in

@@ -196 +196 @@
 };
 
-/** Enumeration of DLT types supported by libtrace */
+/** Enumeration of DLT types supported by libtrace 
+ * These aren't actually DLTs, but LINKTYPE_'s, so becareful when modifying 
+ * this.
+ */ 
 typedef enum {
         TRACE_DLT_NULL = 0,
         TRACE_DLT_EN10MB = 1,
         TRACE_DLT_ATM_RFC1483 = 11,
+        TRACE_DLT_RAW = 101,
         TRACE_DLT_IEEE802_11 = 105,
         TRACE_DLT_LINUX_SLL = 113,

lib/linktypes.c

@@ -35 +35 @@
 {
         switch(dlt) {
-                case TRACE_DLT_NULL: return TRACE_TYPE_NONE;
+                case TRACE_DLT_RAW: return TRACE_TYPE_NONE;
                 case TRACE_DLT_EN10MB: return TRACE_TYPE_ETH;
                 case TRACE_DLT_IEEE802_11: return TRACE_TYPE_80211;
@@ -55 +55 @@
          */
         switch(type) {
-                case TRACE_TYPE_NONE: return TRACE_DLT_NULL;
+                case TRACE_TYPE_NONE: return TRACE_DLT_RAW;
                 case TRACE_TYPE_ETH: return TRACE_DLT_EN10MB;
                 case TRACE_TYPE_80211: return TRACE_DLT_IEEE802_11;
@@ -259 +259 @@
                                         ->hatype)) {
                                 case ARPHRD_PPP:
-                                        packet->type=pcap_dlt_to_rt(TRACE_DLT_NULL);
+                                        packet->type=pcap_dlt_to_rt(TRACE_DLT_RAW);
                                         break;
                                 case ARPHRD_ETHER: