diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2005-01-20 12:16:53 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2005-01-20 12:16:53 +0000 |
| commit | 5978eebab002176fe501b39946ba6674a93d796d (patch) | |
| tree | c138a3e0ef9fe79a7ed73ef7c2507d299fa08728 /epan | |
| parent | f73394ab99c4385f86e839b63c78599def95747b (diff) | |
NonStandardData and TunnelledProtocol reimplemented and tested
H225 dissector regenerated with new asn2eth version
svn path=/trunk/; revision=13139
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-h225.c | 913 |
1 files changed, 495 insertions, 418 deletions
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index eb09f13f1c..40acff090b 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -104,7 +104,6 @@ static int hf_h225_ras_rsp_frame = -1; static int hf_h225_ras_dup = -1; static int hf_h225_ras_deltatime = -1; static int hf_h225_fastStart_item_length = -1; -static int hf_h225_nsp_data = -1; /*--- Included file: packet-h225-hf.c ---*/ @@ -128,21 +127,21 @@ static int hf_h225_statusInquiry = -1; /* StatusInquiry_UUIE */ static int hf_h225_setupAcknowledge = -1; /* SetupAcknowledge_UUIE */ static int hf_h225_notify = -1; /* Notify_UUIE */ static int hf_h225_nonStandardData = -1; /* NonStandardParameter */ -static int hf_h225_h4501SupplementaryService = -1; /* SEQUNCE_OF_OCTET_STRING */ +static int hf_h225_h4501SupplementaryService = -1; /* T_h4501SupplementaryService */ static int hf_h225_h4501SupplementaryService_item = -1; /* T_h4501SupplementaryService_item */ static int hf_h225_h245Tunneling = -1; /* BOOLEAN */ static int hf_h225_h245Control = -1; /* H245Control */ -static int hf_h225_nonStandardControl = -1; /* SEQUNCE_OF_NonStandardParameter */ +static int hf_h225_nonStandardControl = -1; /* SEQUENCE_OF_NonStandardParameter */ static int hf_h225_nonStandardControl_item = -1; /* NonStandardParameter */ static int hf_h225_callLinkage = -1; /* CallLinkage */ static int hf_h225_tunnelledSignallingMessage = -1; /* T_tunnelledSignallingMessage */ static int hf_h225_tunnelledProtocolID = -1; /* TunnelledProtocol */ -static int hf_h225_messageContent = -1; /* SEQUNCE_OF_OCTET_STRING */ -static int hf_h225_messageContent_item = -1; /* OCTET_STRING */ +static int hf_h225_messageContent = -1; /* T_messageContent */ +static int hf_h225_messageContent_item = -1; /* T_messageContent_item */ static int hf_h225_tunnellingRequired = -1; /* NULL */ static int hf_h225_provisionalRespToH245Tunneling = -1; /* NULL */ static int hf_h225_stimulusControl = -1; /* StimulusControl */ -static int hf_h225_genericData = -1; /* SEQUNCE_OF_GenericData */ +static int hf_h225_genericData = -1; /* SEQUENCE_OF_GenericData */ static int hf_h225_genericData_item = -1; /* GenericData */ static int hf_h225_H245Control_item = -1; /* H245Control_item */ static int hf_h225_nonStandard = -1; /* NonStandardParameter */ @@ -153,30 +152,30 @@ static int hf_h225_uUIE_destinationInfo = -1; /* EndpointType */ static int hf_h225_h245Address = -1; /* H245TransportAddress */ static int hf_h225_callIdentifier = -1; /* CallIdentifier */ static int hf_h225_h245SecurityMode = -1; /* H245Security */ -static int hf_h225_tokens = -1; /* SEQUNCE_OF_ClearToken */ +static int hf_h225_tokens = -1; /* SEQUENCE_OF_ClearToken */ static int hf_h225_tokens_item = -1; /* ClearToken */ -static int hf_h225_cryptoTokens = -1; /* SEQUNCE_OF_CryptoH323Token */ +static int hf_h225_cryptoTokens = -1; /* SEQUENCE_OF_CryptoH323Token */ static int hf_h225_cryptoTokens_item = -1; /* CryptoH323Token */ static int hf_h225_fastStart = -1; /* FastStart */ static int hf_h225_multipleCalls = -1; /* BOOLEAN */ static int hf_h225_maintainConnection = -1; /* BOOLEAN */ -static int hf_h225_alertingAddress = -1; /* SEQUNCE_OF_AliasAddress */ +static int hf_h225_alertingAddress = -1; /* SEQUENCE_OF_AliasAddress */ static int hf_h225_alertingAddress_item = -1; /* AliasAddress */ static int hf_h225_presentationIndicator = -1; /* PresentationIndicator */ static int hf_h225_screeningIndicator = -1; /* ScreeningIndicator */ static int hf_h225_fastConnectRefused = -1; /* NULL */ -static int hf_h225_serviceControl = -1; /* SEQUNCE_OF_ServiceControlSession */ +static int hf_h225_serviceControl = -1; /* SEQUENCE_OF_ServiceControlSession */ static int hf_h225_serviceControl_item = -1; /* ServiceControlSession */ static int hf_h225_capacity = -1; /* CallCapacity */ static int hf_h225_featureSet = -1; /* FeatureSet */ static int hf_h225_conferenceID = -1; /* ConferenceIdentifier */ -static int hf_h225_language = -1; /* SEQUNCE_OF_IA5String_SIZE_1_32 */ +static int hf_h225_language = -1; /* T_language */ static int hf_h225_language_item = -1; /* IA5String_SIZE_1_32 */ -static int hf_h225_connectedAddress = -1; /* SEQUNCE_OF_AliasAddress */ +static int hf_h225_connectedAddress = -1; /* SEQUENCE_OF_AliasAddress */ static int hf_h225_connectedAddress_item = -1; /* AliasAddress */ static int hf_h225_circuitInfo = -1; /* CircuitInfo */ static int hf_h225_releaseCompleteReason = -1; /* ReleaseCompleteReason */ -static int hf_h225_busyAddress = -1; /* SEQUNCE_OF_AliasAddress */ +static int hf_h225_busyAddress = -1; /* SEQUENCE_OF_AliasAddress */ static int hf_h225_busyAddress_item = -1; /* AliasAddress */ static int hf_h225_noBandwidth = -1; /* NULL */ static int hf_h225_gatekeeperResources = -1; /* NULL */ @@ -203,15 +202,15 @@ static int hf_h225_tunnelledSignallingRejected = -1; /* NULL */ static int hf_h225_invalidCID = -1; /* NULL */ static int hf_h225_rLC_securityError = -1; /* SecurityErrors */ static int hf_h225_hopCountExceeded = -1; /* NULL */ -static int hf_h225_sourceAddress = -1; /* SEQUNCE_OF_AliasAddress */ +static int hf_h225_sourceAddress = -1; /* SEQUENCE_OF_AliasAddress */ static int hf_h225_sourceAddress_item = -1; /* AliasAddress */ static int hf_h225_Setup_UUIE_sourceInfo = -1; /* EndpointType */ -static int hf_h225_destinationAddress = -1; /* SEQUNCE_OF_AliasAddress */ +static int hf_h225_destinationAddress = -1; /* SEQUENCE_OF_AliasAddress */ static int hf_h225_destinationAddress_item = -1; /* AliasAddress */ static int hf_h225_destCallSignalAddress = -1; /* TransportAddress */ -static int hf_h225_destExtraCallInfo = -1; /* SEQUNCE_OF_AliasAddress */ +static int hf_h225_destExtraCallInfo = -1; /* SEQUENCE_OF_AliasAddress */ static int hf_h225_destExtraCallInfo_item = -1; /* AliasAddress */ -static int hf_h225_destExtraCRV = -1; /* SEQUNCE_OF_CallReferenceValue */ +static int hf_h225_destExtraCRV = -1; /* SEQUENCE_OF_CallReferenceValue */ static int hf_h225_destExtraCRV_item = -1; /* CallReferenceValue */ static int hf_h225_activeMC = -1; /* BOOLEAN */ static int hf_h225_conferenceGoal = -1; /* T_conferenceGoal */ @@ -224,7 +223,7 @@ static int hf_h225_callServices = -1; /* QseriesOptions */ static int hf_h225_callType = -1; /* CallType */ static int hf_h225_sourceCallSignalAddress = -1; /* TransportAddress */ static int hf_h225_uUIE_remoteExtensionAddress = -1; /* AliasAddress */ -static int hf_h225_h245SecurityCapability = -1; /* SEQUNCE_OF_H245Security */ +static int hf_h225_h245SecurityCapability = -1; /* SEQUENCE_OF_H245Security */ static int hf_h225_h245SecurityCapability_item = -1; /* H245Security */ static int hf_h225_mediaWaitForConnect = -1; /* BOOLEAN */ static int hf_h225_canOverlapSend = -1; /* BOOLEAN */ @@ -233,17 +232,18 @@ static int hf_h225_connectionParameters = -1; /* T_connectionParameters */ static int hf_h225_connectionType = -1; /* ScnConnectionType */ static int hf_h225_numberOfScnConnections = -1; /* INTEGER_0_65535 */ static int hf_h225_connectionAggregation = -1; /* ScnConnectionAggregation */ +static int hf_h225_language1 = -1; /* T_language1 */ static int hf_h225_symmetricOperationRequired = -1; /* NULL */ -static int hf_h225_desiredProtocols = -1; /* SEQUNCE_OF_SupportedProtocols */ +static int hf_h225_desiredProtocols = -1; /* SEQUENCE_OF_SupportedProtocols */ static int hf_h225_desiredProtocols_item = -1; /* SupportedProtocols */ -static int hf_h225_neededFeatures = -1; /* SEQUNCE_OF_FeatureDescriptor */ +static int hf_h225_neededFeatures = -1; /* SEQUENCE_OF_FeatureDescriptor */ static int hf_h225_neededFeatures_item = -1; /* FeatureDescriptor */ -static int hf_h225_desiredFeatures = -1; /* SEQUNCE_OF_FeatureDescriptor */ +static int hf_h225_desiredFeatures = -1; /* SEQUENCE_OF_FeatureDescriptor */ static int hf_h225_desiredFeatures_item = -1; /* FeatureDescriptor */ -static int hf_h225_supportedFeatures = -1; /* SEQUNCE_OF_FeatureDescriptor */ +static int hf_h225_supportedFeatures = -1; /* SEQUENCE_OF_FeatureDescriptor */ static int hf_h225_supportedFeatures_item = -1; /* FeatureDescriptor */ static int hf_h225_parallelH245Control = -1; /* ParallelH245Control */ -static int hf_h225_additionalSourceAddresses = -1; /* SEQUNCE_OF_ExtendedAliasAddress */ +static int hf_h225_additionalSourceAddresses = -1; /* SEQUENCE_OF_ExtendedAliasAddress */ static int hf_h225_additionalSourceAddresses_item = -1; /* ExtendedAliasAddress */ static int hf_h225_hopCount_1_31 = -1; /* INTEGER_1_31 */ static int hf_h225_ParallelH245Control_item = -1; /* OCTET_STRING */ @@ -264,10 +264,10 @@ static int hf_h225_presentationAllowed = -1; /* NULL */ static int hf_h225_presentationRestricted = -1; /* NULL */ static int hf_h225_addressNotAvailable = -1; /* NULL */ static int hf_h225_alternativeAddress = -1; /* TransportAddress */ -static int hf_h225_alternativeAliasAddress = -1; /* SEQUNCE_OF_AliasAddress */ +static int hf_h225_alternativeAliasAddress = -1; /* SEQUENCE_OF_AliasAddress */ static int hf_h225_alternativeAliasAddress_item = -1; /* AliasAddress */ static int hf_h225_facilityReason = -1; /* FacilityReason */ -static int hf_h225_conferences = -1; /* SEQUNCE_OF_ConferenceList */ +static int hf_h225_conferences = -1; /* SEQUENCE_OF_ConferenceList */ static int hf_h225_conferences_item = -1; /* ConferenceList */ static int hf_h225_conferenceAlias = -1; /* AliasAddress */ static int hf_h225_routeCallToGatekeeper = -1; /* NULL */ @@ -287,7 +287,7 @@ static int hf_h225_ipV4_port = -1; /* INTEGER_0_65535 */ static int hf_h225_ipSourceRoute = -1; /* T_ipSourceRoute */ static int hf_h225_src_route_ipV4 = -1; /* OCTET_STRING_SIZE_4 */ static int hf_h225_ipV4_src_port = -1; /* INTEGER_0_65535 */ -static int hf_h225_route = -1; /* SEQUNCE_OF_OCTET_STRING_SIZE_4 */ +static int hf_h225_route = -1; /* T_route */ static int hf_h225_route_item = -1; /* OCTET_STRING_SIZE_4 */ static int hf_h225_routing = -1; /* T_routing */ static int hf_h225_strict = -1; /* NULL */ @@ -308,7 +308,7 @@ static int hf_h225_h245ipv4port = -1; /* T_h245ipv4port */ static int hf_h225_h245ipSourceRoute = -1; /* T_h245ipSourceRoute */ static int hf_h225_h245routeip = -1; /* OCTET_STRING_SIZE_4 */ static int hf_h225_h245routeport = -1; /* INTEGER_0_65535 */ -static int hf_h225_h245route = -1; /* SEQUNCE_OF_OCTET_STRING_SIZE_4 */ +static int hf_h225_h245route = -1; /* T_h245route */ static int hf_h225_h245route_item = -1; /* OCTET_STRING_SIZE_4 */ static int hf_h225_h245routing = -1; /* T_h245routing */ static int hf_h225_h245ipxAddress = -1; /* T_h245ipxAddress */ @@ -326,9 +326,9 @@ static int hf_h225_terminal = -1; /* TerminalInfo */ static int hf_h225_mc = -1; /* BOOLEAN */ static int hf_h225_undefinedNode = -1; /* BOOLEAN */ static int hf_h225_set = -1; /* BIT_STRING_SIZE_32 */ -static int hf_h225_supportedTunnelledProtocols = -1; /* SEQUNCE_OF_TunnelledProtocol */ +static int hf_h225_supportedTunnelledProtocols = -1; /* SEQUENCE_OF_TunnelledProtocol */ static int hf_h225_supportedTunnelledProtocols_item = -1; /* TunnelledProtocol */ -static int hf_h225_protocol = -1; /* SEQUNCE_OF_SupportedProtocols */ +static int hf_h225_protocol = -1; /* SEQUENCE_OF_SupportedProtocols */ static int hf_h225_protocol_item = -1; /* SupportedProtocols */ static int hf_h225_h310 = -1; /* H310Caps */ static int hf_h225_h320 = -1; /* H320Caps */ @@ -341,9 +341,9 @@ static int hf_h225_t120_only = -1; /* T120OnlyCaps */ static int hf_h225_nonStandardProtocol = -1; /* NonStandardProtocol */ static int hf_h225_t38FaxAnnexbOnly = -1; /* T38FaxAnnexbOnlyCaps */ static int hf_h225_sip = -1; /* SIPCaps */ -static int hf_h225_dataRatesSupported = -1; /* SEQUNCE_OF_DataRate */ +static int hf_h225_dataRatesSupported = -1; /* SEQUENCE_OF_DataRate */ static int hf_h225_dataRatesSupported_item = -1; /* DataRate */ -static int hf_h225_supportedPrefixes = -1; /* SEQUNCE_OF_SupportedPrefix */ +static int hf_h225_supportedPrefixes = -1; /* SEQUENCE_OF_SupportedPrefix */ static int hf_h225_supportedPrefixes_item = -1; /* SupportedPrefix */ static int hf_h225_t38FaxProtocol = -1; /* DataProtocolCapability */ static int hf_h225_t38FaxProfile = -1; /* T38FaxProfile */ @@ -361,8 +361,8 @@ static int hf_h225_subIdentifier = -1; /* IA5String_SIZE_1_64 */ static int hf_h225_protocolType = -1; /* IA5String_SIZE_1_64 */ static int hf_h225_protocolVariant = -1; /* IA5String_SIZE_1_64 */ static int hf_h225_nonStandardIdentifier = -1; /* NonStandardIdentifier */ -static int hf_h225_data_oct_str = -1; /* OCTET_STRING */ -static int hf_h225_object = -1; /* T_object */ +static int hf_h225_nsp_data = -1; /* T_data */ +static int hf_h225_nsiOID = -1; /* T_object */ static int hf_h225_h221NonStandard = -1; /* H221NonStandard */ static int hf_h225_dialedDigits = -1; /* DialedDigits */ static int hf_h225_h323_ID = -1; /* BMPString_SIZE_1_256 */ @@ -414,20 +414,20 @@ static int hf_h225_imei = -1; /* TBCD_STRING */ static int hf_h225_hplmn = -1; /* TBCD_STRING */ static int hf_h225_vplmn = -1; /* TBCD_STRING */ static int hf_h225_address = -1; /* AliasAddress */ -static int hf_h225_aliasAddress = -1; /* SEQUNCE_OF_AliasAddress */ +static int hf_h225_aliasAddress = -1; /* SEQUENCE_OF_AliasAddress */ static int hf_h225_aliasAddress_item = -1; /* AliasAddress */ -static int hf_h225_callSignalAddress = -1; /* SEQUNCE_OF_TransportAddress */ +static int hf_h225_callSignalAddress = -1; /* SEQUENCE_OF_TransportAddress */ static int hf_h225_callSignalAddress_item = -1; /* TransportAddress */ -static int hf_h225_rasAddress = -1; /* SEQUNCE_OF_TransportAddress */ +static int hf_h225_rasAddress = -1; /* SEQUENCE_OF_TransportAddress */ static int hf_h225_rasAddress_item = -1; /* TransportAddress */ static int hf_h225_endpointType = -1; /* EndpointType */ static int hf_h225_priority = -1; /* INTEGER_0_127 */ -static int hf_h225_remoteExtensionAddress = -1; /* SEQUNCE_OF_AliasAddress */ +static int hf_h225_remoteExtensionAddress = -1; /* SEQUENCE_OF_AliasAddress */ static int hf_h225_remoteExtensionAddress_item = -1; /* AliasAddress */ static int hf_h225_alternateTransportAddresses = -1; /* AlternateTransportAddresses */ -static int hf_h225_annexE = -1; /* SEQUNCE_OF_TransportAddress */ +static int hf_h225_annexE = -1; /* SEQUENCE_OF_TransportAddress */ static int hf_h225_annexE_item = -1; /* TransportAddress */ -static int hf_h225_sctp = -1; /* SEQUNCE_OF_TransportAddress */ +static int hf_h225_sctp = -1; /* SEQUENCE_OF_TransportAddress */ static int hf_h225_sctp_item = -1; /* TransportAddress */ static int hf_h225_tcp = -1; /* NULL */ static int hf_h225_annexE_flg = -1; /* NULL */ @@ -435,7 +435,7 @@ static int hf_h225_sctp_flg = -1; /* NULL */ static int hf_h225_alternateGK_rasAddress = -1; /* TransportAddress */ static int hf_h225_gatekeeperIdentifier = -1; /* GatekeeperIdentifier */ static int hf_h225_needToRegister = -1; /* BOOLEAN */ -static int hf_h225_alternateGatekeeper = -1; /* SEQUNCE_OF_AlternateGK */ +static int hf_h225_alternateGatekeeper = -1; /* SEQUENCE_OF_AlternateGK */ static int hf_h225_alternateGatekeeper_item = -1; /* AlternateGK */ static int hf_h225_altGKisPermanent = -1; /* BOOLEAN */ static int hf_h225_default = -1; /* NULL */ @@ -505,29 +505,29 @@ static int hf_h225_callStart = -1; /* NULL */ static int hf_h225_callEnd = -1; /* NULL */ static int hf_h225_maximumCallCapacity = -1; /* CallCapacityInfo */ static int hf_h225_currentCallCapacity = -1; /* CallCapacityInfo */ -static int hf_h225_voiceGwCallsAvailable = -1; /* SEQUNCE_OF_CallsAvailable */ +static int hf_h225_voiceGwCallsAvailable = -1; /* SEQUENCE_OF_CallsAvailable */ static int hf_h225_voiceGwCallsAvailable_item = -1; /* CallsAvailable */ -static int hf_h225_h310GwCallsAvailable = -1; /* SEQUNCE_OF_CallsAvailable */ +static int hf_h225_h310GwCallsAvailable = -1; /* SEQUENCE_OF_CallsAvailable */ static int hf_h225_h310GwCallsAvailable_item = -1; /* CallsAvailable */ -static int hf_h225_h320GwCallsAvailable = -1; /* SEQUNCE_OF_CallsAvailable */ +static int hf_h225_h320GwCallsAvailable = -1; /* SEQUENCE_OF_CallsAvailable */ static int hf_h225_h320GwCallsAvailable_item = -1; /* CallsAvailable */ -static int hf_h225_h321GwCallsAvailable = -1; /* SEQUNCE_OF_CallsAvailable */ +static int hf_h225_h321GwCallsAvailable = -1; /* SEQUENCE_OF_CallsAvailable */ static int hf_h225_h321GwCallsAvailable_item = -1; /* CallsAvailable */ -static int hf_h225_h322GwCallsAvailable = -1; /* SEQUNCE_OF_CallsAvailable */ +static int hf_h225_h322GwCallsAvailable = -1; /* SEQUENCE_OF_CallsAvailable */ static int hf_h225_h322GwCallsAvailable_item = -1; /* CallsAvailable */ -static int hf_h225_h323GwCallsAvailable = -1; /* SEQUNCE_OF_CallsAvailable */ +static int hf_h225_h323GwCallsAvailable = -1; /* SEQUENCE_OF_CallsAvailable */ static int hf_h225_h323GwCallsAvailable_item = -1; /* CallsAvailable */ -static int hf_h225_h324GwCallsAvailable = -1; /* SEQUNCE_OF_CallsAvailable */ +static int hf_h225_h324GwCallsAvailable = -1; /* SEQUENCE_OF_CallsAvailable */ static int hf_h225_h324GwCallsAvailable_item = -1; /* CallsAvailable */ -static int hf_h225_t120OnlyGwCallsAvailable = -1; /* SEQUNCE_OF_CallsAvailable */ +static int hf_h225_t120OnlyGwCallsAvailable = -1; /* SEQUENCE_OF_CallsAvailable */ static int hf_h225_t120OnlyGwCallsAvailable_item = -1; /* CallsAvailable */ -static int hf_h225_t38FaxAnnexbOnlyGwCallsAvailable = -1; /* SEQUNCE_OF_CallsAvailable */ +static int hf_h225_t38FaxAnnexbOnlyGwCallsAvailable = -1; /* SEQUENCE_OF_CallsAvailable */ static int hf_h225_t38FaxAnnexbOnlyGwCallsAvailable_item = -1; /* CallsAvailable */ -static int hf_h225_terminalCallsAvailable = -1; /* SEQUNCE_OF_CallsAvailable */ +static int hf_h225_terminalCallsAvailable = -1; /* SEQUENCE_OF_CallsAvailable */ static int hf_h225_terminalCallsAvailable_item = -1; /* CallsAvailable */ -static int hf_h225_mcuCallsAvailable = -1; /* SEQUNCE_OF_CallsAvailable */ +static int hf_h225_mcuCallsAvailable = -1; /* SEQUENCE_OF_CallsAvailable */ static int hf_h225_mcuCallsAvailable_item = -1; /* CallsAvailable */ -static int hf_h225_sipGwCallsAvailable = -1; /* SEQUNCE_OF_CallsAvailable */ +static int hf_h225_sipGwCallsAvailable = -1; /* SEQUENCE_OF_CallsAvailable */ static int hf_h225_sipGwCallsAvailable_item = -1; /* CallsAvailable */ static int hf_h225_calls = -1; /* INTEGER_0_4294967295 */ static int hf_h225_group_IA5String = -1; /* IA5String_SIZE_1_128 */ @@ -536,10 +536,10 @@ static int hf_h225_sourceCircuitID = -1; /* CircuitIdentifier */ static int hf_h225_destinationCircuitID = -1; /* CircuitIdentifier */ static int hf_h225_cic = -1; /* CicInfo */ static int hf_h225_group = -1; /* GroupID */ -static int hf_h225_cic_2_4 = -1; /* SEQUNCE_OF_OCTET_STRING_SIZE_2_4 */ +static int hf_h225_cic_2_4 = -1; /* T_cic */ static int hf_h225_cic_item = -1; /* OCTET_STRING_SIZE_2_4 */ static int hf_h225_pointCode = -1; /* OCTET_STRING_SIZE_2_5 */ -static int hf_h225_member = -1; /* SEQUNCE_OF_INTEGER_0_65535 */ +static int hf_h225_member = -1; /* T_member */ static int hf_h225_member_item = -1; /* INTEGER_0_65535 */ static int hf_h225_carrierIdentificationCode = -1; /* OCTET_STRING_SIZE_3_4 */ static int hf_h225_carrierName = -1; /* IA5String_SIZE_1_128 */ @@ -552,7 +552,7 @@ static int hf_h225_reason = -1; /* ServiceControlSession_reaso static int hf_h225_open = -1; /* NULL */ static int hf_h225_refresh = -1; /* NULL */ static int hf_h225_close = -1; /* NULL */ -static int hf_h225_nonStandardUsageTypes = -1; /* SEQUNCE_OF_NonStandardParameter */ +static int hf_h225_nonStandardUsageTypes = -1; /* SEQUENCE_OF_NonStandardParameter */ static int hf_h225_nonStandardUsageTypes_item = -1; /* NonStandardParameter */ static int hf_h225_startTime = -1; /* NULL */ static int hf_h225_endTime_flg = -1; /* NULL */ @@ -565,7 +565,7 @@ static int hf_h225_ras_callStartingPoint = -1; /* RasUsageSpecificationcallSt static int hf_h225_alerting_flg = -1; /* NULL */ static int hf_h225_connect_flg = -1; /* NULL */ static int hf_h225_required = -1; /* RasUsageInfoTypes */ -static int hf_h225_nonStandardUsageFields = -1; /* SEQUNCE_OF_NonStandardParameter */ +static int hf_h225_nonStandardUsageFields = -1; /* SEQUENCE_OF_NonStandardParameter */ static int hf_h225_nonStandardUsageFields_item = -1; /* NonStandardParameter */ static int hf_h225_alertingTime = -1; /* TimeStamp */ static int hf_h225_connectTime = -1; /* TimeStamp */ @@ -585,7 +585,7 @@ static int hf_h225_callDurationLimit = -1; /* INTEGER_1_4294967295 */ static int hf_h225_enforceCallDurationLimit = -1; /* BOOLEAN */ static int hf_h225_callStartingPoint = -1; /* CallCreditServiceControl_callStartingPoint */ static int hf_h225_id = -1; /* GenericIdentifier */ -static int hf_h225_parameters = -1; /* SEQUNCE_SIZE_1_512_OF_EnumeratedParameter */ +static int hf_h225_parameters = -1; /* SEQUENCE_SIZE_1_512_OF_EnumeratedParameter */ static int hf_h225_parameters_item = -1; /* EnumeratedParameter */ static int hf_h225_standard = -1; /* INTEGER_0_16383_ */ static int hf_h225_oid = -1; /* OBJECT_IDENTIFIER */ @@ -599,9 +599,9 @@ static int hf_h225_number8 = -1; /* INTEGER_0_255 */ static int hf_h225_number16 = -1; /* INTEGER_0_65535 */ static int hf_h225_number32 = -1; /* INTEGER_0_4294967295 */ static int hf_h225_transport = -1; /* TransportAddress */ -static int hf_h225_compound = -1; /* SEQUNCE_SIZE_1_512_OF_EnumeratedParameter */ +static int hf_h225_compound = -1; /* SEQUENCE_SIZE_1_512_OF_EnumeratedParameter */ static int hf_h225_compound_item = -1; /* EnumeratedParameter */ -static int hf_h225_nested = -1; /* SEQUNCE_SIZE_1_16_OF_GenericData */ +static int hf_h225_nested = -1; /* SEQUENCE_SIZE_1_16_OF_GenericData */ static int hf_h225_nested_item = -1; /* GenericData */ static int hf_h225_replacementFeatureSet = -1; /* BOOLEAN */ static int hf_h225_sendAddress = -1; /* TransportAddress */ @@ -611,7 +611,7 @@ static int hf_h225_rtcpAddress = -1; /* TransportChannelInfo */ static int hf_h225_cname = -1; /* PrintableString */ static int hf_h225_ssrc = -1; /* INTEGER_1_4294967295 */ static int hf_h225_sessionId = -1; /* INTEGER_1_255 */ -static int hf_h225_associatedSessionIds = -1; /* SEQUNCE_OF_INTEGER_1_255 */ +static int hf_h225_associatedSessionIds = -1; /* T_associatedSessionIds */ static int hf_h225_associatedSessionIds_item = -1; /* INTEGER_1_255 */ static int hf_h225_multicast_flg = -1; /* NULL */ static int hf_h225_gatekeeperRequest = -1; /* GatekeeperRequest */ @@ -646,19 +646,19 @@ static int hf_h225_infoRequestAck = -1; /* InfoRequestAck */ static int hf_h225_infoRequestNak = -1; /* InfoRequestNak */ static int hf_h225_serviceControlIndication = -1; /* ServiceControlIndication */ static int hf_h225_serviceControlResponse = -1; /* ServiceControlResponse */ -static int hf_h225_admissionConfirmSequence = -1; /* SEQUNCE_OF_AdmissionConfirm */ +static int hf_h225_admissionConfirmSequence = -1; /* SEQUENCE_OF_AdmissionConfirm */ static int hf_h225_admissionConfirmSequence_item = -1; /* AdmissionConfirm */ static int hf_h225_requestSeqNum = -1; /* RequestSeqNum */ static int hf_h225_gatekeeperRequest_rasAddress = -1; /* TransportAddress */ -static int hf_h225_endpointAlias = -1; /* SEQUNCE_OF_AliasAddress */ +static int hf_h225_endpointAlias = -1; /* SEQUENCE_OF_AliasAddress */ static int hf_h225_endpointAlias_item = -1; /* AliasAddress */ -static int hf_h225_alternateEndpoints = -1; /* SEQUNCE_OF_Endpoint */ +static int hf_h225_alternateEndpoints = -1; /* SEQUENCE_OF_Endpoint */ static int hf_h225_alternateEndpoints_item = -1; /* Endpoint */ -static int hf_h225_authenticationCapability = -1; /* SEQUNCE_OF_AuthenticationMechanism */ +static int hf_h225_authenticationCapability = -1; /* SEQUENCE_OF_AuthenticationMechanism */ static int hf_h225_authenticationCapability_item = -1; /* AuthenticationMechanism */ -static int hf_h225_algorithmOIDs = -1; /* SEQUNCE_OF_OBJECT_IDENTIFIER */ +static int hf_h225_algorithmOIDs = -1; /* T_algorithmOIDs */ static int hf_h225_algorithmOIDs_item = -1; /* OBJECT_IDENTIFIER */ -static int hf_h225_integrity = -1; /* SEQUNCE_OF_IntegrityMechanism */ +static int hf_h225_integrity = -1; /* SEQUENCE_OF_IntegrityMechanism */ static int hf_h225_integrity_item = -1; /* IntegrityMechanism */ static int hf_h225_integrityCheckValue = -1; /* ICV */ static int hf_h225_supportsAltGK = -1; /* NULL */ @@ -672,17 +672,17 @@ static int hf_h225_securityDenial = -1; /* NULL */ static int hf_h225_gkRej_securityError = -1; /* SecurityErrors */ static int hf_h225_discoveryComplete = -1; /* BOOLEAN */ static int hf_h225_terminalType = -1; /* EndpointType */ -static int hf_h225_terminalAlias = -1; /* SEQUNCE_OF_AliasAddress */ +static int hf_h225_terminalAlias = -1; /* SEQUENCE_OF_AliasAddress */ static int hf_h225_terminalAlias_item = -1; /* AliasAddress */ static int hf_h225_endpointVendor = -1; /* VendorIdentifier */ static int hf_h225_timeToLive = -1; /* TimeToLive */ static int hf_h225_keepAlive = -1; /* BOOLEAN */ static int hf_h225_willSupplyUUIEs = -1; /* BOOLEAN */ static int hf_h225_additiveRegistration = -1; /* NULL */ -static int hf_h225_terminalAliasPattern = -1; /* SEQUNCE_OF_AddressPattern */ +static int hf_h225_terminalAliasPattern = -1; /* SEQUENCE_OF_AddressPattern */ static int hf_h225_terminalAliasPattern_item = -1; /* AddressPattern */ static int hf_h225_usageReportingCapability = -1; /* RasUsageInfoTypes */ -static int hf_h225_supportedH248Packages = -1; /* SEQUNCE_OF_H248PackagesDescriptor */ +static int hf_h225_supportedH248Packages = -1; /* SEQUENCE_OF_H248PackagesDescriptor */ static int hf_h225_supportedH248Packages_item = -1; /* H248PackagesDescriptor */ static int hf_h225_callCreditCapability = -1; /* CallCreditCapability */ static int hf_h225_capacityReportingCapability = -1; /* CapacityReportingCapability */ @@ -698,7 +698,7 @@ static int hf_h225_irrFrequencyInCall = -1; /* INTEGER_1_65535 */ static int hf_h225_totalBandwidthRestriction = -1; /* BandWidth */ static int hf_h225_useSpecifiedTransport = -1; /* UseSpecifiedTransport */ static int hf_h225_supportsAdditiveRegistration = -1; /* NULL */ -static int hf_h225_usageSpec = -1; /* SEQUNCE_OF_RasUsageSpecification */ +static int hf_h225_usageSpec = -1; /* SEQUENCE_OF_RasUsageSpecification */ static int hf_h225_usageSpec_item = -1; /* RasUsageSpecification */ static int hf_h225_featureServerAlias = -1; /* AliasAddress */ static int hf_h225_capacityReportingSpec = -1; /* CapacityReportingSpecification */ @@ -706,7 +706,7 @@ static int hf_h225_registrationRejectReason = -1; /* RegistrationRejectReason * static int hf_h225_discoveryRequired = -1; /* NULL */ static int hf_h225_invalidCallSignalAddress = -1; /* NULL */ static int hf_h225_invalidRASAddress = -1; /* NULL */ -static int hf_h225_duplicateAlias = -1; /* SEQUNCE_OF_AliasAddress */ +static int hf_h225_duplicateAlias = -1; /* SEQUENCE_OF_AliasAddress */ static int hf_h225_duplicateAlias_item = -1; /* AliasAddress */ static int hf_h225_invalidTerminalType = -1; /* NULL */ static int hf_h225_transportNotSupported = -1; /* NULL */ @@ -717,7 +717,7 @@ static int hf_h225_additiveRegistrationNotSupported = -1; /* NULL */ static int hf_h225_invalidTerminalAliases = -1; /* T_invalidTerminalAliases */ static int hf_h225_reg_securityError = -1; /* SecurityErrors */ static int hf_h225_unregRequestReason = -1; /* UnregRequestReason */ -static int hf_h225_endpointAliasPattern = -1; /* SEQUNCE_OF_AddressPattern */ +static int hf_h225_endpointAliasPattern = -1; /* SEQUENCE_OF_AddressPattern */ static int hf_h225_endpointAliasPattern_item = -1; /* AddressPattern */ static int hf_h225_reregistrationRequired = -1; /* NULL */ static int hf_h225_ttlExpired = -1; /* NULL */ @@ -729,15 +729,15 @@ static int hf_h225_callInProgress = -1; /* NULL */ static int hf_h225_permissionDenied = -1; /* NULL */ static int hf_h225_callModel = -1; /* CallModel */ static int hf_h225_destinationInfo = -1; /* DestinationInfo */ -static int hf_h225_srcInfo = -1; /* SEQUNCE_OF_AliasAddress */ +static int hf_h225_srcInfo = -1; /* SEQUENCE_OF_AliasAddress */ static int hf_h225_srcInfo_item = -1; /* AliasAddress */ static int hf_h225_srcCallSignalAddress = -1; /* TransportAddress */ static int hf_h225_bandWidth = -1; /* BandWidth */ static int hf_h225_callReferenceValue = -1; /* CallReferenceValue */ static int hf_h225_canMapAlias = -1; /* BOOLEAN */ -static int hf_h225_srcAlternatives = -1; /* SEQUNCE_OF_Endpoint */ +static int hf_h225_srcAlternatives = -1; /* SEQUENCE_OF_Endpoint */ static int hf_h225_srcAlternatives_item = -1; /* Endpoint */ -static int hf_h225_destAlternatives = -1; /* SEQUNCE_OF_Endpoint */ +static int hf_h225_destAlternatives = -1; /* SEQUENCE_OF_Endpoint */ static int hf_h225_destAlternatives_item = -1; /* Endpoint */ static int hf_h225_transportQOS = -1; /* TransportQOS */ static int hf_h225_gatewayDataRate = -1; /* DataRate */ @@ -756,9 +756,10 @@ static int hf_h225_noControl = -1; /* NULL */ static int hf_h225_irrFrequency = -1; /* INTEGER_1_65535 */ static int hf_h225_destinationType = -1; /* EndpointType */ static int hf_h225_uuiesRequested = -1; /* UUIEsRequested */ -static int hf_h225_supportedProtocols = -1; /* SEQUNCE_OF_SupportedProtocols */ +static int hf_h225_language2 = -1; /* T_language2 */ +static int hf_h225_supportedProtocols = -1; /* SEQUENCE_OF_SupportedProtocols */ static int hf_h225_supportedProtocols_item = -1; /* SupportedProtocols */ -static int hf_h225_modifiedSrcInfo = -1; /* SEQUNCE_OF_AliasAddress */ +static int hf_h225_modifiedSrcInfo = -1; /* SEQUENCE_OF_AliasAddress */ static int hf_h225_modifiedSrcInfo_item = -1; /* AliasAddress */ static int hf_h225_setup_bool = -1; /* BOOLEAN */ static int hf_h225_callProceeding_flg = -1; /* BOOLEAN */ @@ -780,7 +781,7 @@ static int hf_h225_invalidEndpointIdentifier = -1; /* NULL */ static int hf_h225_qosControlNotSupported = -1; /* NULL */ static int hf_h225_incompleteAddress = -1; /* NULL */ static int hf_h225_aliasesInconsistent = -1; /* NULL */ -static int hf_h225_routeCallToSCN = -1; /* SEQUNCE_OF_PartyNumber */ +static int hf_h225_routeCallToSCN = -1; /* SEQUENCE_OF_PartyNumber */ static int hf_h225_routeCallToSCN_item = -1; /* PartyNumber */ static int hf_h225_exceedsCallCapacity = -1; /* NULL */ static int hf_h225_collectDestination = -1; /* NULL */ @@ -789,7 +790,7 @@ static int hf_h225_noRouteToDestination = -1; /* NULL */ static int hf_h225_unallocatedNumber = -1; /* NULL */ static int hf_h225_answeredCall = -1; /* BOOLEAN */ static int hf_h225_usageInformation = -1; /* RasUsageInformation */ -static int hf_h225_bandwidthDetails = -1; /* SEQUNCE_OF_BandwidthDetails */ +static int hf_h225_bandwidthDetails = -1; /* SEQUENCE_OF_BandwidthDetails */ static int hf_h225_bandwidthDetails_item = -1; /* BandwidthDetails */ static int hf_h225_bandRejectReason = -1; /* BandRejectReason */ static int hf_h225_allowedBandWidth = -1; /* BandWidth */ @@ -797,16 +798,16 @@ static int hf_h225_notBound = -1; /* NULL */ static int hf_h225_invalidConferenceID = -1; /* NULL */ static int hf_h225_insufficientResources = -1; /* NULL */ static int hf_h225_replyAddress = -1; /* TransportAddress */ -static int hf_h225_sourceInfo = -1; /* SEQUNCE_OF_AliasAddress */ +static int hf_h225_sourceInfo = -1; /* SEQUENCE_OF_AliasAddress */ static int hf_h225_sourceInfo_item = -1; /* AliasAddress */ static int hf_h225_hopCount = -1; /* INTEGER_1_255 */ -static int hf_h225_sourceEndpointInfo = -1; /* SEQUNCE_OF_AliasAddress */ +static int hf_h225_sourceEndpointInfo = -1; /* SEQUENCE_OF_AliasAddress */ static int hf_h225_sourceEndpointInfo_item = -1; /* AliasAddress */ static int hf_h225_locationConfirm_callSignalAddress = -1; /* TransportAddress */ static int hf_h225_locationConfirm_rasAddress = -1; /* TransportAddress */ static int hf_h225_locationRejectReason = -1; /* LocationRejectReason */ static int hf_h225_notRegistered = -1; /* NULL */ -static int hf_h225_routeCalltoSCN = -1; /* SEQUNCE_OF_PartyNumber */ +static int hf_h225_routeCalltoSCN = -1; /* SEQUENCE_OF_PartyNumber */ static int hf_h225_routeCalltoSCN_item = -1; /* PartyNumber */ static int hf_h225_disengageReason = -1; /* DisengageReason */ static int hf_h225_terminationCause = -1; /* CallTerminationCause */ @@ -822,15 +823,15 @@ static int hf_h225_infoRequestResponse_rasAddress = -1; /* TransportAddress */ static int hf_h225_perCallInfo = -1; /* T_perCallInfo */ static int hf_h225_perCallInfo_item = -1; /* T_perCallInfo_item */ static int hf_h225_originator = -1; /* BOOLEAN */ -static int hf_h225_audio = -1; /* SEQUNCE_OF_RTPSession */ +static int hf_h225_audio = -1; /* SEQUENCE_OF_RTPSession */ static int hf_h225_audio_item = -1; /* RTPSession */ -static int hf_h225_video = -1; /* SEQUNCE_OF_RTPSession */ +static int hf_h225_video = -1; /* SEQUENCE_OF_RTPSession */ static int hf_h225_video_item = -1; /* RTPSession */ -static int hf_h225_data = -1; /* SEQUNCE_OF_TransportChannelInfo */ +static int hf_h225_data = -1; /* SEQUENCE_OF_TransportChannelInfo */ static int hf_h225_data_item = -1; /* TransportChannelInfo */ static int hf_h225_h245 = -1; /* TransportChannelInfo */ static int hf_h225_callSignaling = -1; /* TransportChannelInfo */ -static int hf_h225_substituteConfIDs = -1; /* SEQUNCE_OF_ConferenceIdentifier */ +static int hf_h225_substituteConfIDs = -1; /* SEQUENCE_OF_ConferenceIdentifier */ static int hf_h225_substituteConfIDs_item = -1; /* ConferenceIdentifier */ static int hf_h225_pdu = -1; /* T_pdu */ static int hf_h225_pdu_item = -1; /* T_pdu_item */ @@ -846,7 +847,7 @@ static int hf_h225_invalidCall = -1; /* NULL */ static int hf_h225_nakReason = -1; /* InfoRequestNakReason */ static int hf_h225_messageNotUnderstood = -1; /* OCTET_STRING */ static int hf_h225_delay = -1; /* INTEGER_1_65535 */ -static int hf_h225_protocols = -1; /* SEQUNCE_OF_SupportedProtocols */ +static int hf_h225_protocols = -1; /* SEQUENCE_OF_SupportedProtocols */ static int hf_h225_protocols_item = -1; /* SupportedProtocols */ static int hf_h225_almostOutOfResources = -1; /* BOOLEAN */ static int hf_h225_callSpecific = -1; /* T_callSpecific */ @@ -868,37 +869,39 @@ static gint ett_h225_H323_UserInformation = -1; static gint ett_h225_T_user_data = -1; static gint ett_h225_H323_UU_PDU = -1; static gint ett_h225_T_h323_message_body = -1; -static gint ett_h225_SEQUNCE_OF_OCTET_STRING = -1; -static gint ett_h225_SEQUNCE_OF_NonStandardParameter = -1; +static gint ett_h225_T_h4501SupplementaryService = -1; +static gint ett_h225_SEQUENCE_OF_NonStandardParameter = -1; static gint ett_h225_T_tunnelledSignallingMessage = -1; -static gint ett_h225_SEQUNCE_OF_GenericData = -1; +static gint ett_h225_T_messageContent = -1; +static gint ett_h225_SEQUENCE_OF_GenericData = -1; static gint ett_h225_H245Control = -1; static gint ett_h225_StimulusControl = -1; static gint ett_h225_Alerting_UUIE = -1; -static gint ett_h225_SEQUNCE_OF_ClearToken = -1; -static gint ett_h225_SEQUNCE_OF_CryptoH323Token = -1; -static gint ett_h225_SEQUNCE_OF_AliasAddress = -1; -static gint ett_h225_SEQUNCE_OF_ServiceControlSession = -1; +static gint ett_h225_SEQUENCE_OF_ClearToken = -1; +static gint ett_h225_SEQUENCE_OF_CryptoH323Token = -1; +static gint ett_h225_SEQUENCE_OF_AliasAddress = -1; +static gint ett_h225_SEQUENCE_OF_ServiceControlSession = -1; static gint ett_h225_CallProceeding_UUIE = -1; static gint ett_h225_Connect_UUIE = -1; -static gint ett_h225_SEQUNCE_OF_IA5String_SIZE_1_32 = -1; +static gint ett_h225_T_language = -1; static gint ett_h225_Information_UUIE = -1; static gint ett_h225_ReleaseComplete_UUIE = -1; static gint ett_h225_ReleaseCompleteReason = -1; static gint ett_h225_Setup_UUIE = -1; -static gint ett_h225_SEQUNCE_OF_CallReferenceValue = -1; +static gint ett_h225_SEQUENCE_OF_CallReferenceValue = -1; static gint ett_h225_T_conferenceGoal = -1; -static gint ett_h225_SEQUNCE_OF_H245Security = -1; +static gint ett_h225_SEQUENCE_OF_H245Security = -1; static gint ett_h225_T_connectionParameters = -1; -static gint ett_h225_SEQUNCE_OF_SupportedProtocols = -1; -static gint ett_h225_SEQUNCE_OF_FeatureDescriptor = -1; -static gint ett_h225_SEQUNCE_OF_ExtendedAliasAddress = -1; +static gint ett_h225_T_language1 = -1; +static gint ett_h225_SEQUENCE_OF_SupportedProtocols = -1; +static gint ett_h225_SEQUENCE_OF_FeatureDescriptor = -1; +static gint ett_h225_SEQUENCE_OF_ExtendedAliasAddress = -1; static gint ett_h225_ParallelH245Control = -1; static gint ett_h225_ScnConnectionType = -1; static gint ett_h225_ScnConnectionAggregation = -1; static gint ett_h225_PresentationIndicator = -1; static gint ett_h225_Facility_UUIE = -1; -static gint ett_h225_SEQUNCE_OF_ConferenceList = -1; +static gint ett_h225_SEQUENCE_OF_ConferenceList = -1; static gint ett_h225_ConferenceList = -1; static gint ett_h225_FacilityReason = -1; static gint ett_h225_Progress_UUIE = -1; @@ -906,13 +909,14 @@ static gint ett_h225_FastStart = -1; static gint ett_h225_TransportAddress = -1; static gint ett_h225_T_ipAddress = -1; static gint ett_h225_T_ipSourceRoute = -1; -static gint ett_h225_SEQUNCE_OF_OCTET_STRING_SIZE_4 = -1; +static gint ett_h225_T_route = -1; static gint ett_h225_T_routing = -1; static gint ett_h225_T_ipxAddress = -1; static gint ett_h225_T_ip6Address = -1; static gint ett_h225_H245TransportAddress = -1; static gint ett_h225_T_h245ipAddress = -1; static gint ett_h225_T_h245ipSourceRoute = -1; +static gint ett_h225_T_h245route = -1; static gint ett_h225_T_h245routing = -1; static gint ett_h225_T_h245ipxAddress = -1; static gint ett_h225_T_h245ip6Address = -1; @@ -921,12 +925,12 @@ static gint ett_h225_StatusInquiry_UUIE = -1; static gint ett_h225_SetupAcknowledge_UUIE = -1; static gint ett_h225_Notify_UUIE = -1; static gint ett_h225_EndpointType = -1; -static gint ett_h225_SEQUNCE_OF_TunnelledProtocol = -1; +static gint ett_h225_SEQUENCE_OF_TunnelledProtocol = -1; static gint ett_h225_GatewayInfo = -1; static gint ett_h225_SupportedProtocols = -1; static gint ett_h225_H310Caps = -1; -static gint ett_h225_SEQUNCE_OF_DataRate = -1; -static gint ett_h225_SEQUNCE_OF_SupportedPrefix = -1; +static gint ett_h225_SEQUENCE_OF_DataRate = -1; +static gint ett_h225_SEQUENCE_OF_SupportedPrefix = -1; static gint ett_h225_H320Caps = -1; static gint ett_h225_H321Caps = -1; static gint ett_h225_H322Caps = -1; @@ -961,12 +965,12 @@ static gint ett_h225_T_system_id = -1; static gint ett_h225_GSM_UIM = -1; static gint ett_h225_ExtendedAliasAddress = -1; static gint ett_h225_Endpoint = -1; -static gint ett_h225_SEQUNCE_OF_TransportAddress = -1; +static gint ett_h225_SEQUENCE_OF_TransportAddress = -1; static gint ett_h225_AlternateTransportAddresses = -1; static gint ett_h225_UseSpecifiedTransport = -1; static gint ett_h225_AlternateGK = -1; static gint ett_h225_AltGKInfo = -1; -static gint ett_h225_SEQUNCE_OF_AlternateGK = -1; +static gint ett_h225_SEQUENCE_OF_AlternateGK = -1; static gint ett_h225_SecurityServiceMode = -1; static gint ett_h225_SecurityCapabilities = -1; static gint ett_h225_SecurityErrors = -1; @@ -990,14 +994,14 @@ static gint ett_h225_CapacityReportingSpecification = -1; static gint ett_h225_CapacityReportingSpecification_when = -1; static gint ett_h225_CallCapacity = -1; static gint ett_h225_CallCapacityInfo = -1; -static gint ett_h225_SEQUNCE_OF_CallsAvailable = -1; +static gint ett_h225_SEQUENCE_OF_CallsAvailable = -1; static gint ett_h225_CallsAvailable = -1; static gint ett_h225_CircuitInfo = -1; static gint ett_h225_CircuitIdentifier = -1; static gint ett_h225_CicInfo = -1; -static gint ett_h225_SEQUNCE_OF_OCTET_STRING_SIZE_2_4 = -1; +static gint ett_h225_T_cic = -1; static gint ett_h225_GroupID = -1; -static gint ett_h225_SEQUNCE_OF_INTEGER_0_65535 = -1; +static gint ett_h225_T_member = -1; static gint ett_h225_CarrierInfo = -1; static gint ett_h225_ServiceControlDescriptor = -1; static gint ett_h225_ServiceControlSession = -1; @@ -1014,31 +1018,31 @@ static gint ett_h225_CallCreditServiceControl = -1; static gint ett_h225_T_billingMode = -1; static gint ett_h225_CallCreditServiceControl_callStartingPoint = -1; static gint ett_h225_GenericData = -1; -static gint ett_h225_SEQUNCE_SIZE_1_512_OF_EnumeratedParameter = -1; +static gint ett_h225_SEQUENCE_SIZE_1_512_OF_EnumeratedParameter = -1; static gint ett_h225_GenericIdentifier = -1; static gint ett_h225_EnumeratedParameter = -1; static gint ett_h225_Content = -1; -static gint ett_h225_SEQUNCE_SIZE_1_16_OF_GenericData = -1; +static gint ett_h225_SEQUENCE_SIZE_1_16_OF_GenericData = -1; static gint ett_h225_FeatureSet = -1; static gint ett_h225_TransportChannelInfo = -1; static gint ett_h225_RTPSession = -1; -static gint ett_h225_SEQUNCE_OF_INTEGER_1_255 = -1; +static gint ett_h225_T_associatedSessionIds = -1; static gint ett_h225_RasMessage = -1; -static gint ett_h225_SEQUNCE_OF_AdmissionConfirm = -1; +static gint ett_h225_SEQUENCE_OF_AdmissionConfirm = -1; static gint ett_h225_GatekeeperRequest = -1; -static gint ett_h225_SEQUNCE_OF_Endpoint = -1; -static gint ett_h225_SEQUNCE_OF_AuthenticationMechanism = -1; -static gint ett_h225_SEQUNCE_OF_OBJECT_IDENTIFIER = -1; -static gint ett_h225_SEQUNCE_OF_IntegrityMechanism = -1; +static gint ett_h225_SEQUENCE_OF_Endpoint = -1; +static gint ett_h225_SEQUENCE_OF_AuthenticationMechanism = -1; +static gint ett_h225_T_algorithmOIDs = -1; +static gint ett_h225_SEQUENCE_OF_IntegrityMechanism = -1; static gint ett_h225_GatekeeperConfirm = -1; static gint ett_h225_GatekeeperReject = -1; static gint ett_h225_GatekeeperRejectReason = -1; static gint ett_h225_RegistrationRequest = -1; -static gint ett_h225_SEQUNCE_OF_AddressPattern = -1; -static gint ett_h225_SEQUNCE_OF_H248PackagesDescriptor = -1; +static gint ett_h225_SEQUENCE_OF_AddressPattern = -1; +static gint ett_h225_SEQUENCE_OF_H248PackagesDescriptor = -1; static gint ett_h225_RegistrationConfirm = -1; static gint ett_h225_T_preGrantedARQ = -1; -static gint ett_h225_SEQUNCE_OF_RasUsageSpecification = -1; +static gint ett_h225_SEQUENCE_OF_RasUsageSpecification = -1; static gint ett_h225_RegistrationReject = -1; static gint ett_h225_RegistrationRejectReason = -1; static gint ett_h225_T_invalidTerminalAliases = -1; @@ -1053,12 +1057,13 @@ static gint ett_h225_CallType = -1; static gint ett_h225_CallModel = -1; static gint ett_h225_TransportQOS = -1; static gint ett_h225_AdmissionConfirm = -1; +static gint ett_h225_T_language2 = -1; static gint ett_h225_UUIEsRequested = -1; static gint ett_h225_AdmissionReject = -1; static gint ett_h225_AdmissionRejectReason = -1; -static gint ett_h225_SEQUNCE_OF_PartyNumber = -1; +static gint ett_h225_SEQUENCE_OF_PartyNumber = -1; static gint ett_h225_BandwidthRequest = -1; -static gint ett_h225_SEQUNCE_OF_BandwidthDetails = -1; +static gint ett_h225_SEQUENCE_OF_BandwidthDetails = -1; static gint ett_h225_BandwidthConfirm = -1; static gint ett_h225_BandwidthReject = -1; static gint ett_h225_BandRejectReason = -1; @@ -1075,9 +1080,9 @@ static gint ett_h225_InfoRequest = -1; static gint ett_h225_InfoRequestResponse = -1; static gint ett_h225_T_perCallInfo = -1; static gint ett_h225_T_perCallInfo_item = -1; -static gint ett_h225_SEQUNCE_OF_RTPSession = -1; -static gint ett_h225_SEQUNCE_OF_TransportChannelInfo = -1; -static gint ett_h225_SEQUNCE_OF_ConferenceIdentifier = -1; +static gint ett_h225_SEQUENCE_OF_RTPSession = -1; +static gint ett_h225_SEQUENCE_OF_TransportChannelInfo = -1; +static gint ett_h225_SEQUENCE_OF_ConferenceIdentifier = -1; static gint ett_h225_T_pdu = -1; static gint ett_h225_T_pdu_item = -1; static gint ett_h225_InfoRequestResponseStatus = -1; @@ -1100,12 +1105,21 @@ static gint ett_h225_T_result = -1; /* Global variables */ static guint32 ipv4_address; static guint32 ipv4_port; -static char object[256]; guint32 T38_manufacturer_code; -static char tpID[256]; static gboolean h225_reassembly = TRUE; +guint32 value; static gboolean contains_faststart = FALSE; +/* NonStandardParameter */ +static char nsiOID[256]; +static guint32 h221NonStandard; +static guint32 t35CountryCode; +static guint32 t35Extension; +static guint32 manufacturerCode; + +/* TunnelledProtocol */ +static char tpOID[256]; + /*--- Included file: packet-h225-fn.c ---*/ @@ -1313,17 +1327,14 @@ static int dissect_segment(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_ static int -dissect_h225_SEQUNCE_OF_OCTET_STRING_SIZE_4(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_T_h245route(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_OCTET_STRING_SIZE_4, dissect_route_item); + ett_h225_T_h245route, dissect_h245route_item); return offset; } -static int dissect_route(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_OCTET_STRING_SIZE_4(tvb, offset, pinfo, tree, hf_h225_route); -} static int dissect_h245route(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_OCTET_STRING_SIZE_4(tvb, offset, pinfo, tree, hf_h225_h245route); + return dissect_h225_T_h245route(tvb, offset, pinfo, tree, hf_h225_h245route); } @@ -1990,26 +2001,22 @@ static int dissect_h245nsap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto static int dissect_h225_T_object(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - - offset = dissect_per_object_identifier(tvb, offset, pinfo, tree, hf_index, - object); - + offset = dissect_per_object_identifier(tvb, offset, pinfo, tree, + hf_h225_nsiOID, + nsiOID); return offset; } -static int dissect_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_T_object(tvb, offset, pinfo, tree, hf_h225_object); +static int dissect_nsiOID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { + return dissect_h225_T_object(tvb, offset, pinfo, tree, hf_h225_nsiOID); } static int dissect_h225_T_t35CountryCode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - guint32 value; - offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0U, 255U, &value, NULL, FALSE); - T38_manufacturer_code = value << 24; + 0U, 255U, &t35CountryCode, NULL, FALSE); return offset; } @@ -2021,11 +2028,8 @@ static int dissect_t35CountryCode(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_h225_T_t35Extension(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - guint32 value; - offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0U, 255U, &value, NULL, FALSE); - T38_manufacturer_code = T38_manufacturer_code ^ (value << 16); + 0U, 255U, &t35Extension, NULL, FALSE); return offset; } @@ -2037,13 +2041,8 @@ static int dissect_t35Extension(tvbuff_t *tvb, int offset, packet_info *pinfo, p static int dissect_h225_T_manufacturerCode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - guint32 value; - offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0U, 65535U, &value, NULL, FALSE); - T38_manufacturer_code = T38_manufacturer_code ^ value; - proto_tree_add_uint(tree, hf_h221Manufacturer, tvb, (offset)-4,4,T38_manufacturer_code); - + 0U, 65535U, &manufacturerCode, NULL, FALSE); return offset; } @@ -2060,9 +2059,14 @@ static const per_sequence_t H221NonStandard_sequence[] = { static int dissect_h225_H221NonStandard(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + t35CountryCode = 0; + t35Extension = 0; + manufacturerCode = 0; offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index, ett_h225_H221NonStandard, H221NonStandard_sequence); + h221NonStandard = ((t35CountryCode * 256) + t35Extension) * 65536 + manufacturerCode; + proto_tree_add_uint(tree, hf_h221Manufacturer, tvb, (offset>>3)-4, 4, h221NonStandard); return offset; } static int dissect_vendorIdentifier_vendor(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { @@ -2080,7 +2084,7 @@ static const value_string h225_NonStandardIdentifier_vals[] = { }; static const per_choice_t NonStandardIdentifier_choice[] = { - { 0, "object" , ASN1_EXTENSION_ROOT , dissect_object }, + { 0, "object" , ASN1_EXTENSION_ROOT , dissect_nsiOID }, { 1, "h221NonStandard" , ASN1_EXTENSION_ROOT , dissect_h221NonStandard }, { 0, NULL, 0, NULL } }; @@ -2089,24 +2093,25 @@ static int dissect_h225_NonStandardIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { guint32 value; - *object = '\0'; - T38_manufacturer_code = 0; + nsiOID[0] = '\0'; + h221NonStandard = 0; + + offset = dissect_per_choice(tvb, offset, pinfo, tree, + hf_h225_nonStandardIdentifier, + ett_h225_NonStandardIdentifier, NonStandardIdentifier_choice, "NonStandardIdentifier", + &value); - offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, - ett_h225_NonStandardIdentifier, NonStandardIdentifier_choice, "NonStandardIdentifier", - &value); switch (value) { case 0 : /* object */ - nsp_handle = dissector_get_string_handle(nsp_object_dissector_table, object); + nsp_handle = dissector_get_string_handle(nsp_object_dissector_table, nsiOID); break; case 1 : /* h221NonStandard */ - nsp_handle = dissector_get_port_handle(nsp_h221_dissector_table, T38_manufacturer_code); + nsp_handle = dissector_get_port_handle(nsp_h221_dissector_table, h221NonStandard); break; default : nsp_handle = NULL; } - return offset; } static int dissect_nonStandardIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { @@ -2115,40 +2120,35 @@ static int dissect_nonStandardIdentifier(tvbuff_t *tvb, int offset, packet_info static int -dissect_h225_OCTET_STRING(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index, - -1, -1, - NULL, NULL); +dissect_h225_T_data(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + guint32 value_offset, value_len; + tvbuff_t *next_tvb; + + offset = dissect_per_octet_string(tvb, offset, pinfo, tree, + hf_h225_nsp_data, -1, -1, + &value_offset, &value_len); + + if (value_len > 0) { + next_tvb = tvb_new_subset(tvb, value_offset, value_len, value_len); + call_dissector((nsp_handle)?nsp_handle:data_handle, next_tvb, pinfo, tree); + } return offset; } -static int dissect_messageContent_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_OCTET_STRING(tvb, offset, pinfo, tree, hf_h225_messageContent_item); -} -static int dissect_h248Message(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_OCTET_STRING(tvb, offset, pinfo, tree, hf_h225_h248Message); -} -static int dissect_ParallelH245Control_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_OCTET_STRING(tvb, offset, pinfo, tree, hf_h225_ParallelH245Control_item); -} -static int dissect_data_oct_str(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_OCTET_STRING(tvb, offset, pinfo, tree, hf_h225_data_oct_str); -} -static int dissect_raw(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_OCTET_STRING(tvb, offset, pinfo, tree, hf_h225_raw); -} -static int dissect_messageNotUnderstood(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_OCTET_STRING(tvb, offset, pinfo, tree, hf_h225_messageNotUnderstood); +static int dissect_nsp_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { + return dissect_h225_T_data(tvb, offset, pinfo, tree, hf_h225_nsp_data); } static const per_sequence_t NonStandardParameter_sequence[] = { { "nonStandardIdentifier" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nonStandardIdentifier }, - { "data" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_data_oct_str }, + { "data" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nsp_data }, { NULL, 0, 0, NULL } }; int dissect_h225_NonStandardParameter(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + nsp_handle = NULL; + offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index, ett_h225_NonStandardParameter, NonStandardParameter_sequence); @@ -2304,6 +2304,18 @@ static int dissect_ipAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, prot } +static int +dissect_h225_T_route(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, + ett_h225_T_route, dissect_route_item); + + return offset; +} +static int dissect_route(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { + return dissect_h225_T_route(tvb, offset, pinfo, tree, hf_h225_route); +} + + static const value_string h225_T_routing_vals[] = { { 0, "strict" }, { 1, "loose" }, @@ -2922,59 +2934,59 @@ static int dissect_sourceEndpointInfo_item(tvbuff_t *tvb, int offset, packet_inf static int -dissect_h225_SEQUNCE_OF_AliasAddress(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_AliasAddress(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_AliasAddress, dissect_alertingAddress_item); + ett_h225_SEQUENCE_OF_AliasAddress, dissect_alertingAddress_item); return offset; } static int dissect_alertingAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_alertingAddress); + return dissect_h225_SEQUENCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_alertingAddress); } static int dissect_connectedAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_connectedAddress); + return dissect_h225_SEQUENCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_connectedAddress); } static int dissect_busyAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_busyAddress); + return dissect_h225_SEQUENCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_busyAddress); } static int dissect_sourceAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_sourceAddress); + return dissect_h225_SEQUENCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_sourceAddress); } static int dissect_destinationAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_destinationAddress); + return dissect_h225_SEQUENCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_destinationAddress); } static int dissect_destExtraCallInfo(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_destExtraCallInfo); + return dissect_h225_SEQUENCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_destExtraCallInfo); } static int dissect_alternativeAliasAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_alternativeAliasAddress); + return dissect_h225_SEQUENCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_alternativeAliasAddress); } static int dissect_aliasAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_aliasAddress); + return dissect_h225_SEQUENCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_aliasAddress); } static int dissect_remoteExtensionAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_remoteExtensionAddress); + return dissect_h225_SEQUENCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_remoteExtensionAddress); } static int dissect_endpointAlias(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_endpointAlias); + return dissect_h225_SEQUENCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_endpointAlias); } static int dissect_terminalAlias(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_terminalAlias); + return dissect_h225_SEQUENCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_terminalAlias); } static int dissect_duplicateAlias(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_duplicateAlias); + return dissect_h225_SEQUENCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_duplicateAlias); } static int dissect_srcInfo(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_srcInfo); + return dissect_h225_SEQUENCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_srcInfo); } static int dissect_modifiedSrcInfo(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_modifiedSrcInfo); + return dissect_h225_SEQUENCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_modifiedSrcInfo); } static int dissect_sourceInfo(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_sourceInfo); + return dissect_h225_SEQUENCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_sourceInfo); } static int dissect_sourceEndpointInfo(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_sourceEndpointInfo); + return dissect_h225_SEQUENCE_OF_AliasAddress(tvb, offset, pinfo, tree, hf_h225_sourceEndpointInfo); } @@ -3122,14 +3134,14 @@ static int dissect_gatewayDataRate(tvbuff_t *tvb, int offset, packet_info *pinfo static int -dissect_h225_SEQUNCE_OF_DataRate(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_DataRate(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_DataRate, dissect_dataRatesSupported_item); + ett_h225_SEQUENCE_OF_DataRate, dissect_dataRatesSupported_item); return offset; } static int dissect_dataRatesSupported(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_DataRate(tvb, offset, pinfo, tree, hf_h225_dataRatesSupported); + return dissect_h225_SEQUENCE_OF_DataRate(tvb, offset, pinfo, tree, hf_h225_dataRatesSupported); } static const per_sequence_t SupportedPrefix_sequence[] = { @@ -3151,14 +3163,14 @@ static int dissect_supportedPrefixes_item(tvbuff_t *tvb, int offset, packet_info static int -dissect_h225_SEQUNCE_OF_SupportedPrefix(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_SupportedPrefix(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_SupportedPrefix, dissect_supportedPrefixes_item); + ett_h225_SEQUENCE_OF_SupportedPrefix, dissect_supportedPrefixes_item); return offset; } static int dissect_supportedPrefixes(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_SupportedPrefix(tvb, offset, pinfo, tree, hf_h225_supportedPrefixes); + return dissect_h225_SEQUENCE_OF_SupportedPrefix(tvb, offset, pinfo, tree, hf_h225_supportedPrefixes); } static const per_sequence_t H310Caps_sequence[] = { @@ -3417,23 +3429,23 @@ static int dissect_protocols_item(tvbuff_t *tvb, int offset, packet_info *pinfo, static int -dissect_h225_SEQUNCE_OF_SupportedProtocols(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_SupportedProtocols(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_SupportedProtocols, dissect_desiredProtocols_item); + ett_h225_SEQUENCE_OF_SupportedProtocols, dissect_desiredProtocols_item); return offset; } static int dissect_desiredProtocols(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_SupportedProtocols(tvb, offset, pinfo, tree, hf_h225_desiredProtocols); + return dissect_h225_SEQUENCE_OF_SupportedProtocols(tvb, offset, pinfo, tree, hf_h225_desiredProtocols); } static int dissect_protocol(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_SupportedProtocols(tvb, offset, pinfo, tree, hf_h225_protocol); + return dissect_h225_SEQUENCE_OF_SupportedProtocols(tvb, offset, pinfo, tree, hf_h225_protocol); } static int dissect_supportedProtocols(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_SupportedProtocols(tvb, offset, pinfo, tree, hf_h225_supportedProtocols); + return dissect_h225_SEQUENCE_OF_SupportedProtocols(tvb, offset, pinfo, tree, hf_h225_supportedProtocols); } static int dissect_protocols(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_SupportedProtocols(tvb, offset, pinfo, tree, hf_h225_protocols); + return dissect_h225_SEQUENCE_OF_SupportedProtocols(tvb, offset, pinfo, tree, hf_h225_protocols); } static const per_sequence_t GatewayInfo_sequence[] = { @@ -3678,9 +3690,7 @@ static int dissect_set(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree static int dissect_h225_T_tunnelledProtocolObjectID(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_per_object_identifier(tvb, offset, pinfo, tree, hf_index, - tpID); - + offset=dissect_per_object_identifier(tvb, offset, pinfo, tree, hf_h225_tunnelledProtocolObjectID, tpOID); return offset; } @@ -3756,11 +3766,11 @@ static const per_sequence_t TunnelledProtocol_sequence[] = { static int dissect_h225_TunnelledProtocol(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - tpID[0] = '\0'; + tpOID[0] = '\0'; offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index, ett_h225_TunnelledProtocol, TunnelledProtocol_sequence); - tp_handle = dissector_get_string_handle(tp_dissector_table, tpID); + tp_handle = dissector_get_string_handle(tp_dissector_table, tpOID); return offset; } static int dissect_tunnelledProtocolID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { @@ -3775,14 +3785,14 @@ static int dissect_desiredTunnelledProtocol(tvbuff_t *tvb, int offset, packet_in static int -dissect_h225_SEQUNCE_OF_TunnelledProtocol(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_TunnelledProtocol(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_TunnelledProtocol, dissect_supportedTunnelledProtocols_item); + ett_h225_SEQUENCE_OF_TunnelledProtocol, dissect_supportedTunnelledProtocols_item); return offset; } static int dissect_supportedTunnelledProtocols(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_TunnelledProtocol(tvb, offset, pinfo, tree, hf_h225_supportedTunnelledProtocols); + return dissect_h225_SEQUENCE_OF_TunnelledProtocol(tvb, offset, pinfo, tree, hf_h225_supportedTunnelledProtocols); } static const per_sequence_t EndpointType_sequence[] = { @@ -3840,14 +3850,14 @@ static int dissect_callReferenceValue(tvbuff_t *tvb, int offset, packet_info *pi static int -dissect_h225_SEQUNCE_OF_CallReferenceValue(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_CallReferenceValue(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_CallReferenceValue, dissect_destExtraCRV_item); + ett_h225_SEQUENCE_OF_CallReferenceValue, dissect_destExtraCRV_item); return offset; } static int dissect_destExtraCRV(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_CallReferenceValue(tvb, offset, pinfo, tree, hf_h225_destExtraCRV); + return dissect_h225_SEQUENCE_OF_CallReferenceValue(tvb, offset, pinfo, tree, hf_h225_destExtraCRV); } @@ -4105,26 +4115,26 @@ static int dissect_h245SecurityCapability_item(tvbuff_t *tvb, int offset, packet static int -dissect_h225_SEQUNCE_OF_H245Security(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_H245Security(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_H245Security, dissect_h245SecurityCapability_item); + ett_h225_SEQUENCE_OF_H245Security, dissect_h245SecurityCapability_item); return offset; } static int dissect_h245SecurityCapability(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_H245Security(tvb, offset, pinfo, tree, hf_h225_h245SecurityCapability); + return dissect_h225_SEQUENCE_OF_H245Security(tvb, offset, pinfo, tree, hf_h225_h245SecurityCapability); } static int -dissect_h225_SEQUNCE_OF_ClearToken(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_ClearToken(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_ClearToken, dissect_tokens_item); + ett_h225_SEQUENCE_OF_ClearToken, dissect_tokens_item); return offset; } static int dissect_tokens(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_ClearToken(tvb, offset, pinfo, tree, hf_h225_tokens); + return dissect_h225_SEQUENCE_OF_ClearToken(tvb, offset, pinfo, tree, hf_h225_tokens); } static const per_sequence_t T_cryptoEPPwdHash_sequence[] = { @@ -4217,14 +4227,14 @@ static int dissect_cryptoTokens_item(tvbuff_t *tvb, int offset, packet_info *pin static int -dissect_h225_SEQUNCE_OF_CryptoH323Token(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_CryptoH323Token(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_CryptoH323Token, dissect_cryptoTokens_item); + ett_h225_SEQUENCE_OF_CryptoH323Token, dissect_cryptoTokens_item); return offset; } static int dissect_cryptoTokens(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_CryptoH323Token(tvb, offset, pinfo, tree, hf_h225_cryptoTokens); + return dissect_h225_SEQUENCE_OF_CryptoH323Token(tvb, offset, pinfo, tree, hf_h225_cryptoTokens); } @@ -4374,14 +4384,14 @@ static int dissect_language_item(tvbuff_t *tvb, int offset, packet_info *pinfo, static int -dissect_h225_SEQUNCE_OF_IA5String_SIZE_1_32(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_T_language1(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_IA5String_SIZE_1_32, dissect_language_item); + ett_h225_T_language1, dissect_language_item); return offset; } -static int dissect_language(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_IA5String_SIZE_1_32(tvb, offset, pinfo, tree, hf_h225_language); +static int dissect_language1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { + return dissect_h225_T_language1(tvb, offset, pinfo, tree, hf_h225_language1); } @@ -4650,14 +4660,14 @@ static int dissect_serviceControl_item(tvbuff_t *tvb, int offset, packet_info *p static int -dissect_h225_SEQUNCE_OF_ServiceControlSession(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_ServiceControlSession(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_ServiceControlSession, dissect_serviceControl_item); + ett_h225_SEQUENCE_OF_ServiceControlSession, dissect_serviceControl_item); return offset; } static int dissect_serviceControl(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_ServiceControlSession(tvb, offset, pinfo, tree, hf_h225_serviceControl); + return dissect_h225_SEQUENCE_OF_ServiceControlSession(tvb, offset, pinfo, tree, hf_h225_serviceControl); } @@ -4774,47 +4784,47 @@ static int dissect_sipGwCallsAvailable_item(tvbuff_t *tvb, int offset, packet_in static int -dissect_h225_SEQUNCE_OF_CallsAvailable(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_CallsAvailable(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_CallsAvailable, dissect_voiceGwCallsAvailable_item); + ett_h225_SEQUENCE_OF_CallsAvailable, dissect_voiceGwCallsAvailable_item); return offset; } static int dissect_voiceGwCallsAvailable(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_voiceGwCallsAvailable); + return dissect_h225_SEQUENCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_voiceGwCallsAvailable); } static int dissect_h310GwCallsAvailable(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_h310GwCallsAvailable); + return dissect_h225_SEQUENCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_h310GwCallsAvailable); } static int dissect_h320GwCallsAvailable(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_h320GwCallsAvailable); + return dissect_h225_SEQUENCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_h320GwCallsAvailable); } static int dissect_h321GwCallsAvailable(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_h321GwCallsAvailable); + return dissect_h225_SEQUENCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_h321GwCallsAvailable); } static int dissect_h322GwCallsAvailable(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_h322GwCallsAvailable); + return dissect_h225_SEQUENCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_h322GwCallsAvailable); } static int dissect_h323GwCallsAvailable(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_h323GwCallsAvailable); + return dissect_h225_SEQUENCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_h323GwCallsAvailable); } static int dissect_h324GwCallsAvailable(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_h324GwCallsAvailable); + return dissect_h225_SEQUENCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_h324GwCallsAvailable); } static int dissect_t120OnlyGwCallsAvailable(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_t120OnlyGwCallsAvailable); + return dissect_h225_SEQUENCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_t120OnlyGwCallsAvailable); } static int dissect_t38FaxAnnexbOnlyGwCallsAvailable(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_t38FaxAnnexbOnlyGwCallsAvailable); + return dissect_h225_SEQUENCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_t38FaxAnnexbOnlyGwCallsAvailable); } static int dissect_terminalCallsAvailable(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_terminalCallsAvailable); + return dissect_h225_SEQUENCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_terminalCallsAvailable); } static int dissect_mcuCallsAvailable(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_mcuCallsAvailable); + return dissect_h225_SEQUENCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_mcuCallsAvailable); } static int dissect_sipGwCallsAvailable(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_sipGwCallsAvailable); + return dissect_h225_SEQUENCE_OF_CallsAvailable(tvb, offset, pinfo, tree, hf_h225_sipGwCallsAvailable); } static const per_sequence_t CallCapacityInfo_sequence[] = { @@ -4879,14 +4889,14 @@ static int dissect_cic_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto static int -dissect_h225_SEQUNCE_OF_OCTET_STRING_SIZE_2_4(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_T_cic(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_OCTET_STRING_SIZE_2_4, dissect_cic_item); + ett_h225_T_cic, dissect_cic_item); return offset; } static int dissect_cic_2_4(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_OCTET_STRING_SIZE_2_4(tvb, offset, pinfo, tree, hf_h225_cic_2_4); + return dissect_h225_T_cic(tvb, offset, pinfo, tree, hf_h225_cic_2_4); } @@ -4921,14 +4931,14 @@ static int dissect_cic(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree static int -dissect_h225_SEQUNCE_OF_INTEGER_0_65535(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_T_member(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_INTEGER_0_65535, dissect_member_item); + ett_h225_T_member, dissect_member_item); return offset; } static int dissect_member(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_INTEGER_0_65535(tvb, offset, pinfo, tree, hf_h225_member); + return dissect_h225_T_member(tvb, offset, pinfo, tree, hf_h225_member); } static const per_sequence_t GroupID_sequence[] = { @@ -5011,6 +5021,28 @@ static int dissect_id(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree static int +dissect_h225_OCTET_STRING(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index, + -1, -1, + NULL, NULL); + + return offset; +} +static int dissect_h248Message(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { + return dissect_h225_OCTET_STRING(tvb, offset, pinfo, tree, hf_h225_h248Message); +} +static int dissect_ParallelH245Control_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { + return dissect_h225_OCTET_STRING(tvb, offset, pinfo, tree, hf_h225_ParallelH245Control_item); +} +static int dissect_raw(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { + return dissect_h225_OCTET_STRING(tvb, offset, pinfo, tree, hf_h225_raw); +} +static int dissect_messageNotUnderstood(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { + return dissect_h225_OCTET_STRING(tvb, offset, pinfo, tree, hf_h225_messageNotUnderstood); +} + + +static int dissect_h225_IA5String(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_IA5String(tvb, offset, pinfo, tree, hf_index, -1, -1); @@ -5035,31 +5067,31 @@ static int dissect_unicode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_ static int -dissect_h225_SEQUNCE_SIZE_1_512_OF_EnumeratedParameter(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_SIZE_1_512_OF_EnumeratedParameter(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_SIZE_1_512_OF_EnumeratedParameter, dissect_parameters_item, + ett_h225_SEQUENCE_SIZE_1_512_OF_EnumeratedParameter, dissect_parameters_item, 1, 512); return offset; } static int dissect_parameters(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_SIZE_1_512_OF_EnumeratedParameter(tvb, offset, pinfo, tree, hf_h225_parameters); + return dissect_h225_SEQUENCE_SIZE_1_512_OF_EnumeratedParameter(tvb, offset, pinfo, tree, hf_h225_parameters); } static int dissect_compound(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_SIZE_1_512_OF_EnumeratedParameter(tvb, offset, pinfo, tree, hf_h225_compound); + return dissect_h225_SEQUENCE_SIZE_1_512_OF_EnumeratedParameter(tvb, offset, pinfo, tree, hf_h225_compound); } static int -dissect_h225_SEQUNCE_SIZE_1_16_OF_GenericData(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_SIZE_1_16_OF_GenericData(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_SIZE_1_16_OF_GenericData, dissect_nested_item, + ett_h225_SEQUENCE_SIZE_1_16_OF_GenericData, dissect_nested_item, 1, 16); return offset; } static int dissect_nested(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_SIZE_1_16_OF_GenericData(tvb, offset, pinfo, tree, hf_h225_nested); + return dissect_h225_SEQUENCE_SIZE_1_16_OF_GenericData(tvb, offset, pinfo, tree, hf_h225_nested); } @@ -5137,14 +5169,14 @@ dissect_h225_GenericData(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot static int -dissect_h225_SEQUNCE_OF_GenericData(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_GenericData(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_GenericData, dissect_genericData_item); + ett_h225_SEQUENCE_OF_GenericData, dissect_genericData_item); return offset; } static int dissect_genericData(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_GenericData(tvb, offset, pinfo, tree, hf_h225_genericData); + return dissect_h225_SEQUENCE_OF_GenericData(tvb, offset, pinfo, tree, hf_h225_genericData); } static const per_sequence_t CircuitInfo_sequence[] = { @@ -5184,20 +5216,20 @@ static int dissect_supportedFeatures_item(tvbuff_t *tvb, int offset, packet_info static int -dissect_h225_SEQUNCE_OF_FeatureDescriptor(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_FeatureDescriptor(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_FeatureDescriptor, dissect_neededFeatures_item); + ett_h225_SEQUENCE_OF_FeatureDescriptor, dissect_neededFeatures_item); return offset; } static int dissect_neededFeatures(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_FeatureDescriptor(tvb, offset, pinfo, tree, hf_h225_neededFeatures); + return dissect_h225_SEQUENCE_OF_FeatureDescriptor(tvb, offset, pinfo, tree, hf_h225_neededFeatures); } static int dissect_desiredFeatures(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_FeatureDescriptor(tvb, offset, pinfo, tree, hf_h225_desiredFeatures); + return dissect_h225_SEQUENCE_OF_FeatureDescriptor(tvb, offset, pinfo, tree, hf_h225_desiredFeatures); } static int dissect_supportedFeatures(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_FeatureDescriptor(tvb, offset, pinfo, tree, hf_h225_supportedFeatures); + return dissect_h225_SEQUENCE_OF_FeatureDescriptor(tvb, offset, pinfo, tree, hf_h225_supportedFeatures); } @@ -5232,14 +5264,14 @@ static int dissect_additionalSourceAddresses_item(tvbuff_t *tvb, int offset, pac static int -dissect_h225_SEQUNCE_OF_ExtendedAliasAddress(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_ExtendedAliasAddress(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_ExtendedAliasAddress, dissect_additionalSourceAddresses_item); + ett_h225_SEQUENCE_OF_ExtendedAliasAddress, dissect_additionalSourceAddresses_item); return offset; } static int dissect_additionalSourceAddresses(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_ExtendedAliasAddress(tvb, offset, pinfo, tree, hf_h225_additionalSourceAddresses); + return dissect_h225_SEQUENCE_OF_ExtendedAliasAddress(tvb, offset, pinfo, tree, hf_h225_additionalSourceAddresses); } @@ -5282,7 +5314,7 @@ static const per_sequence_t Setup_UUIE_sequence[] = { { "multipleCalls" , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_multipleCalls }, { "maintainConnection" , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_maintainConnection }, { "connectionParameters" , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_connectionParameters }, - { "language" , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_language }, + { "language" , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_language1 }, { "presentationIndicator" , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_presentationIndicator }, { "screeningIndicator" , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_screeningIndicator }, { "serviceControl" , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_serviceControl }, @@ -5359,6 +5391,18 @@ static int dissect_callProceeding(tvbuff_t *tvb, int offset, packet_info *pinfo, return dissect_h225_CallProceeding_UUIE(tvb, offset, pinfo, tree, hf_h225_callProceeding); } + +static int +dissect_h225_T_language(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, + ett_h225_T_language, dissect_language_item); + + return offset; +} +static int dissect_language(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { + return dissect_h225_T_language(tvb, offset, pinfo, tree, hf_h225_language); +} + static const per_sequence_t Connect_UUIE_sequence[] = { { "protocolIdentifier" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_protocolIdentifier }, { "h245Address" , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h245Address }, @@ -5676,14 +5720,14 @@ static int dissect_conferences_item(tvbuff_t *tvb, int offset, packet_info *pinf static int -dissect_h225_SEQUNCE_OF_ConferenceList(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_ConferenceList(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_ConferenceList, dissect_conferences_item); + ett_h225_SEQUENCE_OF_ConferenceList, dissect_conferences_item); return offset; } static int dissect_conferences(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_ConferenceList(tvb, offset, pinfo, tree, hf_h225_conferences); + return dissect_h225_SEQUENCE_OF_ConferenceList(tvb, offset, pinfo, tree, hf_h225_conferences); } static const per_sequence_t Facility_UUIE_sequence[] = { @@ -5918,17 +5962,14 @@ static int dissect_h4501SupplementaryService_item(tvbuff_t *tvb, int offset, pac static int -dissect_h225_SEQUNCE_OF_OCTET_STRING(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_T_h4501SupplementaryService(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_OCTET_STRING, dissect_h4501SupplementaryService_item); + ett_h225_T_h4501SupplementaryService, dissect_h4501SupplementaryService_item); return offset; } static int dissect_h4501SupplementaryService(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_OCTET_STRING(tvb, offset, pinfo, tree, hf_h225_h4501SupplementaryService); -} -static int dissect_messageContent(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_OCTET_STRING(tvb, offset, pinfo, tree, hf_h225_messageContent); + return dissect_h225_T_h4501SupplementaryService(tvb, offset, pinfo, tree, hf_h225_h4501SupplementaryService); } @@ -5967,20 +6008,20 @@ static int dissect_h245Control(tvbuff_t *tvb, int offset, packet_info *pinfo, pr static int -dissect_h225_SEQUNCE_OF_NonStandardParameter(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_NonStandardParameter(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_NonStandardParameter, dissect_nonStandardControl_item); + ett_h225_SEQUENCE_OF_NonStandardParameter, dissect_nonStandardControl_item); return offset; } static int dissect_nonStandardControl(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_NonStandardParameter(tvb, offset, pinfo, tree, hf_h225_nonStandardControl); + return dissect_h225_SEQUENCE_OF_NonStandardParameter(tvb, offset, pinfo, tree, hf_h225_nonStandardControl); } static int dissect_nonStandardUsageTypes(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_NonStandardParameter(tvb, offset, pinfo, tree, hf_h225_nonStandardUsageTypes); + return dissect_h225_SEQUENCE_OF_NonStandardParameter(tvb, offset, pinfo, tree, hf_h225_nonStandardUsageTypes); } static int dissect_nonStandardUsageFields(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_NonStandardParameter(tvb, offset, pinfo, tree, hf_h225_nonStandardUsageFields); + return dissect_h225_SEQUENCE_OF_NonStandardParameter(tvb, offset, pinfo, tree, hf_h225_nonStandardUsageFields); } static const per_sequence_t CallLinkage_sequence[] = { @@ -6000,6 +6041,39 @@ static int dissect_callLinkage(tvbuff_t *tvb, int offset, packet_info *pinfo, pr return dissect_h225_CallLinkage(tvb, offset, pinfo, tree, hf_h225_callLinkage); } + +static int +dissect_h225_T_messageContent_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + guint32 value_offset, value_len; + tvbuff_t *next_tvb; + + offset = dissect_per_octet_string(tvb, offset, pinfo, tree, + hf_h225_messageContent_item, -1, -1, + &value_offset, &value_len); + + if (value_len > 0) { + next_tvb = tvb_new_subset(tvb, value_offset, value_len, value_len); + call_dissector((tp_handle)?tp_handle:data_handle, next_tvb, pinfo, tree); + } + + return offset; +} +static int dissect_messageContent_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { + return dissect_h225_T_messageContent_item(tvb, offset, pinfo, tree, hf_h225_messageContent_item); +} + + +static int +dissect_h225_T_messageContent(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, + ett_h225_T_messageContent, dissect_messageContent_item); + + return offset; +} +static int dissect_messageContent(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { + return dissect_h225_T_messageContent(tvb, offset, pinfo, tree, hf_h225_messageContent); +} + static const per_sequence_t T_tunnelledSignallingMessage_sequence[] = { { "tunnelledProtocolID" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_tunnelledProtocolID }, { "messageContent" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_messageContent }, @@ -6010,6 +6084,7 @@ static const per_sequence_t T_tunnelledSignallingMessage_sequence[] = { static int dissect_h225_T_tunnelledSignallingMessage(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + tp_handle = NULL; offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index, ett_h225_T_tunnelledSignallingMessage, T_tunnelledSignallingMessage_sequence); @@ -6157,23 +6232,23 @@ static int dissect_endpointAliasPattern_item(tvbuff_t *tvb, int offset, packet_i static int -dissect_h225_SEQUNCE_OF_TransportAddress(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_TransportAddress(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_TransportAddress, dissect_callSignalAddress_item); + ett_h225_SEQUENCE_OF_TransportAddress, dissect_callSignalAddress_item); return offset; } static int dissect_callSignalAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_TransportAddress(tvb, offset, pinfo, tree, hf_h225_callSignalAddress); + return dissect_h225_SEQUENCE_OF_TransportAddress(tvb, offset, pinfo, tree, hf_h225_callSignalAddress); } static int dissect_rasAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_TransportAddress(tvb, offset, pinfo, tree, hf_h225_rasAddress); + return dissect_h225_SEQUENCE_OF_TransportAddress(tvb, offset, pinfo, tree, hf_h225_rasAddress); } static int dissect_annexE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_TransportAddress(tvb, offset, pinfo, tree, hf_h225_annexE); + return dissect_h225_SEQUENCE_OF_TransportAddress(tvb, offset, pinfo, tree, hf_h225_annexE); } static int dissect_sctp(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_TransportAddress(tvb, offset, pinfo, tree, hf_h225_sctp); + return dissect_h225_SEQUENCE_OF_TransportAddress(tvb, offset, pinfo, tree, hf_h225_sctp); } @@ -6288,14 +6363,14 @@ static int dissect_alternateGatekeeper_item(tvbuff_t *tvb, int offset, packet_in static int -dissect_h225_SEQUNCE_OF_AlternateGK(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_AlternateGK(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_AlternateGK, dissect_alternateGatekeeper_item); + ett_h225_SEQUENCE_OF_AlternateGK, dissect_alternateGatekeeper_item); return offset; } static int dissect_alternateGatekeeper(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_AlternateGK(tvb, offset, pinfo, tree, hf_h225_alternateGatekeeper); + return dissect_h225_SEQUENCE_OF_AlternateGK(tvb, offset, pinfo, tree, hf_h225_alternateGatekeeper); } static const per_sequence_t AltGKInfo_sequence[] = { @@ -6796,14 +6871,14 @@ static int dissect_hopCount(tvbuff_t *tvb, int offset, packet_info *pinfo, proto static int -dissect_h225_SEQUNCE_OF_INTEGER_1_255(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_T_associatedSessionIds(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_INTEGER_1_255, dissect_associatedSessionIds_item); + ett_h225_T_associatedSessionIds, dissect_associatedSessionIds_item); return offset; } static int dissect_associatedSessionIds(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_INTEGER_1_255(tvb, offset, pinfo, tree, hf_h225_associatedSessionIds); + return dissect_h225_T_associatedSessionIds(tvb, offset, pinfo, tree, hf_h225_associatedSessionIds); } static const per_sequence_t RTPSession_sequence[] = { @@ -6834,56 +6909,56 @@ static int dissect_video_item(tvbuff_t *tvb, int offset, packet_info *pinfo, pro static int -dissect_h225_SEQUNCE_OF_Endpoint(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_Endpoint(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_Endpoint, dissect_alternateEndpoints_item); + ett_h225_SEQUENCE_OF_Endpoint, dissect_alternateEndpoints_item); return offset; } static int dissect_alternateEndpoints(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_Endpoint(tvb, offset, pinfo, tree, hf_h225_alternateEndpoints); + return dissect_h225_SEQUENCE_OF_Endpoint(tvb, offset, pinfo, tree, hf_h225_alternateEndpoints); } static int dissect_srcAlternatives(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_Endpoint(tvb, offset, pinfo, tree, hf_h225_srcAlternatives); + return dissect_h225_SEQUENCE_OF_Endpoint(tvb, offset, pinfo, tree, hf_h225_srcAlternatives); } static int dissect_destAlternatives(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_Endpoint(tvb, offset, pinfo, tree, hf_h225_destAlternatives); + return dissect_h225_SEQUENCE_OF_Endpoint(tvb, offset, pinfo, tree, hf_h225_destAlternatives); } static int -dissect_h225_SEQUNCE_OF_AuthenticationMechanism(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_AuthenticationMechanism(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_AuthenticationMechanism, dissect_authenticationCapability_item); + ett_h225_SEQUENCE_OF_AuthenticationMechanism, dissect_authenticationCapability_item); return offset; } static int dissect_authenticationCapability(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_AuthenticationMechanism(tvb, offset, pinfo, tree, hf_h225_authenticationCapability); + return dissect_h225_SEQUENCE_OF_AuthenticationMechanism(tvb, offset, pinfo, tree, hf_h225_authenticationCapability); } static int -dissect_h225_SEQUNCE_OF_OBJECT_IDENTIFIER(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_T_algorithmOIDs(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_OBJECT_IDENTIFIER, dissect_algorithmOIDs_item); + ett_h225_T_algorithmOIDs, dissect_algorithmOIDs_item); return offset; } static int dissect_algorithmOIDs(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_OBJECT_IDENTIFIER(tvb, offset, pinfo, tree, hf_h225_algorithmOIDs); + return dissect_h225_T_algorithmOIDs(tvb, offset, pinfo, tree, hf_h225_algorithmOIDs); } static int -dissect_h225_SEQUNCE_OF_IntegrityMechanism(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_IntegrityMechanism(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_IntegrityMechanism, dissect_integrity_item); + ett_h225_SEQUENCE_OF_IntegrityMechanism, dissect_integrity_item); return offset; } static int dissect_integrity(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_IntegrityMechanism(tvb, offset, pinfo, tree, hf_h225_integrity); + return dissect_h225_SEQUENCE_OF_IntegrityMechanism(tvb, offset, pinfo, tree, hf_h225_integrity); } static const per_sequence_t GatekeeperRequest_sequence[] = { @@ -7017,29 +7092,29 @@ static int dissect_gatekeeperReject(tvbuff_t *tvb, int offset, packet_info *pinf static int -dissect_h225_SEQUNCE_OF_AddressPattern(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_AddressPattern(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_AddressPattern, dissect_terminalAliasPattern_item); + ett_h225_SEQUENCE_OF_AddressPattern, dissect_terminalAliasPattern_item); return offset; } static int dissect_terminalAliasPattern(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_AddressPattern(tvb, offset, pinfo, tree, hf_h225_terminalAliasPattern); + return dissect_h225_SEQUENCE_OF_AddressPattern(tvb, offset, pinfo, tree, hf_h225_terminalAliasPattern); } static int dissect_endpointAliasPattern(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_AddressPattern(tvb, offset, pinfo, tree, hf_h225_endpointAliasPattern); + return dissect_h225_SEQUENCE_OF_AddressPattern(tvb, offset, pinfo, tree, hf_h225_endpointAliasPattern); } static int -dissect_h225_SEQUNCE_OF_H248PackagesDescriptor(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_H248PackagesDescriptor(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_H248PackagesDescriptor, dissect_supportedH248Packages_item); + ett_h225_SEQUENCE_OF_H248PackagesDescriptor, dissect_supportedH248Packages_item); return offset; } static int dissect_supportedH248Packages(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_H248PackagesDescriptor(tvb, offset, pinfo, tree, hf_h225_supportedH248Packages); + return dissect_h225_SEQUENCE_OF_H248PackagesDescriptor(tvb, offset, pinfo, tree, hf_h225_supportedH248Packages); } static const per_sequence_t RegistrationRequest_sequence[] = { @@ -7134,14 +7209,14 @@ static int dissect_preGrantedARQ(tvbuff_t *tvb, int offset, packet_info *pinfo, static int -dissect_h225_SEQUNCE_OF_RasUsageSpecification(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_RasUsageSpecification(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_RasUsageSpecification, dissect_usageSpec_item); + ett_h225_SEQUENCE_OF_RasUsageSpecification, dissect_usageSpec_item); return offset; } static int dissect_usageSpec(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_RasUsageSpecification(tvb, offset, pinfo, tree, hf_h225_usageSpec); + return dissect_h225_SEQUENCE_OF_RasUsageSpecification(tvb, offset, pinfo, tree, hf_h225_usageSpec); } static const per_sequence_t RegistrationConfirm_sequence[] = { @@ -7576,6 +7651,18 @@ static int dissect_uuiesRequested(tvbuff_t *tvb, int offset, packet_info *pinfo, return dissect_h225_UUIEsRequested(tvb, offset, pinfo, tree, hf_h225_uuiesRequested); } + +static int +dissect_h225_T_language2(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, + ett_h225_T_language2, dissect_language_item); + + return offset; +} +static int dissect_language2(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { + return dissect_h225_T_language2(tvb, offset, pinfo, tree, hf_h225_language2); +} + static const per_sequence_t AdmissionConfirm_sequence[] = { { "requestSeqNum" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_requestSeqNum }, { "bandWidth" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_bandWidth }, @@ -7594,7 +7681,7 @@ static const per_sequence_t AdmissionConfirm_sequence[] = { { "transportQOS" , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_transportQOS }, { "willRespondToIRR" , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_willRespondToIRR }, { "uuiesRequested" , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_uuiesRequested }, - { "language" , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_language }, + { "language" , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_language2 }, { "alternateTransportAddresses" , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_alternateTransportAddresses }, { "useSpecifiedTransport" , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_useSpecifiedTransport }, { "circuitInfo" , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_circuitInfo }, @@ -7624,17 +7711,17 @@ static int dissect_admissionConfirmSequence_item(tvbuff_t *tvb, int offset, pack static int -dissect_h225_SEQUNCE_OF_PartyNumber(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_PartyNumber(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_PartyNumber, dissect_routeCallToSCN_item); + ett_h225_SEQUENCE_OF_PartyNumber, dissect_routeCallToSCN_item); return offset; } static int dissect_routeCallToSCN(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_PartyNumber(tvb, offset, pinfo, tree, hf_h225_routeCallToSCN); + return dissect_h225_SEQUENCE_OF_PartyNumber(tvb, offset, pinfo, tree, hf_h225_routeCallToSCN); } static int dissect_routeCalltoSCN(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_PartyNumber(tvb, offset, pinfo, tree, hf_h225_routeCalltoSCN); + return dissect_h225_SEQUENCE_OF_PartyNumber(tvb, offset, pinfo, tree, hf_h225_routeCalltoSCN); } @@ -7733,14 +7820,14 @@ static int dissect_admissionReject(tvbuff_t *tvb, int offset, packet_info *pinfo static int -dissect_h225_SEQUNCE_OF_BandwidthDetails(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_BandwidthDetails(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_BandwidthDetails, dissect_bandwidthDetails_item); + ett_h225_SEQUENCE_OF_BandwidthDetails, dissect_bandwidthDetails_item); return offset; } static int dissect_bandwidthDetails(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_BandwidthDetails(tvb, offset, pinfo, tree, hf_h225_bandwidthDetails); + return dissect_h225_SEQUENCE_OF_BandwidthDetails(tvb, offset, pinfo, tree, hf_h225_bandwidthDetails); } static const per_sequence_t BandwidthRequest_sequence[] = { @@ -8190,41 +8277,41 @@ static int dissect_infoRequest(tvbuff_t *tvb, int offset, packet_info *pinfo, pr static int -dissect_h225_SEQUNCE_OF_RTPSession(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_RTPSession(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_RTPSession, dissect_audio_item); + ett_h225_SEQUENCE_OF_RTPSession, dissect_audio_item); return offset; } static int dissect_audio(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_RTPSession(tvb, offset, pinfo, tree, hf_h225_audio); + return dissect_h225_SEQUENCE_OF_RTPSession(tvb, offset, pinfo, tree, hf_h225_audio); } static int dissect_video(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_RTPSession(tvb, offset, pinfo, tree, hf_h225_video); + return dissect_h225_SEQUENCE_OF_RTPSession(tvb, offset, pinfo, tree, hf_h225_video); } static int -dissect_h225_SEQUNCE_OF_TransportChannelInfo(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_TransportChannelInfo(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_TransportChannelInfo, dissect_data_item); + ett_h225_SEQUENCE_OF_TransportChannelInfo, dissect_data_item); return offset; } static int dissect_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_TransportChannelInfo(tvb, offset, pinfo, tree, hf_h225_data); + return dissect_h225_SEQUENCE_OF_TransportChannelInfo(tvb, offset, pinfo, tree, hf_h225_data); } static int -dissect_h225_SEQUNCE_OF_ConferenceIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_ConferenceIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_ConferenceIdentifier, dissect_substituteConfIDs_item); + ett_h225_SEQUENCE_OF_ConferenceIdentifier, dissect_substituteConfIDs_item); return offset; } static int dissect_substituteConfIDs(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_ConferenceIdentifier(tvb, offset, pinfo, tree, hf_h225_substituteConfIDs); + return dissect_h225_SEQUENCE_OF_ConferenceIdentifier(tvb, offset, pinfo, tree, hf_h225_substituteConfIDs); } static const per_sequence_t T_pdu_item_sequence[] = { @@ -8647,14 +8734,14 @@ static int dissect_serviceControlResponse(tvbuff_t *tvb, int offset, packet_info static int -dissect_h225_SEQUNCE_OF_AdmissionConfirm(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_h225_SEQUENCE_OF_AdmissionConfirm(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUNCE_OF_AdmissionConfirm, dissect_admissionConfirmSequence_item); + ett_h225_SEQUENCE_OF_AdmissionConfirm, dissect_admissionConfirmSequence_item); return offset; } static int dissect_admissionConfirmSequence(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_SEQUNCE_OF_AdmissionConfirm(tvb, offset, pinfo, tree, hf_h225_admissionConfirmSequence); + return dissect_h225_SEQUENCE_OF_AdmissionConfirm(tvb, offset, pinfo, tree, hf_h225_admissionConfirmSequence); } @@ -8807,25 +8894,6 @@ dissect_h225_h225_RasMessage(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree return offset; } - -static int -dissect_h225_nsp_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) -{ - guint32 value_offset, value_len; - tvbuff_t *next_tvb; - - offset = dissect_per_octet_string(tvb, offset, pinfo, tree, - hf_h225_nsp_data, -1, -1, - &value_offset, &value_len); - - if (value_len > 0) { - next_tvb = tvb_new_subset(tvb, value_offset, value_len, value_len); - call_dissector((nsp_handle)?nsp_handle:data_handle, next_tvb, pinfo, tree); - } - - return offset; -} - /*--- proto_register_h225 -------------------------------------------*/ void proto_register_h225(void) { @@ -8855,9 +8923,6 @@ void proto_register_h225(void) { { &hf_h225_fastStart_item_length, { "fastStart item length", "h225.fastStart_item_length", FT_UINT32, BASE_DEC, NULL, 0, "fastStart item length", HFILL }}, - { &hf_h225_nsp_data, - { "data", "h225.nsp_data", FT_BYTES, BASE_HEX, - NULL, 0, "OCTET STRING", HFILL }}, /*--- Included file: packet-h225-hfarr.c ---*/ @@ -8980,7 +9045,7 @@ void proto_register_h225(void) { "H323-UU-PDU/tunnelledSignallingMessage/messageContent", HFILL }}, { &hf_h225_messageContent_item, { "Item", "h225.messageContent_item", - FT_BYTES, BASE_HEX, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "H323-UU-PDU/tunnelledSignallingMessage/messageContent/_item", HFILL }}, { &hf_h225_tunnellingRequired, { "tunnellingRequired", "h225.tunnellingRequired", @@ -9109,7 +9174,7 @@ void proto_register_h225(void) { { &hf_h225_language, { "language", "h225.language", FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }}, + "Connect-UUIE/language", HFILL }}, { &hf_h225_language_item, { "Item", "h225.language_item", FT_STRING, BASE_NONE, NULL, 0, @@ -9358,6 +9423,10 @@ void proto_register_h225(void) { { "connectionAggregation", "h225.connectionAggregation", FT_UINT32, BASE_DEC, VALS(h225_ScnConnectionAggregation_vals), 0, "Setup-UUIE/connectionParameters/connectionAggregation", HFILL }}, + { &hf_h225_language1, + { "language", "h225.language", + FT_NONE, BASE_NONE, NULL, 0, + "Setup-UUIE/language", HFILL }}, { &hf_h225_symmetricOperationRequired, { "symmetricOperationRequired", "h225.symmetricOperationRequired", FT_NONE, BASE_NONE, NULL, 0, @@ -9870,11 +9939,11 @@ void proto_register_h225(void) { { "nonStandardIdentifier", "h225.nonStandardIdentifier", FT_UINT32, BASE_DEC, VALS(h225_NonStandardIdentifier_vals), 0, "NonStandardParameter/nonStandardIdentifier", HFILL }}, - { &hf_h225_data_oct_str, + { &hf_h225_nsp_data, { "data", "h225.data", - FT_BYTES, BASE_HEX, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "NonStandardParameter/data", HFILL }}, - { &hf_h225_object, + { &hf_h225_nsiOID, { "object", "h225.object", FT_STRING, BASE_NONE, NULL, 0, "NonStandardIdentifier/object", HFILL }}, @@ -11450,6 +11519,10 @@ void proto_register_h225(void) { { "uuiesRequested", "h225.uuiesRequested", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }}, + { &hf_h225_language2, + { "language", "h225.language", + FT_NONE, BASE_NONE, NULL, 0, + "AdmissionConfirm/language", HFILL }}, { &hf_h225_supportedProtocols, { "supportedProtocols", "h225.supportedProtocols", FT_NONE, BASE_NONE, NULL, 0, @@ -11861,37 +11934,39 @@ void proto_register_h225(void) { &ett_h225_T_user_data, &ett_h225_H323_UU_PDU, &ett_h225_T_h323_message_body, - &ett_h225_SEQUNCE_OF_OCTET_STRING, - &ett_h225_SEQUNCE_OF_NonStandardParameter, + &ett_h225_T_h4501SupplementaryService, + &ett_h225_SEQUENCE_OF_NonStandardParameter, &ett_h225_T_tunnelledSignallingMessage, - &ett_h225_SEQUNCE_OF_GenericData, + &ett_h225_T_messageContent, + &ett_h225_SEQUENCE_OF_GenericData, &ett_h225_H245Control, &ett_h225_StimulusControl, &ett_h225_Alerting_UUIE, - &ett_h225_SEQUNCE_OF_ClearToken, - &ett_h225_SEQUNCE_OF_CryptoH323Token, - &ett_h225_SEQUNCE_OF_AliasAddress, - &ett_h225_SEQUNCE_OF_ServiceControlSession, + &ett_h225_SEQUENCE_OF_ClearToken, + &ett_h225_SEQUENCE_OF_CryptoH323Token, + &ett_h225_SEQUENCE_OF_AliasAddress, + &ett_h225_SEQUENCE_OF_ServiceControlSession, &ett_h225_CallProceeding_UUIE, &ett_h225_Connect_UUIE, - &ett_h225_SEQUNCE_OF_IA5String_SIZE_1_32, + &ett_h225_T_language, &ett_h225_Information_UUIE, &ett_h225_ReleaseComplete_UUIE, &ett_h225_ReleaseCompleteReason, &ett_h225_Setup_UUIE, - &ett_h225_SEQUNCE_OF_CallReferenceValue, + &ett_h225_SEQUENCE_OF_CallReferenceValue, &ett_h225_T_conferenceGoal, - &ett_h225_SEQUNCE_OF_H245Security, + &ett_h225_SEQUENCE_OF_H245Security, &ett_h225_T_connectionParameters, - &ett_h225_SEQUNCE_OF_SupportedProtocols, - &ett_h225_SEQUNCE_OF_FeatureDescriptor, - &ett_h225_SEQUNCE_OF_ExtendedAliasAddress, + &ett_h225_T_language1, + &ett_h225_SEQUENCE_OF_SupportedProtocols, + &ett_h225_SEQUENCE_OF_FeatureDescriptor, + &ett_h225_SEQUENCE_OF_ExtendedAliasAddress, &ett_h225_ParallelH245Control, &ett_h225_ScnConnectionType, &ett_h225_ScnConnectionAggregation, &ett_h225_PresentationIndicator, &ett_h225_Facility_UUIE, - &ett_h225_SEQUNCE_OF_ConferenceList, + &ett_h225_SEQUENCE_OF_ConferenceList, &ett_h225_ConferenceList, &ett_h225_FacilityReason, &ett_h225_Progress_UUIE, @@ -11899,13 +11974,14 @@ void proto_register_h225(void) { &ett_h225_TransportAddress, &ett_h225_T_ipAddress, &ett_h225_T_ipSourceRoute, - &ett_h225_SEQUNCE_OF_OCTET_STRING_SIZE_4, + &ett_h225_T_route, &ett_h225_T_routing, &ett_h225_T_ipxAddress, &ett_h225_T_ip6Address, &ett_h225_H245TransportAddress, &ett_h225_T_h245ipAddress, &ett_h225_T_h245ipSourceRoute, + &ett_h225_T_h245route, &ett_h225_T_h245routing, &ett_h225_T_h245ipxAddress, &ett_h225_T_h245ip6Address, @@ -11914,12 +11990,12 @@ void proto_register_h225(void) { &ett_h225_SetupAcknowledge_UUIE, &ett_h225_Notify_UUIE, &ett_h225_EndpointType, - &ett_h225_SEQUNCE_OF_TunnelledProtocol, + &ett_h225_SEQUENCE_OF_TunnelledProtocol, &ett_h225_GatewayInfo, &ett_h225_SupportedProtocols, &ett_h225_H310Caps, - &ett_h225_SEQUNCE_OF_DataRate, - &ett_h225_SEQUNCE_OF_SupportedPrefix, + &ett_h225_SEQUENCE_OF_DataRate, + &ett_h225_SEQUENCE_OF_SupportedPrefix, &ett_h225_H320Caps, &ett_h225_H321Caps, &ett_h225_H322Caps, @@ -11954,12 +12030,12 @@ void proto_register_h225(void) { &ett_h225_GSM_UIM, &ett_h225_ExtendedAliasAddress, &ett_h225_Endpoint, - &ett_h225_SEQUNCE_OF_TransportAddress, + &ett_h225_SEQUENCE_OF_TransportAddress, &ett_h225_AlternateTransportAddresses, &ett_h225_UseSpecifiedTransport, &ett_h225_AlternateGK, &ett_h225_AltGKInfo, - &ett_h225_SEQUNCE_OF_AlternateGK, + &ett_h225_SEQUENCE_OF_AlternateGK, &ett_h225_SecurityServiceMode, &ett_h225_SecurityCapabilities, &ett_h225_SecurityErrors, @@ -11983,14 +12059,14 @@ void proto_register_h225(void) { &ett_h225_CapacityReportingSpecification_when, &ett_h225_CallCapacity, &ett_h225_CallCapacityInfo, - &ett_h225_SEQUNCE_OF_CallsAvailable, + &ett_h225_SEQUENCE_OF_CallsAvailable, &ett_h225_CallsAvailable, &ett_h225_CircuitInfo, &ett_h225_CircuitIdentifier, &ett_h225_CicInfo, - &ett_h225_SEQUNCE_OF_OCTET_STRING_SIZE_2_4, + &ett_h225_T_cic, &ett_h225_GroupID, - &ett_h225_SEQUNCE_OF_INTEGER_0_65535, + &ett_h225_T_member, &ett_h225_CarrierInfo, &ett_h225_ServiceControlDescriptor, &ett_h225_ServiceControlSession, @@ -12007,31 +12083,31 @@ void proto_register_h225(void) { &ett_h225_T_billingMode, &ett_h225_CallCreditServiceControl_callStartingPoint, &ett_h225_GenericData, - &ett_h225_SEQUNCE_SIZE_1_512_OF_EnumeratedParameter, + &ett_h225_SEQUENCE_SIZE_1_512_OF_EnumeratedParameter, &ett_h225_GenericIdentifier, &ett_h225_EnumeratedParameter, &ett_h225_Content, - &ett_h225_SEQUNCE_SIZE_1_16_OF_GenericData, + &ett_h225_SEQUENCE_SIZE_1_16_OF_GenericData, &ett_h225_FeatureSet, &ett_h225_TransportChannelInfo, &ett_h225_RTPSession, - &ett_h225_SEQUNCE_OF_INTEGER_1_255, + &ett_h225_T_associatedSessionIds, &ett_h225_RasMessage, - &ett_h225_SEQUNCE_OF_AdmissionConfirm, + &ett_h225_SEQUENCE_OF_AdmissionConfirm, &ett_h225_GatekeeperRequest, - &ett_h225_SEQUNCE_OF_Endpoint, - &ett_h225_SEQUNCE_OF_AuthenticationMechanism, - &ett_h225_SEQUNCE_OF_OBJECT_IDENTIFIER, - &ett_h225_SEQUNCE_OF_IntegrityMechanism, + &ett_h225_SEQUENCE_OF_Endpoint, + &ett_h225_SEQUENCE_OF_AuthenticationMechanism, + &ett_h225_T_algorithmOIDs, + &ett_h225_SEQUENCE_OF_IntegrityMechanism, &ett_h225_GatekeeperConfirm, &ett_h225_GatekeeperReject, &ett_h225_GatekeeperRejectReason, &ett_h225_RegistrationRequest, - &ett_h225_SEQUNCE_OF_AddressPattern, - &ett_h225_SEQUNCE_OF_H248PackagesDescriptor, + &ett_h225_SEQUENCE_OF_AddressPattern, + &ett_h225_SEQUENCE_OF_H248PackagesDescriptor, &ett_h225_RegistrationConfirm, &ett_h225_T_preGrantedARQ, - &ett_h225_SEQUNCE_OF_RasUsageSpecification, + &ett_h225_SEQUENCE_OF_RasUsageSpecification, &ett_h225_RegistrationReject, &ett_h225_RegistrationRejectReason, &ett_h225_T_invalidTerminalAliases, @@ -12046,12 +12122,13 @@ void proto_register_h225(void) { &ett_h225_CallModel, &ett_h225_TransportQOS, &ett_h225_AdmissionConfirm, + &ett_h225_T_language2, &ett_h225_UUIEsRequested, &ett_h225_AdmissionReject, &ett_h225_AdmissionRejectReason, - &ett_h225_SEQUNCE_OF_PartyNumber, + &ett_h225_SEQUENCE_OF_PartyNumber, &ett_h225_BandwidthRequest, - &ett_h225_SEQUNCE_OF_BandwidthDetails, + &ett_h225_SEQUENCE_OF_BandwidthDetails, &ett_h225_BandwidthConfirm, &ett_h225_BandwidthReject, &ett_h225_BandRejectReason, @@ -12068,9 +12145,9 @@ void proto_register_h225(void) { &ett_h225_InfoRequestResponse, &ett_h225_T_perCallInfo, &ett_h225_T_perCallInfo_item, - &ett_h225_SEQUNCE_OF_RTPSession, - &ett_h225_SEQUNCE_OF_TransportChannelInfo, - &ett_h225_SEQUNCE_OF_ConferenceIdentifier, + &ett_h225_SEQUENCE_OF_RTPSession, + &ett_h225_SEQUENCE_OF_TransportChannelInfo, + &ett_h225_SEQUENCE_OF_ConferenceIdentifier, &ett_h225_T_pdu, &ett_h225_T_pdu_item, &ett_h225_InfoRequestResponseStatus, |