Changeset 4c90362 for libpacketdump

Timestamp:

03/10/11 16:24:57 (11 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:

99425f8

Parents:

8ccb7897

Message:

• Fixed libpacketdump to correctly display SLL packets that also include an Ethernet header

File:

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

libpacketdump/link_6.c

@@ -13 +13 @@
 
 #include "arphrd.h"
+
+/* Copied this here because this isn't currently part of our external API -
+ * maybe we need to think about doing that? */
+libtrace_linktype_t arphrd_type_to_libtrace(unsigned int arphrd) {
+        switch(arphrd) {
+                case ARPHRD_ETHER: return TRACE_TYPE_ETH;
+                case ARPHRD_EETHER: return TRACE_TYPE_ETH;
+                case ARPHRD_IEEE80211: return TRACE_TYPE_80211;
+                case ARPHRD_80211_RADIOTAP: return TRACE_TYPE_80211_RADIO;
+                case ARPHRD_PPP: return TRACE_TYPE_NONE;
+                case ARPHRD_LOOPBACK: return TRACE_TYPE_NONE;
+                case ARPHRD_NONE: return TRACE_TYPE_NONE;
+        }
+        printf("Unknown ARPHRD: %u\n", arphrd);
+        return ~0U;
+}
 
 DLLEXPORT void decode(int link_type ,const char *pkt,unsigned len) 
@@ -47 +63 @@
         
         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));
-
+                                ntohs(sll->hatype) == ARPHRD_LOOPBACK) { 
+                
+                if (ntohs(sll->protocol) == 0x0060) {
+                        decode_next(ret, len, "link", 
+                                arphrd_type_to_libtrace(ntohs(sll->hatype)));
+                }
+                else
+                        decode_next(pkt + sizeof(*sll), len - sizeof(*sll), 
+                                        "eth", ntohs(sll->protocol));
+        }
+        else {
+                decode_next(ret, len, "link", 
+                                arphrd_type_to_libtrace(ntohs(sll->hatype)));
+        }
         return;