Changeset e187b16

Timestamp:

08/26/15 10:55:39 (6 years ago)

Author:

Richard Sanger <rsangerarj@…>

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:

285acaa

Parents:

9a3a846 (diff), 7aa2a21 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'upstream/develop' into develop

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);