Changeset 873558d for lib

Timestamp:

06/23/06 12:02:36 (15 years ago)

Author:

Perry Lorier <perry@…>

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:

575c531

Parents:

45dfddc

Message:

Fix latent bugs with protocol decodes

File:

• lib/protocols.c (modified) (2 diffs)

lib/protocols.c

@@ -87 +87 @@
                 return NULL;
 
-        eth=(libtrace_802_11_payload_t *)((char*)wifi+sizeof(*eth));
-
-        if (*type) *type=eth->type;
+        eth=(libtrace_802_11_payload_t *)((char*)wifi+sizeof(*wifi));
+
+        if (type) *type=eth->type;
 
         return eth;
@@ -141 +141 @@
         llc = (libtrace_llcsnap_t*)((char *)llc + 4);
 
-        if (*type) *type = ntohs(llc->type);
+        if (type) *type = ntohs(llc->type);
 
         return (void*)((char*)llc+sizeof(*llc));