Changeset 2f3a25e for lib/format_pcapfile.c

Timestamp:

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

File:

• lib/format_pcapfile.c (modified) (1 diff)

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,