Changeset d247823

Timestamp:

07/15/11 14:56:49 (10 years ago)

Author:

Shane Alcock <salcock@…>

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:

29b93a5

Parents:

8bd2bbf

Message:

• Fixed bug in trace_get_payload_from_ip6 where we were incorrectly calculating the length of any extension headers that were present - for some silly reason, the first 8 bytes are not included in the length field. Thanks to Rong Zheng for reporting this bug (#314).

File:

• lib/protocols_l3.c (modified) (1 diff)

lib/protocols_l3.c

@@ -157 +157 @@
                         case 0: /* hop by hop options */
                         case TRACE_IPPROTO_ROUTING:
-                        case TRACE_IPPROTO_ESP:
                         case TRACE_IPPROTO_AH: 
                         case TRACE_IPPROTO_DSTOPTS: 
-                                {
-                                        len=((libtrace_ip6_ext_t*)payload)->len
-                                        +sizeof(libtrace_ip6_ext_t);
-
-                                        if (remaining) {
-                                                if (*remaining < len) {
-                                                        /* Snap too short */
-                                                        *remaining = 0;
-                                                        return NULL;
-                                                }
-                                                *remaining-=len;
+                        {
+                                /* Length does not include the first 8 bytes */
+                                len=((libtrace_ip6_ext_t*)payload)->len * 8;
+                                len += 8;
+
+
+                                if (remaining) {
+                                        if (*remaining < len) {
+                                                /* Snap too short */
+                                                *remaining = 0;
+                                                return NULL;
                                         }
-
-                                        nxt=((libtrace_ip6_ext_t*)payload)->nxt;
-                                        payload=(char*)payload+len;
-                                        continue;
+                                        *remaining-=len;
                                 }
+
+                                nxt=((libtrace_ip6_ext_t*)payload)->nxt;
+                                payload=(char*)payload+len;
+                                continue;
+                        }
+                        case TRACE_IPPROTO_ESP: 
+                        {
+                                if (prot) *prot=TRACE_IPPROTO_ESP;
+                                return payload;
+                        }
                         case TRACE_IPPROTO_FRAGMENT:
                                 {