osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Revert "ProfiNet: Fix order in AssetManagment" 

This reverts commit 1e98cee5e1.

According to Profinet specification, DeviceSubId, DeviceId,
VendorId, Organization must be in reverse order.

Change-Id: I3db3d7d83813239784557286479b37448f70db55
Reviewed-on: https://code.wireshark.org/review/32683
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
This commit is contained in:
Başak Kalfa 2019-04-02 03:54:09 -07:00 committed by Roland Knall
parent 194abe7f3a
commit 01c161ca43
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13866,22 +13866,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, 0xFFFF000000000000,
FT_UINT64, BASE_HEX, NULL, 0x000000000000FFFF,
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, 0x0000FFFF00000000,
FT_UINT64, BASE_HEX, NULL, 0x00000000FFFF0000,
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, 0x00000000FFFF0000,
FT_UINT64, BASE_HEX, NULL, 0x0000FFFF00000000,
NULL, HFILL }
},
{ &hf_pn_io_am_device_identification_organization,
{ "AM_DeviceIdentification.Organization", "pn_io.am_device_identification.organization",
FT_UINT64, BASE_HEX, NULL, 0x000000000000FFFF,
FT_UINT64, BASE_HEX, NULL, 0xFFFF000000000000,
NULL, HFILL }
},
{ &hf_pn_io_rs_adjust_info,