From 2210ef1c76b3b4d9cd0b8c8692f36ebd7c333c1c Mon Sep 17 00:00:00 2001 From: Birol Capa Date: Tue, 14 Mar 2017 17:42:15 +0300 Subject: PROFINET: Remove AMFilterData Block Since AMFilterData block is removed from PROFINET specification, related parts are removed from dissector. Change-Id: I0f9f346fd409fc0cb78f4d7a8ca5869229d68bed Reviewed-on: https://code.wireshark.org/review/20546 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- plugins/profinet/packet-dcerpc-pn-io.c | 56 +--------------------------------- 1 file changed, 1 insertion(+), 55 deletions(-) (limited to 'plugins') diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c index 986e5fe5fc..2f75ee34ac 100644 --- a/plugins/profinet/packet-dcerpc-pn-io.c +++ b/plugins/profinet/packet-dcerpc-pn-io.c @@ -753,9 +753,6 @@ static int hf_pn_io_am_location_reserved4 = -1; static int hf_pn_io_am_software_revision = -1; static int hf_pn_io_am_hardware_revision = -1; static int hf_pn_io_am_type_identification = -1; -static int hf_pn_io_am_information = -1; -static int hf_pn_io_am_information_reserved_8_15 = -1; -static int hf_pn_io_am_information_reserved_0_7 = -1; /* static int hf_pn_io_packedframe_SFCRC = -1; */ static gint ett_pn_io = -1; @@ -909,7 +906,7 @@ static const value_string pn_io_block_type[] = { { 0x0030, "I&M0FilterDataSubmodul"}, { 0x0031, "I&M0FilterDataModul"}, { 0x0032, "I&M0FilterDataDevice"}, - { 0x0033, "AMFilterData" }, + { 0x0033, "Reserved" }, { 0x0034, "I&M5Data"}, { 0x0035, "AssetManagementData"}, { 0x0036, "AM_FullInformation"}, @@ -4737,39 +4734,6 @@ guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow) return offset; } -static int -dissect_AMFilterDataInfo(tvbuff_t *tvb, int offset, -packet_info *pinfo, proto_tree *tree, guint8 *drep) -{ - proto_item *sub_item; - proto_tree *sub_tree; - guint16 u16AM_Information; - - sub_item = proto_tree_add_item(tree, hf_pn_io_am_information, tvb, offset, 2, ENC_BIG_ENDIAN); - sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_rs_alarm_info); - - dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep, - hf_pn_io_am_information_reserved_0_7, &u16AM_Information); - - offset = dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep, - hf_pn_io_am_information_reserved_8_15, &u16AM_Information); - return offset; -} - -static int -dissect_AMFilterData_Block(tvbuff_t *tvb, int offset, -packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, -guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow) -{ - if (u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) { - expert_add_info_format(pinfo, item, &ei_pn_io_block_version, - "Block version %u.%u not implemented yet!", u8BlockVersionHigh, u8BlockVersionLow); - return offset; - } - offset = dissect_AMFilterDataInfo(tvb, offset, pinfo, tree, drep); - return offset; -} - /* dissect the AssetManagementInfo */ static int dissect_AssetManagementInfo(tvbuff_t *tvb, int offset, @@ -10330,9 +10294,6 @@ dissect_block(tvbuff_t *tvb, int offset, case(0x0032): dissect_IandM0FilterData_block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow); break; - case(0x0033): - dissect_AMFilterData_Block(tvb, offset, pinfo, sub_tree, sub_item, drep, u8BlockVersionHigh, u8BlockVersionLow); - break; case(0x0034): dissect_IandM5Data_block(tvb, offset, pinfo, sub_tree, sub_item, drep); break; @@ -14671,21 +14632,6 @@ proto_register_pn_io (void) FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, - { &hf_pn_io_am_information_reserved_8_15, - { "AM_Information.Reserved2", "pn_io.am_information_reserved_8_15", - FT_UINT16, BASE_HEX, NULL, 0x0FF00, - NULL, HFILL } - }, - { &hf_pn_io_am_information, - { "AM_Information", "pn_io.am_information", - FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_pn_io_am_information_reserved_0_7, - { "AM_Information.Reserved1", "pn_io.am_information_reserved_0_7", - FT_UINT16, BASE_HEX, NULL, 0x000FF, - NULL, HFILL } - }, }; static gint *ett[] = { -- cgit v1.2.3