Changeset 65a41fd
- Timestamp:
- 11/17/05 15:05:10 (17 years ago)
- 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:
- 08f7fca
- Parents:
- de99828
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/format_erf.c
re3b0188 r65a41fd 547 547 return 0; 548 548 } 549 549 550 rlen = ntohs(((dag_record_t *)buffer)->rlen); 550 551 buffer2 = buffer + dag_record_size; 551 552 size = rlen - dag_record_size; 552 553 assert(size < LIBTRACE_PACKET_BUFSIZE); 554 553 555 /* If your trace is legacy, or corrupt, then this assert may fire. */ 554 556 /* turns out some older traces have fixed snaplens, which are padded … … 611 613 buffer = packet->buffer; 612 614 615 613 616 do { 614 617 if (tracefifo_out_available(libtrace->fifo) == 0 || read_required) { … … 627 630 } 628 631 tracefifo_out_update(libtrace->fifo,sizeof(uint32_t)); 629 630 632 // Read in packet size 631 633 if (tracefifo_out_read(libtrace->fifo, … … 679 681 return -1; 680 682 } 681 if ((numbytes = LIBTRACE_WRITE(OUTPUT.file, buffer, size)) == 0) { 682 perror("libtrace_write"); 683 return -1; 684 } 685 return numbytes + pad + dag_record_size; 683 684 if (buffer) { 685 if ((numbytes = LIBTRACE_WRITE(OUTPUT.file, buffer, size)) == 0) { 686 perror("libtrace_write"); 687 return -1; 688 } 689 690 return numbytes + pad + dag_record_size; 691 } 692 return numbytes; 686 693 } 687 694 … … 690 697 dag_record_t erfhdr; 691 698 int pad = 0; 699 dag_record_t *dag_hdr = (dag_record_t *)packet->buffer; 692 700 void *payload = (void *)trace_get_link(packet); 693 701 694 702 pad = erf_get_padding(packet); 703 704 /* If we've had an rxerror, we have no payload to write - fix rlen to 705 * be the correct length */ 706 if (payload == NULL) { 707 dag_hdr->rlen = htons(dag_record_size + pad); 708 } 709 695 710 if (packet->trace->format == &erf || 696 711 #if HAVE_DAG
Note: See TracChangeset
for help on using the changeset viewer.