diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-12-12 18:47:59 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-12-12 18:47:59 +0000 |
| commit | 708e463c471f557702c94607b8e8136c797e7e8c (patch) | |
| tree | c1d85661660821751260ddc057d238a432759edf /plugins/profinet/packet-pn-dcp.c | |
| parent | f6f46de2ca806a7293bbc1a82191f5dffc84de7c (diff) | |
| download | wireshark-708e463c471f557702c94607b8e8136c797e7e8c.tar.gz | |
From Wido Kelling: [Profinet] Updated disecction regarding the IEC 61158
(with a few minor fixes by me).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8002
major change:
reassembling of PNIO fragments (only works if OpenSafty dissector is disabled)
minor changes:
improved handling of DFP Frames
added / updated
MRP Block decoding
ARServerBlock
ARVendorBlock
PDInterfaceDataReal
PDInterfaceAdjust
PDPortStatistic
SubdirFrameData corrected display and subblocks added
PDIRGlobalData complete dissection
decoding of FrameDataProperties and ARTypes updated to conform the STD
removed now usuported RTC2 ranges
svn path=/trunk/; revision=46522
Diffstat (limited to 'plugins/profinet/packet-pn-dcp.c')
| -rw-r--r-- | plugins/profinet/packet-pn-dcp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/profinet/packet-pn-dcp.c index aae9bbe407..12dc1db683 100644 --- a/plugins/profinet/packet-pn-dcp.c +++ b/plugins/profinet/packet-pn-dcp.c @@ -467,13 +467,13 @@ dissect_PNDCP_Suboption_Device(tvbuff_t *tvb, int offset, packet_info *pinfo, tvb_memcpy(tvb, (guint8 *) typeofstation, offset, block_length); typeofstation[block_length] = '\0'; proto_tree_add_string (tree, hf_pn_dcp_suboption_device_typeofstation, tvb, offset, block_length, typeofstation); - pn_append_info(pinfo, dcp_item, ", TypeOfStation"); + pn_append_info(pinfo, dcp_item, ", DeviceVendorValue"); proto_item_append_text(block_item, "Device/Manufacturer specific"); if(have_block_qualifier) proto_item_append_text(block_item, ", BlockQualifier: %s", val_to_str(block_qualifier, pn_dcp_block_qualifier, "Unknown")); if(have_block_info) proto_item_append_text(block_item, ", BlockInfo: %s", val_to_str(block_info, pn_dcp_block_info, "Unknown")); - proto_item_append_text(block_item, ", TypeOfStation: \"%s\"", typeofstation); + proto_item_append_text(block_item, ", DeviceVendorValue: \"%s\"", typeofstation); offset += block_length; break; case(PNDCP_SUBOPTION_DEVICE_NAMEOFSTATION): @@ -998,7 +998,7 @@ proto_register_pn_dcp (void) { &hf_pn_dcp_suboption_device, { "Suboption", "pn_dcp.suboption_device", FT_UINT8, BASE_DEC, VALS(pn_dcp_suboption_device), 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_device_typeofstation, - { "TypeOfStation", "pn_dcp.suboption_device_typeofstation", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { "DeviceVendorValue", "pn_dcp.suboption_device_devicevendorvalue", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_device_nameofstation, { "NameOfStation", "pn_dcp.suboption_device_nameofstation", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_vendor_id, |