Unify how opcua arrays are displayed

- Display 'Array of <fieldname>' instead of 'Array of Simple Type'
- Display array indexes for simple types
- Display data type in simple type arrays

Change-Id: Id2cc746898f97ce329c6afb9cc49f1907a9f18e4
Reviewed-on: https://code.wireshark.org/review/2161
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 89 insertions, 89 deletions

diff --git a/plugins/opcua/opcua_serviceparser.c b/plugins/opcua/opcua_serviceparser.c
index 08c3880fe5..0a46a819f0 100644
--- a/plugins/opcua/opcua_serviceparser.c
+++ b/plugins/opcua/opcua_serviceparser.c
@@ -1,5 +1,5 @@
 /******************************************************************************
-** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved.
+** Copyright (C) 2006-2014 ascolab GmbH. All Rights Reserved.
 ** Web: http://www.ascolab.com
 **
 ** This program is free software; you can redistribute it and/or
@@ -14,7 +14,7 @@
 **
 ** Description: OpcUa Complex Type Parser
 **
-** This file was autogenerated on 12.02.2013.
+** This file was autogenerated on 17.06.2014.
 ** DON'T MODIFY THIS FILE!
 **
 ******************************************************************************/
@@ -47,9 +47,9 @@ void parseFindServersRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
   parseRequestHeader(subtree, tvb, pOffset, "RequestHeader");
   parseString(subtree, tvb, pOffset, hf_opcua_EndpointUrl);
   /* Array length field ignored: NoOfLocaleIds */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_LocaleIds, parseString);
+  parseArraySimple(subtree, tvb, pOffset, "LocaleIds", "String", hf_opcua_LocaleIds, parseString);
   /* Array length field ignored: NoOfServerUris */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_ServerUris, parseString);
+  parseArraySimple(subtree, tvb, pOffset, "ServerUris", "String", hf_opcua_ServerUris, parseString);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_FindServersResponse = -1;
@@ -60,7 +60,7 @@ void parseFindServersResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfServers */
-  parseArrayComplex(subtree, tvb, pOffset, "Servers", parseApplicationDescription);
+  parseArrayComplex(subtree, tvb, pOffset, "Servers", "ApplicationDescription", parseApplicationDescription);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_GetEndpointsRequest = -1;
@@ -72,9 +72,9 @@ void parseGetEndpointsRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
   parseRequestHeader(subtree, tvb, pOffset, "RequestHeader");
   parseString(subtree, tvb, pOffset, hf_opcua_EndpointUrl);
   /* Array length field ignored: NoOfLocaleIds */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_LocaleIds, parseString);
+  parseArraySimple(subtree, tvb, pOffset, "LocaleIds", "String", hf_opcua_LocaleIds, parseString);
   /* Array length field ignored: NoOfProfileUris */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_ProfileUris, parseString);
+  parseArraySimple(subtree, tvb, pOffset, "ProfileUris", "String", hf_opcua_ProfileUris, parseString);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_GetEndpointsResponse = -1;
@@ -85,7 +85,7 @@ void parseGetEndpointsResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfEndpoints */
-  parseArrayComplex(subtree, tvb, pOffset, "Endpoints", parseEndpointDescription);
+  parseArrayComplex(subtree, tvb, pOffset, "Endpoints", "EndpointDescription", parseEndpointDescription);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_RegisterServerRequest = -1;
@@ -181,9 +181,9 @@ void parseCreateSessionResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
   parseByteString(subtree, tvb, pOffset, hf_opcua_ServerNonce);
   parseByteString(subtree, tvb, pOffset, hf_opcua_ServerCertificate);
   /* Array length field ignored: NoOfServerEndpoints */
-  parseArrayComplex(subtree, tvb, pOffset, "ServerEndpoints", parseEndpointDescription);
+  parseArrayComplex(subtree, tvb, pOffset, "ServerEndpoints", "EndpointDescription", parseEndpointDescription);
   /* Array length field ignored: NoOfServerSoftwareCertificates */
-  parseArrayComplex(subtree, tvb, pOffset, "ServerSoftwareCertificates", parseSignedSoftwareCertificate);
+  parseArrayComplex(subtree, tvb, pOffset, "ServerSoftwareCertificates", "SignedSoftwareCertificate", parseSignedSoftwareCertificate);
   parseSignatureData(subtree, tvb, pOffset, "ServerSignature");
   parseUInt32(subtree, tvb, pOffset, hf_opcua_MaxRequestMessageSize);
   proto_item_set_end(ti, tvb, *pOffset);
@@ -197,9 +197,9 @@ void parseActivateSessionRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
   parseRequestHeader(subtree, tvb, pOffset, "RequestHeader");
   parseSignatureData(subtree, tvb, pOffset, "ClientSignature");
   /* Array length field ignored: NoOfClientSoftwareCertificates */
-  parseArrayComplex(subtree, tvb, pOffset, "ClientSoftwareCertificates", parseSignedSoftwareCertificate);
+  parseArrayComplex(subtree, tvb, pOffset, "ClientSoftwareCertificates", "SignedSoftwareCertificate", parseSignedSoftwareCertificate);
   /* Array length field ignored: NoOfLocaleIds */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_LocaleIds, parseString);
+  parseArraySimple(subtree, tvb, pOffset, "LocaleIds", "String", hf_opcua_LocaleIds, parseString);
   parseExtensionObject(subtree, tvb, pOffset, "UserIdentityToken");
   parseSignatureData(subtree, tvb, pOffset, "UserTokenSignature");
   proto_item_set_end(ti, tvb, *pOffset);
@@ -213,9 +213,9 @@ void parseActivateSessionResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffset
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   parseByteString(subtree, tvb, pOffset, hf_opcua_ServerNonce);
   /* Array length field ignored: NoOfResults */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_Results, parseStatusCode);
+  parseArraySimple(subtree, tvb, pOffset, "Results", "StatusCode", hf_opcua_Results, parseStatusCode);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_CloseSessionRequest = -1;
@@ -265,7 +265,7 @@ void parseAddNodesRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseRequestHeader(subtree, tvb, pOffset, "RequestHeader");
   /* Array length field ignored: NoOfNodesToAdd */
-  parseArrayComplex(subtree, tvb, pOffset, "NodesToAdd", parseAddNodesItem);
+  parseArrayComplex(subtree, tvb, pOffset, "NodesToAdd", "AddNodesItem", parseAddNodesItem);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_AddNodesResponse = -1;
@@ -276,9 +276,9 @@ void parseAddNodesResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfResults */
-  parseArrayComplex(subtree, tvb, pOffset, "Results", parseAddNodesResult);
+  parseArrayComplex(subtree, tvb, pOffset, "Results", "AddNodesResult", parseAddNodesResult);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_AddReferencesRequest = -1;
@@ -289,7 +289,7 @@ void parseAddReferencesRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseRequestHeader(subtree, tvb, pOffset, "RequestHeader");
   /* Array length field ignored: NoOfReferencesToAdd */
-  parseArrayComplex(subtree, tvb, pOffset, "ReferencesToAdd", parseAddReferencesItem);
+  parseArrayComplex(subtree, tvb, pOffset, "ReferencesToAdd", "AddReferencesItem", parseAddReferencesItem);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_AddReferencesResponse = -1;
@@ -300,9 +300,9 @@ void parseAddReferencesResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfResults */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_Results, parseStatusCode);
+  parseArraySimple(subtree, tvb, pOffset, "Results", "StatusCode", hf_opcua_Results, parseStatusCode);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_DeleteNodesRequest = -1;
@@ -313,7 +313,7 @@ void parseDeleteNodesRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseRequestHeader(subtree, tvb, pOffset, "RequestHeader");
   /* Array length field ignored: NoOfNodesToDelete */
-  parseArrayComplex(subtree, tvb, pOffset, "NodesToDelete", parseDeleteNodesItem);
+  parseArrayComplex(subtree, tvb, pOffset, "NodesToDelete", "DeleteNodesItem", parseDeleteNodesItem);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_DeleteNodesResponse = -1;
@@ -324,9 +324,9 @@ void parseDeleteNodesResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfResults */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_Results, parseStatusCode);
+  parseArraySimple(subtree, tvb, pOffset, "Results", "StatusCode", hf_opcua_Results, parseStatusCode);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_DeleteReferencesRequest = -1;
@@ -337,7 +337,7 @@ void parseDeleteReferencesRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset
 
   parseRequestHeader(subtree, tvb, pOffset, "RequestHeader");
   /* Array length field ignored: NoOfReferencesToDelete */
-  parseArrayComplex(subtree, tvb, pOffset, "ReferencesToDelete", parseDeleteReferencesItem);
+  parseArrayComplex(subtree, tvb, pOffset, "ReferencesToDelete", "DeleteReferencesItem", parseDeleteReferencesItem);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_DeleteReferencesResponse = -1;
@@ -348,9 +348,9 @@ void parseDeleteReferencesResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffse
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfResults */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_Results, parseStatusCode);
+  parseArraySimple(subtree, tvb, pOffset, "Results", "StatusCode", hf_opcua_Results, parseStatusCode);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_BrowseRequest = -1;
@@ -363,7 +363,7 @@ void parseBrowseRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
   parseViewDescription(subtree, tvb, pOffset, "View");
   parseUInt32(subtree, tvb, pOffset, hf_opcua_RequestedMaxReferencesPerNode);
   /* Array length field ignored: NoOfNodesToBrowse */
-  parseArrayComplex(subtree, tvb, pOffset, "NodesToBrowse", parseBrowseDescription);
+  parseArrayComplex(subtree, tvb, pOffset, "NodesToBrowse", "BrowseDescription", parseBrowseDescription);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_BrowseResponse = -1;
@@ -374,9 +374,9 @@ void parseBrowseResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfResults */
-  parseArrayComplex(subtree, tvb, pOffset, "Results", parseBrowseResult);
+  parseArrayComplex(subtree, tvb, pOffset, "Results", "BrowseResult", parseBrowseResult);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_BrowseNextRequest = -1;
@@ -388,7 +388,7 @@ void parseBrowseNextRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
   parseRequestHeader(subtree, tvb, pOffset, "RequestHeader");
   parseBoolean(subtree, tvb, pOffset, hf_opcua_ReleaseContinuationPoints);
   /* Array length field ignored: NoOfContinuationPoints */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_ContinuationPoints, parseByteString);
+  parseArraySimple(subtree, tvb, pOffset, "ContinuationPoints", "ByteString", hf_opcua_ContinuationPoints, parseByteString);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_BrowseNextResponse = -1;
@@ -399,9 +399,9 @@ void parseBrowseNextResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfResults */
-  parseArrayComplex(subtree, tvb, pOffset, "Results", parseBrowseResult);
+  parseArrayComplex(subtree, tvb, pOffset, "Results", "BrowseResult", parseBrowseResult);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_TranslateBrowsePathsToNodeIdsRequest = -1;
@@ -412,7 +412,7 @@ void parseTranslateBrowsePathsToNodeIdsRequest(proto_tree *tree, tvbuff_t *tvb,
 
   parseRequestHeader(subtree, tvb, pOffset, "RequestHeader");
   /* Array length field ignored: NoOfBrowsePaths */
-  parseArrayComplex(subtree, tvb, pOffset, "BrowsePaths", parseBrowsePath);
+  parseArrayComplex(subtree, tvb, pOffset, "BrowsePaths", "BrowsePath", parseBrowsePath);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_TranslateBrowsePathsToNodeIdsResponse = -1;
@@ -423,9 +423,9 @@ void parseTranslateBrowsePathsToNodeIdsResponse(proto_tree *tree, tvbuff_t *tvb,
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfResults */
-  parseArrayComplex(subtree, tvb, pOffset, "Results", parseBrowsePathResult);
+  parseArrayComplex(subtree, tvb, pOffset, "Results", "BrowsePathResult", parseBrowsePathResult);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_RegisterNodesRequest = -1;
@@ -436,7 +436,7 @@ void parseRegisterNodesRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseRequestHeader(subtree, tvb, pOffset, "RequestHeader");
   /* Array length field ignored: NoOfNodesToRegister */
-  parseArrayComplex(subtree, tvb, pOffset, "NodesToRegister", parseNodeId);
+  parseArrayComplex(subtree, tvb, pOffset, "NodesToRegister", "NodeId", parseNodeId);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_RegisterNodesResponse = -1;
@@ -447,7 +447,7 @@ void parseRegisterNodesResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfRegisteredNodeIds */
-  parseArrayComplex(subtree, tvb, pOffset, "RegisteredNodeIds", parseNodeId);
+  parseArrayComplex(subtree, tvb, pOffset, "RegisteredNodeIds", "NodeId", parseNodeId);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_UnregisterNodesRequest = -1;
@@ -458,7 +458,7 @@ void parseUnregisterNodesRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseRequestHeader(subtree, tvb, pOffset, "RequestHeader");
   /* Array length field ignored: NoOfNodesToUnregister */
-  parseArrayComplex(subtree, tvb, pOffset, "NodesToUnregister", parseNodeId);
+  parseArrayComplex(subtree, tvb, pOffset, "NodesToUnregister", "NodeId", parseNodeId);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_UnregisterNodesResponse = -1;
@@ -479,7 +479,7 @@ void parseQueryFirstRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
   parseRequestHeader(subtree, tvb, pOffset, "RequestHeader");
   parseViewDescription(subtree, tvb, pOffset, "View");
   /* Array length field ignored: NoOfNodeTypes */
-  parseArrayComplex(subtree, tvb, pOffset, "NodeTypes", parseNodeTypeDescription);
+  parseArrayComplex(subtree, tvb, pOffset, "NodeTypes", "NodeTypeDescription", parseNodeTypeDescription);
   parseContentFilter(subtree, tvb, pOffset, "Filter");
   parseUInt32(subtree, tvb, pOffset, hf_opcua_MaxDataSetsToReturn);
   parseUInt32(subtree, tvb, pOffset, hf_opcua_MaxReferencesToReturn);
@@ -493,12 +493,12 @@ void parseQueryFirstResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfQueryDataSets */
-  parseArrayComplex(subtree, tvb, pOffset, "QueryDataSets", parseQueryDataSet);
+  parseArrayComplex(subtree, tvb, pOffset, "QueryDataSets", "QueryDataSet", parseQueryDataSet);
   parseByteString(subtree, tvb, pOffset, hf_opcua_ContinuationPoint);
   /* Array length field ignored: NoOfParsingResults */
-  parseArrayComplex(subtree, tvb, pOffset, "ParsingResults", parseParsingResult);
+  parseArrayComplex(subtree, tvb, pOffset, "ParsingResults", "ParsingResult", parseParsingResult);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   parseContentFilterResult(subtree, tvb, pOffset, "FilterResult");
   proto_item_set_end(ti, tvb, *pOffset);
 }
@@ -521,7 +521,7 @@ void parseQueryNextResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfQueryDataSets */
-  parseArrayComplex(subtree, tvb, pOffset, "QueryDataSets", parseQueryDataSet);
+  parseArrayComplex(subtree, tvb, pOffset, "QueryDataSets", "QueryDataSet", parseQueryDataSet);
   parseByteString(subtree, tvb, pOffset, hf_opcua_RevisedContinuationPoint);
   proto_item_set_end(ti, tvb, *pOffset);
 }
@@ -535,7 +535,7 @@ void parseReadRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
   parseDouble(subtree, tvb, pOffset, hf_opcua_MaxAge);
   parseTimestampsToReturn(subtree, tvb, pOffset);
   /* Array length field ignored: NoOfNodesToRead */
-  parseArrayComplex(subtree, tvb, pOffset, "NodesToRead", parseReadValueId);
+  parseArrayComplex(subtree, tvb, pOffset, "NodesToRead", "ReadValueId", parseReadValueId);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_ReadResponse = -1;
@@ -546,9 +546,9 @@ void parseReadResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfResults */
-  parseArrayComplex(subtree, tvb, pOffset, "Results", parseDataValue);
+  parseArrayComplex(subtree, tvb, pOffset, "Results", "DataValue", parseDataValue);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_HistoryReadRequest = -1;
@@ -562,7 +562,7 @@ void parseHistoryReadRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
   parseTimestampsToReturn(subtree, tvb, pOffset);
   parseBoolean(subtree, tvb, pOffset, hf_opcua_ReleaseContinuationPoints);
   /* Array length field ignored: NoOfNodesToRead */
-  parseArrayComplex(subtree, tvb, pOffset, "NodesToRead", parseHistoryReadValueId);
+  parseArrayComplex(subtree, tvb, pOffset, "NodesToRead", "HistoryReadValueId", parseHistoryReadValueId);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_HistoryReadResponse = -1;
@@ -573,9 +573,9 @@ void parseHistoryReadResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfResults */
-  parseArrayComplex(subtree, tvb, pOffset, "Results", parseHistoryReadResult);
+  parseArrayComplex(subtree, tvb, pOffset, "Results", "HistoryReadResult", parseHistoryReadResult);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_WriteRequest = -1;
@@ -586,7 +586,7 @@ void parseWriteRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseRequestHeader(subtree, tvb, pOffset, "RequestHeader");
   /* Array length field ignored: NoOfNodesToWrite */
-  parseArrayComplex(subtree, tvb, pOffset, "NodesToWrite", parseWriteValue);
+  parseArrayComplex(subtree, tvb, pOffset, "NodesToWrite", "WriteValue", parseWriteValue);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_WriteResponse = -1;
@@ -597,9 +597,9 @@ void parseWriteResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfResults */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_Results, parseStatusCode);
+  parseArraySimple(subtree, tvb, pOffset, "Results", "StatusCode", hf_opcua_Results, parseStatusCode);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_HistoryUpdateRequest = -1;
@@ -610,7 +610,7 @@ void parseHistoryUpdateRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseRequestHeader(subtree, tvb, pOffset, "RequestHeader");
   /* Array length field ignored: NoOfHistoryUpdateDetails */
-  parseArrayComplex(subtree, tvb, pOffset, "HistoryUpdateDetails", parseExtensionObject);
+  parseArrayComplex(subtree, tvb, pOffset, "HistoryUpdateDetails", "ExtensionObject", parseExtensionObject);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_HistoryUpdateResponse = -1;
@@ -621,9 +621,9 @@ void parseHistoryUpdateResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfResults */
-  parseArrayComplex(subtree, tvb, pOffset, "Results", parseHistoryUpdateResult);
+  parseArrayComplex(subtree, tvb, pOffset, "Results", "HistoryUpdateResult", parseHistoryUpdateResult);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_CallRequest = -1;
@@ -634,7 +634,7 @@ void parseCallRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseRequestHeader(subtree, tvb, pOffset, "RequestHeader");
   /* Array length field ignored: NoOfMethodsToCall */
-  parseArrayComplex(subtree, tvb, pOffset, "MethodsToCall", parseCallMethodRequest);
+  parseArrayComplex(subtree, tvb, pOffset, "MethodsToCall", "CallMethodRequest", parseCallMethodRequest);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_CallResponse = -1;
@@ -645,9 +645,9 @@ void parseCallResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfResults */
-  parseArrayComplex(subtree, tvb, pOffset, "Results", parseCallMethodResult);
+  parseArrayComplex(subtree, tvb, pOffset, "Results", "CallMethodResult", parseCallMethodResult);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_CreateMonitoredItemsRequest = -1;
@@ -660,7 +660,7 @@ void parseCreateMonitoredItemsRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOf
   parseUInt32(subtree, tvb, pOffset, hf_opcua_SubscriptionId);
   parseTimestampsToReturn(subtree, tvb, pOffset);
   /* Array length field ignored: NoOfItemsToCreate */
-  parseArrayComplex(subtree, tvb, pOffset, "ItemsToCreate", parseMonitoredItemCreateRequest);
+  parseArrayComplex(subtree, tvb, pOffset, "ItemsToCreate", "MonitoredItemCreateRequest", parseMonitoredItemCreateRequest);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_CreateMonitoredItemsResponse = -1;
@@ -671,9 +671,9 @@ void parseCreateMonitoredItemsResponse(proto_tree *tree, tvbuff_t *tvb, gint *pO
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfResults */
-  parseArrayComplex(subtree, tvb, pOffset, "Results", parseMonitoredItemCreateResult);
+  parseArrayComplex(subtree, tvb, pOffset, "Results", "MonitoredItemCreateResult", parseMonitoredItemCreateResult);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_ModifyMonitoredItemsRequest = -1;
@@ -686,7 +686,7 @@ void parseModifyMonitoredItemsRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOf
   parseUInt32(subtree, tvb, pOffset, hf_opcua_SubscriptionId);
   parseTimestampsToReturn(subtree, tvb, pOffset);
   /* Array length field ignored: NoOfItemsToModify */
-  parseArrayComplex(subtree, tvb, pOffset, "ItemsToModify", parseMonitoredItemModifyRequest);
+  parseArrayComplex(subtree, tvb, pOffset, "ItemsToModify", "MonitoredItemModifyRequest", parseMonitoredItemModifyRequest);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_ModifyMonitoredItemsResponse = -1;
@@ -697,9 +697,9 @@ void parseModifyMonitoredItemsResponse(proto_tree *tree, tvbuff_t *tvb, gint *pO
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfResults */
-  parseArrayComplex(subtree, tvb, pOffset, "Results", parseMonitoredItemModifyResult);
+  parseArrayComplex(subtree, tvb, pOffset, "Results", "MonitoredItemModifyResult", parseMonitoredItemModifyResult);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_SetMonitoringModeRequest = -1;
@@ -712,7 +712,7 @@ void parseSetMonitoringModeRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffse
   parseUInt32(subtree, tvb, pOffset, hf_opcua_SubscriptionId);
   parseMonitoringMode(subtree, tvb, pOffset);
   /* Array length field ignored: NoOfMonitoredItemIds */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_MonitoredItemIds, parseUInt32);
+  parseArraySimple(subtree, tvb, pOffset, "MonitoredItemIds", "UInt32", hf_opcua_MonitoredItemIds, parseUInt32);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_SetMonitoringModeResponse = -1;
@@ -723,9 +723,9 @@ void parseSetMonitoringModeResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffs
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfResults */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_Results, parseStatusCode);
+  parseArraySimple(subtree, tvb, pOffset, "Results", "StatusCode", hf_opcua_Results, parseStatusCode);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_SetTriggeringRequest = -1;
@@ -738,9 +738,9 @@ void parseSetTriggeringRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
   parseUInt32(subtree, tvb, pOffset, hf_opcua_SubscriptionId);
   parseUInt32(subtree, tvb, pOffset, hf_opcua_TriggeringItemId);
   /* Array length field ignored: NoOfLinksToAdd */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_LinksToAdd, parseUInt32);
+  parseArraySimple(subtree, tvb, pOffset, "LinksToAdd", "UInt32", hf_opcua_LinksToAdd, parseUInt32);
   /* Array length field ignored: NoOfLinksToRemove */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_LinksToRemove, parseUInt32);
+  parseArraySimple(subtree, tvb, pOffset, "LinksToRemove", "UInt32", hf_opcua_LinksToRemove, parseUInt32);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_SetTriggeringResponse = -1;
@@ -751,13 +751,13 @@ void parseSetTriggeringResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfAddResults */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_AddResults, parseStatusCode);
+  parseArraySimple(subtree, tvb, pOffset, "AddResults", "StatusCode", hf_opcua_AddResults, parseStatusCode);
   /* Array length field ignored: NoOfAddDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "AddDiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "AddDiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   /* Array length field ignored: NoOfRemoveResults */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_RemoveResults, parseStatusCode);
+  parseArraySimple(subtree, tvb, pOffset, "RemoveResults", "StatusCode", hf_opcua_RemoveResults, parseStatusCode);
   /* Array length field ignored: NoOfRemoveDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "RemoveDiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "RemoveDiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_DeleteMonitoredItemsRequest = -1;
@@ -769,7 +769,7 @@ void parseDeleteMonitoredItemsRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOf
   parseRequestHeader(subtree, tvb, pOffset, "RequestHeader");
   parseUInt32(subtree, tvb, pOffset, hf_opcua_SubscriptionId);
   /* Array length field ignored: NoOfMonitoredItemIds */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_MonitoredItemIds, parseUInt32);
+  parseArraySimple(subtree, tvb, pOffset, "MonitoredItemIds", "UInt32", hf_opcua_MonitoredItemIds, parseUInt32);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_DeleteMonitoredItemsResponse = -1;
@@ -780,9 +780,9 @@ void parseDeleteMonitoredItemsResponse(proto_tree *tree, tvbuff_t *tvb, gint *pO
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfResults */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_Results, parseStatusCode);
+  parseArraySimple(subtree, tvb, pOffset, "Results", "StatusCode", hf_opcua_Results, parseStatusCode);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_CreateSubscriptionRequest = -1;
@@ -849,7 +849,7 @@ void parseSetPublishingModeRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffse
   parseRequestHeader(subtree, tvb, pOffset, "RequestHeader");
   parseBoolean(subtree, tvb, pOffset, hf_opcua_PublishingEnabled);
   /* Array length field ignored: NoOfSubscriptionIds */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_SubscriptionIds, parseUInt32);
+  parseArraySimple(subtree, tvb, pOffset, "SubscriptionIds", "UInt32", hf_opcua_SubscriptionIds, parseUInt32);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_SetPublishingModeResponse = -1;
@@ -860,9 +860,9 @@ void parseSetPublishingModeResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffs
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfResults */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_Results, parseStatusCode);
+  parseArraySimple(subtree, tvb, pOffset, "Results", "StatusCode", hf_opcua_Results, parseStatusCode);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_PublishRequest = -1;
@@ -873,7 +873,7 @@ void parsePublishRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
 
   parseRequestHeader(subtree, tvb, pOffset, "RequestHeader");
   /* Array length field ignored: NoOfSubscriptionAcknowledgements */
-  parseArrayComplex(subtree, tvb, pOffset, "SubscriptionAcknowledgements", parseSubscriptionAcknowledgement);
+  parseArrayComplex(subtree, tvb, pOffset, "SubscriptionAcknowledgements", "SubscriptionAcknowledgement", parseSubscriptionAcknowledgement);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_PublishResponse = -1;
@@ -885,13 +885,13 @@ void parsePublishResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   parseUInt32(subtree, tvb, pOffset, hf_opcua_SubscriptionId);
   /* Array length field ignored: NoOfAvailableSequenceNumbers */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_AvailableSequenceNumbers, parseUInt32);
+  parseArraySimple(subtree, tvb, pOffset, "AvailableSequenceNumbers", "UInt32", hf_opcua_AvailableSequenceNumbers, parseUInt32);
   parseBoolean(subtree, tvb, pOffset, hf_opcua_MoreNotifications);
   parseNotificationMessage(subtree, tvb, pOffset, "NotificationMessage");
   /* Array length field ignored: NoOfResults */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_Results, parseStatusCode);
+  parseArraySimple(subtree, tvb, pOffset, "Results", "StatusCode", hf_opcua_Results, parseStatusCode);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_RepublishRequest = -1;
@@ -923,7 +923,7 @@ void parseTransferSubscriptionsRequest(proto_tree *tree, tvbuff_t *tvb, gint *pO
 
   parseRequestHeader(subtree, tvb, pOffset, "RequestHeader");
   /* Array length field ignored: NoOfSubscriptionIds */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_SubscriptionIds, parseUInt32);
+  parseArraySimple(subtree, tvb, pOffset, "SubscriptionIds", "UInt32", hf_opcua_SubscriptionIds, parseUInt32);
   parseBoolean(subtree, tvb, pOffset, hf_opcua_SendInitialValues);
   proto_item_set_end(ti, tvb, *pOffset);
 }
@@ -935,9 +935,9 @@ void parseTransferSubscriptionsResponse(proto_tree *tree, tvbuff_t *tvb, gint *p
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfResults */
-  parseArrayComplex(subtree, tvb, pOffset, "Results", parseTransferResult);
+  parseArrayComplex(subtree, tvb, pOffset, "Results", "TransferResult", parseTransferResult);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_DeleteSubscriptionsRequest = -1;
@@ -948,7 +948,7 @@ void parseDeleteSubscriptionsRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOff
 
   parseRequestHeader(subtree, tvb, pOffset, "RequestHeader");
   /* Array length field ignored: NoOfSubscriptionIds */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_SubscriptionIds, parseUInt32);
+  parseArraySimple(subtree, tvb, pOffset, "SubscriptionIds", "UInt32", hf_opcua_SubscriptionIds, parseUInt32);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_DeleteSubscriptionsResponse = -1;
@@ -959,9 +959,9 @@ void parseDeleteSubscriptionsResponse(proto_tree *tree, tvbuff_t *tvb, gint *pOf
 
   parseResponseHeader(subtree, tvb, pOffset, "ResponseHeader");
   /* Array length field ignored: NoOfResults */
-  parseArraySimple(subtree, tvb, pOffset, hf_opcua_Results, parseStatusCode);
+  parseArraySimple(subtree, tvb, pOffset, "Results", "StatusCode", hf_opcua_Results, parseStatusCode);
   /* Array length field ignored: NoOfDiagnosticInfos */
-  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo);
+  parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", "DiagnosticInfo", parseDiagnosticInfo);
   proto_item_set_end(ti, tvb, *pOffset);
 }
 gint ett_opcua_TestStackRequest = -1;