- Timestamp:
- 09/14/15 11:25:29 (5 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:
- a6b44a7
- Parents:
- 322c516
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/format_erf.c
r7c17e4a rb3dca4d 559 559 560 560 static int erf_dump_packet(libtrace_out_t *libtrace, 561 dag_record_t *erfptr, unsigned int pad, void *buffer) { 561 dag_record_t *erfptr, int framinglen, void *buffer, 562 int caplen) { 562 563 int numbytes = 0; 563 564 int size; … … 566 567 wandio_wwrite(OUTPUT->file, 567 568 erfptr, 568 (size_t)( dag_record_size + pad)))569 != (int)( dag_record_size+pad)) {569 (size_t)(framinglen))) 570 != (int)(framinglen)) { 570 571 trace_set_err_out(libtrace,errno, 571 572 "write(%s)",libtrace->uridata); … … 573 574 } 574 575 575 size= ntohs(erfptr->rlen)-(dag_record_size+pad);576 576 size=caplen-(framinglen); 577 numbytes=wandio_wwrite(OUTPUT->file, buffer, (size_t)size); 577 578 if (numbytes != size) { 578 579 trace_set_err_out(libtrace,errno, … … 580 581 return -1; 581 582 } 582 return numbytes + pad + dag_record_size;583 return numbytes + framinglen; 583 584 } 584 585 … … 653 654 numbytes = erf_dump_packet(libtrace, 654 655 (dag_record_t *)packet->header, 655 pad, 656 payload 656 trace_get_framing_length(packet), 657 payload, 658 trace_get_capture_length(packet) 657 659 ); 658 660 } else { … … 698 700 numbytes = erf_dump_packet(libtrace, 699 701 &erfhdr, 700 pad, 701 payload); 702 framing, 703 payload, 704 trace_get_capture_length(packet)); 702 705 } 703 706 return numbytes;
Note: See TracChangeset
for help on using the changeset viewer.