osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "[PROFINET] Fix swapped MaintenanceRequired & MaintenanceDemanded bits" 

This reverts commit 0452f763fb. Changes should
have been made in ChannelProperties instead of Submodule state. Current
implementation merely *appears* to be correct as we are reading it as a two bit
value but instead should be addressing it as individual bits, little endian
Bug: 10753

Change-Id: Ia3bd088aeb376b8511d64352f62c4304e4129ba6
Reviewed-on: https://code.wireshark.org/review/6334
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Anish Bhatt 2015-01-05 22:26:46 -08:00 committed by Alexis La Goutte
parent a7a17047eb
commit eb98b04ac1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/profinet/packet-dcerpc-pn-io.c
View File

@ -7945,10 +7945,10 @@ dissect_ModuleDiffBlock_block(tvbuff_t *tvb, int offset,
hf_pn_io_submodule_state_ar_info, &u16SubmoduleState);
dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
hf_pn_io_submodule_state_diag_info, &u16SubmoduleState);
dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
hf_pn_io_submodule_state_maintenance_required, &u16SubmoduleState);
dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
hf_pn_io_submodule_state_maintenance_demanded, &u16SubmoduleState);
dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
hf_pn_io_submodule_state_maintenance_required, &u16SubmoduleState);
dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
hf_pn_io_submodule_state_qualified_info, &u16SubmoduleState);
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, submodule_tree, drep,
@ -10656,14 +10656,14 @@ proto_register_pn_io (void)
FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_qualified_info), 0x0008,
NULL, HFILL }
},
{ &hf_pn_io_submodule_state_maintenance_demanded,
{ "MaintenanceDemanded", "pn_io.submodule_state.maintenance_demanded",
FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_maintenance_demanded), 0x0010,
NULL, HFILL }
},
{ &hf_pn_io_submodule_state_maintenance_required,
{ "MaintenanceRequired", "pn_io.submodule_state.maintenance_required",
FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_maintenance_required), 0x0020,
FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_maintenance_required), 0x0010,
NULL, HFILL }
},
{ &hf_pn_io_submodule_state_maintenance_demanded,
{ "MaintenanceDemanded", "pn_io.submodule_state.maintenance_demanded",
FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_maintenance_demanded), 0x0020,
NULL, HFILL }
},
{ &hf_pn_io_submodule_state_diag_info,