aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/epan
diff options
context:
space:
mode:
authorRoland Knall <roland.knall@br-automation.com>2018-09-21 14:35:03 +0200
committerRoland Knall <rknall@gmail.com>2018-09-21 13:01:50 +0000
commit1e98cee5e1797839b515703f6a48cc0efedbbdb7 (patch)
tree377f46642b25027f36aa9c9ff4ad4b96c8d6cf96 /plugins/epan
parent001a81bace06c8f3c92f0a2c375746312f88dd25 (diff)
ProfiNet: Fix order in AssetManagment
According to the current Profinet specification in regard to the coding of the AM_DeviceIdentification field, the dissection order of DeviceId and VendorId is in the wrong order. Bug: 15140 Change-Id: I9954619a938db382967104de91e2b905677cc171 Reviewed-on: https://code.wireshark.org/review/29780 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'plugins/epan')
-rw-r--r--plugins/epan/profinet/packet-dcerpc-pn-io.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/epan/profinet/packet-dcerpc-pn-io.c b/plugins/epan/profinet/packet-dcerpc-pn-io.c
index d4e564768a..1206b0bc69 100644
--- a/plugins/epan/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/epan/profinet/packet-dcerpc-pn-io.c
@@ -13813,22 +13813,22 @@ proto_register_pn_io (void)
},
{ &hf_pn_io_am_device_identification_device_sub_id,
{ "AM_DeviceIdentification.DeviceSubID", "pn_io.am_device_identification.device_sub_id",
- FT_UINT64, BASE_HEX, NULL, 0x000000000000FFFF,
+ FT_UINT64, BASE_HEX, NULL, 0xFFFF000000000000,
NULL, HFILL }
},
{ &hf_pn_io_am_device_identification_device_id,
{ "AM_DeviceIdentification.DeviceID", "pn_io.am_device_identification.device_id",
- FT_UINT64, BASE_HEX, NULL, 0x00000000FFFF0000,
+ FT_UINT64, BASE_HEX, NULL, 0x0000FFFF00000000,
NULL, HFILL }
},
{ &hf_pn_io_am_device_identification_vendor_id,
{ "AM_DeviceIdentification.VendorID", "pn_io.am_device_identification.vendor_id",
- FT_UINT64, BASE_HEX, NULL, 0x0000FFFF00000000,
+ FT_UINT64, BASE_HEX, NULL, 0x00000000FFFF0000,
NULL, HFILL }
},
{ &hf_pn_io_am_device_identification_organization,
{ "AM_DeviceIdentification.Organization", "pn_io.am_device_identification.organization",
- FT_UINT64, BASE_HEX, NULL, 0xFFFF000000000000,
+ FT_UINT64, BASE_HEX, NULL, 0x000000000000FFFF,
NULL, HFILL }
},
{ &hf_pn_io_rs_adjust_info,