From 5352ef42f94b5c14a24eb2e5559440c71fdcae8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Mon, 15 Jan 2018 12:40:55 +0000 Subject: plugins: Add source tree subfolder for plugin library MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows some simplification and makes things more consistent, particularly for loading plugins from the build dir. Also fixes the issue reported here: https://www.wireshark.org/lists/wireshark-dev/201801/msg00061.html Change-Id: I0d8a000ee679172bccad546a3b0c47a79486f44d Reviewed-on: https://code.wireshark.org/review/25329 Petri-Dish: João Valverde Reviewed-by: João Valverde --- plugins/epan/profinet/packet-pn-mrp.c | 680 ++++++++++++++++++++++++++++++++++ 1 file changed, 680 insertions(+) create mode 100644 plugins/epan/profinet/packet-pn-mrp.c (limited to 'plugins/epan/profinet/packet-pn-mrp.c') diff --git a/plugins/epan/profinet/packet-pn-mrp.c b/plugins/epan/profinet/packet-pn-mrp.c new file mode 100644 index 0000000000..7aa57c0ab5 --- /dev/null +++ b/plugins/epan/profinet/packet-pn-mrp.c @@ -0,0 +1,680 @@ +/* packet-pn-mrp.c + * Routines for PN-MRP (PROFINET Media Redundancy Protocol) + * packet dissection. + * + * Wireshark - Network traffic analyzer + * By Gerald Combs + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "config.h" + +#include +#include +#include +#include + +#include "packet-pn.h" + +void proto_register_pn_mrp(void); +void proto_reg_handoff_pn_mrp(void); + +static int proto_pn_mrp = -1; + +static int hf_pn_mrp_type = -1; +static int hf_pn_mrp_length = -1; +static int hf_pn_mrp_version = -1; +static int hf_pn_mrp_sequence_id = -1; +static int hf_pn_mrp_sa = -1; +static int hf_pn_mrp_prio = -1; +static int hf_pn_mrp_port_role = -1; +static int hf_pn_mrp_ring_state = -1; +static int hf_pn_mrp_interval = -1; +static int hf_pn_mrp_transition = -1; +static int hf_pn_mrp_time_stamp = -1; +static int hf_pn_mrp_blocked = -1; +static int hf_pn_mrp_domain_uuid = -1; +static int hf_pn_mrp_oui = -1; +static int hf_pn_mrp_ed1type = -1; +static int hf_pn_mrp_ed1_manufacturer_data = -1; +static int hf_pn_mrp_sub_tlv_header_type = -1; +static int hf_pn_mrp_sub_tlv_header_length = -1; +static int hf_pn_mrp_sub_option2 = -1; +static int hf_pn_mrp_other_mrm_prio = -1; +static int hf_pn_mrp_other_mrm_sa = -1; + +static gint ett_pn_mrp = -1; +static gint ett_pn_mrp_type = -1; +static gint ett_pn_sub_tlv = -1; + +static const value_string pn_mrp_block_type_vals[] = { + { 0x00, "MRP_End" }, + { 0x01, "MRP_Common" }, + { 0x02, "MRP_Test" }, + { 0x03, "MRP_TopologyChange" }, + { 0x04, "MRP_LinkDown" }, + { 0x05, "MRP_LinkUp" }, + { 0x06, "MRP_InTest" }, + { 0x07, "MRP_InTopologyChange" }, + { 0x08, "MRP_InLinkDown" }, + { 0x09, "MRP_InLinkUp" }, + { 0x0A, "MRP_InLinkStatusPoll" }, + /*0x0B - 0x7E Reserved */ + { 0x7F, "MRP_Option (Organizationally Specific)"}, + { 0, NULL }, +}; + +static const value_string pn_mrp_oui_vals[] = { + { OUI_PROFINET, "PROFINET" }, + { OUI_SIEMENS, "SIEMENS" }, + + { 0, NULL } +}; + + + +static const value_string pn_mrp_port_role_vals[] = { + { 0x0000, "Primary ring port" }, + { 0x0001, "Secondary ring port"}, + /*0x0002 - 0xFFFF Reserved */ + + { 0, NULL } +}; + +#if 0 +static const value_string pn_mrp_role_vals[] = { + { 0x0000, "Media redundancy disabled" }, + { 0x0001, "Media redundancy client" }, + { 0x0002, "Media redundancy manager" }, + { 0x0003, "Media redundancy manager (auto)" }, + /*0x0004 - 0xFFFF Reserved */ + + { 0, NULL } +}; +#endif + +static const value_string pn_mrp_ring_state_vals[] = { + { 0x0000, "Ring open" }, + { 0x0001, "Ring closed"}, + /*0x0002 - 0xFFFF Reserved */ + + { 0, NULL } +}; + + +#if 0 +static const value_string pn_mrp_prio_vals[] = { + { 0x8000, "Default priority for redundancy manager" }, + + { 0, NULL } +}; +#endif + +static const value_string pn_mrp_sub_tlv_header_type_vals[] = { + { 0x00, "End" }, + { 0x01, "MRP_TestMgrNAck" }, + { 0x02, "MRP_TestPropagate" }, + { 0x03, "MRP_AutoMgr" }, + { 0, NULL }, +}; + +static int +dissect_PNMRP_Common(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, proto_item *item _U_) +{ + guint16 sequence_id; + e_guid_t uuid; + + + /* MRP_SequenceID */ + offset = dissect_pn_uint16(tvb, offset, pinfo, tree, hf_pn_mrp_sequence_id, &sequence_id); + + /* MRP_DomainUUID */ + offset = dissect_pn_uuid(tvb, offset, pinfo, tree, hf_pn_mrp_domain_uuid, &uuid); + + return offset; +} + + +static int +dissect_PNMRP_Link(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, proto_item *item _U_) +{ + guint8 mac[6]; + guint16 port_role; + guint16 interval; + guint16 blocked; + proto_item *sub_item; + + /* MRP_SA */ + offset = dissect_pn_mac(tvb, offset, pinfo, tree, hf_pn_mrp_sa, mac); + + /* MRP_PortRole */ + offset = dissect_pn_uint16(tvb, offset, pinfo, tree, hf_pn_mrp_port_role, &port_role); + + /* MRP_Interval */ + offset = dissect_pn_uint16_ret_item(tvb, offset, pinfo, tree, hf_pn_mrp_interval, &interval, &sub_item); + if (tree) + { + proto_item_append_text(sub_item," Interval for next topology change event (in ms)"); + if (interval <0x07D1) + proto_item_append_text(sub_item," Mandatory"); + else + proto_item_append_text(sub_item," Optional"); + } + + /* MRP_Blocked */ + offset = dissect_pn_uint16_ret_item(tvb, offset, pinfo, tree, hf_pn_mrp_blocked, &blocked, &sub_item); + if (tree) + { + if (blocked == 0) + proto_item_append_text(sub_item," The MRC is not able to receive and forward frames to port in state blocked"); + else + if (blocked == 1) + proto_item_append_text(sub_item," The MRC is able to receive and forward frames to port in state blocked"); + else + proto_item_append_text(sub_item," Reserved"); + } + + /* Padding */ + offset = dissect_pn_align4(tvb, offset, pinfo, tree); + return offset; +} + +static const char * mrp_Prio2msg(guint16 prio) +{ + + if (prio == 0x0000) + return(" Highest priority redundancy manager"); + if ((prio >= 0x1000) && (prio <= 0x7000)) + return(" High priorities"); + if (prio == 0x8000) + return(" Default priority for redundancy manager"); + if ((prio >= 0x8001) && (prio <= 0x8FFF)) + return(" Low priorities for redundancy manager"); + if ((prio >= 0x9000) && (prio <= 0x9FFF)) + return(" High priorities for redundancy manager (auto)"); + if (prio == 0xA000) + return(" Default priority for redundancy manager (auto)"); + if ((prio >= 0xA001) && (prio <= 0xF000)) + return(" Low priorities for redundancy manager (auto)"); + if (prio ==0xFFFF) + return(" Lowest priority for redundancy manager (auto)"); + + return(" Reserved"); +} + +static int +dissect_PNMRP_Test(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, proto_item *item _U_) +{ + guint16 prio; + guint8 mac[6]; + guint16 port_role; + guint16 ring_state; + guint16 transition; + guint32 time_stamp; + proto_item *sub_item; + + + /* MRP_Prio */ + offset = dissect_pn_uint16_ret_item(tvb, offset, pinfo, tree, hf_pn_mrp_prio, &prio, &sub_item); + if (tree) + proto_item_append_text(sub_item, "%s", mrp_Prio2msg(prio)); + + /* MRP_SA */ + offset = dissect_pn_mac(tvb, offset, pinfo, tree, hf_pn_mrp_sa, mac); + + /* MRP_PortRole */ + offset = dissect_pn_uint16(tvb, offset, pinfo, tree, hf_pn_mrp_port_role, &port_role); + + /* MRP_RingState */ + offset = dissect_pn_uint16(tvb, offset, pinfo, tree, hf_pn_mrp_ring_state, &ring_state); + + /* MRP_Transition */ + offset = dissect_pn_uint16(tvb, offset, pinfo, tree, hf_pn_mrp_transition, &transition); + + /* MRP_TimeStamp */ + proto_tree_add_item_ret_uint(tree, hf_pn_mrp_time_stamp, tvb, offset, 4, ENC_BIG_ENDIAN, &time_stamp); + offset += 4; + + /* Padding */ + offset = dissect_pn_align4(tvb, offset, pinfo, tree); + + return offset; +} + + +static int +dissect_PNMRP_TopologyChange(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, proto_item *item _U_) +{ + guint16 prio; + guint8 mac[6]; + guint16 interval; + proto_item *sub_item; + + + /* MRP_Prio */ + offset = dissect_pn_uint16_ret_item(tvb, offset, pinfo, tree, hf_pn_mrp_prio, &prio, &sub_item); + if (tree) + proto_item_append_text(sub_item, "%s", mrp_Prio2msg(prio)); + + /* MRP_SA */ + offset = dissect_pn_mac(tvb, offset, pinfo, tree, hf_pn_mrp_sa, mac); + + /* MRP_Interval */ + offset = dissect_pn_uint16_ret_item(tvb, offset, pinfo, tree, hf_pn_mrp_interval, &interval, &sub_item); + if (tree) + { + proto_item_append_text(sub_item," Interval for next topology change event (in ms) "); + if (interval <0x07D1) + proto_item_append_text(sub_item,"Mandatory"); + else + proto_item_append_text(sub_item,"Optional"); + } + /* Padding */ + /*offset = dissect_pn_align4(tvb, offset, pinfo, tree);*/ + + return offset; +} + +static int +dissect_PNMRP_Ed1ManufacturerData(tvbuff_t *tvb, int offset, +packet_info *pinfo, proto_tree *tree, guint8 *pLength) +{ + guint16 u16MrpEd1ManufacturerData; + offset = dissect_pn_uint16(tvb, offset, pinfo, tree, hf_pn_mrp_ed1_manufacturer_data, + &u16MrpEd1ManufacturerData); + *pLength -= 2; + return offset; +} + +static int +dissect_PNMRP_SubOption2(tvbuff_t *tvb, int offset, +packet_info *pinfo, proto_tree *tree) +{ + guint8 u8SubType; + guint8 u8Sublength; + proto_item *sub_item; + proto_tree *sub_tree; + guint16 u16Prio; + guint16 u16OtherPrio; + guint8 mac[6]; + guint8 otherMac[6]; + + sub_item = proto_tree_add_item(tree, hf_pn_mrp_sub_option2, tvb, offset, 0, ENC_NA); + sub_tree = proto_item_add_subtree(sub_item, ett_pn_sub_tlv); + + /* + MRP_SubTLVHeader (Type=0x01 or Type=0x02, Length = 0x12), + MRP_Prio, + MRP_SA, + MRP_OtherMRMPrio, + MRP_OtherMRMSA, + Padding (=0x00,0x00) + */ + /* MRP_SubTLVHeader.Type */ + offset = dissect_pn_uint8(tvb, offset, pinfo, sub_tree, hf_pn_mrp_sub_tlv_header_type, &u8SubType); + + /* MRP_SubTLVHeader.Length */ + offset = dissect_pn_uint8(tvb, offset, pinfo, sub_tree, hf_pn_mrp_sub_tlv_header_length, &u8Sublength); + + if (u8SubType == 0x00) + { + // IEC area: 0x00: MRP_End; + return offset; + } + else if (u8SubType == 0x01) + { + // IEC area: 0x01: MRP_TestMgrNAck; + + /* MRP_Prio */ + offset = dissect_pn_uint16_ret_item(tvb, offset, pinfo, sub_tree, hf_pn_mrp_prio, &u16Prio, &sub_item); + proto_item_append_text(sub_item, "%s", mrp_Prio2msg(u16Prio)); + + /* MRP_SA */ + offset = dissect_pn_mac(tvb, offset, pinfo, sub_tree, hf_pn_mrp_sa, mac); + + /* MRP_OtherMRMPrio */ + offset = dissect_pn_uint16_ret_item(tvb, offset, pinfo, sub_tree, hf_pn_mrp_other_mrm_prio, + &u16OtherPrio, &sub_item); + proto_item_append_text(sub_item, "%s", mrp_Prio2msg(u16OtherPrio)); + + /* MRP_OtherMRMSA */ + offset = dissect_pn_mac(tvb, offset, pinfo, sub_tree, hf_pn_mrp_other_mrm_sa, otherMac); + + offset = dissect_pn_align4(tvb, offset, pinfo, sub_tree); + } + else if (u8SubType == 0x02) + { + /* MRP_Prio */ + offset = dissect_pn_uint16_ret_item(tvb, offset, pinfo, sub_tree, hf_pn_mrp_prio, &u16Prio, &sub_item); + proto_item_append_text(sub_item, "%s", mrp_Prio2msg(u16Prio)); + + /* MRP_SA */ + offset = dissect_pn_mac(tvb, offset, pinfo, sub_tree, hf_pn_mrp_sa, mac); + + /* MRP_OtherMRMPrio */ + offset = dissect_pn_uint16_ret_item(tvb, offset, pinfo, sub_tree, hf_pn_mrp_other_mrm_prio, + &u16OtherPrio, &sub_item); + proto_item_append_text(sub_item, "%s", mrp_Prio2msg(u16OtherPrio)); + + /* MRP_OtherMRMSA */ + offset = dissect_pn_mac(tvb, offset, pinfo, sub_tree, hf_pn_mrp_other_mrm_sa, otherMac); + + offset = dissect_pn_align4(tvb, offset, pinfo, sub_tree); + } + return offset; +} + +static int +dissect_PNMRP_Option(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 length) +{ + guint32 oui; + guint8 u8MrpEd1Type; + + /* OUI (organizational unique id) */ + offset = dissect_pn_oid(tvb, offset, pinfo,tree, hf_pn_mrp_oui, &oui); + + switch (oui) + { + case OUI_SIEMENS: + proto_item_append_text(item, "(SIEMENS)"); + length -= 3; + offset = dissect_pn_uint8(tvb, offset, pinfo, tree, hf_pn_mrp_ed1type, &u8MrpEd1Type); + length -= 1; + switch (u8MrpEd1Type) + { + case 0x00: + offset = dissect_PNMRP_Ed1ManufacturerData(tvb, offset, pinfo, tree, &length); + break; + case 0x01: + case 0x02: + case 0x03: + break; + case 0x04: + offset = dissect_PNMRP_Ed1ManufacturerData(tvb, offset, pinfo, tree, &length); + break; + /* 0x05 to 0xFF*/ + default: + break; + } + //offset = dissect_PNMRP_Ed1ManufacturerData(tvb, offset, pinfo, tree, &length); + + if (length != 0) + { + offset = dissect_PNMRP_SubOption2(tvb, offset, pinfo, tree); + } + col_append_str(pinfo->cinfo, COL_INFO, "(Siemens)"); + break; + default: + proto_item_append_text(item, " (Unknown-OUI)"); + offset = dissect_pn_undecoded(tvb, offset, pinfo, tree, length); + + } + + /* Padding */ + offset = dissect_pn_align4(tvb, offset, pinfo, tree); + + return offset; +} + + +static int +dissect_PNMRP_PDU(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *tree, proto_item *item) +{ + guint16 version; + guint8 type; + guint8 length; + gint i; + tvbuff_t *new_tvb; + proto_item *sub_item; + proto_tree *sub_tree; + + /* MRP_Version */ + offset = dissect_pn_uint16(tvb, offset, pinfo, tree, hf_pn_mrp_version, &version); + + /* the rest of the packet has 4byte alignment regarding to the beginning of the next TLV block! */ + /* XXX - do we have to free this new tvb below? */ + new_tvb = tvb_new_subset_remaining(tvb, offset); + offset = 0; + + for(i=0; tvb_reported_length_remaining(tvb, offset) > 0; i++) { + + sub_item = proto_tree_add_item(tree, hf_pn_mrp_type, new_tvb, offset, 1, ENC_BIG_ENDIAN); + sub_tree = proto_item_add_subtree(sub_item, ett_pn_mrp_type); + + /* MRP_TLVHeader.Type */ + offset = dissect_pn_uint8(new_tvb, offset, pinfo, sub_tree, hf_pn_mrp_type, &type); + + /* MRP_TLVHeader.Length */ + offset = dissect_pn_uint8(new_tvb, offset, pinfo, sub_tree, hf_pn_mrp_length, &length); + + if (i != 0) { + col_append_str(pinfo->cinfo, COL_INFO, ", "); + + proto_item_append_text(item, ", "); + } else { + proto_item_append_text(item, " "); + } + col_append_str(pinfo->cinfo, COL_INFO, val_to_str_const(type, pn_mrp_block_type_vals, "Unknown TLVType 0x%x")); + proto_item_append_text(item, "%s", val_to_str_const(type, pn_mrp_block_type_vals, "Unknown TLVType 0x%x")); + + switch(type) { + case 0x00: + /* no content */ + return offset; + break; + case 0x01: + offset = dissect_PNMRP_Common(new_tvb, offset, pinfo, sub_tree, sub_item); + break; + case 0x02: + offset = dissect_PNMRP_Test(new_tvb, offset, pinfo, sub_tree, sub_item); + break; + case 0x03: + offset = dissect_PNMRP_TopologyChange(new_tvb, offset, pinfo, sub_tree, sub_item); + break; + case 0x04: + case 0x05: /* dissection of up and down is identical! */ + offset = dissect_PNMRP_Link(new_tvb, offset, pinfo, sub_tree, sub_item); + break; + case 0x7f: + offset = dissect_PNMRP_Option(new_tvb, offset, pinfo, sub_tree, sub_item, length); + break; + default: + offset = dissect_pn_undecoded(tvb, offset, pinfo, sub_tree, length); + + } + } + + return offset; +} + + +/* Dissect MRP packets */ +static int +dissect_PNMRP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) +{ + proto_item *ti = NULL; + proto_tree *mrp_tree = NULL; + + guint32 offset = 0; + + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PN-MRP"); + + /* Clear the information column on summary display */ + col_clear(pinfo->cinfo, COL_INFO); + + if (tree) + { + ti = proto_tree_add_item(tree, proto_pn_mrp, tvb, offset, -1, ENC_NA); + mrp_tree = proto_item_add_subtree(ti, ett_pn_mrp); + } + + dissect_PNMRP_PDU(tvb, offset, pinfo, mrp_tree, ti); + return tvb_captured_length(tvb); +} + + +void +proto_register_pn_mrp (void) +{ + static hf_register_info hf[] = { + { &hf_pn_mrp_type, + { "MRP_TLVHeader.Type", "pn_mrp.type", + FT_UINT8, BASE_HEX, VALS(pn_mrp_block_type_vals), 0x0, + NULL, HFILL }}, + + { &hf_pn_mrp_length, + { "MRP_TLVHeader.Length", "pn_mrp.length", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL }}, + + { &hf_pn_mrp_version, + { "MRP_Version", "pn_mrp.version", + FT_UINT16, BASE_DEC, NULL, 0x0, + NULL, HFILL }}, + + { &hf_pn_mrp_sequence_id, + { "MRP_SequenceID", "pn_mrp.sequence_id", + FT_UINT16, BASE_HEX, NULL, 0x0, + "Unique sequence number to each outstanding service request", HFILL }}, + + { &hf_pn_mrp_sa, + { "MRP_SA", "pn_mrp.sa", + FT_ETHER, BASE_NONE, 0x0, 0x0, + NULL, HFILL }}, + + { &hf_pn_mrp_prio, + { "MRP_Prio", "pn_mrp.prio", + FT_UINT16, BASE_HEX, 0, 0x0, + NULL, HFILL }}, + + { &hf_pn_mrp_port_role, + { "MRP_PortRole", "pn_mrp.port_role", + FT_UINT16, BASE_HEX, VALS(pn_mrp_port_role_vals), 0x0, + NULL, HFILL }}, + + { &hf_pn_mrp_ring_state, + { "MRP_RingState", "pn_mrp.ring_state", + FT_UINT16, BASE_HEX, VALS(pn_mrp_ring_state_vals), 0x0, + NULL, HFILL }}, + + { &hf_pn_mrp_interval, + { "MRP_Interval", "pn_mrp.interval", + FT_UINT16, BASE_DEC, NULL, 0x0, + "Interval for next topology change event (in ms)", HFILL }}, + + { &hf_pn_mrp_transition, + { "MRP_Transition", "pn_mrp.transition", + FT_UINT16, BASE_HEX, NULL, 0x0, + "Number of transitions between media redundancy lost and ok states", HFILL }}, + + { &hf_pn_mrp_time_stamp, + { "MRP_TimeStamp [ms]", "pn_mrp.time_stamp", + FT_UINT32, BASE_HEX, NULL, 0x0, + "Actual counter value of 1ms counter", HFILL }}, + + { &hf_pn_mrp_blocked, + { "MRP_Blocked", "pn_mrp.blocked", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL }}, + + { &hf_pn_mrp_domain_uuid, + { "MRP_DomainUUID", "pn_mrp.domain_uuid", + FT_GUID, BASE_NONE, NULL, 0x0, + NULL, HFILL }}, + + { &hf_pn_mrp_oui, + { "MRP_ManufacturerOUI", "pn_mrp.oui", + FT_UINT24, BASE_HEX, VALS(pn_mrp_oui_vals), 0x0, + NULL, HFILL }}, + + { &hf_pn_mrp_ed1type, + { "MRP_Ed1Type", "pn_mrp.ed1type", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL }}, + + { &hf_pn_mrp_ed1_manufacturer_data, + { "MRP_Ed1ManufacturerData", "pn_mrp.ed1manufacturerdata", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL }}, + + { &hf_pn_mrp_sub_option2, + { "MRP_SubOption2", "pn_mrp.sub_option2", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } }, + + { &hf_pn_mrp_sub_tlv_header_type, + { "MRP_SubTLVHeader.Type", "pn_mrp.sub_type", + FT_UINT8, BASE_HEX, VALS(pn_mrp_sub_tlv_header_type_vals), 0x0, + NULL, HFILL }}, + + { &hf_pn_mrp_sub_tlv_header_length, + { "MRP_SubTLVHeader.Length", "pn_mrp.sub_length", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL }}, + + { &hf_pn_mrp_other_mrm_prio, + { "MRP_OtherMRMPrio", "pn_mrp.other_mrm_prio", + FT_UINT16, BASE_HEX, 0, 0x0, + NULL, HFILL }}, + + { &hf_pn_mrp_other_mrm_sa, + { "MRP_OtherMRMSA", "pn_mrp.other_mrm_sa", + FT_ETHER, BASE_NONE, 0x0, 0x0, + NULL, HFILL }} + }; + + static gint *ett[] = { + &ett_pn_mrp, + &ett_pn_mrp_type, + &ett_pn_sub_tlv + }; + + proto_pn_mrp = proto_register_protocol ("PROFINET MRP", "PN-MRP", "pn_mrp"); + proto_register_field_array (proto_pn_mrp, hf, array_length (hf)); + proto_register_subtree_array (ett, array_length (ett)); +} + + +void +proto_reg_handoff_pn_mrp (void) +{ + dissector_handle_t mrp_handle; + + + mrp_handle = create_dissector_handle(dissect_PNMRP,proto_pn_mrp); + dissector_add_uint("ethertype", ETHERTYPE_MRP, mrp_handle); + +} + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ -- cgit v1.2.3