From 95ec5329a3647f02629454d7f7716a170e97fb91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camille=20Gu=C3=A9rin?= Date: Mon, 1 May 2017 23:36:21 +0200 Subject: OPC UA: Added details for BrowseDescription NodeClassMask and ResultMask Display the details for the NodeClassMask and ResultMask values in a BrowseRequest's BrowseDescription. As described in OPC UA 1.03 Specification, the value 0 for the NodeClassMask and the value 63 (0x003F) for ResultMask should results in returning all the fields in the BrowseResponse. Display 'All' when those fields have those values Display a detailled bit tree mask when values are different Code Change: Added parseNodeClass and parseResultMask Use them in parseBrowseDescription instead of parseUInt32 Removed not needed anymore hf_opcua_NodeClassMask, hf_opcua_ResultMask and their related entries in registerFieldTypes Change-Id: Ic3ed8630825b5456f91156f06b2203ebfa422155 Reviewed-on: https://code.wireshark.org/review/21446 Petri-Dish: Alexis La Goutte Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- plugins/opcua/opcua_hfindeces.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'plugins/opcua/opcua_hfindeces.c') diff --git a/plugins/opcua/opcua_hfindeces.c b/plugins/opcua/opcua_hfindeces.c index 07d1fb0409..dd84925a51 100644 --- a/plugins/opcua/opcua_hfindeces.c +++ b/plugins/opcua/opcua_hfindeces.c @@ -176,7 +176,6 @@ int hf_opcua_MoreNotifications = -1; int hf_opcua_Name = -1; int hf_opcua_NamespaceUri = -1; int hf_opcua_NextSequenceNumber = -1; -int hf_opcua_NodeClassMask = -1; int hf_opcua_NotificationsCount = -1; int hf_opcua_NumValuesPerNode = -1; int hf_opcua_Offset = -1; @@ -219,7 +218,6 @@ int hf_opcua_RequestedMaxKeepAliveCount = -1; int hf_opcua_RequestedMaxReferencesPerNode = -1; int hf_opcua_RequestedPublishingInterval = -1; int hf_opcua_RequestedSessionTimeout = -1; -int hf_opcua_ResultMask = -1; int hf_opcua_Results = -1; int hf_opcua_RetransmitSequenceNumber = -1; int hf_opcua_ReturnBounds = -1; @@ -481,7 +479,6 @@ void registerFieldTypes(int proto) { &hf_opcua_Name, { "Name", "opcua.Name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_NamespaceUri, { "NamespaceUri", "opcua.NamespaceUri", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_NextSequenceNumber, { "NextSequenceNumber", "opcua.NextSequenceNumber", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_NodeClassMask, { "NodeClassMask", "opcua.NodeClassMask", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_NotificationsCount, { "NotificationsCount", "opcua.NotificationsCount", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_NumValuesPerNode, { "NumValuesPerNode", "opcua.NumValuesPerNode", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_Offset, { "Offset", "opcua.Offset", FT_INT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, @@ -524,7 +521,6 @@ void registerFieldTypes(int proto) { &hf_opcua_RequestedMaxReferencesPerNode, { "RequestedMaxReferencesPerNode", "opcua.RequestedMaxReferencesPerNode", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_RequestedPublishingInterval, { "RequestedPublishingInterval", "opcua.RequestedPublishingInterval", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_RequestedSessionTimeout, { "RequestedSessionTimeout", "opcua.RequestedSessionTimeout", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - { &hf_opcua_ResultMask, { "ResultMask", "opcua.ResultMask", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_Results, { "Results", "opcua.Results", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_RetransmitSequenceNumber, { "RetransmitSequenceNumber", "opcua.RetransmitSequenceNumber", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_ReturnBounds, { "ReturnBounds", "opcua.ReturnBounds", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, -- cgit v1.2.3