From abf1b5ead7f58ff6cd204c3727bed30eebe75e4e Mon Sep 17 00:00:00 2001 From: Hannes Mezger Date: Tue, 10 Jun 2014 18:01:27 +0200 Subject: Regenerate all sources using latest OPC UA specification - HistoryUpdateEventResult has been removed - Fixes two enums - Removes unused identifier defines Change-Id: I39c65c1eca1701b60dfaa3541cd7a5d1b479fb9b Reviewed-on: https://code.wireshark.org/review/2129 Reviewed-by: Anders Broman --- plugins/opcua/opcua_complextypeparser.c | 17 ++---- plugins/opcua/opcua_complextypeparser.h | 5 +- plugins/opcua/opcua_enumparser.c | 13 ++--- plugins/opcua/opcua_extensionobjectids.h | 89 ++---------------------------- plugins/opcua/opcua_extensionobjecttable.c | 5 +- plugins/opcua/opcua_hfindeces.c | 6 +- plugins/opcua/opcua_hfindeces.h | 5 +- plugins/opcua/opcua_serviceids.h | 89 +----------------------------- 8 files changed, 28 insertions(+), 201 deletions(-) (limited to 'plugins') diff --git a/plugins/opcua/opcua_complextypeparser.c b/plugins/opcua/opcua_complextypeparser.c index 9c4b04c775..f8a9a815b3 100644 --- a/plugins/opcua/opcua_complextypeparser.c +++ b/plugins/opcua/opcua_complextypeparser.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 10.06.2014. ** DON'T MODIFY THIS FILE! ** ******************************************************************************/ @@ -1072,7 +1072,8 @@ void parseUpdateEventDetails(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, con parseNodeId(subtree, tvb, pOffset, "NodeId"); parsePerformUpdateType(subtree, tvb, pOffset); parseEventFilter(subtree, tvb, pOffset, "Filter"); - parseHistoryEventFieldList(subtree, tvb, pOffset, "EventData"); + /* Array length field ignored: NoOfEventData */ + parseArrayComplex(subtree, tvb, pOffset, "EventData", parseHistoryEventFieldList); proto_item_set_end(ti, tvb, *pOffset); } gint ett_opcua_DeleteRawModifiedDetails = -1; @@ -1118,15 +1119,6 @@ void parseHistoryUpdateResult(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, co parseArrayComplex(subtree, tvb, pOffset, "DiagnosticInfos", parseDiagnosticInfo); proto_item_set_end(ti, tvb, *pOffset); } -gint ett_opcua_HistoryUpdateEventResult = -1; -void parseHistoryUpdateEventResult(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, const char *szFieldName) -{ - proto_item *ti = proto_tree_add_text(tree, tvb, *pOffset, -1, "%s : HistoryUpdateEventResult", szFieldName); - proto_tree *subtree = proto_item_add_subtree(ti, ett_opcua_HistoryUpdateEventResult); - parseStatusCode(subtree, tvb, pOffset, hf_opcua_StatusCode); - parseEventFilterResult(subtree, tvb, pOffset, "EventFilterResult"); - proto_item_set_end(ti, tvb, *pOffset); -} gint ett_opcua_CallMethodRequest = -1; void parseCallMethodRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, const char *szFieldName) { @@ -1865,7 +1857,6 @@ static gint *ett[] = &ett_opcua_DeleteAtTimeDetails, &ett_opcua_DeleteEventDetails, &ett_opcua_HistoryUpdateResult, - &ett_opcua_HistoryUpdateEventResult, &ett_opcua_CallMethodRequest, &ett_opcua_CallMethodResult, &ett_opcua_DataChangeFilter, diff --git a/plugins/opcua/opcua_complextypeparser.h b/plugins/opcua/opcua_complextypeparser.h index dd154a68a1..fbd6ce4cab 100644 --- a/plugins/opcua/opcua_complextypeparser.h +++ b/plugins/opcua/opcua_complextypeparser.h @@ -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 10.06.2014. ** DON'T MODIFY THIS FILE! ** XXX - well, except that you may have to. See the README. ** @@ -112,7 +112,6 @@ void parseDeleteRawModifiedDetails(proto_tree *tree, tvbuff_t *tvb, gint *pOffse void parseDeleteAtTimeDetails(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, const char *szFieldName); void parseDeleteEventDetails(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, const char *szFieldName); void parseHistoryUpdateResult(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, const char *szFieldName); -void parseHistoryUpdateEventResult(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, const char *szFieldName); void parseCallMethodRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, const char *szFieldName); void parseCallMethodResult(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, const char *szFieldName); void parseDataChangeFilter(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, const char *szFieldName); diff --git a/plugins/opcua/opcua_enumparser.c b/plugins/opcua/opcua_enumparser.c index 4e4c1681e5..c12e033876 100644 --- a/plugins/opcua/opcua_enumparser.c +++ b/plugins/opcua/opcua_enumparser.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 Enum Type Parser ** -** This file was autogenerated on 12.02.2013. +** This file was autogenerated on 10.06.2014. ** DON'T MODIFY THIS FILE! ** ******************************************************************************/ @@ -32,9 +32,8 @@ static const value_string g_NodeIdTypeTable[] = { { 1, "FourByte" }, { 2, "Numeric" }, { 3, "String" }, - { 4, "Uri" }, - { 5, "Guid" }, - { 6, "ByteString" }, + { 4, "Guid" }, + { 5, "ByteString" }, { 0, NULL } }; static int hf_opcua_NodeIdType = -1; @@ -453,8 +452,8 @@ void parseAxisScaleEnumeration(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) /** ExceptionDeviationFormat enum table */ static const value_string g_ExceptionDeviationFormatTable[] = { { 0, "AbsoluteValue" }, - { 1, "PercentOfRange" }, - { 2, "PercentOfValue" }, + { 1, "PercentOfValue" }, + { 2, "PercentOfRange" }, { 3, "PercentOfEURange" }, { 4, "Unknown" }, { 0, NULL } diff --git a/plugins/opcua/opcua_extensionobjectids.h b/plugins/opcua/opcua_extensionobjectids.h index d186fcac6f..2d7e112c13 100644 --- a/plugins/opcua/opcua_extensionobjectids.h +++ b/plugins/opcua/opcua_extensionobjectids.h @@ -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,6 +14,9 @@ ** ** Description: OpcUa Extension Object IDs ** +** This file was autogenerated on 10.06.2014. +** DON'T MODIFY THIS FILE! +** ******************************************************************************/ #define OpcUaId_Node_Encoding_DefaultBinary 260 @@ -34,35 +37,17 @@ #define OpcUaId_ApplicationDescription_Encoding_DefaultBinary 310 #define OpcUaId_RequestHeader_Encoding_DefaultBinary 391 #define OpcUaId_ResponseHeader_Encoding_DefaultBinary 394 -#define OpcUaId_FindServersRequest_Encoding_DefaultBinary 422 -#define OpcUaId_FindServersResponse_Encoding_DefaultBinary 425 #define OpcUaId_UserTokenPolicy_Encoding_DefaultBinary 306 #define OpcUaId_EndpointDescription_Encoding_DefaultBinary 314 -#define OpcUaId_GetEndpointsRequest_Encoding_DefaultBinary 428 -#define OpcUaId_GetEndpointsResponse_Encoding_DefaultBinary 431 #define OpcUaId_RegisteredServer_Encoding_DefaultBinary 434 -#define OpcUaId_RegisterServerRequest_Encoding_DefaultBinary 437 -#define OpcUaId_RegisterServerResponse_Encoding_DefaultBinary 440 #define OpcUaId_ChannelSecurityToken_Encoding_DefaultBinary 443 -#define OpcUaId_OpenSecureChannelRequest_Encoding_DefaultBinary 446 -#define OpcUaId_OpenSecureChannelResponse_Encoding_DefaultBinary 449 -#define OpcUaId_CloseSecureChannelRequest_Encoding_DefaultBinary 452 -#define OpcUaId_CloseSecureChannelResponse_Encoding_DefaultBinary 455 #define OpcUaId_SignedSoftwareCertificate_Encoding_DefaultBinary 346 #define OpcUaId_SignatureData_Encoding_DefaultBinary 458 -#define OpcUaId_CreateSessionRequest_Encoding_DefaultBinary 461 -#define OpcUaId_CreateSessionResponse_Encoding_DefaultBinary 464 #define OpcUaId_UserIdentityToken_Encoding_DefaultBinary 318 #define OpcUaId_AnonymousIdentityToken_Encoding_DefaultBinary 321 #define OpcUaId_UserNameIdentityToken_Encoding_DefaultBinary 324 #define OpcUaId_X509IdentityToken_Encoding_DefaultBinary 327 #define OpcUaId_IssuedIdentityToken_Encoding_DefaultBinary 940 -#define OpcUaId_ActivateSessionRequest_Encoding_DefaultBinary 467 -#define OpcUaId_ActivateSessionResponse_Encoding_DefaultBinary 470 -#define OpcUaId_CloseSessionRequest_Encoding_DefaultBinary 473 -#define OpcUaId_CloseSessionResponse_Encoding_DefaultBinary 476 -#define OpcUaId_CancelRequest_Encoding_DefaultBinary 479 -#define OpcUaId_CancelResponse_Encoding_DefaultBinary 482 #define OpcUaId_NodeAttributes_Encoding_DefaultBinary 351 #define OpcUaId_ObjectAttributes_Encoding_DefaultBinary 354 #define OpcUaId_VariableAttributes_Encoding_DefaultBinary 357 @@ -74,36 +59,18 @@ #define OpcUaId_ViewAttributes_Encoding_DefaultBinary 375 #define OpcUaId_AddNodesItem_Encoding_DefaultBinary 378 #define OpcUaId_AddNodesResult_Encoding_DefaultBinary 485 -#define OpcUaId_AddNodesRequest_Encoding_DefaultBinary 488 -#define OpcUaId_AddNodesResponse_Encoding_DefaultBinary 491 #define OpcUaId_AddReferencesItem_Encoding_DefaultBinary 381 -#define OpcUaId_AddReferencesRequest_Encoding_DefaultBinary 494 -#define OpcUaId_AddReferencesResponse_Encoding_DefaultBinary 497 #define OpcUaId_DeleteNodesItem_Encoding_DefaultBinary 384 -#define OpcUaId_DeleteNodesRequest_Encoding_DefaultBinary 500 -#define OpcUaId_DeleteNodesResponse_Encoding_DefaultBinary 503 #define OpcUaId_DeleteReferencesItem_Encoding_DefaultBinary 387 -#define OpcUaId_DeleteReferencesRequest_Encoding_DefaultBinary 506 -#define OpcUaId_DeleteReferencesResponse_Encoding_DefaultBinary 509 #define OpcUaId_ViewDescription_Encoding_DefaultBinary 513 #define OpcUaId_BrowseDescription_Encoding_DefaultBinary 516 #define OpcUaId_ReferenceDescription_Encoding_DefaultBinary 520 #define OpcUaId_BrowseResult_Encoding_DefaultBinary 524 -#define OpcUaId_BrowseRequest_Encoding_DefaultBinary 527 -#define OpcUaId_BrowseResponse_Encoding_DefaultBinary 530 -#define OpcUaId_BrowseNextRequest_Encoding_DefaultBinary 533 -#define OpcUaId_BrowseNextResponse_Encoding_DefaultBinary 536 #define OpcUaId_RelativePathElement_Encoding_DefaultBinary 539 #define OpcUaId_RelativePath_Encoding_DefaultBinary 542 #define OpcUaId_BrowsePath_Encoding_DefaultBinary 545 #define OpcUaId_BrowsePathTarget_Encoding_DefaultBinary 548 #define OpcUaId_BrowsePathResult_Encoding_DefaultBinary 551 -#define OpcUaId_TranslateBrowsePathsToNodeIdsRequest_Encoding_DefaultBinary 554 -#define OpcUaId_TranslateBrowsePathsToNodeIdsResponse_Encoding_DefaultBinary 557 -#define OpcUaId_RegisterNodesRequest_Encoding_DefaultBinary 560 -#define OpcUaId_RegisterNodesResponse_Encoding_DefaultBinary 563 -#define OpcUaId_UnregisterNodesRequest_Encoding_DefaultBinary 566 -#define OpcUaId_UnregisterNodesResponse_Encoding_DefaultBinary 569 #define OpcUaId_EndpointConfiguration_Encoding_DefaultBinary 333 #define OpcUaId_SupportedProfile_Encoding_DefaultBinary 337 #define OpcUaId_SoftwareCertificate_Encoding_DefaultBinary 343 @@ -113,7 +80,6 @@ #define OpcUaId_NodeReference_Encoding_DefaultBinary 582 #define OpcUaId_ContentFilterElement_Encoding_DefaultBinary 585 #define OpcUaId_ContentFilter_Encoding_DefaultBinary 588 -#define OpcUaId_FilterOperand_Encoding_DefaultBinary 591 #define OpcUaId_ElementOperand_Encoding_DefaultBinary 594 #define OpcUaId_LiteralOperand_Encoding_DefaultBinary 597 #define OpcUaId_AttributeOperand_Encoding_DefaultBinary 600 @@ -121,16 +87,9 @@ #define OpcUaId_ContentFilterElementResult_Encoding_DefaultBinary 606 #define OpcUaId_ContentFilterResult_Encoding_DefaultBinary 609 #define OpcUaId_ParsingResult_Encoding_DefaultBinary 612 -#define OpcUaId_QueryFirstRequest_Encoding_DefaultBinary 615 -#define OpcUaId_QueryFirstResponse_Encoding_DefaultBinary 618 -#define OpcUaId_QueryNextRequest_Encoding_DefaultBinary 621 -#define OpcUaId_QueryNextResponse_Encoding_DefaultBinary 624 #define OpcUaId_ReadValueId_Encoding_DefaultBinary 628 -#define OpcUaId_ReadRequest_Encoding_DefaultBinary 631 -#define OpcUaId_ReadResponse_Encoding_DefaultBinary 634 #define OpcUaId_HistoryReadValueId_Encoding_DefaultBinary 637 #define OpcUaId_HistoryReadResult_Encoding_DefaultBinary 640 -#define OpcUaId_HistoryReadDetails_Encoding_DefaultBinary 643 #define OpcUaId_ReadEventDetails_Encoding_DefaultBinary 646 #define OpcUaId_ReadRawModifiedDetails_Encoding_DefaultBinary 649 #define OpcUaId_ReadProcessedDetails_Encoding_DefaultBinary 652 @@ -139,11 +98,7 @@ #define OpcUaId_ModificationInfo_Encoding_DefaultBinary 11226 #define OpcUaId_HistoryModifiedData_Encoding_DefaultBinary 11227 #define OpcUaId_HistoryEvent_Encoding_DefaultBinary 661 -#define OpcUaId_HistoryReadRequest_Encoding_DefaultBinary 664 -#define OpcUaId_HistoryReadResponse_Encoding_DefaultBinary 667 #define OpcUaId_WriteValue_Encoding_DefaultBinary 670 -#define OpcUaId_WriteRequest_Encoding_DefaultBinary 673 -#define OpcUaId_WriteResponse_Encoding_DefaultBinary 676 #define OpcUaId_HistoryUpdateDetails_Encoding_DefaultBinary 679 #define OpcUaId_UpdateDataDetails_Encoding_DefaultBinary 682 #define OpcUaId_UpdateStructureDataDetails_Encoding_DefaultBinary 11300 @@ -152,44 +107,20 @@ #define OpcUaId_DeleteAtTimeDetails_Encoding_DefaultBinary 691 #define OpcUaId_DeleteEventDetails_Encoding_DefaultBinary 694 #define OpcUaId_HistoryUpdateResult_Encoding_DefaultBinary 697 -#define OpcUaId_HistoryUpdateEventResult_Encoding_DefaultBinary 931 -#define OpcUaId_HistoryUpdateRequest_Encoding_DefaultBinary 700 -#define OpcUaId_HistoryUpdateResponse_Encoding_DefaultBinary 703 #define OpcUaId_CallMethodRequest_Encoding_DefaultBinary 706 #define OpcUaId_CallMethodResult_Encoding_DefaultBinary 709 -#define OpcUaId_CallRequest_Encoding_DefaultBinary 712 -#define OpcUaId_CallResponse_Encoding_DefaultBinary 715 -#define OpcUaId_MonitoringFilter_Encoding_DefaultBinary 721 #define OpcUaId_DataChangeFilter_Encoding_DefaultBinary 724 #define OpcUaId_EventFilter_Encoding_DefaultBinary 727 #define OpcUaId_AggregateConfiguration_Encoding_DefaultBinary 950 #define OpcUaId_AggregateFilter_Encoding_DefaultBinary 730 -#define OpcUaId_MonitoringFilterResult_Encoding_DefaultBinary 733 #define OpcUaId_EventFilterResult_Encoding_DefaultBinary 736 #define OpcUaId_AggregateFilterResult_Encoding_DefaultBinary 739 #define OpcUaId_MonitoringParameters_Encoding_DefaultBinary 742 #define OpcUaId_MonitoredItemCreateRequest_Encoding_DefaultBinary 745 #define OpcUaId_MonitoredItemCreateResult_Encoding_DefaultBinary 748 -#define OpcUaId_CreateMonitoredItemsRequest_Encoding_DefaultBinary 751 -#define OpcUaId_CreateMonitoredItemsResponse_Encoding_DefaultBinary 754 #define OpcUaId_MonitoredItemModifyRequest_Encoding_DefaultBinary 757 #define OpcUaId_MonitoredItemModifyResult_Encoding_DefaultBinary 760 -#define OpcUaId_ModifyMonitoredItemsRequest_Encoding_DefaultBinary 763 -#define OpcUaId_ModifyMonitoredItemsResponse_Encoding_DefaultBinary 766 -#define OpcUaId_SetMonitoringModeRequest_Encoding_DefaultBinary 769 -#define OpcUaId_SetMonitoringModeResponse_Encoding_DefaultBinary 772 -#define OpcUaId_SetTriggeringRequest_Encoding_DefaultBinary 775 -#define OpcUaId_SetTriggeringResponse_Encoding_DefaultBinary 778 -#define OpcUaId_DeleteMonitoredItemsRequest_Encoding_DefaultBinary 781 -#define OpcUaId_DeleteMonitoredItemsResponse_Encoding_DefaultBinary 784 -#define OpcUaId_CreateSubscriptionRequest_Encoding_DefaultBinary 787 -#define OpcUaId_CreateSubscriptionResponse_Encoding_DefaultBinary 790 -#define OpcUaId_ModifySubscriptionRequest_Encoding_DefaultBinary 793 -#define OpcUaId_ModifySubscriptionResponse_Encoding_DefaultBinary 796 -#define OpcUaId_SetPublishingModeRequest_Encoding_DefaultBinary 799 -#define OpcUaId_SetPublishingModeResponse_Encoding_DefaultBinary 802 #define OpcUaId_NotificationMessage_Encoding_DefaultBinary 805 -#define OpcUaId_NotificationData_Encoding_DefaultBinary 947 #define OpcUaId_DataChangeNotification_Encoding_DefaultBinary 811 #define OpcUaId_MonitoredItemNotification_Encoding_DefaultBinary 808 #define OpcUaId_EventNotificationList_Encoding_DefaultBinary 916 @@ -197,22 +128,10 @@ #define OpcUaId_HistoryEventFieldList_Encoding_DefaultBinary 922 #define OpcUaId_StatusChangeNotification_Encoding_DefaultBinary 820 #define OpcUaId_SubscriptionAcknowledgement_Encoding_DefaultBinary 823 -#define OpcUaId_PublishRequest_Encoding_DefaultBinary 826 -#define OpcUaId_PublishResponse_Encoding_DefaultBinary 829 -#define OpcUaId_RepublishRequest_Encoding_DefaultBinary 832 -#define OpcUaId_RepublishResponse_Encoding_DefaultBinary 835 #define OpcUaId_TransferResult_Encoding_DefaultBinary 838 -#define OpcUaId_TransferSubscriptionsRequest_Encoding_DefaultBinary 841 -#define OpcUaId_TransferSubscriptionsResponse_Encoding_DefaultBinary 844 -#define OpcUaId_DeleteSubscriptionsRequest_Encoding_DefaultBinary 847 -#define OpcUaId_DeleteSubscriptionsResponse_Encoding_DefaultBinary 850 #define OpcUaId_ScalarTestType_Encoding_DefaultBinary 401 #define OpcUaId_ArrayTestType_Encoding_DefaultBinary 404 #define OpcUaId_CompositeTestType_Encoding_DefaultBinary 407 -#define OpcUaId_TestStackRequest_Encoding_DefaultBinary 410 -#define OpcUaId_TestStackResponse_Encoding_DefaultBinary 413 -#define OpcUaId_TestStackExRequest_Encoding_DefaultBinary 416 -#define OpcUaId_TestStackExResponse_Encoding_DefaultBinary 419 #define OpcUaId_BuildInfo_Encoding_DefaultBinary 340 #define OpcUaId_RedundantServerDataType_Encoding_DefaultBinary 855 #define OpcUaId_EndpointUrlListDataType_Encoding_DefaultBinary 11957 diff --git a/plugins/opcua/opcua_extensionobjecttable.c b/plugins/opcua/opcua_extensionobjecttable.c index 0d170696ca..fb34e9ccdf 100644 --- a/plugins/opcua/opcua_extensionobjecttable.c +++ b/plugins/opcua/opcua_extensionobjecttable.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: Service table and service dispatcher. ** -** This file was autogenerated on 12.02.2013. +** This file was autogenerated on 10.06.2014. ** DON'T MODIFY THIS FILE! ** XXX - well, except that you may have to. See the README. ** @@ -119,7 +119,6 @@ ExtensionObjectParserEntry g_arExtensionObjectParserTable[] = { { OpcUaId_DeleteAtTimeDetails_Encoding_DefaultBinary, parseDeleteAtTimeDetails, "DeleteAtTimeDetails" }, { OpcUaId_DeleteEventDetails_Encoding_DefaultBinary, parseDeleteEventDetails, "DeleteEventDetails" }, { OpcUaId_HistoryUpdateResult_Encoding_DefaultBinary, parseHistoryUpdateResult, "HistoryUpdateResult" }, - { OpcUaId_HistoryUpdateEventResult_Encoding_DefaultBinary, parseHistoryUpdateEventResult, "HistoryUpdateEventResult" }, { OpcUaId_CallMethodRequest_Encoding_DefaultBinary, parseCallMethodRequest, "CallMethodRequest" }, { OpcUaId_CallMethodResult_Encoding_DefaultBinary, parseCallMethodResult, "CallMethodResult" }, { OpcUaId_DataChangeFilter_Encoding_DefaultBinary, parseDataChangeFilter, "DataChangeFilter" }, diff --git a/plugins/opcua/opcua_hfindeces.c b/plugins/opcua/opcua_hfindeces.c index 0e48d1662a..cf05f9767c 100644 --- a/plugins/opcua/opcua_hfindeces.c +++ b/plugins/opcua/opcua_hfindeces.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: This file contains protocol field handles. ** -** This file was autogenerated on 12.02.2013. +** This file was autogenerated on 10.06.2014. ** DON'T MODIFY THIS FILE! ** ******************************************************************************/ @@ -198,6 +198,7 @@ int hf_opcua_NoOfElements = -1; int hf_opcua_NoOfEndpointUrlList = -1; int hf_opcua_NoOfEndpoints = -1; int hf_opcua_NoOfEnumeratedValues = -1; +int hf_opcua_NoOfEventData = -1; int hf_opcua_NoOfEventFields = -1; int hf_opcua_NoOfEventIds = -1; int hf_opcua_NoOfEvents = -1; @@ -594,6 +595,7 @@ void registerFieldTypes(int proto) { &hf_opcua_NoOfEndpointUrlList, { "NoOfEndpointUrlList", "opcua.NoOfEndpointUrlList", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_NoOfEndpoints, { "NoOfEndpoints", "opcua.NoOfEndpoints", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_NoOfEnumeratedValues, { "NoOfEnumeratedValues", "opcua.NoOfEnumeratedValues", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, + { &hf_opcua_NoOfEventData, { "NoOfEventData", "opcua.NoOfEventData", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_NoOfEventFields, { "NoOfEventFields", "opcua.NoOfEventFields", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_NoOfEventIds, { "NoOfEventIds", "opcua.NoOfEventIds", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_opcua_NoOfEvents, { "NoOfEvents", "opcua.NoOfEvents", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, diff --git a/plugins/opcua/opcua_hfindeces.h b/plugins/opcua/opcua_hfindeces.h index 88ad673016..5f351ae412 100644 --- a/plugins/opcua/opcua_hfindeces.h +++ b/plugins/opcua/opcua_hfindeces.h @@ -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: This file contains protocol field handles. ** -** This file was autogenerated on 12.02.2013. +** This file was autogenerated on 10.06.2014. ** DON'T MODIFY THIS FILE! ** XXX - well, except that you may have to. See the README. ** @@ -195,6 +195,7 @@ extern int hf_opcua_NoOfElements; extern int hf_opcua_NoOfEndpointUrlList; extern int hf_opcua_NoOfEndpoints; extern int hf_opcua_NoOfEnumeratedValues; +extern int hf_opcua_NoOfEventData; extern int hf_opcua_NoOfEventFields; extern int hf_opcua_NoOfEventIds; extern int hf_opcua_NoOfEvents; diff --git a/plugins/opcua/opcua_serviceids.h b/plugins/opcua/opcua_serviceids.h index 27d03f2e40..15b9f2d4c5 100644 --- a/plugins/opcua/opcua_serviceids.h +++ b/plugins/opcua/opcua_serviceids.h @@ -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,17 +14,13 @@ ** ** Description: OpcUa Service IDs ** -** This file was autogenerated on 31.03.2009. +** This file was autogenerated on 10.06.2014. ** DON'T MODIFY THIS FILE! ** XXX - well, except that you may have to. See the README. ** ******************************************************************************/ #define OpcUaId_ServiceFault_Encoding_DefaultBinary 397 -#define OpcUaId_TestStackRequest_Encoding_DefaultBinary 410 -#define OpcUaId_TestStackResponse_Encoding_DefaultBinary 413 -#define OpcUaId_TestStackExRequest_Encoding_DefaultBinary 416 -#define OpcUaId_TestStackExResponse_Encoding_DefaultBinary 419 #define OpcUaId_FindServersRequest_Encoding_DefaultBinary 422 #define OpcUaId_FindServersResponse_Encoding_DefaultBinary 425 #define OpcUaId_GetEndpointsRequest_Encoding_DefaultBinary 428 @@ -73,13 +69,10 @@ #define OpcUaId_WriteResponse_Encoding_DefaultBinary 676 #define OpcUaId_HistoryUpdateRequest_Encoding_DefaultBinary 700 #define OpcUaId_HistoryUpdateResponse_Encoding_DefaultBinary 703 -#define OpcUaId_CallMethodRequest_Encoding_DefaultBinary 706 #define OpcUaId_CallRequest_Encoding_DefaultBinary 712 #define OpcUaId_CallResponse_Encoding_DefaultBinary 715 -#define OpcUaId_MonitoredItemCreateRequest_Encoding_DefaultBinary 745 #define OpcUaId_CreateMonitoredItemsRequest_Encoding_DefaultBinary 751 #define OpcUaId_CreateMonitoredItemsResponse_Encoding_DefaultBinary 754 -#define OpcUaId_MonitoredItemModifyRequest_Encoding_DefaultBinary 757 #define OpcUaId_ModifyMonitoredItemsRequest_Encoding_DefaultBinary 763 #define OpcUaId_ModifyMonitoredItemsResponse_Encoding_DefaultBinary 766 #define OpcUaId_SetMonitoringModeRequest_Encoding_DefaultBinary 769 @@ -106,80 +99,4 @@ #define OpcUaId_TestStackResponse_Encoding_DefaultBinary 413 #define OpcUaId_TestStackExRequest_Encoding_DefaultBinary 416 #define OpcUaId_TestStackExResponse_Encoding_DefaultBinary 419 -#define OpcUaId_FindServersRequest_Encoding_DefaultBinary 422 -#define OpcUaId_FindServersResponse_Encoding_DefaultBinary 425 -#define OpcUaId_GetEndpointsRequest_Encoding_DefaultBinary 428 -#define OpcUaId_GetEndpointsResponse_Encoding_DefaultBinary 431 -#define OpcUaId_RegisterServerRequest_Encoding_DefaultBinary 437 -#define OpcUaId_RegisterServerResponse_Encoding_DefaultBinary 440 -#define OpcUaId_OpenSecureChannelRequest_Encoding_DefaultBinary 446 -#define OpcUaId_OpenSecureChannelResponse_Encoding_DefaultBinary 449 -#define OpcUaId_CloseSecureChannelRequest_Encoding_DefaultBinary 452 -#define OpcUaId_CloseSecureChannelResponse_Encoding_DefaultBinary 455 -#define OpcUaId_CreateSessionRequest_Encoding_DefaultBinary 461 -#define OpcUaId_CreateSessionResponse_Encoding_DefaultBinary 464 -#define OpcUaId_ActivateSessionRequest_Encoding_DefaultBinary 467 -#define OpcUaId_ActivateSessionResponse_Encoding_DefaultBinary 470 -#define OpcUaId_CloseSessionRequest_Encoding_DefaultBinary 473 -#define OpcUaId_CloseSessionResponse_Encoding_DefaultBinary 476 -#define OpcUaId_CancelRequest_Encoding_DefaultBinary 479 -#define OpcUaId_CancelResponse_Encoding_DefaultBinary 482 -#define OpcUaId_AddNodesRequest_Encoding_DefaultBinary 488 -#define OpcUaId_AddNodesResponse_Encoding_DefaultBinary 491 -#define OpcUaId_AddReferencesRequest_Encoding_DefaultBinary 494 -#define OpcUaId_AddReferencesResponse_Encoding_DefaultBinary 497 -#define OpcUaId_DeleteNodesRequest_Encoding_DefaultBinary 500 -#define OpcUaId_DeleteNodesResponse_Encoding_DefaultBinary 503 -#define OpcUaId_DeleteReferencesRequest_Encoding_DefaultBinary 506 -#define OpcUaId_DeleteReferencesResponse_Encoding_DefaultBinary 509 -#define OpcUaId_BrowseRequest_Encoding_DefaultBinary 527 -#define OpcUaId_BrowseResponse_Encoding_DefaultBinary 530 -#define OpcUaId_BrowseNextRequest_Encoding_DefaultBinary 533 -#define OpcUaId_BrowseNextResponse_Encoding_DefaultBinary 536 -#define OpcUaId_TranslateBrowsePathsToNodeIdsRequest_Encoding_DefaultBinary 554 -#define OpcUaId_TranslateBrowsePathsToNodeIdsResponse_Encoding_DefaultBinary 557 -#define OpcUaId_RegisterNodesRequest_Encoding_DefaultBinary 560 -#define OpcUaId_RegisterNodesResponse_Encoding_DefaultBinary 563 -#define OpcUaId_UnregisterNodesRequest_Encoding_DefaultBinary 566 -#define OpcUaId_UnregisterNodesResponse_Encoding_DefaultBinary 569 -#define OpcUaId_QueryFirstRequest_Encoding_DefaultBinary 615 -#define OpcUaId_QueryFirstResponse_Encoding_DefaultBinary 618 -#define OpcUaId_QueryNextRequest_Encoding_DefaultBinary 621 -#define OpcUaId_QueryNextResponse_Encoding_DefaultBinary 624 -#define OpcUaId_ReadRequest_Encoding_DefaultBinary 631 -#define OpcUaId_ReadResponse_Encoding_DefaultBinary 634 -#define OpcUaId_HistoryReadRequest_Encoding_DefaultBinary 664 -#define OpcUaId_HistoryReadResponse_Encoding_DefaultBinary 667 -#define OpcUaId_WriteRequest_Encoding_DefaultBinary 673 -#define OpcUaId_WriteResponse_Encoding_DefaultBinary 676 -#define OpcUaId_HistoryUpdateRequest_Encoding_DefaultBinary 700 -#define OpcUaId_HistoryUpdateResponse_Encoding_DefaultBinary 703 -#define OpcUaId_CallMethodRequest_Encoding_DefaultBinary 706 -#define OpcUaId_CallRequest_Encoding_DefaultBinary 712 -#define OpcUaId_CallResponse_Encoding_DefaultBinary 715 -#define OpcUaId_MonitoredItemCreateRequest_Encoding_DefaultBinary 745 -#define OpcUaId_CreateMonitoredItemsRequest_Encoding_DefaultBinary 751 -#define OpcUaId_CreateMonitoredItemsResponse_Encoding_DefaultBinary 754 -#define OpcUaId_MonitoredItemModifyRequest_Encoding_DefaultBinary 757 -#define OpcUaId_ModifyMonitoredItemsRequest_Encoding_DefaultBinary 763 -#define OpcUaId_ModifyMonitoredItemsResponse_Encoding_DefaultBinary 766 -#define OpcUaId_SetMonitoringModeRequest_Encoding_DefaultBinary 769 -#define OpcUaId_SetMonitoringModeResponse_Encoding_DefaultBinary 772 -#define OpcUaId_SetTriggeringRequest_Encoding_DefaultBinary 775 -#define OpcUaId_SetTriggeringResponse_Encoding_DefaultBinary 778 -#define OpcUaId_DeleteMonitoredItemsRequest_Encoding_DefaultBinary 781 -#define OpcUaId_DeleteMonitoredItemsResponse_Encoding_DefaultBinary 784 -#define OpcUaId_CreateSubscriptionRequest_Encoding_DefaultBinary 787 -#define OpcUaId_CreateSubscriptionResponse_Encoding_DefaultBinary 790 -#define OpcUaId_ModifySubscriptionRequest_Encoding_DefaultBinary 793 -#define OpcUaId_ModifySubscriptionResponse_Encoding_DefaultBinary 796 -#define OpcUaId_SetPublishingModeRequest_Encoding_DefaultBinary 799 -#define OpcUaId_SetPublishingModeResponse_Encoding_DefaultBinary 802 -#define OpcUaId_PublishRequest_Encoding_DefaultBinary 826 -#define OpcUaId_PublishResponse_Encoding_DefaultBinary 829 -#define OpcUaId_RepublishRequest_Encoding_DefaultBinary 832 -#define OpcUaId_RepublishResponse_Encoding_DefaultBinary 835 -#define OpcUaId_TransferSubscriptionsRequest_Encoding_DefaultBinary 841 -#define OpcUaId_TransferSubscriptionsResponse_Encoding_DefaultBinary 844 -#define OpcUaId_DeleteSubscriptionsRequest_Encoding_DefaultBinary 847 -#define OpcUaId_DeleteSubscriptionsResponse_Encoding_DefaultBinary 850 + -- cgit v1.2.3