diff options
| author | Anish Bhatt <anish@chelsio.com> | 2015-01-05 22:26:46 -0800 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-01-06 10:12:20 +0000 |
| commit | 29e1f73b9421d022395badfd7021d07f3022a607 (patch) | |
| tree | e8aef967f3204564ac9efb8b19414c3357d37c35 /plugins | |
| parent | f5e435ab8bccaf64ca93dc6e2330090b2e99e532 (diff) | |
| download | wireshark-29e1f73b9421d022395badfd7021d07f3022a607.tar.gz | |
Revert "[PROFINET] Fix swapped MaintenanceRequired & MaintenanceDemanded bits"
This reverts commit 0452f763fb0dd2cf7e38f0a127c306199a814c3e. 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>
(cherry picked from commit eb98b04ac12efe01d1abddf866b18f31101533ee)
Reviewed-on: https://code.wireshark.org/review/6339
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/profinet/packet-dcerpc-pn-io.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c index 420adebaa4..292c4cd3ba 100644 --- a/plugins/profinet/packet-dcerpc-pn-io.c +++ b/plugins/profinet/packet-dcerpc-pn-io.c @@ -7942,10 +7942,10 @@ dissect_ModuleDiffBlock_block(tvbuff_t *tvb, int offset, 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, hf_pn_io_submodule_state_add_info, &u16SubmoduleState); @@ -10639,14 +10639,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, |