Changeset b56ea4d for lib/trace.c

Timestamp:

12/10/04 11:24:22 (17 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:

b597b64

Parents:

b49264a

Message:

improved testing for fragmentation offset - need to mask out top 3 bits

File:

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

lib/trace.c

@@ -686 +686 @@
                         return -1;
                 }
-                if ((numbytes + dag_record_size) != rlen) {
-                        printf("read %d wanted %d\n",numbytes +dag_record_size, rlen);
-                }
+                //if ((numbytes + dag_record_size) != rlen) {
+                //      printf("read %d wanted %d\n",numbytes +dag_record_size, rlen);
+                //}
                 packet->size = rlen;
                         
@@ -917 +917 @@
  * @returns a pointer to the TCP header, or NULL if there is not a TCP packet
  */
+
+#define SW_IP_OFFMASK 0xff1f
 struct libtrace_tcp *trace_get_tcp(struct libtrace_packet_t *packet) {
         struct libtrace_tcp *tcpptr = 0;
@@ -923 +925 @@
         if(!(ipptr = trace_get_ip(packet))) {
                 return 0;
-        }
-        if ((ipptr->ip_p == 6) && (ipptr->ip_off == 0 )) {
+        }
+        if ((ipptr->ip_p == 6) && ((ipptr->ip_off & SW_IP_OFFMASK) == 0))  {
                 tcpptr = (struct libtrace_tcp *)((ptrdiff_t)ipptr + (ipptr->ip_hl * 4));
         }
@@ -944 +946 @@
                 return 0;
         }
-        if (ipptr->ip_p == 17) {
+        if ((ipptr->ip_p == 17) && ((ipptr->ip_off & SW_IP_OFFMASK) == 0)) {
                 udpptr = (struct libtrace_udp *)((ptrdiff_t)ipptr + (ipptr->ip_hl * 4));
         }
@@ -964 +966 @@
                 return 0;
         }
-        if (ipptr->ip_p == 1) {
+        if ((ipptr->ip_p == 1)&& ((ipptr->ip_off & SW_IP_OFFMASK) == 0 )){
                 icmpptr = (struct libtrace_icmp *)((ptrdiff_t)ipptr + (ipptr->ip_hl * 4));
         }