Changeset 8e580c5 for libpacketdump

Timestamp:

05/06/10 14:59:13 (11 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:

f01e6a8

Parents:

28318a4

Message:

use trace_get_payload_from_meta() as it's exported.

File:

• libpacketdump/link_6.c (modified) (2 diffs)

libpacketdump/link_6.c

@@ -11 +11 @@
 #include "libtrace_int.h"
 
-DLLEXPORT void decode(int link_type UNUSED,const char *pkt,unsigned len) 
+DLLEXPORT void decode(int link_type ,const char *pkt,unsigned len) 
 {
         libtrace_sll_header_t *sll = (libtrace_sll_header_t *) pkt;
-        uint16_t type;
-        
+        libtrace_linktype_t linktype = link_type;
+        void *ret;      
+
         if (len < sizeof(*sll)) {
                 printf(" Linux SLL: Truncated (len = %u)\n", len);
@@ -40 +41 @@
         
         /* Do we recognise the hardware address type? */
-        type = arphrd_type_to_libtrace(ntohs(sll->hatype));
-        if (type != 65535) { 
-                decode_next(pkt + sizeof(*sll), len - sizeof(*sll), "link", type);
+        ret=trace_get_payload_from_meta(pkt, &linktype, &len);
+        /*type = arphrd_type_to_libtrace(ntohs(sll->hatype)); */
+        if (linktype != 65535) { 
+                decode_next(ret, len, "link", linktype);
+                /*decode_next(pkt + sizeof(*sll), len - sizeof(*sll), "link", type);*/
                 return;
         }