Changeset e4e94c38 for libpacketdump

Timestamp:

02/22/11 10:01:55 (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:

cd4e06c

Parents:

9cc1266

Message:

• Fixed libpacketdump to process SLL packets correctly

File:

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

libpacketdump/link_6.c

@@ -4 +4 @@
  */
 
+#include "config.h"
 #include "libtrace_int.h"
 #include <sys/types.h>
@@ -10 +11 @@
 #include "libpacketdump.h"
 #include "libtrace.h"
+
+#include "arphrd.h"
 
 DLLEXPORT void decode(int link_type ,const char *pkt,unsigned len) 
@@ -42 +45 @@
         /* Do we recognise the hardware address 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;
-        }
+        
+        if (ntohs(sll->hatype) == ARPHRD_ETHER || 
+                                ntohs(sll->hatype) == ARPHRD_LOOPBACK) 
+                decode_next(pkt + sizeof(*sll), len - sizeof(*sll), "eth", ntohs(sll->protocol));
+        
+        else
+                decode_next(ret, len, "link", ntohs(sll->hatype));
 
-        /* Meh.. pass it off to eth decoder */
-        decode_next(pkt + sizeof(*sll), len - sizeof(*sll), "eth", ntohs(sll->protocol));
-
+        return;
+        
 }