aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2010-11-02 07:54:24 +0000
committerJaap Keuter <jaap.keuter@xs4all.nl>2010-11-02 07:54:24 +0000
commit9a1a03eca964b05da33a3b641df7eb56bda9c39c (patch)
tree0b8012c07aac9821f90580b71fd5ca35888d3d07 /epan
parent2f8ab638582a8ecbcabb50362cd559a02be0ffba (diff)
From Daniel Ginsburg:
draft-ietf-isis-ext-eth specifies an extension to current Ethernet Frame specifications for hardware and frame format to support payloads greater than 1500 Bytes for Type interpretation and Length interpretation frames. The extension introduced by draft-ietf-isis-ext-eth is currently used by Cisco Systems' IS-IS routing protocol implementation when running IS-IS over Ethernet links with large MTU. svn path=/trunk/; revision=34748
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-ethertype.c1
-rw-r--r--epan/dissectors/packet-llc.c1
-rw-r--r--epan/etypes.h4
3 files changed, 6 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c
index 4f1e8d738e..cb74edcfaa 100644
--- a/epan/dissectors/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
@@ -84,6 +84,7 @@ const value_string etype_vals[] = {
{ ETHERTYPE_PPPOES, "PPPoE Session" },
{ ETHERTYPE_INTEL_ANS, "Intel ANS probe" },
{ ETHERTYPE_MS_NLB_HEARTBEAT, "MS NLB heartbeat" },
+ { ETHERTYPE_JUMBO_LLC, "Jumbo LLC" },
{ ETHERTYPE_HOMEPLUG, "Homeplug" },
{ ETHERTYPE_IEEE_802_1AD, "802.1ad Provider Bridge (Q-in-Q)" },
{ ETHERTYPE_IEEE_802_1AH, "802.1ah Provider Backbone Bridge (mac-in-mac)" },
diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c
index c89d29c5df..ab9ef3682d 100644
--- a/epan/dissectors/packet-llc.c
+++ b/epan/dissectors/packet-llc.c
@@ -972,6 +972,7 @@ proto_reg_handoff_llc(void)
* apparently.
*/
dissector_add("arcnet.protocol_id", ARCNET_PROTO_BACNET, llc_handle);
+ dissector_add("ethertype", ETHERTYPE_JUMBO_LLC, llc_handle);
/*
* Register all the fields for PIDs for various OUIs.
diff --git a/epan/etypes.h b/epan/etypes.h
index 11e7bd654d..18d4971d5f 100644
--- a/epan/etypes.h
+++ b/epan/etypes.h
@@ -283,6 +283,10 @@
#define ETHERTYPE_MS_NLB_HEARTBEAT 0x886F /* MS Network Load Balancing heartbeat http://www.microsoft.com/technet/treeview/default.asp?url=/TechNet/prodtechnol/windows2000serv/deploy/confeat/nlbovw.asp */
#endif
+#ifndef ETHERTYPE_JUMBO_LLC
+#define ETHERTYPE_JUMBO_LLC 0x8870 /* 802.2 jumbo frames http://tools.ietf.org/html/draft-ietf-isis-ext-eth */
+#endif
+
#ifndef ETHERTYPE_HOMEPLUG
#define ETHERTYPE_HOMEPLUG 0x887B /* IEEE assigned Ethertype */
#endif