Changeset 7aa2a21 for lib

Timestamp:

08/26/15 10:11:15 (6 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:

39c3ce7, 7c17e4a, e187b16

Parents:

84cdb05

Message:

Fix bad framing calculation when converting to ERF

The bug was caused by our newly added support for ERF extension
headers. Previously, erf_get_framing_length() didn't actually
inspect the contents of the packet passed to it but now it does (to
try and detect any extension headers).

This means that when converting from another format, we can't call
erf_get_framing_length on the original packet anymore to work out
how much framing space we need as it will interpret the original
packet contents as an ERF header.

File:

• lib/format_erf.c (modified) (2 diffs)

lib/format_erf.c

@@ -659 +659 @@
                 dag_record_t erfhdr;
                 int rlen;
+                int framing;
                 /* convert format - build up a new erf header */
                 /* Timestamp */
@@ -679 +680 @@
                 assert(trace_get_capture_length(packet)>0 
                                 && trace_get_capture_length(packet)<=65536);
-                assert(erf_get_framing_length(packet)>0 
-                                && trace_get_framing_length(packet)<=65536);
-
-                rlen = trace_get_capture_length(packet) + 
-                                erf_get_framing_length(packet);
+                assert(trace_get_framing_length(packet)<=65536);
+               
+                if (erfhdr.type == TYPE_ETH)
+                        framing = dag_record_size + 2;
+                else
+                        framing = dag_record_size;
+               
+                rlen = trace_get_capture_length(packet) + framing;
                 assert(rlen > 0 && rlen <= 65536);
                 erfhdr.rlen = htons(rlen);