From 051986ccf82f048c351f00d2ec2d38caf70371f1 Mon Sep 17 00:00:00 2001 From: Hannes Mezger Date: Wed, 1 Jul 2015 18:32:50 +0200 Subject: opcua dissector: Add DefaultXml encoding IDs Currently only DefaultBinary encoding IDs can be displayed, this commit adds the DefaultXml encoding IDs Change-Id: I19f3693d3aa03451655058770383222c3828b570 Reviewed-on: https://code.wireshark.org/review/9442 Reviewed-by: Pascal Quantin --- plugins/opcua/opcua_serviceids.h | 84 +++++++++++++++++++++++++++++++++++++- plugins/opcua/opcua_servicetable.c | 83 ++++++++++++++++++++++++++++++++++++- 2 files changed, 163 insertions(+), 4 deletions(-) (limited to 'plugins') diff --git a/plugins/opcua/opcua_serviceids.h b/plugins/opcua/opcua_serviceids.h index 15b9f2d4c5..d9c35cb8e5 100644 --- a/plugins/opcua/opcua_serviceids.h +++ b/plugins/opcua/opcua_serviceids.h @@ -1,5 +1,5 @@ /****************************************************************************** -** Copyright (C) 2006-2014 ascolab GmbH. All Rights Reserved. +** Copyright (C) 2006-2015 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 Service IDs ** -** This file was autogenerated on 10.06.2014. +** This file was autogenerated on 01.07.2015. ** DON'T MODIFY THIS FILE! ** XXX - well, except that you may have to. See the README. ** @@ -100,3 +100,83 @@ #define OpcUaId_TestStackExRequest_Encoding_DefaultBinary 416 #define OpcUaId_TestStackExResponse_Encoding_DefaultBinary 419 +#define OpcUaId_ServiceFault_Encoding_DefaultXml 396 +#define OpcUaId_FindServersRequest_Encoding_DefaultXml 421 +#define OpcUaId_FindServersResponse_Encoding_DefaultXml 424 +#define OpcUaId_GetEndpointsRequest_Encoding_DefaultXml 427 +#define OpcUaId_GetEndpointsResponse_Encoding_DefaultXml 430 +#define OpcUaId_RegisterServerRequest_Encoding_DefaultXml 436 +#define OpcUaId_RegisterServerResponse_Encoding_DefaultXml 439 +#define OpcUaId_OpenSecureChannelRequest_Encoding_DefaultXml 445 +#define OpcUaId_OpenSecureChannelResponse_Encoding_DefaultXml 448 +#define OpcUaId_CloseSecureChannelRequest_Encoding_DefaultXml 451 +#define OpcUaId_CloseSecureChannelResponse_Encoding_DefaultXml 454 +#define OpcUaId_CreateSessionRequest_Encoding_DefaultXml 460 +#define OpcUaId_CreateSessionResponse_Encoding_DefaultXml 463 +#define OpcUaId_ActivateSessionRequest_Encoding_DefaultXml 466 +#define OpcUaId_ActivateSessionResponse_Encoding_DefaultXml 469 +#define OpcUaId_CloseSessionRequest_Encoding_DefaultXml 472 +#define OpcUaId_CloseSessionResponse_Encoding_DefaultXml 475 +#define OpcUaId_CancelRequest_Encoding_DefaultXml 478 +#define OpcUaId_CancelResponse_Encoding_DefaultXml 481 +#define OpcUaId_AddNodesRequest_Encoding_DefaultXml 487 +#define OpcUaId_AddNodesResponse_Encoding_DefaultXml 490 +#define OpcUaId_AddReferencesRequest_Encoding_DefaultXml 493 +#define OpcUaId_AddReferencesResponse_Encoding_DefaultXml 496 +#define OpcUaId_DeleteNodesRequest_Encoding_DefaultXml 499 +#define OpcUaId_DeleteNodesResponse_Encoding_DefaultXml 502 +#define OpcUaId_DeleteReferencesRequest_Encoding_DefaultXml 505 +#define OpcUaId_DeleteReferencesResponse_Encoding_DefaultXml 508 +#define OpcUaId_BrowseRequest_Encoding_DefaultXml 526 +#define OpcUaId_BrowseResponse_Encoding_DefaultXml 529 +#define OpcUaId_BrowseNextRequest_Encoding_DefaultXml 532 +#define OpcUaId_BrowseNextResponse_Encoding_DefaultXml 535 +#define OpcUaId_TranslateBrowsePathsToNodeIdsRequest_Encoding_DefaultXml 553 +#define OpcUaId_TranslateBrowsePathsToNodeIdsResponse_Encoding_DefaultXml 556 +#define OpcUaId_RegisterNodesRequest_Encoding_DefaultXml 559 +#define OpcUaId_RegisterNodesResponse_Encoding_DefaultXml 562 +#define OpcUaId_UnregisterNodesRequest_Encoding_DefaultXml 565 +#define OpcUaId_UnregisterNodesResponse_Encoding_DefaultXml 568 +#define OpcUaId_QueryFirstRequest_Encoding_DefaultXml 614 +#define OpcUaId_QueryFirstResponse_Encoding_DefaultXml 617 +#define OpcUaId_QueryNextRequest_Encoding_DefaultXml 620 +#define OpcUaId_QueryNextResponse_Encoding_DefaultXml 623 +#define OpcUaId_ReadRequest_Encoding_DefaultXml 630 +#define OpcUaId_ReadResponse_Encoding_DefaultXml 633 +#define OpcUaId_HistoryReadRequest_Encoding_DefaultXml 663 +#define OpcUaId_HistoryReadResponse_Encoding_DefaultXml 666 +#define OpcUaId_WriteRequest_Encoding_DefaultXml 672 +#define OpcUaId_WriteResponse_Encoding_DefaultXml 675 +#define OpcUaId_HistoryUpdateRequest_Encoding_DefaultXml 699 +#define OpcUaId_HistoryUpdateResponse_Encoding_DefaultXml 702 +#define OpcUaId_CallRequest_Encoding_DefaultXml 711 +#define OpcUaId_CallResponse_Encoding_DefaultXml 714 +#define OpcUaId_CreateMonitoredItemsRequest_Encoding_DefaultXml 750 +#define OpcUaId_CreateMonitoredItemsResponse_Encoding_DefaultXml 753 +#define OpcUaId_ModifyMonitoredItemsRequest_Encoding_DefaultXml 762 +#define OpcUaId_ModifyMonitoredItemsResponse_Encoding_DefaultXml 765 +#define OpcUaId_SetMonitoringModeRequest_Encoding_DefaultXml 768 +#define OpcUaId_SetMonitoringModeResponse_Encoding_DefaultXml 771 +#define OpcUaId_SetTriggeringRequest_Encoding_DefaultXml 774 +#define OpcUaId_SetTriggeringResponse_Encoding_DefaultXml 777 +#define OpcUaId_DeleteMonitoredItemsRequest_Encoding_DefaultXml 780 +#define OpcUaId_DeleteMonitoredItemsResponse_Encoding_DefaultXml 783 +#define OpcUaId_CreateSubscriptionRequest_Encoding_DefaultXml 786 +#define OpcUaId_CreateSubscriptionResponse_Encoding_DefaultXml 789 +#define OpcUaId_ModifySubscriptionRequest_Encoding_DefaultXml 792 +#define OpcUaId_ModifySubscriptionResponse_Encoding_DefaultXml 795 +#define OpcUaId_SetPublishingModeRequest_Encoding_DefaultXml 798 +#define OpcUaId_SetPublishingModeResponse_Encoding_DefaultXml 801 +#define OpcUaId_PublishRequest_Encoding_DefaultXml 825 +#define OpcUaId_PublishResponse_Encoding_DefaultXml 828 +#define OpcUaId_RepublishRequest_Encoding_DefaultXml 831 +#define OpcUaId_RepublishResponse_Encoding_DefaultXml 834 +#define OpcUaId_TransferSubscriptionsRequest_Encoding_DefaultXml 840 +#define OpcUaId_TransferSubscriptionsResponse_Encoding_DefaultXml 843 +#define OpcUaId_DeleteSubscriptionsRequest_Encoding_DefaultXml 846 +#define OpcUaId_DeleteSubscriptionsResponse_Encoding_DefaultXml 849 +#define OpcUaId_TestStackRequest_Encoding_DefaultXml 409 +#define OpcUaId_TestStackResponse_Encoding_DefaultXml 412 +#define OpcUaId_TestStackExRequest_Encoding_DefaultXml 415 +#define OpcUaId_TestStackExResponse_Encoding_DefaultXml 418 + diff --git a/plugins/opcua/opcua_servicetable.c b/plugins/opcua/opcua_servicetable.c index 024c73af4b..ef51133a5d 100644 --- a/plugins/opcua/opcua_servicetable.c +++ b/plugins/opcua/opcua_servicetable.c @@ -1,5 +1,5 @@ /****************************************************************************** -** Copyright (C) 2006-2014 ascolab GmbH. All Rights Reserved. +** Copyright (C) 2006-2015 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 16.10.2014. +** This file was autogenerated on 01.07.2015. ** DON'T MODIFY THIS FILE! ** ******************************************************************************/ @@ -191,6 +191,85 @@ const value_string g_requesttypes[] = { { OpcUaId_TestStackResponse_Encoding_DefaultBinary, "TestStackResponse" }, { OpcUaId_TestStackExRequest_Encoding_DefaultBinary, "TestStackExRequest" }, { OpcUaId_TestStackExResponse_Encoding_DefaultBinary, "TestStackExResponse" }, + { OpcUaId_ServiceFault_Encoding_DefaultXml, "ServiceFault (XML Encoding)" }, + { OpcUaId_FindServersRequest_Encoding_DefaultXml, "FindServersRequest (XML Encoding)" }, + { OpcUaId_FindServersResponse_Encoding_DefaultXml, "FindServersResponse (XML Encoding)" }, + { OpcUaId_GetEndpointsRequest_Encoding_DefaultXml, "GetEndpointsRequest (XML Encoding)" }, + { OpcUaId_GetEndpointsResponse_Encoding_DefaultXml, "GetEndpointsResponse (XML Encoding)" }, + { OpcUaId_RegisterServerRequest_Encoding_DefaultXml, "RegisterServerRequest (XML Encoding)" }, + { OpcUaId_RegisterServerResponse_Encoding_DefaultXml, "RegisterServerResponse (XML Encoding)" }, + { OpcUaId_OpenSecureChannelRequest_Encoding_DefaultXml, "OpenSecureChannelRequest (XML Encoding)" }, + { OpcUaId_OpenSecureChannelResponse_Encoding_DefaultXml, "OpenSecureChannelResponse (XML Encoding)" }, + { OpcUaId_CloseSecureChannelRequest_Encoding_DefaultXml, "CloseSecureChannelRequest (XML Encoding)" }, + { OpcUaId_CloseSecureChannelResponse_Encoding_DefaultXml, "CloseSecureChannelResponse (XML Encoding)" }, + { OpcUaId_CreateSessionRequest_Encoding_DefaultXml, "CreateSessionRequest (XML Encoding)" }, + { OpcUaId_CreateSessionResponse_Encoding_DefaultXml, "CreateSessionResponse (XML Encoding)" }, + { OpcUaId_ActivateSessionRequest_Encoding_DefaultXml, "ActivateSessionRequest (XML Encoding)" }, + { OpcUaId_ActivateSessionResponse_Encoding_DefaultXml, "ActivateSessionResponse (XML Encoding)" }, + { OpcUaId_CloseSessionRequest_Encoding_DefaultXml, "CloseSessionRequest (XML Encoding)" }, + { OpcUaId_CloseSessionResponse_Encoding_DefaultXml, "CloseSessionResponse (XML Encoding)" }, + { OpcUaId_CancelRequest_Encoding_DefaultXml, "CancelRequest (XML Encoding)" }, + { OpcUaId_CancelResponse_Encoding_DefaultXml, "CancelResponse (XML Encoding)" }, + { OpcUaId_AddNodesRequest_Encoding_DefaultXml, "AddNodesRequest (XML Encoding)" }, + { OpcUaId_AddNodesResponse_Encoding_DefaultXml, "AddNodesResponse (XML Encoding)" }, + { OpcUaId_AddReferencesRequest_Encoding_DefaultXml, "AddReferencesRequest (XML Encoding)" }, + { OpcUaId_AddReferencesResponse_Encoding_DefaultXml, "AddReferencesResponse (XML Encoding)" }, + { OpcUaId_DeleteNodesRequest_Encoding_DefaultXml, "DeleteNodesRequest (XML Encoding)" }, + { OpcUaId_DeleteNodesResponse_Encoding_DefaultXml, "DeleteNodesResponse (XML Encoding)" }, + { OpcUaId_DeleteReferencesRequest_Encoding_DefaultXml, "DeleteReferencesRequest (XML Encoding)" }, + { OpcUaId_DeleteReferencesResponse_Encoding_DefaultXml, "DeleteReferencesResponse (XML Encoding)" }, + { OpcUaId_BrowseRequest_Encoding_DefaultXml, "BrowseRequest (XML Encoding)" }, + { OpcUaId_BrowseResponse_Encoding_DefaultXml, "BrowseResponse (XML Encoding)" }, + { OpcUaId_BrowseNextRequest_Encoding_DefaultXml, "BrowseNextRequest (XML Encoding)" }, + { OpcUaId_BrowseNextResponse_Encoding_DefaultXml, "BrowseNextResponse (XML Encoding)" }, + { OpcUaId_TranslateBrowsePathsToNodeIdsRequest_Encoding_DefaultXml, "TranslateBrowsePathsToNodeIdsRequest (XML Encoding)" }, + { OpcUaId_TranslateBrowsePathsToNodeIdsResponse_Encoding_DefaultXml, "TranslateBrowsePathsToNodeIdsResponse (XML Encoding)" }, + { OpcUaId_RegisterNodesRequest_Encoding_DefaultXml, "RegisterNodesRequest (XML Encoding)" }, + { OpcUaId_RegisterNodesResponse_Encoding_DefaultXml, "RegisterNodesResponse (XML Encoding)" }, + { OpcUaId_UnregisterNodesRequest_Encoding_DefaultXml, "UnregisterNodesRequest (XML Encoding)" }, + { OpcUaId_UnregisterNodesResponse_Encoding_DefaultXml, "UnregisterNodesResponse (XML Encoding)" }, + { OpcUaId_QueryFirstRequest_Encoding_DefaultXml, "QueryFirstRequest (XML Encoding)" }, + { OpcUaId_QueryFirstResponse_Encoding_DefaultXml, "QueryFirstResponse (XML Encoding)" }, + { OpcUaId_QueryNextRequest_Encoding_DefaultXml, "QueryNextRequest (XML Encoding)" }, + { OpcUaId_QueryNextResponse_Encoding_DefaultXml, "QueryNextResponse (XML Encoding)" }, + { OpcUaId_ReadRequest_Encoding_DefaultXml, "ReadRequest (XML Encoding)" }, + { OpcUaId_ReadResponse_Encoding_DefaultXml, "ReadResponse (XML Encoding)" }, + { OpcUaId_HistoryReadRequest_Encoding_DefaultXml, "HistoryReadRequest (XML Encoding)" }, + { OpcUaId_HistoryReadResponse_Encoding_DefaultXml, "HistoryReadResponse (XML Encoding)" }, + { OpcUaId_WriteRequest_Encoding_DefaultXml, "WriteRequest (XML Encoding)" }, + { OpcUaId_WriteResponse_Encoding_DefaultXml, "WriteResponse (XML Encoding)" }, + { OpcUaId_HistoryUpdateRequest_Encoding_DefaultXml, "HistoryUpdateRequest (XML Encoding)" }, + { OpcUaId_HistoryUpdateResponse_Encoding_DefaultXml, "HistoryUpdateResponse (XML Encoding)" }, + { OpcUaId_CallRequest_Encoding_DefaultXml, "CallRequest (XML Encoding)" }, + { OpcUaId_CallResponse_Encoding_DefaultXml, "CallResponse (XML Encoding)" }, + { OpcUaId_CreateMonitoredItemsRequest_Encoding_DefaultXml, "CreateMonitoredItemsRequest (XML Encoding)" }, + { OpcUaId_CreateMonitoredItemsResponse_Encoding_DefaultXml, "CreateMonitoredItemsResponse (XML Encoding)" }, + { OpcUaId_ModifyMonitoredItemsRequest_Encoding_DefaultXml, "ModifyMonitoredItemsRequest (XML Encoding)" }, + { OpcUaId_ModifyMonitoredItemsResponse_Encoding_DefaultXml, "ModifyMonitoredItemsResponse (XML Encoding)" }, + { OpcUaId_SetMonitoringModeRequest_Encoding_DefaultXml, "SetMonitoringModeRequest (XML Encoding)" }, + { OpcUaId_SetMonitoringModeResponse_Encoding_DefaultXml, "SetMonitoringModeResponse (XML Encoding)" }, + { OpcUaId_SetTriggeringRequest_Encoding_DefaultXml, "SetTriggeringRequest (XML Encoding)" }, + { OpcUaId_SetTriggeringResponse_Encoding_DefaultXml, "SetTriggeringResponse (XML Encoding)" }, + { OpcUaId_DeleteMonitoredItemsRequest_Encoding_DefaultXml, "DeleteMonitoredItemsRequest (XML Encoding)" }, + { OpcUaId_DeleteMonitoredItemsResponse_Encoding_DefaultXml, "DeleteMonitoredItemsResponse (XML Encoding)" }, + { OpcUaId_CreateSubscriptionRequest_Encoding_DefaultXml, "CreateSubscriptionRequest (XML Encoding)" }, + { OpcUaId_CreateSubscriptionResponse_Encoding_DefaultXml, "CreateSubscriptionResponse (XML Encoding)" }, + { OpcUaId_ModifySubscriptionRequest_Encoding_DefaultXml, "ModifySubscriptionRequest (XML Encoding)" }, + { OpcUaId_ModifySubscriptionResponse_Encoding_DefaultXml, "ModifySubscriptionResponse (XML Encoding)" }, + { OpcUaId_SetPublishingModeRequest_Encoding_DefaultXml, "SetPublishingModeRequest (XML Encoding)" }, + { OpcUaId_SetPublishingModeResponse_Encoding_DefaultXml, "SetPublishingModeResponse (XML Encoding)" }, + { OpcUaId_PublishRequest_Encoding_DefaultXml, "PublishRequest (XML Encoding)" }, + { OpcUaId_PublishResponse_Encoding_DefaultXml, "PublishResponse (XML Encoding)" }, + { OpcUaId_RepublishRequest_Encoding_DefaultXml, "RepublishRequest (XML Encoding)" }, + { OpcUaId_RepublishResponse_Encoding_DefaultXml, "RepublishResponse (XML Encoding)" }, + { OpcUaId_TransferSubscriptionsRequest_Encoding_DefaultXml, "TransferSubscriptionsRequest (XML Encoding)" }, + { OpcUaId_TransferSubscriptionsResponse_Encoding_DefaultXml, "TransferSubscriptionsResponse (XML Encoding)" }, + { OpcUaId_DeleteSubscriptionsRequest_Encoding_DefaultXml, "DeleteSubscriptionsRequest (XML Encoding)" }, + { OpcUaId_DeleteSubscriptionsResponse_Encoding_DefaultXml, "DeleteSubscriptionsResponse (XML Encoding)" }, + { OpcUaId_TestStackRequest_Encoding_DefaultXml, "TestStackRequest (XML Encoding)" }, + { OpcUaId_TestStackResponse_Encoding_DefaultXml, "TestStackResponse (XML Encoding)" }, + { OpcUaId_TestStackExRequest_Encoding_DefaultXml, "TestStackExRequest (XML Encoding)" }, + { OpcUaId_TestStackExResponse_Encoding_DefaultXml, "TestStackExResponse (XML Encoding)" }, { 0, NULL } }; -- cgit v1.2.3