Changeset ed636fb4

Timestamp:

03/17/06 13:44:13 (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:

eea0f87

Parents:

5ad7ad0

Message:

Codify the fact that trace_get_wire_length includes the FCS

Location:

lib

Files:

• format_pcap.c (modified) (4 diffs)
• libtrace.h (modified) (1 diff)

lib/format_pcap.c

@@ -300 +300 @@
         if (packet->trace->format == &pcap || 
                         packet->trace->format == &pcapint) {
-                pcap_dump((u_char*)OUTPUT.trace.dump,(struct pcap_pkthdr *)packet->header,packet->payload);
+                pcap_dump((u_char*)OUTPUT.trace.dump,
+                                (struct pcap_pkthdr *)packet->header,
+                                packet->payload);
         } else {
                 /* Leave the manual copy as it is, as it gets around 
@@ -309 +311 @@
                 pcap_pkt_hdr.ts.tv_usec = ts.tv_usec;
                 pcap_pkt_hdr.caplen = trace_get_capture_length(packet);
-                pcap_pkt_hdr.len = trace_get_wire_length(packet);
+                /* trace_get_wire_length includes FCS, while pcap doesn't */
+                if (trace_get_link_type(packet)==TRACE_TYPE_ETH)
+                        pcap_pkt_hdr.len = trace_get_wire_length(packet)-4;
+                else
+                        pcap_pkt_hdr.len = trace_get_wire_length(packet);
 
                 assert(pcap_pkt_hdr.caplen<65536);
@@ -409 +415 @@
         pcapptr = (struct pcap_pkthdr *)packet->header;
         assert(pcapptr->caplen<=65536);
+
         return pcapptr->caplen;
 }
@@ -415 +422 @@
         struct pcap_pkthdr *pcapptr = 0;
         pcapptr = (struct pcap_pkthdr *)packet->header;
-        return pcapptr->len;
+        if (packet->type==pcap_dlt_to_rt(DLT_EN10MB))
+                return pcapptr->len+4; /* Include the missing FCS */
+        else
+                return pcapptr->len;
 }
 

lib/libtrace.h

@@ -811 +811 @@
  * @note Due to the trace being a header capture, or anonymisation this may
  * not be the same as the Capture Len.
+ * @note trace_getwire_length \em{includes} FCS.
  */ 
 SIMPLE_FUNCTION