diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2010-11-20 18:14:30 +0000 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2010-11-20 18:14:30 +0000 |
| commit | ba2d64102c32e1087bb5a38c1749ca738dc58c1f (patch) | |
| tree | 7735eef3874f19b23dce47d5731827f96e73caf5 /epan/dissectors/packet-sll.c | |
| parent | d8462d9e0c68ce023ecd599a615bec1efdc11d3d (diff) | |
Fix for bug 5422:
Add support for dissecting SLL type 0x03 frames.
svn path=/trunk/; revision=34987
Diffstat (limited to 'epan/dissectors/packet-sll.c')
| -rw-r--r-- | epan/dissectors/packet-sll.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c index 4907bea69b..902e53db0a 100644 --- a/epan/dissectors/packet-sll.c +++ b/epan/dissectors/packet-sll.c @@ -33,6 +33,7 @@ #include "packet-sll.h" #include "packet-ipx.h" #include "packet-llc.h" +#include "packet-eth.h" #include "packet-ppp.h" #include "packet-gre.h" #include <epan/addr_resolv.h> @@ -78,6 +79,7 @@ static const value_string packet_type_vals[] = { static const value_string ltype_vals[] = { { LINUX_SLL_P_802_3, "Raw 802.3" }, + { LINUX_SLL_P_ETHERNET, "Ethernet" }, { LINUX_SLL_P_802_2, "802.2 LLC" }, { LINUX_SLL_P_PPPHDLC, "PPP (HDLC)" }, { 0, NULL } @@ -111,6 +113,13 @@ capture_sll(const guchar *pd, int len, packet_counts *ld) capture_llc(pd, len, SLL_HEADER_SIZE, ld); break; + case LINUX_SLL_P_ETHERNET: + /* + * Ethernet. + */ + capture_eth(pd, SLL_HEADER_SIZE, len, ld); + break; + case LINUX_SLL_P_802_3: /* * Novell IPX inside 802.3 with no 802.2 LLC |