Changeset 41c254d for lib/protocols_pktmeta.c

Timestamp:

07/02/08 23:47:26 (13 years ago)

Author:

Scott Raynel <smr26@…>

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:

ab25522

Parents:

11c0f44

Message:

Don't use sizeof(struct libtrace_linux_sll_t) and instead compute the
header length based on the contents of the header. This fixes a bug
visible via trace_get_payload_from_meta() which returns the correct
pointer but an incorrect remaining byte count.

This bug may also affect demote_packet() but this hasn't been looked at
yet.

File:

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

lib/protocols_pktmeta.c

@@ -21 +21 @@
                 uint16_t *type, uint32_t *remaining) 
 {
-        libtrace_sll_header_t *sll;
-
-        sll = (libtrace_sll_header_t*) link;
-
-        if (remaining) {
-                if (*remaining <= sizeof(*sll)) {
-                        *remaining = 0;
-                        return NULL;
-                }
-                *remaining-=sizeof(*sll);
+        libtrace_sll_header_t *sll = (libtrace_sll_header_t*) link;
+
+        /* Determine SLL header length */
+        uint32_t hlen = ntohs(sll->halen) + (sizeof(uint16_t) * 4);
+
+        if (remaining) {
+                if (*remaining <= hlen) {
+                        *remaining = 0;
+                        return NULL;
+                }
+                *remaining -= hlen;
         }
 
         if (type) *type = ntohs(sll->hatype);
 
-        return (void*)((char*)sll+sizeof(*sll));
+        return (void*) ((char*)sll + hlen);
 
 }