From 43f3644d4e2b43ee43be807d6ef53fb879b90e5d Mon Sep 17 00:00:00 2001 From: kukosa Date: Fri, 5 Oct 2007 07:44:03 +0000 Subject: export more types from H.225.0 and H.245 which will be necessary for H.460.x, H.323 (Annex M,R), H.501 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23069 f5534014-38df-0310-8fa8-9805f1628bb7 --- asn1/h225/h225-exp.cnf | 24 ++++++ asn1/h225/h225.cnf | 34 +++++++- asn1/h245/h245-exp.cnf | 4 + asn1/h245/h245.cnf | 5 ++ asn1/h450/packet-h450-template.c | 2 +- epan/dissectors/packet-h225.c | 158 +++++++++++++++++----------------- epan/dissectors/packet-h225.h | 34 +++++++- epan/dissectors/packet-h245.c | 180 +++++++++++++++++++-------------------- epan/dissectors/packet-h245.h | 8 ++ epan/dissectors/packet-h450.c | 2 +- epan/libwireshark.def | 2 +- gtk/h225_counter.c | 2 +- tap-h225counter.c | 2 +- 13 files changed, 280 insertions(+), 177 deletions(-) diff --git a/asn1/h225/h225-exp.cnf b/asn1/h225/h225-exp.cnf index ab3249cbce..11fb609a20 100644 --- a/asn1/h225/h225-exp.cnf +++ b/asn1/h225/h225-exp.cnf @@ -8,13 +8,37 @@ H323-MESSAGES h225 #.END #.TYPE_ATTR +ReleaseCompleteReason TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_ReleaseCompleteReason_vals) BITMASK = 0 PresentationIndicator TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_PresentationIndicator_vals) BITMASK = 0 ScreeningIndicator TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_ScreeningIndicator_vals) BITMASK = 0 +TransportAddress TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_TransportAddress_vals) BITMASK = 0 +EndpointType TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +SupportedProtocols TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_SupportedProtocols_vals) BITMASK = 0 +TunnelledProtocol TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 NonStandardParameter TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 AliasAddress TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(AliasAddress_vals) BITMASK = 0 PartyNumber TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_PartyNumber_vals) BITMASK = 0 +PublicTypeOfNumber TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_PublicTypeOfNumber_vals) BITMASK = 0 +PrivateTypeOfNumber TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_PrivateTypeOfNumber_vals) BITMASK = 0 +AlternateTransportAddresses TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +GloballyUniqueID TYPE = FT_GUID DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +ConferenceIdentifier TYPE = FT_GUID DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +GatekeeperIdentifier TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +BandWidth TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +CallReferenceValue TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +TimeToLive TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 CallIdentifier TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +IntegrityMechanism TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_IntegrityMechanism_vals) BITMASK = 0 +ICV TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +CryptoH323Token TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_CryptoH323Token_vals) BITMASK = 0 +CircuitInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +CircuitIdentifier TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +ServiceControlSession TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 GenericData TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +GenericIdentifier TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_GenericIdentifier_vals) BITMASK = 0 +FeatureSet TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +TransportChannelInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 RasMessage TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(RasMessage_vals) BITMASK = 0 +TransportQOS TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_TransportQOS_vals) BITMASK = 0 #.END diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf index 236c3ae28d..bac9f1e2a0 100644 --- a/asn1/h225/h225.cnf +++ b/asn1/h225/h225.cnf @@ -4,6 +4,12 @@ # $Id$ #.INCLUDE ../h235/h235-exp.cnf + +#.TYPE_ATTR +# override TransportAddress from H.245 +# temporary solution till collision between imported and defined type is solved in the asn2wrs +TransportAddress TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_TransportAddress_vals) BITMASK = 0 +#.END #.INCLUDE ../h245/h245-exp.cnf #---------------------------------------------------------------------------------------- @@ -18,18 +24,42 @@ BandRejectReason DisengageReason DisengageRejectReason InfoRequestNakReason -ReleaseCompleteReason AdmissionRejectReason LocationRejectReason RegistrationRejectReason + #.EXPORTS -NonStandardParameter +NonStandardParameter +PublicTypeOfNumber +PrivateTypeOfNumber AliasAddress NO_PROT_PREFIX PartyNumber PresentationIndicator ScreeningIndicator CallIdentifier +ConferenceIdentifier +CircuitIdentifier +GenericIdentifier GenericData +BandWidth +TimeToLive +TransportAddress +AlternateTransportAddresses +TransportChannelInfo +CallReferenceValue +GloballyUniqueID +TunnelledProtocol +IntegrityMechanism +ICV +CryptoH323Token +TransportQOS +FeatureSet +CircuitInfo +EndpointType +SupportedProtocols +GatekeeperIdentifier +ServiceControlSession +ReleaseCompleteReason WS_VAR #.END #---------------------------------------------------------------------------------------- diff --git a/asn1/h245/h245-exp.cnf b/asn1/h245/h245-exp.cnf index a5d15ba570..4995060aa5 100644 --- a/asn1/h245/h245-exp.cnf +++ b/asn1/h245/h245-exp.cnf @@ -8,11 +8,15 @@ MULTIMEDIA-SYSTEM-CONTROL h245 #.END #.TYPE_ATTR +Capability TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h245_Capability_vals) BITMASK = 0 H223Capability TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 QOSCapability TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 DataProtocolCapability TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(DataProtocolCapability_vals) BITMASK = 0 T38FaxProfile TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 OpenLogicalChannel TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 H223LogicalChannelParameters TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +TransportAddress TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h245_TransportAddress_vals) BITMASK = 0 +UnicastAddress TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h245_UnicastAddress_vals) BITMASK = 0 +MulticastAddress TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h245_MulticastAddress_vals) BITMASK = 0 #.END diff --git a/asn1/h245/h245.cnf b/asn1/h245/h245.cnf index 7b0c01db79..c3c886421a 100644 --- a/asn1/h245/h245.cnf +++ b/asn1/h245/h245.cnf @@ -10,6 +10,11 @@ OpenLogicalChannel QOSCapability H223Capability H223LogicalChannelParameters +TransportAddress +UnicastAddress +MulticastAddress +Capability +#.END #.PDU OpenLogicalChannel diff --git a/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c index fa3b73e5fe..c6d2ca76b2 100644 --- a/asn1/h450/packet-h450-template.c +++ b/asn1/h450/packet-h450-template.c @@ -46,7 +46,7 @@ #include "packet-h450-ros.h" #define PNAME "H.450 Supplementary Services" -#define PSNAME "H450" +#define PSNAME "H.450" #define PFNAME "h450" /* Initialize the protocol and registered fields */ diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index 1962bb3b40..433ab9c7b0 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -1179,7 +1179,7 @@ dissect_h225_ProtocolIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static int dissect_h225_T_h245Ip(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 281 "h225.cnf" +#line 311 "h225.cnf" tvbuff_t *value_tvb; ipv4_address = 0; @@ -1419,7 +1419,7 @@ static const per_sequence_t H221NonStandard_sequence[] = { static int dissect_h225_H221NonStandard(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 570 "h225.cnf" +#line 600 "h225.cnf" t35CountryCode = 0; t35Extension = 0; manufacturerCode = 0; @@ -1427,7 +1427,7 @@ dissect_h225_H221NonStandard(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_H221NonStandard, H221NonStandard_sequence); -#line 574 "h225.cnf" +#line 604 "h225.cnf" h221NonStandard = ((t35CountryCode * 256) + t35Extension) * 65536 + manufacturerCode; proto_tree_add_uint(tree, hf_h221Manufacturer, tvb, (offset>>3)-4, 4, h221NonStandard); @@ -1449,7 +1449,7 @@ static const per_choice_t NonStandardIdentifier_choice[] = { static int dissect_h225_NonStandardIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 551 "h225.cnf" +#line 581 "h225.cnf" guint32 value; nsiOID = ""; @@ -1478,7 +1478,7 @@ dissect_h225_NonStandardIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_h225_T_nsp_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 585 "h225.cnf" +#line 615 "h225.cnf" tvbuff_t *next_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -1501,7 +1501,7 @@ static const per_sequence_t NonStandardParameter_sequence[] = { int dissect_h225_NonStandardParameter(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 583 "h225.cnf" +#line 613 "h225.cnf" nsp_handle = NULL; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -1535,7 +1535,7 @@ static const per_choice_t H245TransportAddress_choice[] = { static int dissect_h225_H245TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 391 "h225.cnf" +#line 421 "h225.cnf" ipv4_address=0; ipv4_port=0; @@ -1544,7 +1544,7 @@ dissect_h225_H245TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t ett_h225_H245TransportAddress, H245TransportAddress_choice, NULL); -#line 397 "h225.cnf" +#line 427 "h225.cnf" /* we need this info for TAPing */ h225_pi->is_h245 = TRUE; h225_pi->h245_address = ipv4_address; @@ -1573,7 +1573,7 @@ dissect_h225_H245TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_h225_DialedDigits(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 263 "h225.cnf" +#line 293 "h225.cnf" tvbuff_t *value_tvb = NULL; guint len = 0; @@ -1726,7 +1726,7 @@ dissect_h225_T_ip6Address(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U } -static const value_string h225_TransportAddress_vals[] = { +const value_string h225_TransportAddress_vals[] = { { 0, "ipAddress" }, { 1, "ipSourceRoute" }, { 2, "ipxAddress" }, @@ -1748,7 +1748,7 @@ static const per_choice_t TransportAddress_choice[] = { { 0, NULL, 0, NULL } }; -static int +int dissect_h225_TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h225_TransportAddress, TransportAddress_choice, @@ -1758,7 +1758,7 @@ dissect_h225_TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string h225_PublicTypeOfNumber_vals[] = { +const value_string h225_PublicTypeOfNumber_vals[] = { { 0, "unknown" }, { 1, "internationalNumber" }, { 2, "nationalNumber" }, @@ -1778,7 +1778,7 @@ static const per_choice_t PublicTypeOfNumber_choice[] = { { 0, NULL, 0, NULL } }; -static int +int dissect_h225_PublicTypeOfNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h225_PublicTypeOfNumber, PublicTypeOfNumber_choice, @@ -1814,7 +1814,7 @@ dissect_h225_PublicPartyNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac } -static const value_string h225_PrivateTypeOfNumber_vals[] = { +const value_string h225_PrivateTypeOfNumber_vals[] = { { 0, "unknown" }, { 1, "level2RegionalNumber" }, { 2, "level1RegionalNumber" }, @@ -1834,7 +1834,7 @@ static const per_choice_t PrivateTypeOfNumber_choice[] = { { 0, NULL, 0, NULL } }; -static int +int dissect_h225_PrivateTypeOfNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h225_PrivateTypeOfNumber, PrivateTypeOfNumber_choice, @@ -2207,7 +2207,7 @@ dissect_h225_GatekeeperInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx -static int +int dissect_h225_BandWidth(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 4294967295U, NULL, FALSE); @@ -2461,7 +2461,7 @@ dissect_h225_SIPCaps(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr } -static const value_string h225_SupportedProtocols_vals[] = { +const value_string h225_SupportedProtocols_vals[] = { { 0, "nonStandardData" }, { 1, "h310" }, { 2, "h320" }, @@ -2493,7 +2493,7 @@ static const per_choice_t SupportedProtocols_choice[] = { { 0, NULL, 0, NULL } }; -static int +int dissect_h225_SupportedProtocols(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h225_SupportedProtocols, SupportedProtocols_choice, @@ -2641,15 +2641,15 @@ static const per_sequence_t TunnelledProtocol_sequence[] = { { NULL, 0, 0, NULL } }; -static int +int dissect_h225_TunnelledProtocol(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 528 "h225.cnf" +#line 558 "h225.cnf" tpOID = ""; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_TunnelledProtocol, TunnelledProtocol_sequence); -#line 530 "h225.cnf" +#line 560 "h225.cnf" tp_handle = dissector_get_string_handle(tp_dissector_table, tpOID); return offset; @@ -2683,7 +2683,7 @@ static const per_sequence_t EndpointType_sequence[] = { { NULL, 0, 0, NULL } }; -static int +int dissect_h225_EndpointType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_EndpointType, EndpointType_sequence); @@ -2693,7 +2693,7 @@ dissect_h225_EndpointType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U -static int +int dissect_h225_CallReferenceValue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 65535U, NULL, FALSE); @@ -2716,7 +2716,7 @@ dissect_h225_SEQUENCE_OF_CallReferenceValue(tvbuff_t *tvb _U_, int offset _U_, a -static int +int dissect_h225_GloballyUniqueID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, 16, 16, actx->value_ptr); @@ -2726,7 +2726,7 @@ dissect_h225_GloballyUniqueID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act -static int +int dissect_h225_ConferenceIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_h225_GloballyUniqueID(tvb, offset, actx, tree, hf_index); @@ -2827,7 +2827,7 @@ dissect_h225_CallType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p static int dissect_h225_T_guid(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 503 "h225.cnf" +#line 533 "h225.cnf" tvbuff_t *guid_tvb; actx->value_ptr = &guid_tvb; @@ -2965,7 +2965,7 @@ dissect_h225_T_cryptoEPPwdHash(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac -static int +int dissect_h225_GatekeeperIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_BMPString(tvb, offset, actx, tree, hf_index, 1, 128); @@ -2990,7 +2990,7 @@ dissect_h225_T_cryptoGKPwdHash(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac } -static const value_string h225_CryptoH323Token_vals[] = { +const value_string h225_CryptoH323Token_vals[] = { { 0, "cryptoEPPwdHash" }, { 1, "cryptoGKPwdHash" }, { 2, "cryptoEPPwdEncr" }, @@ -3014,7 +3014,7 @@ static const per_choice_t CryptoH323Token_choice[] = { { 0, NULL, 0, NULL } }; -static int +int dissect_h225_CryptoH323Token(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h225_CryptoH323Token, CryptoH323Token_choice, @@ -3040,7 +3040,7 @@ dissect_h225_SEQUENCE_OF_CryptoH323Token(tvbuff_t *tvb _U_, int offset _U_, asn1 static int dissect_h225_FastStart_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 230 "h225.cnf" +#line 260 "h225.cnf" tvbuff_t *value_tvb = NULL; char codec_str[50]; @@ -3397,7 +3397,7 @@ static const per_sequence_t ServiceControlSession_sequence[] = { { NULL, 0, 0, NULL } }; -static int +int dissect_h225_ServiceControlSession(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_ServiceControlSession, ServiceControlSession_sequence); @@ -3616,7 +3616,7 @@ static const per_sequence_t CircuitIdentifier_sequence[] = { { NULL, 0, 0, NULL } }; -static int +int dissect_h225_CircuitIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_CircuitIdentifier, CircuitIdentifier_sequence); @@ -3635,7 +3635,7 @@ dissect_h225_INTEGER_0_16383_(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string h225_GenericIdentifier_vals[] = { +const value_string h225_GenericIdentifier_vals[] = { { 0, "standard" }, { 1, "oid" }, { 2, "nonStandard" }, @@ -3649,7 +3649,7 @@ static const per_choice_t GenericIdentifier_choice[] = { { 0, NULL, 0, NULL } }; -static int +int dissect_h225_GenericIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h225_GenericIdentifier, GenericIdentifier_choice, @@ -3809,7 +3809,7 @@ static const per_sequence_t CircuitInfo_sequence[] = { { NULL, 0, 0, NULL } }; -static int +int dissect_h225_CircuitInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_CircuitInfo, CircuitInfo_sequence); @@ -3843,7 +3843,7 @@ dissect_h225_SEQUENCE_OF_FeatureDescriptor(tvbuff_t *tvb _U_, int offset _U_, as static int dissect_h225_ParallelH245Control_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 292 "h225.cnf" +#line 322 "h225.cnf" tvbuff_t *h245_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -3954,13 +3954,13 @@ static const per_sequence_t Setup_UUIE_sequence[] = { static int dissect_h225_Setup_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 345 "h225.cnf" +#line 375 "h225.cnf" contains_faststart = FALSE; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Setup_UUIE, Setup_UUIE_sequence); -#line 349 "h225.cnf" +#line 379 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_SETUP; if (contains_faststart == TRUE ) @@ -3980,7 +3980,7 @@ static const per_sequence_t FeatureSet_sequence[] = { { NULL, 0, 0, NULL } }; -static int +int dissect_h225_FeatureSet(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_FeatureSet, FeatureSet_sequence); @@ -4010,7 +4010,7 @@ dissect_h225_CallProceeding_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_CallProceeding_UUIE, CallProceeding_UUIE_sequence); -#line 358 "h225.cnf" +#line 388 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_CALL_PROCEDING; if (contains_faststart == TRUE ) @@ -4050,7 +4050,7 @@ dissect_h225_Connect_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Connect_UUIE, Connect_UUIE_sequence); -#line 382 "h225.cnf" +#line 412 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_CONNECT; if (contains_faststart == TRUE ) @@ -4088,7 +4088,7 @@ dissect_h225_Alerting_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Alerting_UUIE, Alerting_UUIE_sequence); -#line 367 "h225.cnf" +#line 397 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_ALERTING; if (contains_faststart == TRUE ) @@ -4116,7 +4116,7 @@ dissect_h225_Information_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Information_UUIE, Information_UUIE_sequence); -#line 316 "h225.cnf" +#line 346 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_INFORMATION; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "")); @@ -4175,7 +4175,7 @@ dissect_h225_SecurityErrors(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } -const value_string ReleaseCompleteReason_vals[] = { +const value_string h225_ReleaseCompleteReason_vals[] = { { 0, "noBandwidth" }, { 1, "gatekeeperResources" }, { 2, "unreachableDestination" }, @@ -4233,9 +4233,9 @@ static const per_choice_t ReleaseCompleteReason_choice[] = { { 0, NULL, 0, NULL } }; -static int +int dissect_h225_ReleaseCompleteReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 496 "h225.cnf" +#line 526 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -4269,7 +4269,7 @@ dissect_h225_ReleaseComplete_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_ReleaseComplete_UUIE, ReleaseComplete_UUIE_sequence); -#line 376 "h225.cnf" +#line 406 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_RELEASE_COMPLET; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "")); @@ -4310,7 +4310,7 @@ static const per_choice_t FacilityReason_choice[] = { static int dissect_h225_FacilityReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 420 "h225.cnf" +#line 450 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -4383,7 +4383,7 @@ dissect_h225_Facility_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Facility_UUIE, Facility_UUIE_sequence); -#line 337 "h225.cnf" +#line 367 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_FACILITY; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "")); @@ -4412,7 +4412,7 @@ dissect_h225_Progress_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Progress_UUIE, Progress_UUIE_sequence); -#line 322 "h225.cnf" +#line 352 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_PROGRESS; if (contains_faststart == TRUE ) @@ -4429,7 +4429,7 @@ static int dissect_h225_T_empty_flg(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_null(tvb, offset, actx, tree, hf_index); -#line 306 "h225.cnf" +#line 336 "h225.cnf" h225_pi->cs_type = H225_EMPTY; return offset; @@ -4449,7 +4449,7 @@ dissect_h225_Status_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Status_UUIE, Status_UUIE_sequence); -#line 310 "h225.cnf" +#line 340 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_STATUS; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "")); @@ -4488,7 +4488,7 @@ dissect_h225_SetupAcknowledge_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_SetupAcknowledge_UUIE, SetupAcknowledge_UUIE_sequence); -#line 331 "h225.cnf" +#line 361 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_SETUP_ACK; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "")); @@ -4553,7 +4553,7 @@ static const per_choice_t T_h323_message_body_choice[] = { static int dissect_h225_T_h323_message_body(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 203 "h225.cnf" +#line 233 "h225.cnf" guint32 message_body_val; contains_faststart = FALSE; @@ -4590,7 +4590,7 @@ dissect_h225_T_h323_message_body(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * static int dissect_h225_T_h4501SupplementaryService_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 516 "h225.cnf" +#line 546 "h225.cnf" tvbuff_t *h4501_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -4630,7 +4630,7 @@ dissect_h225_T_h245Tunneling(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_h225_H245Control_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 299 "h225.cnf" +#line 329 "h225.cnf" tvbuff_t *h245_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -4687,7 +4687,7 @@ dissect_h225_CallLinkage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static int dissect_h225_T_messageContent_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 538 "h225.cnf" +#line 568 "h225.cnf" tvbuff_t *next_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -4723,7 +4723,7 @@ static const per_sequence_t T_tunnelledSignallingMessage_sequence[] = { static int dissect_h225_T_tunnelledSignallingMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 536 "h225.cnf" +#line 566 "h225.cnf" tp_handle = NULL; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -4879,7 +4879,7 @@ static const per_sequence_t AlternateTransportAddresses_sequence[] = { { NULL, 0, 0, NULL } }; -static int +int dissect_h225_AlternateTransportAddresses(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_AlternateTransportAddresses, AlternateTransportAddresses_sequence); @@ -5024,7 +5024,7 @@ dissect_h225_RequestSeqNum(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ -static int +int dissect_h225_TimeToLive(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 1U, 4294967295U, NULL, FALSE); @@ -5091,7 +5091,7 @@ dissect_h225_NonIsoIntegrityMechanism(tvbuff_t *tvb _U_, int offset _U_, asn1_ct } -static const value_string h225_IntegrityMechanism_vals[] = { +const value_string h225_IntegrityMechanism_vals[] = { { 0, "nonStandard" }, { 1, "digSig" }, { 2, "iso9797" }, @@ -5107,7 +5107,7 @@ static const per_choice_t IntegrityMechanism_choice[] = { { 0, NULL, 0, NULL } }; -static int +int dissect_h225_IntegrityMechanism(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h225_IntegrityMechanism, IntegrityMechanism_choice, @@ -5133,7 +5133,7 @@ static const per_sequence_t ICV_sequence[] = { { NULL, 0, 0, NULL } }; -static int +int dissect_h225_ICV(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_ICV, ICV_sequence); @@ -5313,7 +5313,7 @@ static const per_sequence_t TransportChannelInfo_sequence[] = { { NULL, 0, 0, NULL } }; -static int +int dissect_h225_TransportChannelInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_TransportChannelInfo, TransportChannelInfo_sequence); @@ -5570,7 +5570,7 @@ static const per_choice_t GatekeeperRejectReason_choice[] = { static int dissect_h225_GatekeeperRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 427 "h225.cnf" +#line 457 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -5648,7 +5648,7 @@ dissect_h225_SEQUENCE_SIZE_1_256_OF_QOSCapability(tvbuff_t *tvb _U_, int offset } -static const value_string h225_TransportQOS_vals[] = { +const value_string h225_TransportQOS_vals[] = { { 0, "endpointControlled" }, { 1, "gatekeeperControlled" }, { 2, "noControl" }, @@ -5664,7 +5664,7 @@ static const per_choice_t TransportQOS_choice[] = { { 0, NULL, 0, NULL } }; -static int +int dissect_h225_TransportQOS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h225_TransportQOS, TransportQOS_choice, @@ -5872,7 +5872,7 @@ static const per_choice_t RegistrationRejectReason_choice[] = { static int dissect_h225_RegistrationRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 482 "h225.cnf" +#line 512 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -5935,7 +5935,7 @@ static const per_choice_t UnregRequestReason_choice[] = { static int dissect_h225_UnregRequestReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 434 "h225.cnf" +#line 464 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6020,7 +6020,7 @@ static const per_choice_t UnregRejectReason_choice[] = { static int dissect_h225_UnregRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 441 "h225.cnf" +#line 471 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6080,7 +6080,7 @@ dissect_h225_CallModel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static int dissect_h225_DestinationInfo_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 258 "h225.cnf" +#line 288 "h225.cnf" h225_pi->is_destinationInfo = TRUE; @@ -6288,7 +6288,7 @@ static const per_choice_t AdmissionRejectReason_choice[] = { static int dissect_h225_AdmissionRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 468 "h225.cnf" +#line 498 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6420,7 +6420,7 @@ static const per_choice_t BandRejectReason_choice[] = { static int dissect_h225_BandRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 448 "h225.cnf" +#line 478 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6472,7 +6472,7 @@ static const per_choice_t DisengageReason_choice[] = { static int dissect_h225_DisengageReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 455 "h225.cnf" +#line 485 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6559,7 +6559,7 @@ static const per_choice_t DisengageRejectReason_choice[] = { static int dissect_h225_DisengageRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 461 "h225.cnf" +#line 491 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6705,7 +6705,7 @@ static const per_choice_t LocationRejectReason_choice[] = { static int dissect_h225_LocationRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 475 "h225.cnf" +#line 505 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -7076,7 +7076,7 @@ static const per_choice_t InfoRequestNakReason_choice[] = { static int dissect_h225_InfoRequestNakReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 489 "h225.cnf" +#line 519 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -7287,7 +7287,7 @@ static const per_choice_t RasMessage_choice[] = { int dissect_h225_RasMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 246 "h225.cnf" +#line 276 "h225.cnf" guint32 rasmessage_value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -7685,7 +7685,7 @@ void proto_register_h225(void) { "h225.CircuitInfo", HFILL }}, { &hf_h225_releaseCompleteReason, { "reason", "h225.reason", - FT_UINT32, BASE_DEC, VALS(ReleaseCompleteReason_vals), 0, + FT_UINT32, BASE_DEC, VALS(h225_ReleaseCompleteReason_vals), 0, "h225.ReleaseCompleteReason", HFILL }}, { &hf_h225_busyAddress, { "busyAddress", "h225.busyAddress", diff --git a/epan/dissectors/packet-h225.h b/epan/dissectors/packet-h225.h index 35cd48296f..b0cb05349e 100644 --- a/epan/dissectors/packet-h225.h +++ b/epan/dissectors/packet-h225.h @@ -91,31 +91,63 @@ typedef struct _h225_packet_info { /*--- Included file: packet-h225-exp.h ---*/ #line 1 "packet-h225-exp.h" WS_VAR_IMPORT const value_string T_h323_message_body_vals[]; -WS_VAR_IMPORT const value_string ReleaseCompleteReason_vals[]; +WS_VAR_IMPORT const value_string h225_ReleaseCompleteReason_vals[]; extern const value_string h225_PresentationIndicator_vals[]; extern const value_string h225_ScreeningIndicator_vals[]; WS_VAR_IMPORT const value_string FacilityReason_vals[]; +extern const value_string h225_TransportAddress_vals[]; +extern const value_string h225_SupportedProtocols_vals[]; extern const value_string AliasAddress_vals[]; extern const value_string h225_PartyNumber_vals[]; +extern const value_string h225_PublicTypeOfNumber_vals[]; +extern const value_string h225_PrivateTypeOfNumber_vals[]; +extern const value_string h225_IntegrityMechanism_vals[]; +extern const value_string h225_CryptoH323Token_vals[]; +extern const value_string h225_GenericIdentifier_vals[]; WS_VAR_IMPORT const value_string RasMessage_vals[]; WS_VAR_IMPORT const value_string GatekeeperRejectReason_vals[]; WS_VAR_IMPORT const value_string RegistrationRejectReason_vals[]; WS_VAR_IMPORT const value_string UnregRequestReason_vals[]; WS_VAR_IMPORT const value_string UnregRejectReason_vals[]; +extern const value_string h225_TransportQOS_vals[]; WS_VAR_IMPORT const value_string AdmissionRejectReason_vals[]; WS_VAR_IMPORT const value_string BandRejectReason_vals[]; WS_VAR_IMPORT const value_string LocationRejectReason_vals[]; WS_VAR_IMPORT const value_string DisengageReason_vals[]; WS_VAR_IMPORT const value_string DisengageRejectReason_vals[]; WS_VAR_IMPORT const value_string InfoRequestNakReason_vals[]; +int dissect_h225_ReleaseCompleteReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h225_PresentationIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h225_ScreeningIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_EndpointType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_SupportedProtocols(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_TunnelledProtocol(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h225_NonStandardParameter(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h225_AliasAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h225_PartyNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_PublicTypeOfNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_PrivateTypeOfNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_AlternateTransportAddresses(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_GloballyUniqueID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_ConferenceIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_GatekeeperIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_BandWidth(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_CallReferenceValue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_TimeToLive(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h225_CallIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_IntegrityMechanism(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_ICV(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_CryptoH323Token(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_CircuitInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_CircuitIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_ServiceControlSession(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h225_GenericData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_GenericIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_FeatureSet(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_TransportChannelInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h225_RasMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h225_TransportQOS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); /*--- End of included file: packet-h225-exp.h ---*/ #line 83 "packet-h225-template.h" diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index ab3737956a..f0b37a162f 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -2271,7 +2271,7 @@ static const per_sequence_t H221NonStandardID_sequence[] = { static int dissect_h245_H221NonStandardID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 764 "h245.cnf" +#line 769 "h245.cnf" t35CountryCode = 0; t35Extension = 0; manufacturerCode = 0; @@ -2279,7 +2279,7 @@ dissect_h245_H221NonStandardID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_H221NonStandardID, H221NonStandardID_sequence); -#line 768 "h245.cnf" +#line 773 "h245.cnf" h221NonStandard = ((t35CountryCode * 256) + t35Extension) * 65536 + manufacturerCode; proto_tree_add_uint(tree, hf_h245Manufacturer, tvb, (offset>>3)-4, 4, h221NonStandard); @@ -2301,7 +2301,7 @@ static const per_choice_t NonStandardIdentifier_choice[] = { static int dissect_h245_NonStandardIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 745 "h245.cnf" +#line 750 "h245.cnf" guint32 value; nsiOID = ""; @@ -2330,7 +2330,7 @@ dissect_h245_NonStandardIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_h245_T_nsd_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 779 "h245.cnf" +#line 784 "h245.cnf" tvbuff_t *next_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -2353,7 +2353,7 @@ static const per_sequence_t NonStandardParameter_sequence[] = { static int dissect_h245_NonStandardParameter(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 777 "h245.cnf" +#line 782 "h245.cnf" nsp_handle = NULL; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -2408,7 +2408,7 @@ dissect_h245_MasterSlaveDetermination(tvbuff_t *tvb _U_, int offset _U_, asn1_ct offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_MasterSlaveDetermination, MasterSlaveDetermination_sequence); -#line 488 "h245.cnf" +#line 493 "h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_MastSlvDet; @@ -3308,7 +3308,7 @@ static int dissect_h245_T_standardOid(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_object_identifier_str(tvb, offset, actx, tree, hf_index, &standard_oid_str); -#line 534 "h245.cnf" +#line 539 "h245.cnf" gen_par_prefix = ep_strdup(standard_oid_str); if(!h245_lc_dissector && strcmp(standard_oid_str,"0.0.8.245.1.1.1") == 0) h245_lc_dissector = amr_handle; @@ -3376,7 +3376,7 @@ dissect_h245_INTEGER_0_4294967295(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_h245_T_standard(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 565 "h245.cnf" +#line 570 "h245.cnf" gint32 value_int; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, @@ -3420,7 +3420,7 @@ static int dissect_h245_T_parameterIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_h245_ParameterIdentifier(tvb, offset, actx, tree, hf_index); -#line 561 "h245.cnf" +#line 566 "h245.cnf" gen_par_str = ep_strdup_printf("%s-%s", gen_par_prefix, gen_par_str); return offset; @@ -3430,7 +3430,7 @@ dissect_h245_T_parameterIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_h245_T_octetString(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 572 "h245.cnf" +#line 577 "h245.cnf" tvbuff_t *value_tvb; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -3512,7 +3512,7 @@ static const per_sequence_t GenericParameter_sequence[] = { static int dissect_h245_GenericParameter(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 559 "h245.cnf" +#line 564 "h245.cnf" gen_par_str = ""; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -3534,7 +3534,7 @@ static const per_sequence_t GenericCapability_sequence[] = { static int dissect_h245_GenericCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 540 "h245.cnf" +#line 545 "h245.cnf" gen_par_prefix = ""; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -3582,7 +3582,7 @@ static const per_choice_t Application_choice[] = { static int dissect_h245_Application(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 410 "h245.cnf" +#line 415 "h245.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -5123,7 +5123,7 @@ dissect_h245_H263VideoCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_H263VideoCapability, H263VideoCapability_sequence); -#line 267 "h245.cnf" +#line 272 "h245.cnf" h245_lc_dissector = h263_handle; return offset; @@ -5216,7 +5216,7 @@ static const per_choice_t VideoCapability_choice[] = { static int dissect_h245_VideoCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 400 "h245.cnf" +#line 405 "h245.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -5536,7 +5536,7 @@ static const per_choice_t AudioCapability_choice[] = { static int dissect_h245_AudioCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 390 "h245.cnf" +#line 395 "h245.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -5971,7 +5971,7 @@ dissect_h245_FECCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ } -static const value_string h245_Capability_vals[] = { +const value_string h245_Capability_vals[] = { { 0, "nonStandard" }, { 1, "receiveVideoCapability" }, { 2, "transmitVideoCapability" }, @@ -6037,7 +6037,7 @@ static const per_choice_t Capability_choice[] = { { 0, NULL, 0, NULL } }; -static int +int dissect_h245_Capability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h245_Capability, Capability_choice, @@ -6118,7 +6118,7 @@ dissect_h245_SET_SIZE_1_256_OF_CapabilityDescriptor(tvbuff_t *tvb _U_, int offse static int dissect_h245_T_subMessageIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 548 "h245.cnf" +#line 553 "h245.cnf" guint32 subMessageIdentifer; @@ -6138,7 +6138,7 @@ static const per_sequence_t GenericMessage_sequence[] = { static int dissect_h245_GenericMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 544 "h245.cnf" +#line 549 "h245.cnf" gen_par_prefix = ""; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -6185,7 +6185,7 @@ dissect_h245_TerminalCapabilitySet(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_TerminalCapabilitySet, TerminalCapabilitySet_sequence); -#line 506 "h245.cnf" +#line 511 "h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_TermCapSet; @@ -6197,7 +6197,7 @@ if (h245_pi != NULL) static int dissect_h245_LogicalChannelNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 122 "h245.cnf" +#line 127 "h245.cnf" guint32 value; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 1U, 65535U, &value, FALSE); @@ -6214,7 +6214,7 @@ static int dissect_h245_OLC_fw_lcn(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_h245_LogicalChannelNumber(tvb, offset, actx, tree, hf_index); -#line 128 "h245.cnf" +#line 133 "h245.cnf" h223_fw_lc_num = h245_lc_temp; return offset; @@ -6677,7 +6677,7 @@ dissect_h245_H222LogicalChannelParameters(tvbuff_t *tvb _U_, int offset _U_, asn static int dissect_h245_T_h223_al_type_al1Framed(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 159 "h245.cnf" +#line 164 "h245.cnf" if(h223_lc_params_temp) h223_lc_params_temp->al_type = al1Framed; @@ -6690,7 +6690,7 @@ dissect_h245_T_h223_al_type_al1Framed(tvbuff_t *tvb _U_, int offset _U_, asn1_ct static int dissect_h245_T_h223_al_type_al1NotFramed(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 164 "h245.cnf" +#line 169 "h245.cnf" if(h223_lc_params_temp) h223_lc_params_temp->al_type = al1NotFramed; @@ -6703,7 +6703,7 @@ dissect_h245_T_h223_al_type_al1NotFramed(tvbuff_t *tvb _U_, int offset _U_, asn1 static int dissect_h245_T_h223_al_type_al2WithoutSequenceNumbers(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 169 "h245.cnf" +#line 174 "h245.cnf" if(h223_lc_params_temp) h223_lc_params_temp->al_type = al2WithoutSequenceNumbers; @@ -6716,7 +6716,7 @@ dissect_h245_T_h223_al_type_al2WithoutSequenceNumbers(tvbuff_t *tvb _U_, int off static int dissect_h245_T_h223_al_type_al2WithSequenceNumbers(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 174 "h245.cnf" +#line 179 "h245.cnf" if(h223_lc_params_temp) h223_lc_params_temp->al_type = al2WithSequenceNumbers; @@ -6729,7 +6729,7 @@ dissect_h245_T_h223_al_type_al2WithSequenceNumbers(tvbuff_t *tvb _U_, int offset static int dissect_h245_T_controlFieldOctets(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 188 "h245.cnf" +#line 193 "h245.cnf" guint32 value; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 2U, &value, FALSE); @@ -6745,7 +6745,7 @@ dissect_h245_T_controlFieldOctets(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_h245_T_al3_sendBufferSize(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 197 "h245.cnf" +#line 202 "h245.cnf" guint32 value; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 16777215U, &value, FALSE); @@ -6776,7 +6776,7 @@ dissect_h245_Al3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_ static int dissect_h245_T_h223_al_type_al3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 179 "h245.cnf" +#line 184 "h245.cnf" if(h223_lc_params_temp) { h223_lc_params_temp->al_type = al3; h223_lc_params_temp->al_params = se_alloc(sizeof(h223_al3_params)); @@ -6971,7 +6971,7 @@ dissect_h245_H223AL1MParameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static int dissect_h245_T_h223_al_type_al1M(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 204 "h245.cnf" +#line 209 "h245.cnf" if(h223_lc_params_temp) h223_lc_params_temp->al_type = al1M; @@ -7021,7 +7021,7 @@ dissect_h245_H223AL2MParameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static int dissect_h245_T_h223_al_type_al2M(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 209 "h245.cnf" +#line 214 "h245.cnf" if(h223_lc_params_temp) h223_lc_params_temp->al_type = al2M; @@ -7109,7 +7109,7 @@ dissect_h245_H223AL3MParameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static int dissect_h245_T_h223_al_type_al3M(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 214 "h245.cnf" +#line 219 "h245.cnf" if(h223_lc_params_temp) h223_lc_params_temp->al_type = al3M; @@ -7158,7 +7158,7 @@ dissect_h245_T_adaptationLayerType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_h245_T_h223_lc_segmentableFlag(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 221 "h245.cnf" +#line 226 "h245.cnf" guint32 value; offset = dissect_per_boolean(tvb, offset, actx, tree, hf_index, &value); @@ -7188,7 +7188,7 @@ dissect_h245_H223LogicalChannelParameters(tvbuff_t *tvb _U_, int offset _U_, asn static int dissect_h245_OLC_fw_h223_params(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 141 "h245.cnf" +#line 146 "h245.cnf" h223_fw_lc_params = se_alloc(sizeof(h223_lc_params)); h223_fw_lc_params->al_type = al_nonStandard; h223_fw_lc_params->al_params = NULL; @@ -7362,7 +7362,7 @@ dissect_h245_V76LogicalChannelParameters(tvbuff_t *tvb _U_, int offset _U_, asn1 static int dissect_h245_Ipv4_network(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 579 "h245.cnf" +#line 584 "h245.cnf" tvbuff_t *value_tvb; @@ -7384,7 +7384,7 @@ dissect_h245_Ipv4_network(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static int dissect_h245_TsapIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 592 "h245.cnf" +#line 597 "h245.cnf" guint32 tsapIdentifier; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, @@ -7530,7 +7530,7 @@ dissect_h245_T_iPSourceRouteAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ } -static const value_string h245_UnicastAddress_vals[] = { +const value_string h245_UnicastAddress_vals[] = { { 0, "iPAddress" }, { 1, "iPXAddress" }, { 2, "iP6Address" }, @@ -7552,7 +7552,7 @@ static const per_choice_t UnicastAddress_choice[] = { { 0, NULL, 0, NULL } }; -static int +int dissect_h245_UnicastAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h245_UnicastAddress, UnicastAddress_choice, @@ -7592,7 +7592,7 @@ dissect_h245_MIP6Address(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ } -static const value_string h245_MulticastAddress_vals[] = { +const value_string h245_MulticastAddress_vals[] = { { 0, "iPAddress" }, { 1, "iP6Address" }, { 2, "nsap" }, @@ -7608,7 +7608,7 @@ static const per_choice_t MulticastAddress_choice[] = { { 0, NULL, 0, NULL } }; -static int +int dissect_h245_MulticastAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h245_MulticastAddress, MulticastAddress_choice, @@ -7618,7 +7618,7 @@ dissect_h245_MulticastAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const value_string h245_TransportAddress_vals[] = { +const value_string h245_TransportAddress_vals[] = { { 0, "unicastAddress" }, { 1, "multicastAddress" }, { 0, NULL } @@ -7630,7 +7630,7 @@ static const per_choice_t TransportAddress_choice[] = { { 0, NULL, 0, NULL } }; -static int +int dissect_h245_TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h245_TransportAddress, TransportAddress_choice, @@ -7643,14 +7643,14 @@ dissect_h245_TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act static int dissect_h245_T_mediaChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 610 "h245.cnf" +#line 615 "h245.cnf" media_channel = TRUE; offset = dissect_h245_TransportAddress(tvb, offset, actx, tree, hf_index); -#line 640 "h245.cnf" +#line 645 "h245.cnf" media_channel = FALSE; @@ -7662,14 +7662,14 @@ dissect_h245_T_mediaChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_h245_T_mediaControlChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 622 "h245.cnf" +#line 627 "h245.cnf" media_control_channel = TRUE; offset = dissect_h245_TransportAddress(tvb, offset, actx, tree, hf_index); -#line 646 "h245.cnf" +#line 651 "h245.cnf" media_control_channel = FALSE; @@ -7801,7 +7801,7 @@ static const per_sequence_t T_forwardLogicalChannelParameters_sequence[] = { static int dissect_h245_T_forwardLogicalChannelParameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 132 "h245.cnf" +#line 137 "h245.cnf" h245_lc_dissector = NULL; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_T_forwardLogicalChannelParameters, T_forwardLogicalChannelParameters_sequence); @@ -7819,7 +7819,7 @@ dissect_h245_T_forwardLogicalChannelParameters(tvbuff_t *tvb _U_, int offset _U_ static int dissect_h245_OLC_rev_h223_params(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 150 "h245.cnf" +#line 155 "h245.cnf" h223_rev_lc_params = se_alloc(sizeof(h223_lc_params)); h223_rev_lc_params->al_type = al_nonStandard; h223_rev_lc_params->al_params = NULL; @@ -7849,7 +7849,7 @@ static const per_choice_t OLC_rev_multiplexParameters_choice[] = { static int dissect_h245_OLC_rev_multiplexParameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 696 "h245.cnf" +#line 701 "h245.cnf" media_channel = FALSE; @@ -7860,7 +7860,7 @@ dissect_h245_OLC_rev_multiplexParameters(tvbuff_t *tvb _U_, int offset _U_, asn1 ett_h245_OLC_rev_multiplexParameters, OLC_rev_multiplexParameters_choice, NULL); -#line 704 "h245.cnf" +#line 709 "h245.cnf" if (!actx->pinfo->fd->flags.visited) { if (codec_type && (strcmp(codec_type, "t38fax")==0)) { @@ -8085,7 +8085,7 @@ static const per_sequence_t EncryptionSync_sequence[] = { static int dissect_h245_EncryptionSync(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 555 "h245.cnf" +#line 560 "h245.cnf" gen_par_prefix = "EncryptionSync"; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -8107,7 +8107,7 @@ static const per_sequence_t OpenLogicalChannel_sequence[] = { int dissect_h245_OpenLogicalChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 103 "h245.cnf" +#line 108 "h245.cnf" gint32 temp; h223_fw_lc_num = 0; @@ -8126,7 +8126,7 @@ dissect_h245_OpenLogicalChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a } -#line 519 "h245.cnf" +#line 524 "h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_OpenLogChn; @@ -8193,7 +8193,7 @@ dissect_h245_CloseLogicalChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_CloseLogicalChannel, CloseLogicalChannel_sequence); -#line 464 "h245.cnf" +#line 469 "h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_CloseLogChn; @@ -8247,7 +8247,7 @@ dissect_h245_RequestChannelClose(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * static int dissect_h245_MultiplexTableEntryNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 47 "h245.cnf" +#line 52 "h245.cnf" guint32 value; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 1U, 15U, &value, FALSE); @@ -8262,7 +8262,7 @@ dissect_h245_MultiplexTableEntryNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_c static int dissect_h245_T_logicalChannelNum(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 73 "h245.cnf" +#line 78 "h245.cnf" /*MultiplexElement/type/logicalChannelNumber*/ guint32 value; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, @@ -8282,7 +8282,7 @@ static const per_sequence_t T_subElementList_sequence_of[1] = { static int dissect_h245_T_subElementList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 81 "h245.cnf" +#line 86 "h245.cnf" h223_mux_element dummy_me, *parent_me = h223_me; h223_me = &dummy_me; offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, @@ -8323,7 +8323,7 @@ dissect_h245_Me_type(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr static int dissect_h245_ME_finiteRepeatCount(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 96 "h245.cnf" +#line 101 "h245.cnf" guint32 value; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 1U, 65535U, &value, FALSE); @@ -8340,7 +8340,7 @@ static int dissect_h245_T_untilClosingFlag(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_null(tvb, offset, actx, tree, hf_index); -#line 90 "h245.cnf" +#line 95 "h245.cnf" h223_me->repeat_count = 0; return offset; @@ -8377,7 +8377,7 @@ static const per_sequence_t MultiplexElement_sequence[] = { static int dissect_h245_MultiplexElement(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 63 "h245.cnf" +#line 68 "h245.cnf" /*MultiplexElement*/ h223_mux_element* me = se_alloc(sizeof(h223_mux_element)); h223_me->next = me; @@ -8397,7 +8397,7 @@ static const per_sequence_t T_elementList_sequence_of[1] = { static int dissect_h245_T_elementList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 53 "h245.cnf" +#line 58 "h245.cnf" /* create a h223_mux_element to hold onto the head of the list, since * h223_me will track the tail */ h223_mux_element dummy_me; @@ -8422,7 +8422,7 @@ static const per_sequence_t MultiplexEntryDescriptor_sequence[] = { static int dissect_h245_MultiplexEntryDescriptor(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 35 "h245.cnf" +#line 40 "h245.cnf" /*MultiplexEntryDescriptor*/ h223_me = NULL; h223_mc = 0; @@ -8687,7 +8687,7 @@ static const per_choice_t VideoMode_choice[] = { static int dissect_h245_VideoMode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 428 "h245.cnf" +#line 433 "h245.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -9015,7 +9015,7 @@ static const per_choice_t AudioMode_choice[] = { static int dissect_h245_AudioMode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 419 "h245.cnf" +#line 424 "h245.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -9084,7 +9084,7 @@ static const per_choice_t DataModeApplication_choice[] = { static int dissect_h245_DataModeApplication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 437 "h245.cnf" +#line 442 "h245.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -10073,7 +10073,7 @@ static const per_choice_t RequestMessage_choice[] = { static int dissect_h245_RequestMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 271 "h245.cnf" +#line 276 "h245.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -10152,7 +10152,7 @@ dissect_h245_MasterSlaveDeterminationAck(tvbuff_t *tvb _U_, int offset _U_, asn1 offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_MasterSlaveDeterminationAck, MasterSlaveDeterminationAck_sequence); -#line 446 "h245.cnf" +#line 451 "h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_MastSlvDetAck; @@ -10191,7 +10191,7 @@ dissect_h245_MasterSlaveDeterminationReject(tvbuff_t *tvb _U_, int offset _U_, a offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_MasterSlaveDeterminationReject, MasterSlaveDeterminationReject_sequence); -#line 452 "h245.cnf" +#line 457 "h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_MastSlvDetRjc; @@ -10211,7 +10211,7 @@ dissect_h245_TerminalCapabilitySetAck(tvbuff_t *tvb _U_, int offset _U_, asn1_ct offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_TerminalCapabilitySetAck, TerminalCapabilitySetAck_sequence); -#line 482 "h245.cnf" +#line 487 "h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_TermCapSetAck; @@ -10280,7 +10280,7 @@ dissect_h245_TerminalCapabilitySetReject(tvbuff_t *tvb _U_, int offset _U_, asn1 offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_TerminalCapabilitySetReject, TerminalCapabilitySetReject_sequence); -#line 494 "h245.cnf" +#line 499 "h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_TermCapSetRjc; @@ -10294,7 +10294,7 @@ static int dissect_h245_OLC_ack_fw_lcn(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_h245_LogicalChannelNumber(tvb, offset, actx, tree, hf_index); -#line 259 "h245.cnf" +#line 264 "h245.cnf" h223_fw_lc_num = h245_lc_temp; return offset; @@ -10306,7 +10306,7 @@ static int dissect_h245_T_reverseLogicalChannelNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_h245_LogicalChannelNumber(tvb, offset, actx, tree, hf_index); -#line 263 "h245.cnf" +#line 268 "h245.cnf" h223_rev_lc_num = h245_lc_temp; return offset; @@ -10355,14 +10355,14 @@ dissect_h245_OLC_ack_reverseLogicalChannelParameters(tvbuff_t *tvb _U_, int offs static int dissect_h245_Ack_mediaChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 604 "h245.cnf" +#line 609 "h245.cnf" media_channel = TRUE; offset = dissect_h245_TransportAddress(tvb, offset, actx, tree, hf_index); -#line 628 "h245.cnf" +#line 633 "h245.cnf" media_channel = FALSE; @@ -10374,14 +10374,14 @@ dissect_h245_Ack_mediaChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act static int dissect_h245_Ack_mediaControlChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 616 "h245.cnf" +#line 621 "h245.cnf" media_control_channel = TRUE; offset = dissect_h245_TransportAddress(tvb, offset, actx, tree, hf_index); -#line 634 "h245.cnf" +#line 639 "h245.cnf" media_control_channel = FALSE; @@ -10422,7 +10422,7 @@ static const per_choice_t T_forwardMultiplexAckParameters_choice[] = { static int dissect_h245_T_forwardMultiplexAckParameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 652 "h245.cnf" +#line 657 "h245.cnf" media_channel = FALSE; @@ -10433,7 +10433,7 @@ dissect_h245_T_forwardMultiplexAckParameters(tvbuff_t *tvb _U_, int offset _U_, ett_h245_T_forwardMultiplexAckParameters, T_forwardMultiplexAckParameters_choice, NULL); -#line 660 "h245.cnf" +#line 665 "h245.cnf" if (!actx->pinfo->fd->flags.visited) { if (codec_type && strcmp(codec_type, "t38fax")==0) { @@ -10484,7 +10484,7 @@ static const per_sequence_t OpenLogicalChannelAck_sequence[] = { static int dissect_h245_OpenLogicalChannelAck(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 229 "h245.cnf" +#line 234 "h245.cnf" guint32 temp; int p2p_dir; h223_pending_olc *pend; @@ -10516,7 +10516,7 @@ dissect_h245_OpenLogicalChannelAck(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t actx->pinfo->p2p_dir = p2p_dir; -#line 526 "h245.cnf" +#line 531 "h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_OpenLogChnAck; @@ -10585,7 +10585,7 @@ dissect_h245_OpenLogicalChannelReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ct offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_OpenLogicalChannelReject, OpenLogicalChannelReject_sequence); -#line 458 "h245.cnf" +#line 463 "h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_OpenLogChnRjc; @@ -10604,7 +10604,7 @@ dissect_h245_CloseLogicalChannelAck(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_CloseLogicalChannelAck, CloseLogicalChannelAck_sequence); -#line 470 "h245.cnf" +#line 475 "h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_CloseLogChnAck; @@ -11728,7 +11728,7 @@ static const per_choice_t ResponseMessage_choice[] = { static int dissect_h245_ResponseMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 311 "h245.cnf" +#line 316 "h245.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -12770,7 +12770,7 @@ static const per_choice_t CommandMessage_choice[] = { static int dissect_h245_CommandMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 364 "h245.cnf" +#line 369 "h245.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -12836,7 +12836,7 @@ dissect_h245_MasterSlaveDeterminationRelease(tvbuff_t *tvb _U_, int offset _U_, offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_MasterSlaveDeterminationRelease, MasterSlaveDeterminationRelease_sequence); -#line 500 "h245.cnf" +#line 505 "h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_MastSlvDetRls; @@ -12855,7 +12855,7 @@ dissect_h245_TerminalCapabilitySetRelease(tvbuff_t *tvb _U_, int offset _U_, asn offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_TerminalCapabilitySetRelease, TerminalCapabilitySetRelease_sequence); -#line 512 "h245.cnf" +#line 517 "h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_TermCapSetRls; @@ -12875,7 +12875,7 @@ dissect_h245_OpenLogicalChannelConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_c offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_OpenLogicalChannelConfirm, OpenLogicalChannelConfirm_sequence); -#line 476 "h245.cnf" +#line 481 "h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_OpenLogChnCnf; @@ -13653,7 +13653,7 @@ dissect_h245_FunctionNotSupportedCause(tvbuff_t *tvb _U_, int offset _U_, asn1_c static int dissect_h245_T_returnedFunction(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 788 "h245.cnf" +#line 793 "h245.cnf" tvbuff_t *next_tvb = NULL; proto_item *item; proto_tree *subtree; @@ -13846,7 +13846,7 @@ static const per_choice_t IndicationMessage_choice[] = { static int dissect_h245_IndicationMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 338 "h245.cnf" +#line 343 "h245.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, diff --git a/epan/dissectors/packet-h245.h b/epan/dissectors/packet-h245.h index 62a1e48f7b..259b6603db 100644 --- a/epan/dissectors/packet-h245.h +++ b/epan/dissectors/packet-h245.h @@ -132,13 +132,21 @@ extern void h245_set_h223_add_lc_handle( h223_add_lc_handle_t handle ); /*--- Included file: packet-h245-exp.h ---*/ #line 1 "packet-h245-exp.h" +extern const value_string h245_Capability_vals[]; extern const value_string DataProtocolCapability_vals[]; +extern const value_string h245_TransportAddress_vals[]; +extern const value_string h245_UnicastAddress_vals[]; +extern const value_string h245_MulticastAddress_vals[]; +int dissect_h245_Capability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h245_H223Capability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h245_QOSCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h245_DataProtocolCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h245_T38FaxProfile(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h245_OpenLogicalChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h245_H223LogicalChannelParameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h245_TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h245_UnicastAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_h245_MulticastAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); /*--- End of included file: packet-h245-exp.h ---*/ #line 125 "packet-h245-template.h" diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c index 9922326249..4a7c564c81 100644 --- a/epan/dissectors/packet-h450.c +++ b/epan/dissectors/packet-h450.c @@ -54,7 +54,7 @@ #include "packet-h450-ros.h" #define PNAME "H.450 Supplementary Services" -#define PSNAME "H450" +#define PSNAME "H.450" #define PFNAME "h450" /* Initialize the protocol and registered fields */ diff --git a/epan/libwireshark.def b/epan/libwireshark.def index b88d041423..a7a1bb6abf 100644 --- a/epan/libwireshark.def +++ b/epan/libwireshark.def @@ -716,7 +716,7 @@ register_stat_cmd_arg register_tap register_tap_listener RegistrationRejectReason_vals DATA -ReleaseCompleteReason_vals DATA +h225_ReleaseCompleteReason_vals DATA relinquish_special_privs_perm rel_time_to_str rel_time_to_secs_str diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c index feefd0a55c..a999d4f444 100644 --- a/gtk/h225_counter.c +++ b/gtk/h225_counter.c @@ -450,7 +450,7 @@ h225counter_draw(void *phs) for(j=0;j<=REL_CMP_REASONS;j++) { if(hs->rel_cmp_reason[j]!=0) { g_snprintf(str[0], sizeof(char[256]), - " %s", val_to_str(j,ReleaseCompleteReason_vals,"unknown reason ")); + " %s", val_to_str(j,h225_ReleaseCompleteReason_vals,"unknown reason ")); g_snprintf(str[1], sizeof(char[256]), "%d", hs->rel_cmp_reason[j]); gtk_clist_append(hs->table, str); diff --git a/tap-h225counter.c b/tap-h225counter.c index c1421cb3e5..933c9f69aa 100644 --- a/tap-h225counter.c +++ b/tap-h225counter.c @@ -329,7 +329,7 @@ h225counter_draw(void *phs) case 5: /* ReleaseComplete */ for(j=0;j<=REL_CMP_REASONS;j++) { if(hs->rel_cmp_reason[j]!=0) { - printf(" %s : %u\n", val_to_str(j,ReleaseCompleteReason_vals,"unknown reason "), hs->rel_cmp_reason[j]); + printf(" %s : %u\n", val_to_str(j,h225_ReleaseCompleteReason_vals,"unknown reason "), hs->rel_cmp_reason[j]); } } break; -- cgit v1.2.3