aboutsummaryrefslogtreecommitdiffstats
path: root/epan/etypes.h
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2011-10-31 18:37:58 +0000
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2011-10-31 18:37:58 +0000
commitb17be73489323504e0d1af77bab4cad6a4a11ac8 (patch)
treeae2898f1650672fdb4948b708b83a3b5dfd3c166 /epan/etypes.h
parent4ea690d66e9f12c9fc90e3db6134e4e0ebb5981f (diff)
From Martin Renold via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5730
Dissector for HSR and PRP-1 Here is a patch that adds a dissector for HSR and for PRP-1. Both protocols are defined in IEC62439 Part 3. (High-availability Seamless Redundancy / Parallel Redundancy Protocol) The existing PRP dissector has been refactored to support both the old PRP (now called PRP-0) and the new PRP-1. There are three distinct dissectors: - HSR (ethertype 892F) - HSR/PRP supervision (ethertype 88FB) - PRP-0 and PRP-1 (trailer dissector; disabled by default) From me : * Fix Clang Warning * Add modification for CMakeLists.txt svn path=/trunk/; revision=39692
Diffstat (limited to 'epan/etypes.h')
-rw-r--r--epan/etypes.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/epan/etypes.h b/epan/etypes.h
index d004d4b5d3..76312a9d07 100644
--- a/epan/etypes.h
+++ b/epan/etypes.h
@@ -445,7 +445,7 @@
/* There are three types of application services */
#ifndef ETHERTYPE_PRP
-#define ETHERTYPE_PRP 0x88FB /* Parallel Redundancy Protocol (IEC62439 Chapter 6) */
+#define ETHERTYPE_PRP 0x88FB /* Parallel Redundancy Protocol (IEC62439 Part 3) */
#endif
#ifndef ETHERTYPE_FLIP
@@ -480,6 +480,10 @@
#define ETHERTYPE_TTE_PCF 0x891D /* TTEthernet Protocol Control Frame */
#endif
+#ifndef ETHERTYPE_HSR
+#define ETHERTYPE_HSR 0x892F /* High-availability Seamless Redundancy (IEC62439 Part 3) */
+#endif
+
#ifndef ETHERTYPE_LOOP
#define ETHERTYPE_LOOP 0x9000 /* used for layer 2 testing (do i see my own frames on the wire) */
#endif