aboutsummaryrefslogtreecommitdiffstats
path: root/epan/etypes.h
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss@ulticom.com>2011-05-12 21:37:55 +0000
committerJeff Morriss <jeff.morriss@ulticom.com>2011-05-12 21:37:55 +0000
commitcf485a2ea1fa06f78ab317e47ef5291aa1059050 (patch)
treef521087f80ad63d70ffd2954b3eeaf0ce661eb98 /epan/etypes.h
parent811afde69ec16c3de190bb50a0e029b11afe6494 (diff)
From Johannes Jochen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5900 :
I have created a dissector for the Multiple MAC Registration Protocol based on the exiting dissector of the Multiple Stream Reservation Protocol (bugzilla id: 4757 ) You can found the documentation of the Protocol here: http://standards.ieee.org/getieee802/download/802.1ak-2007.pdf It's also includes the corrections of the protocol you will found here: http://standards.ieee.org/getieee802/download/802.1Q-2005_Cor1-2008.pdf svn path=/trunk/; revision=37104
Diffstat (limited to 'epan/etypes.h')
-rw-r--r--epan/etypes.h24
1 files changed, 14 insertions, 10 deletions
diff --git a/epan/etypes.h b/epan/etypes.h
index b535c1aa17..9e89e6268b 100644
--- a/epan/etypes.h
+++ b/epan/etypes.h
@@ -421,6 +421,10 @@
#define ETHERTYPE_IEEE_802_1AH 0x88E7 /* IEEE 802.1ah Provider Backbone Bridge Mac-in-Mac */
#endif
+#ifndef ETHERTYPE_MMRP
+#define ETHERTYPE_MMRP 0x88F6 /* IEEE 802.1ak Multiple MAC Registration Protocol */
+#endif
+
#ifndef ETHERTYPE_PTP
#define ETHERTYPE_PTP 0x88F7 /* IEEE1588v2 (PTPv2) over Ethernet */
#endif /* in particular for the information exchange between IED's in a power */
@@ -463,23 +467,23 @@
#define ETHERTYPE_LOOP 0x9000 /* used for layer 2 testing (do i see my own frames on the wire) */
#endif
-#ifndef ETHERTYPE_RTMAC
+#ifndef ETHERTYPE_RTMAC
#define ETHERTYPE_RTMAC 0x9021 /* RTnet: Real-Time Media Access Control */
-#endif
-
-#ifndef ETHERTYPE_RTCFG
+#endif
+
+#ifndef ETHERTYPE_RTCFG
#define ETHERTYPE_RTCFG 0x9022 /* RTnet: Real-Time Configuration Protocol */
-#endif
-
-#ifndef ETHERTYPE_LLT
+#endif
+
+#ifndef ETHERTYPE_LLT
#define ETHERTYPE_LLT 0xCAFE /* Veritas Low Latency Transport (not officially registered) */
-#endif
+#endif
#ifndef ETHERTYPE_TDMOE
#define ETHERTYPE_TDMOE 0xD00D /* Digium TDMoE packets (not officially registered) */
#endif
-
-#ifndef ETHERTYPE_FCFT
+
+#ifndef ETHERTYPE_FCFT
#define ETHERTYPE_FCFT 0xFCFC /* used to transport FC frames+MDS hdr internal to Cisco's MDS switch */
#endif