Changeset 3fe7937 for lib/trace.c

Timestamp:

12/09/04 17:53:09 (18 years ago)

Author:

Daniel Lawson <dlawson@…>

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

Message:

check for fragmented packet- if so, don't return TCP header

File:

• lib/trace.c (modified) (5 diffs)

lib/trace.c

@@ -663 +663 @@
         if (libtrace->format == ERF) {
                 void *buffer2 = buffer;
+                int rlen;
                 // read in the trace header
                 if ((numbytes=gzread(libtrace->input.file,
                                                 buffer,
-                                                sizeof(dag_record_t))) == -1) {
+                                                dag_record_size)) == -1) {
                         perror("gzread");
                         return -1;
@@ -673 +674 @@
                         return 0;
                 }
-                size = ntohs(((dag_record_t *)buffer)->rlen) - sizeof(dag_record_t);
+                rlen = ntohs(((dag_record_t *)buffer)->rlen);
+                size = rlen - dag_record_size;
                 assert(size < LIBTRACE_PACKET_BUFSIZE);
-                buffer2 = buffer +  sizeof(dag_record_t);
+                buffer2 = buffer +  dag_record_size;
 
                 // read in the rest of the packet
@@ -684 +686 @@
                         return -1;
                 }
-                packet->size = numbytes + sizeof(dag_record_t);
-                return sizeof(dag_record_t) + numbytes;
+                if ((numbytes + dag_record_size) != rlen) {
+                        printf("read %d wanted %d\n",numbytes +dag_record_size, rlen);
+                }
+                packet->size = rlen;
+                        
+                return rlen;
         }
 
@@ -739 +745 @@
 
                                 /* FALL THRU */
-                        //case ERF:
+                        case ERF:
                         //case DAG:
                                 // read in the erf header
@@ -918 +924 @@
                 return 0;
         }
-        if (ipptr->ip_p == 6) {
+        if ((ipptr->ip_p == 6) && (ipptr->ip_off == 0 )) {
                 tcpptr = (struct libtrace_tcp *)((ptrdiff_t)ipptr + (ipptr->ip_hl * 4));
         }