Changeset 3fe7937 for lib/trace.c
- Timestamp:
- 12/09/04 17:53:09 (18 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:
- b49264a
- Parents:
- 68d4cd7
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/trace.c
r47801f2 r3fe7937 663 663 if (libtrace->format == ERF) { 664 664 void *buffer2 = buffer; 665 int rlen; 665 666 // read in the trace header 666 667 if ((numbytes=gzread(libtrace->input.file, 667 668 buffer, 668 sizeof(dag_record_t))) == -1) {669 dag_record_size)) == -1) { 669 670 perror("gzread"); 670 671 return -1; … … 673 674 return 0; 674 675 } 675 size = ntohs(((dag_record_t *)buffer)->rlen) - sizeof(dag_record_t); 676 rlen = ntohs(((dag_record_t *)buffer)->rlen); 677 size = rlen - dag_record_size; 676 678 assert(size < LIBTRACE_PACKET_BUFSIZE); 677 buffer2 = buffer + sizeof(dag_record_t);679 buffer2 = buffer + dag_record_size; 678 680 679 681 // read in the rest of the packet … … 684 686 return -1; 685 687 } 686 packet->size = numbytes + sizeof(dag_record_t); 687 return sizeof(dag_record_t) + numbytes; 688 if ((numbytes + dag_record_size) != rlen) { 689 printf("read %d wanted %d\n",numbytes +dag_record_size, rlen); 690 } 691 packet->size = rlen; 692 693 return rlen; 688 694 } 689 695 … … 739 745 740 746 /* FALL THRU */ 741 //case ERF:747 case ERF: 742 748 //case DAG: 743 749 // read in the erf header … … 918 924 return 0; 919 925 } 920 if ( ipptr->ip_p == 6) {926 if ((ipptr->ip_p == 6) && (ipptr->ip_off == 0 )) { 921 927 tcpptr = (struct libtrace_tcp *)((ptrdiff_t)ipptr + (ipptr->ip_hl * 4)); 922 928 }
Note: See TracChangeset
for help on using the changeset viewer.