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


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39692 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 201 insertions, 0 deletions

diff --git a/epan/dissectors/packet-hsr.c b/epan/dissectors/packet-hsr.c
new file mode 100644
index 0000000000..490cc2193f
--- /dev/null
+++ b/epan/dissectors/packet-hsr.c
@@ -0,0 +1,201 @@
+/* packet-hsr.c
+ * Routines for HSR dissection (IEC62439 Part 3)
+ * Copyright 2009, Florian Reichert <refl[AT]zhaw.ch>
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald[AT]wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <glib.h>
+#include <epan/packet.h>
+#include <epan/etypes.h>
+
+/**********************************************************/
+/* Lengths of fields within a HSR packet.                 */
+/**********************************************************/
+#define HSR_LSDU_PATH_LENGTH                 2
+#define HSR_SEQUENZNR_LENGTH                 2
+
+#define HSR_TOTAL_LENGTH                     4
+
+/**********************************************************/
+/* Offsets of fields within a HSR packet.                 */
+/**********************************************************/
+#define HSR_PATH_OFFSET                      0
+#define HSR_SEQUENZNR_OFFSET                 2
+
+static const value_string hsr_laneid_vals[] = {
+    {0, "Lane A"},
+    {1, "Lane B"},
+    {0, NULL}
+};
+
+/**********************************************************/
+/* Initialize the protocol and registered fields          */
+/**********************************************************/
+
+static int proto_hsr = -1;
+
+/* Initialize supervision frame fields */
+
+
+static int hf_hsr_path = -1;
+static int hf_hsr_netid = -1;
+static int hf_hsr_laneid = -1;
+static int hf_hsr_lsdu_size = -1;
+static int hf_hsr_sequence_nr = -1;
+static int hf_type= -1;
+
+static dissector_table_t ethertype_subdissector_table;
+/* Initialize the subtree pointers */
+static gint ett_hsr_frame = -1;
+
+static dissector_handle_t data_handle;
+
+/* Code to actually dissect the packets */
+static  void
+dissect_hsr_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+    proto_item *ti;
+    proto_tree *hsr_tree;
+    tvbuff_t *next_tvb;
+    guint16 etype;
+    guint16 lsdu_size, lsdu_size_correct;
+
+    if (check_col(pinfo->cinfo, COL_PROTOCOL))
+        col_set_str(pinfo->cinfo, COL_PROTOCOL, "HSR");
+
+    if (check_col(pinfo->cinfo, COL_INFO)){
+        col_set_str(pinfo->cinfo, COL_INFO, "HSR-Data Frame");
+    }
+
+    /* create display subtree for the protocol */
+
+    ti = proto_tree_add_item(tree, proto_hsr, tvb, 0, HSR_TOTAL_LENGTH, ENC_NA);
+
+    hsr_tree = proto_item_add_subtree(ti, ett_hsr_frame);
+
+    proto_tree_add_item(hsr_tree, hf_hsr_path,
+                        tvb, HSR_PATH_OFFSET, HSR_LSDU_PATH_LENGTH , ENC_BIG_ENDIAN);
+
+    proto_tree_add_item(hsr_tree, hf_hsr_netid,
+                        tvb, HSR_PATH_OFFSET, HSR_LSDU_PATH_LENGTH , ENC_BIG_ENDIAN);
+
+    proto_tree_add_item(hsr_tree, hf_hsr_laneid,
+                        tvb, HSR_PATH_OFFSET, HSR_LSDU_PATH_LENGTH , ENC_BIG_ENDIAN);
+
+
+    lsdu_size = tvb_get_ntohs(tvb, HSR_PATH_OFFSET) & 0x0fff;
+    lsdu_size_correct = tvb_reported_length_remaining(tvb, 0);
+    if (lsdu_size == lsdu_size_correct) {
+        proto_tree_add_uint_format(hsr_tree, hf_hsr_lsdu_size,
+                                   tvb, HSR_PATH_OFFSET, HSR_LSDU_PATH_LENGTH, lsdu_size,
+                                   "LSDU size: %d [correct]", lsdu_size);
+    } else {
+        proto_tree_add_uint_format(hsr_tree, hf_hsr_lsdu_size,
+                                   tvb, HSR_PATH_OFFSET, HSR_LSDU_PATH_LENGTH, lsdu_size,
+                                   "LSDU size: %d [WRONG, should be %d]", lsdu_size, lsdu_size_correct);
+    }
+
+    proto_tree_add_item(hsr_tree, hf_hsr_sequence_nr,
+                        tvb, HSR_SEQUENZNR_OFFSET,HSR_SEQUENZNR_LENGTH, ENC_BIG_ENDIAN);
+
+    proto_tree_add_item(hsr_tree, hf_type,
+                        tvb, HSR_TOTAL_LENGTH,2, ENC_BIG_ENDIAN);
+
+    next_tvb = tvb_new_subset (tvb, HSR_TOTAL_LENGTH + 2, -1, -1);
+
+    etype = tvb_get_ntohs(tvb, HSR_TOTAL_LENGTH);
+
+    if (!dissector_try_uint(ethertype_subdissector_table, etype, next_tvb, pinfo, tree))
+        call_dissector(data_handle, next_tvb, pinfo, hsr_tree);
+
+}
+
+
+
+/* Register the protocol with Wireshark */
+void proto_register_hsr(void)
+{
+    static hf_register_info hf[] = {
+        { &hf_hsr_path,
+          { "Path", "hsr.path",
+            FT_UINT16, BASE_DEC, NULL, 0xf000,
+            NULL, HFILL }
+        },
+
+        { &hf_hsr_netid,
+          { "Network id", "hsr.netid",
+            FT_UINT16, BASE_DEC, NULL, 0xe000,
+            NULL, HFILL }
+        },
+
+        { &hf_hsr_laneid,
+          { "Lane id", "hsr.laneid",
+            FT_UINT16, BASE_DEC, VALS(hsr_laneid_vals), 0x1000,
+            NULL, HFILL }
+        },
+
+        { &hf_hsr_lsdu_size,
+          { "LSDU size", "hsr.lsdu_size",
+            FT_UINT16, BASE_DEC, NULL, 0x0fff,
+            NULL, HFILL }
+        },
+
+        { &hf_hsr_sequence_nr,
+          { "Sequence number", "hsr.hsr_sequence_nr",
+            FT_UINT16, BASE_DEC, NULL, 0x00,
+            NULL, HFILL }
+        },
+        { &hf_type,
+          { "Type", "hsr.type",
+            FT_UINT16, BASE_HEX, VALS(etype_vals), 0x00,
+            NULL, HFILL }
+        }
+
+    };
+
+    static gint *ett[] = {
+        &ett_hsr_frame,
+    };
+
+    /* Register the protocol name and description */
+    proto_hsr = proto_register_protocol("High-availability Seamless Redundancy (IEC62439 Part 3 Chapter 5)",
+                                        "HSR", "hsr");
+
+    /* Required function calls to register the header fields and subtree used */
+    proto_register_field_array(proto_hsr, hf, array_length(hf));
+    proto_register_subtree_array(ett, array_length(ett));
+}
+
+
+void proto_reg_handoff_hsr(void)
+{
+    dissector_handle_t hsr_frame_handle;
+    hsr_frame_handle = create_dissector_handle(dissect_hsr_frame, proto_hsr);
+    dissector_add_uint("ethertype", ETHERTYPE_HSR, hsr_frame_handle);
+
+    ethertype_subdissector_table = find_dissector_table("ethertype");
+    data_handle = find_dissector("data");
+}