Changeset e187b16
- Timestamp:
- 08/26/15 10:55:39 (6 years ago)
- 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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/format_erf.c
r341c38f re187b16 659 659 dag_record_t erfhdr; 660 660 int rlen; 661 int framing; 661 662 /* convert format - build up a new erf header */ 662 663 /* Timestamp */ … … 679 680 assert(trace_get_capture_length(packet)>0 680 681 && trace_get_capture_length(packet)<=65536); 681 assert(erf_get_framing_length(packet)>0 682 && trace_get_framing_length(packet)<=65536); 683 684 rlen = trace_get_capture_length(packet) + 685 erf_get_framing_length(packet); 682 assert(trace_get_framing_length(packet)<=65536); 683 684 if (erfhdr.type == TYPE_ETH) 685 framing = dag_record_size + 2; 686 else 687 framing = dag_record_size; 688 689 rlen = trace_get_capture_length(packet) + framing; 686 690 assert(rlen > 0 && rlen <= 65536); 687 691 erfhdr.rlen = htons(rlen);
Note: See TracChangeset
for help on using the changeset viewer.