osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

H.225.0 updated to version 7 (2009-12) 

svn path=/trunk/; revision=32672
This commit is contained in:
Tomas Kukosa 2010-05-05 13:14:41 +00:00
parent 95a3efc434
commit 05d418eba8
3 changed files with 186 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
asn1/h225/H323-MESSAGES.asn
View File

@ -1,13 +1,14 @@
-- H323-MESSAGES.asn
--
-- Taken from ITU ASN.1 database
-- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h225-0/2006-amd1/H323-MESSAGES.asn
-- http://www.itu.int/ITU-T/formal-language/itu-t/h/h225-0/2009/H323-MESSAGES.asn
--
-- $Id$
--
-- Module H323-MESSAGES (H.225.0:05/2006, Amendment 1:01/2007)
H323-MESSAGES DEFINITIONS AUTOMATIC TAGS ::=
-- Module H323-MESSAGES (H.225.0:12/2009)
H323-MESSAGES {itu-t(0) recommendation(0) h(8) h225-0(2250) version(0)
7 h323-messages(0)} DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
IMPORTS
@ -16,7 +17,8 @@ IMPORTS
AuthenticationMechanism
FROM H235-SECURITY-MESSAGES
DataProtocolCapability, T38FaxProfile, QOSCapability
FROM MULTIMEDIA-SYSTEM-CONTROL;
FROM MULTIMEDIA-SYSTEM-CONTROL {itu-t(0) recommendation(0) h(8) h245(245)
version(0) 15 multimedia-system-control(0)};
H323-UserInformation ::=
SEQUENCE -- root for all H.225.0 call signalling messages
@ -49,27 +51,28 @@ H323-UU-PDU ::= SEQUENCE {
statusInquiry StatusInquiry-UUIE,
setupAcknowledge SetupAcknowledge-UUIE,
notify Notify-UUIE},
nonStandardData NonStandardParameter OPTIONAL,
nonStandardData NonStandardParameter OPTIONAL,
...,
h4501SupplementaryService SEQUENCE OF OCTET STRING OPTIONAL,
h4501SupplementaryService SEQUENCE OF OCTET STRING OPTIONAL,
-- each sequence of octet string is defined as one
-- H4501SupplementaryService APDU as defined in
-- Table 3/H.450.1
h245Tunneling BOOLEAN,
-- if TRUE, tunneling of H.245 messages is enabled
h245Control SEQUENCE OF OCTET STRING OPTIONAL,
nonStandardControl SEQUENCE OF NonStandardParameter OPTIONAL,
callLinkage CallLinkage OPTIONAL,
h245Tunnelling BOOLEAN,
-- if TRUE, tunnelling of H.245 messages is enabled
h245Control SEQUENCE OF OCTET STRING OPTIONAL,
nonStandardControl SEQUENCE OF NonStandardParameter OPTIONAL,
callLinkage CallLinkage OPTIONAL,
tunnelledSignallingMessage
SEQUENCE {tunnelledProtocolID TunnelledProtocol, -- tunnelled signalling protocol ID--
SEQUENCE {tunnelledProtocolID TunnelledProtocol, -- tunnelled signalling--
-- protocol ID
messageContent SEQUENCE OF OCTET STRING, -- sequence of entire --
-- message(s)
tunnellingRequired NULL OPTIONAL,
nonStandardData NonStandardParameter OPTIONAL,
...} OPTIONAL,
provisionalRespToH245Tunneling NULL OPTIONAL,
stimulusControl StimulusControl OPTIONAL,
genericData SEQUENCE OF GenericData OPTIONAL
provisionalRespToH245Tunnelling NULL OPTIONAL,
stimulusControl StimulusControl OPTIONAL,
genericData SEQUENCE OF GenericData OPTIONAL
}
StimulusControl ::= SEQUENCE {
@ -97,7 +100,8 @@ Alerting-UUIE ::= SEQUENCE {
fastConnectRefused NULL OPTIONAL,
serviceControl SEQUENCE OF ServiceControlSession OPTIONAL,
capacity CallCapacity OPTIONAL,
featureSet FeatureSet OPTIONAL
featureSet FeatureSet OPTIONAL,
displayName SEQUENCE OF DisplayName OPTIONAL
}
CallProceeding-UUIE ::= SEQUENCE {
@ -129,14 +133,15 @@ Connect-UUIE ::= SEQUENCE {
fastStart SEQUENCE OF OCTET STRING OPTIONAL,
multipleCalls BOOLEAN,
maintainConnection BOOLEAN,
language SEQUENCE OF IA5String(SIZE (1..32)) OPTIONAL, -- RFC1766 language tag
language SEQUENCE OF IA5String(SIZE (1..32)) OPTIONAL, -- RFC 1766 language tag
connectedAddress SEQUENCE OF AliasAddress OPTIONAL,
presentationIndicator PresentationIndicator OPTIONAL,
screeningIndicator ScreeningIndicator OPTIONAL,
fastConnectRefused NULL OPTIONAL,
serviceControl SEQUENCE OF ServiceControlSession OPTIONAL,
capacity CallCapacity OPTIONAL,
featureSet FeatureSet OPTIONAL
featureSet FeatureSet OPTIONAL,
displayName SEQUENCE OF DisplayName OPTIONAL
}
Information-UUIE ::= SEQUENCE {
@ -162,7 +167,9 @@ ReleaseComplete-UUIE ::= SEQUENCE {
screeningIndicator ScreeningIndicator OPTIONAL,
capacity CallCapacity OPTIONAL,
serviceControl SEQUENCE OF ServiceControlSession OPTIONAL,
featureSet FeatureSet OPTIONAL
featureSet FeatureSet OPTIONAL,
destinationInfo EndpointType OPTIONAL,
displayName SEQUENCE OF DisplayName OPTIONAL
}
ReleaseCompleteReason ::= CHOICE {
@ -197,10 +204,11 @@ ReleaseCompleteReason ::= CHOICE {
-- the Setup may be accepted on
-- a new connection
nonStandardReason NonStandardParameter,
replaceWithConferenceInvite ConferenceIdentifier, -- call dropped due to subsequent invitation
replaceWithConferenceInvite ConferenceIdentifier, -- call dropped due to
-- subsequent invitation
-- to a conference
-- (see H.323 8.4.3.8)
-- (see 8.4.3.8/H.323)
genericDataReason NULL,
neededFeatureNotSupported NULL,
tunnelledSignallingRejected NULL,
@ -251,7 +259,7 @@ Setup-UUIE ::= SEQUENCE {
ScnConnectionAggregation,
...} OPTIONAL,
language SEQUENCE OF IA5String(SIZE (1..32)) OPTIONAL,
-- RFC1766 language tag
-- RFC 1766 language tag
presentationIndicator PresentationIndicator OPTIONAL,
screeningIndicator ScreeningIndicator OPTIONAL,
serviceControl SEQUENCE OF ServiceControlSession OPTIONAL,
@ -264,25 +272,27 @@ Setup-UUIE ::= SEQUENCE {
supportedFeatures SEQUENCE OF FeatureDescriptor OPTIONAL,
parallelH245Control SEQUENCE OF OCTET STRING OPTIONAL,
additionalSourceAddresses SEQUENCE OF ExtendedAliasAddress OPTIONAL,
hopCount INTEGER(1..31) OPTIONAL
hopCount INTEGER(1..31) OPTIONAL,
displayName SEQUENCE OF DisplayName OPTIONAL
}
ScnConnectionType ::= CHOICE {
unknown NULL, -- should be seleceted when connection type is unknown
bChannel NULL, -- each individual connection on the SCN is 64kbps.
unknown NULL, -- should be selected when connection type is unknown
bChannel NULL, -- each individual connection on the SCN is 64 kbit/s.
-- Note that where SCN delivers 56kbps usable data, the
-- actual bandwidth allocated on SCN is still 64kbps.
hybrid2x64 NULL, -- each connection is a 128kbps hybrid call
hybrid384 NULL, -- each connection is an H0 (384kbps) hybrid call
hybrid1536 NULL, -- each connection is an H11 (1536kbps) hybrid call
hybrid1920 NULL, -- each connection is an H12 (1920kbps) hybrid call
-- Note that where SCN delivers 56 kbit/s usable data,
-- the actual bandwidth allocated on SCN is still
-- 64 kbit/s.
hybrid2x64 NULL, -- each connection is a 128 kbit/s hybrid call
hybrid384 NULL, -- each connection is an H0 (384 kbit/s) hybrid call
hybrid1536 NULL, -- each connection is an H11 (1536 kbit/s) hybrid call
hybrid1920 NULL, -- each connection is an H12 (1920 kbit/s) hybrid call
multirate NULL, -- bandwidth supplied by SCN using multirate.
-- In this case, the information transfer rate octet in
-- the bearer capability shall be set to multirate and
-- the rate multiplier octet shall denote the number
-- of B channels.
-- In this case, the information transfer rate octet
-- in the bearer capability shall be set to multirate
-- and the rate multiplier octet shall denote the
-- number of B channels.
...
}
@ -446,7 +456,9 @@ Notify-UUIE ::= SEQUENCE {
...,
connectedAddress SEQUENCE OF AliasAddress OPTIONAL,
presentationIndicator PresentationIndicator OPTIONAL,
screeningIndicator ScreeningIndicator OPTIONAL
screeningIndicator ScreeningIndicator OPTIONAL,
destinationInfo EndpointType OPTIONAL,
displayName SEQUENCE OF DisplayName OPTIONAL
}
-- Beginning of common message elements section
@ -626,15 +638,15 @@ NonStandardIdentifier ::= CHOICE {
}
AliasAddress ::= CHOICE {
dialedDigits IA5String(SIZE (1..128))(FROM ("0123456789#*,")),
h323-ID BMPString(SIZE (1..256)), -- Basic ISO/IEC 10646-1 (Unicode)
dialledDigits IA5String(SIZE (1..128))(FROM ("0123456789#*,")),
h323-ID BMPString(SIZE (1..256)), -- Basic ISO/IEC 10646 (Unicode)
...,
url-ID IA5String(SIZE (1..512)), -- URL style address
transportID TransportAddress,
email-ID IA5String(SIZE (1..512)), -- rfc822-compliant email address
partyNumber PartyNumber,
mobileUIM MobileUIM,
isupNumber IsupNumber
url-ID IA5String(SIZE (1..512)), -- URL style address
transportID TransportAddress,
email-ID IA5String(SIZE (1..512)), -- rfc822-compliant email address
partyNumber PartyNumber,
mobileUIM MobileUIM,
isupNumber IsupNumber
}
AddressPattern ::= CHOICE {
@ -647,7 +659,7 @@ AddressPattern ::= CHOICE {
PartyNumber ::= CHOICE {
e164Number PublicPartyNumber,
-- the numbering plan is according to
-- Recommendations E.163 and E.164.
-- ITUT Recs E.163 and E.164.
dataPartyNumber NumberDigits,
-- not used, value reserved.
telexPartyNumber NumberDigits,
@ -672,6 +684,11 @@ PrivatePartyNumber ::= SEQUENCE {
NumberDigits ::= IA5String(SIZE (1..128))(FROM ("0123456789#*,"))
DisplayName ::= SEQUENCE {
language IA5String OPTIONAL, -- RFC4646 language tag
name BMPString(SIZE (1..80))
}
PublicTypeOfNumber ::= CHOICE {
unknown NULL,
-- if used number digits carry prefix
@ -685,7 +702,8 @@ PublicTypeOfNumber ::= CHOICE {
subscriberNumber NULL,
abbreviatedNumber NULL,
-- valid only for called party number at
-- the outgoing access, network substitutes
-- the outgoing access, network
-- substitutes
-- appropriate number.
...
}
@ -738,8 +756,8 @@ ANSI-41-UIM ::= SEQUENCE {
-- registration or call
-- origination or Short Message response etc.
-- Qualification Information Code refers to the validity
-- SESN Refers to SIM Electronic Serial Number for Security purposes of User
-- Identification
-- SESN Refers to SIM Electronic Serial Number for Security purposes of
-- User Identification
-- SOC refers to System Operator Code
}
@ -761,7 +779,7 @@ GSM-UIM ::= SEQUENCE {
IsupNumber ::= CHOICE {
e164Number IsupPublicPartyNumber,
-- the numbering plan is according to
-- Recommendations E.163 and E.164.
-- ITUT Recs E.163 and E.164.
dataPartyNumber IsupDigits, -- not used, value reserved.
telexPartyNumber IsupDigits, -- not used, value reserved.
privateNumber IsupPrivatePartyNumber,
@ -870,7 +888,9 @@ SecurityErrors ::= CHOICE {
securityWrongGeneralID NULL, -- wrong general ID
securityWrongSendersID NULL, -- wrong senders ID
securityIntegrityFailed NULL, -- integrity check failed
securityWrongOID NULL, -- wrong token OIDs or crypto alg OIDs
securityWrongOID NULL, -- wrong token OIDs or crypto alg
-- OIDs
securityDHmismatch NULL, -- mismatch of DH parameters
securityCertificateExpired NULL, -- certificate has expired
securityCertificateDateInvalid NULL, -- certificate is not yet valid
@ -891,7 +911,9 @@ SecurityErrors ::= CHOICE {
}
SecurityErrors2 ::= CHOICE {
securityWrongSyncTime NULL, -- either time server problem or network delay
securityWrongSyncTime NULL, -- either time server problem or network
-- delay
securityReplay NULL, -- replay attack encountered
securityWrongGeneralID NULL, -- wrong general ID
securityWrongSendersID NULL, -- wrong senders ID
@ -981,7 +1003,8 @@ NonIsoIntegrityMechanism ::=
-- encryption algorithm (long MAC)
hMAC-iso10118-3 OBJECT IDENTIFIER, -- according to ISO/IEC 10118-3 using
-- OID as hash function (OID is SHA-1,
-- OID as hash function (OID is
-- SHA-1,
-- RIPE-MD160,
-- RIPE-MD128)
...
@ -1140,7 +1163,8 @@ CarrierInfo ::= SEQUENCE {
ServiceControlDescriptor ::= CHOICE {
url IA5String(SIZE (0..512)), -- indicates a URL-
-- referenced  protocol/resource
-- referenced
-- protocol/resource
signal H248SignalsDescriptor,
nonStandard NonStandardParameter,
callCreditServiceControl CallCreditServiceControl,
@ -1468,7 +1492,8 @@ RegistrationConfirm ::= SEQUENCE --(RCF)
-- not want IRRs
totalBandwidthRestriction BandWidth OPTIONAL, -- total limit --
-- for all
-- concurrent calls
-- concurrent
-- calls
alternateTransportAddresses
AlternateTransportAddresses OPTIONAL,
useSpecifiedTransport UseSpecifiedTransport OPTIONAL
@ -1517,13 +1542,15 @@ RegistrationRejectReason ::= CHOICE {
undefinedReason NULL,
transportNotSupported NULL, -- one or more of the transports
...,
transportQOSNotSupported NULL, -- endpoint QOS not supported
transportQOSNotSupported NULL, -- endpoint QoS not supported
resourceUnavailable NULL, -- gatekeeper resources exhausted
invalidAlias NULL, -- alias not consistent with
-- gatekeeper rules
securityDenial NULL,
fullRegistrationRequired NULL, -- registration permission has expired
fullRegistrationRequired NULL, -- registration permission has
-- expired
additiveRegistrationNotSupported NULL,
invalidTerminalAliases
SEQUENCE {terminalAlias SEQUENCE OF AliasAddress OPTIONAL,
@ -1916,7 +1943,7 @@ LocationRejectReason ::= CHOICE {
securityError SecurityErrors2,
securityDHmismatch NULL, -- mismatch of DH parameters
noRouteToDestination NULL, -- destination unreachable
unallocatedNumber NULL -- detination number unassigned
unallocatedNumber NULL -- destination number unassigned
}
DisengageRequest ::= SEQUENCE --(DRQ)
@ -2026,7 +2053,7 @@ InfoRequestResponse ::= SEQUENCE --(IRR)
video SEQUENCE OF RTPSession OPTIONAL,
data SEQUENCE OF TransportChannelInfo OPTIONAL,
h245 TransportChannelInfo,
callSignaling TransportChannelInfo,
callSignalling TransportChannelInfo,
callType CallType,
bandWidth BandWidth,
callModel CallModel,

4
asn1/h225/h225.cnf
View File

@ -90,7 +90,7 @@ Progress-UUIE/fastStart FastStart
#.VIRTUAL_ASSGN
H245Control H323-UU-PDU/h245Control
ParallelH245Control Setup-UUIE/parallelH245Control
DialedDigits AliasAddress/dialedDigits
DialedDigits AliasAddress/dialledDigits
#.VIRTUAL_ASSGN
DestinationInfo AdmissionRequest/destinationInfo
@ -376,7 +376,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber
g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"));
#.END
#----------------------------------------------------------------------------------------
#.FN_PARS H323-UU-PDU/h245Tunneling VAL_PTR = &(h225_pi->is_h245Tunneling)
#.FN_PARS H323-UU-PDU/h245Tunnelling VAL_PTR = &(h225_pi->is_h245Tunneling)
#----------------------------------------------------------------------------------------
#.FN_HDR Setup-UUIE
contains_faststart = FALSE;

124
epan/dissectors/packet-h225.c
View File

@ -140,7 +140,7 @@ static int hf_h225_notify = -1; /* Notify_UUIE */
static int hf_h225_nonStandardData = -1; /* NonStandardParameter */
static int hf_h225_h4501SupplementaryService = -1; /* T_h4501SupplementaryService */
static int hf_h225_h4501SupplementaryService_item = -1; /* T_h4501SupplementaryService_item */
static int hf_h225_h245Tunneling = -1; /* T_h245Tunneling */
static int hf_h225_h245Tunnelling = -1; /* T_h245Tunnelling */
static int hf_h225_H245Control_item = -1; /* H245Control_item */
static int hf_h225_h245Control = -1; /* H245Control */
static int hf_h225_nonStandardControl = -1; /* SEQUENCE_OF_NonStandardParameter */
@ -151,7 +151,7 @@ static int hf_h225_tunnelledProtocolID = -1; /* TunnelledProtocol */
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_provisionalRespToH245Tunnelling = -1; /* NULL */
static int hf_h225_stimulusControl = -1; /* StimulusControl */
static int hf_h225_genericData = -1; /* SEQUENCE_OF_GenericData */
static int hf_h225_genericData_item = -1; /* GenericData */
@ -179,6 +179,8 @@ static int hf_h225_serviceControl = -1; /* SEQUENCE_OF_ServiceControlS
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_displayName = -1; /* SEQUENCE_OF_DisplayName */
static int hf_h225_displayName_item = -1; /* DisplayName */
static int hf_h225_conferenceID = -1; /* ConferenceIdentifier */
static int hf_h225_language = -1; /* Language */
static int hf_h225_connectedAddress = -1; /* SEQUENCE_OF_AliasAddress */
@ -187,6 +189,7 @@ static int hf_h225_circuitInfo = -1; /* CircuitInfo */
static int hf_h225_releaseCompleteReason = -1; /* ReleaseCompleteReason */
static int hf_h225_busyAddress = -1; /* SEQUENCE_OF_AliasAddress */
static int hf_h225_busyAddress_item = -1; /* AliasAddress */
static int hf_h225_destinationInfo = -1; /* EndpointType */
static int hf_h225_noBandwidth = -1; /* NULL */
static int hf_h225_gatekeeperResources = -1; /* NULL */
static int hf_h225_unreachableDestination = -1; /* NULL */
@ -371,7 +374,7 @@ static int hf_h225_nonStandardIdentifier = -1; /* NonStandardIdentifier */
static int hf_h225_nsp_data = -1; /* T_nsp_data */
static int hf_h225_nsiOID = -1; /* T_nsiOID */
static int hf_h225_h221NonStandard = -1; /* H221NonStandard */
static int hf_h225_dialedDigits = -1; /* DialedDigits */
static int hf_h225_dialledDigits = -1; /* DialedDigits */
static int hf_h225_h323_ID = -1; /* BMPString_SIZE_1_256 */
static int hf_h225_url_ID = -1; /* IA5String_SIZE_1_512 */
static int hf_h225_transportID = -1; /* TransportAddress */
@ -392,6 +395,8 @@ static int hf_h225_publicTypeOfNumber = -1; /* PublicTypeOfNumber */
static int hf_h225_publicNumberDigits = -1; /* NumberDigits */
static int hf_h225_privateTypeOfNumber = -1; /* PrivateTypeOfNumber */
static int hf_h225_privateNumberDigits = -1; /* NumberDigits */
static int hf_h225_language_01 = -1; /* IA5String */
static int hf_h225_name = -1; /* BMPString_SIZE_1_80 */
static int hf_h225_internationalNumber = -1; /* NULL */
static int hf_h225_nationalNumber = -1; /* NULL */
static int hf_h225_networkSpecificNumber = -1; /* NULL */
@ -754,7 +759,7 @@ 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_item = -1; /* DestinationInfo_item */
static int hf_h225_destinationInfo = -1; /* DestinationInfo */
static int hf_h225_destinationInfo_01 = -1; /* DestinationInfo */
static int hf_h225_srcInfo = -1; /* SEQUENCE_OF_AliasAddress */
static int hf_h225_srcInfo_item = -1; /* AliasAddress */
static int hf_h225_srcCallSignalAddress = -1; /* TransportAddress */
@ -855,7 +860,7 @@ static int hf_h225_video_item = -1; /* RTPSession */
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_callSignalling = -1; /* TransportChannelInfo */
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 */
@ -906,6 +911,7 @@ 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_SEQUENCE_OF_DisplayName = -1;
static gint ett_h225_CallProceeding_UUIE = -1;
static gint ett_h225_Connect_UUIE = -1;
static gint ett_h225_Information_UUIE = -1;
@ -981,6 +987,7 @@ static gint ett_h225_T_range = -1;
static gint ett_h225_PartyNumber = -1;
static gint ett_h225_PublicPartyNumber = -1;
static gint ett_h225_PrivatePartyNumber = -1;
static gint ett_h225_DisplayName = -1;
static gint ett_h225_PublicTypeOfNumber = -1;
static gint ett_h225_PrivateTypeOfNumber = -1;
static gint ett_h225_MobileUIM = -1;
@ -2156,7 +2163,7 @@ dissect_h225_IsupNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
const value_string AliasAddress_vals[] = {
{ 0, "dialedDigits" },
{ 0, "dialledDigits" },
{ 1, "h323-ID" },
{ 2, "url-ID" },
{ 3, "transportID" },
@ -2168,7 +2175,7 @@ const value_string AliasAddress_vals[] = {
};
static const per_choice_t AliasAddress_choice[] = {
{ 0, &hf_h225_dialedDigits , ASN1_EXTENSION_ROOT , dissect_h225_DialedDigits },
{ 0, &hf_h225_dialledDigits , ASN1_EXTENSION_ROOT , dissect_h225_DialedDigits },
{ 1, &hf_h225_h323_ID , ASN1_EXTENSION_ROOT , dissect_h225_BMPString_SIZE_1_256 },
{ 2, &hf_h225_url_ID , ASN1_NOT_EXTENSION_ROOT, dissect_h225_IA5String_SIZE_1_512 },
{ 3, &hf_h225_transportID , ASN1_NOT_EXTENSION_ROOT, dissect_h225_TransportAddress },
@ -4047,6 +4054,44 @@ dissect_h225_INTEGER_1_31(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
}
static int
dissect_h225_BMPString_SIZE_1_80(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_BMPString(tvb, offset, actx, tree, hf_index,
1, 80, FALSE);
return offset;
}
static const per_sequence_t DisplayName_sequence[] = {
{ &hf_h225_language_01 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_h225_IA5String },
{ &hf_h225_name , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h225_BMPString_SIZE_1_80 },
{ NULL, 0, 0, NULL }
};
static int
dissect_h225_DisplayName(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_h225_DisplayName, DisplayName_sequence);
return offset;
}
static const per_sequence_t SEQUENCE_OF_DisplayName_sequence_of[1] = {
{ &hf_h225_displayName_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h225_DisplayName },
};
static int
dissect_h225_SEQUENCE_OF_DisplayName(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence_of(tvb, offset, actx, tree, hf_index,
ett_h225_SEQUENCE_OF_DisplayName, SEQUENCE_OF_DisplayName_sequence_of);
return offset;
}
static const per_sequence_t Setup_UUIE_sequence[] = {
{ &hf_h225_protocolIdentifier, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_ProtocolIdentifier },
{ &hf_h225_h245Address , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h225_H245TransportAddress },
@ -4088,6 +4133,7 @@ static const per_sequence_t Setup_UUIE_sequence[] = {
{ &hf_h225_parallelH245Control, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_ParallelH245Control },
{ &hf_h225_additionalSourceAddresses, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_SEQUENCE_OF_ExtendedAliasAddress },
{ &hf_h225_hopCount_1_31 , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_INTEGER_1_31 },
{ &hf_h225_displayName , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_SEQUENCE_OF_DisplayName },
{ NULL, 0, 0, NULL }
};
@ -4181,6 +4227,7 @@ static const per_sequence_t Connect_UUIE_sequence[] = {
{ &hf_h225_serviceControl , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_SEQUENCE_OF_ServiceControlSession },
{ &hf_h225_capacity , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_CallCapacity },
{ &hf_h225_featureSet , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_FeatureSet },
{ &hf_h225_displayName , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_SEQUENCE_OF_DisplayName },
{ NULL, 0, 0, NULL }
};
@ -4219,6 +4266,7 @@ static const per_sequence_t Alerting_UUIE_sequence[] = {
{ &hf_h225_serviceControl , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_SEQUENCE_OF_ServiceControlSession },
{ &hf_h225_capacity , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_CallCapacity },
{ &hf_h225_featureSet , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_FeatureSet },
{ &hf_h225_displayName , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_SEQUENCE_OF_DisplayName },
{ NULL, 0, 0, NULL }
};
@ -4400,6 +4448,8 @@ static const per_sequence_t ReleaseComplete_UUIE_sequence[] = {
{ &hf_h225_capacity , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_CallCapacity },
{ &hf_h225_serviceControl , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_SEQUENCE_OF_ServiceControlSession },
{ &hf_h225_featureSet , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_FeatureSet },
{ &hf_h225_destinationInfo, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_EndpointType },
{ &hf_h225_displayName , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_SEQUENCE_OF_DisplayName },
{ NULL, 0, 0, NULL }
};
@ -4644,6 +4694,8 @@ static const per_sequence_t Notify_UUIE_sequence[] = {
{ &hf_h225_connectedAddress, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_SEQUENCE_OF_AliasAddress },
{ &hf_h225_presentationIndicator, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_PresentationIndicator },
{ &hf_h225_screeningIndicator, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_ScreeningIndicator },
{ &hf_h225_destinationInfo, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_EndpointType },
{ &hf_h225_displayName , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_SEQUENCE_OF_DisplayName },
{ NULL, 0, 0, NULL }
};
@ -4759,7 +4811,7 @@ dissect_h225_T_h4501SupplementaryService(tvbuff_t *tvb _U_, int offset _U_, asn1
static int
dissect_h225_T_h245Tunneling(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
dissect_h225_T_h245Tunnelling(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_boolean(tvb, offset, actx, tree, hf_index, &(h225_pi->is_h245Tunneling));
return offset;
@ -4892,12 +4944,12 @@ static const per_sequence_t H323_UU_PDU_sequence[] = {
{ &hf_h225_h323_message_body, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_T_h323_message_body },
{ &hf_h225_nonStandardData, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h225_NonStandardParameter },
{ &hf_h225_h4501SupplementaryService, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_T_h4501SupplementaryService },
{ &hf_h225_h245Tunneling , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_h225_T_h245Tunneling },
{ &hf_h225_h245Tunnelling , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_h225_T_h245Tunnelling },
{ &hf_h225_h245Control , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_H245Control },
{ &hf_h225_nonStandardControl, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_SEQUENCE_OF_NonStandardParameter },
{ &hf_h225_callLinkage , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_CallLinkage },
{ &hf_h225_tunnelledSignallingMessage, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_T_tunnelledSignallingMessage },
{ &hf_h225_provisionalRespToH245Tunneling, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_NULL },
{ &hf_h225_provisionalRespToH245Tunnelling, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_NULL },
{ &hf_h225_stimulusControl, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_StimulusControl },
{ &hf_h225_genericData , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_SEQUENCE_OF_GenericData },
{ NULL, 0, 0, NULL }
@ -6238,7 +6290,7 @@ static const per_sequence_t AdmissionRequest_sequence[] = {
{ &hf_h225_callType , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_CallType },
{ &hf_h225_callModel , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h225_CallModel },
{ &hf_h225_endpointIdentifier, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_EndpointIdentifier },
{ &hf_h225_destinationInfo, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h225_DestinationInfo },
{ &hf_h225_destinationInfo_01, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h225_DestinationInfo },
{ &hf_h225_destCallSignalAddress, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h225_TransportAddress },
{ &hf_h225_destExtraCallInfo, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h225_SEQUENCE_OF_AliasAddress },
{ &hf_h225_srcInfo , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_SEQUENCE_OF_AliasAddress },
@ -6314,7 +6366,7 @@ static const per_sequence_t AdmissionConfirm_sequence[] = {
{ &hf_h225_destCallSignalAddress, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_TransportAddress },
{ &hf_h225_irrFrequency , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h225_INTEGER_1_65535 },
{ &hf_h225_nonStandardData, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h225_NonStandardParameter },
{ &hf_h225_destinationInfo, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_DestinationInfo },
{ &hf_h225_destinationInfo_01, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_DestinationInfo },
{ &hf_h225_destExtraCallInfo, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_SEQUENCE_OF_AliasAddress },
{ &hf_h225_destinationType, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_EndpointType },
{ &hf_h225_remoteExtensionAddress, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_SEQUENCE_OF_AliasAddress },
@ -6727,7 +6779,7 @@ dissect_h225_DisengageReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
static const per_sequence_t LocationRequest_sequence[] = {
{ &hf_h225_requestSeqNum , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_RequestSeqNum },
{ &hf_h225_endpointIdentifier, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h225_EndpointIdentifier },
{ &hf_h225_destinationInfo, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_DestinationInfo },
{ &hf_h225_destinationInfo_01, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_DestinationInfo },
{ &hf_h225_nonStandardData, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h225_NonStandardParameter },
{ &hf_h225_replyAddress , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_TransportAddress },
{ &hf_h225_sourceInfo , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_SEQUENCE_OF_AliasAddress },
@ -6764,7 +6816,7 @@ static const per_sequence_t LocationConfirm_sequence[] = {
{ &hf_h225_locationConfirm_callSignalAddress, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_TransportAddress },
{ &hf_h225_locationConfirm_rasAddress, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_TransportAddress },
{ &hf_h225_nonStandardData, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h225_NonStandardParameter },
{ &hf_h225_destinationInfo, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_DestinationInfo },
{ &hf_h225_destinationInfo_01, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_DestinationInfo },
{ &hf_h225_destExtraCallInfo, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_SEQUENCE_OF_AliasAddress },
{ &hf_h225_destinationType, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_EndpointType },
{ &hf_h225_remoteExtensionAddress, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_h225_SEQUENCE_OF_AliasAddress },
@ -6977,7 +7029,7 @@ static const per_sequence_t T_perCallInfo_item_sequence[] = {
{ &hf_h225_video , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h225_SEQUENCE_OF_RTPSession },
{ &hf_h225_data , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_h225_SEQUENCE_OF_TransportChannelInfo },
{ &hf_h225_h245 , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_TransportChannelInfo },
{ &hf_h225_callSignaling , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_TransportChannelInfo },
{ &hf_h225_callSignalling , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_TransportChannelInfo },
{ &hf_h225_callType , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_CallType },
{ &hf_h225_bandWidth , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_BandWidth },
{ &hf_h225_callModel , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h225_CallModel },
@ -7658,10 +7710,10 @@ void proto_register_h225(void) {
{ "h4501SupplementaryService item", "h225.h4501SupplementaryService_item",
FT_UINT32, BASE_DEC, NULL, 0,
"h225.T_h4501SupplementaryService_item", HFILL }},
{ &hf_h225_h245Tunneling,
{ "h245Tunneling", "h225.h245Tunneling",
{ &hf_h225_h245Tunnelling,
{ "h245Tunnelling", "h225.h245Tunnelling",
FT_BOOLEAN, BASE_NONE, NULL, 0,
"h225.T_h245Tunneling", HFILL }},
"h225.T_h245Tunnelling", HFILL }},
{ &hf_h225_H245Control_item,
{ "H245Control item", "h225.H245Control_item",
FT_UINT32, BASE_DEC, NULL, 0,
@ -7702,8 +7754,8 @@ void proto_register_h225(void) {
{ "tunnellingRequired", "h225.tunnellingRequired",
FT_NONE, BASE_NONE, NULL, 0,
"h225.NULL", HFILL }},
{ &hf_h225_provisionalRespToH245Tunneling,
{ "provisionalRespToH245Tunneling", "h225.provisionalRespToH245Tunneling",
{ &hf_h225_provisionalRespToH245Tunnelling,
{ "provisionalRespToH245Tunnelling", "h225.provisionalRespToH245Tunnelling",
FT_NONE, BASE_NONE, NULL, 0,
"h225.NULL", HFILL }},
{ &hf_h225_stimulusControl,
@ -7814,6 +7866,14 @@ void proto_register_h225(void) {
{ "featureSet", "h225.featureSet",
FT_NONE, BASE_NONE, NULL, 0,
"h225.FeatureSet", HFILL }},
{ &hf_h225_displayName,
{ "displayName", "h225.displayName",
FT_UINT32, BASE_DEC, NULL, 0,
"h225.SEQUENCE_OF_DisplayName", HFILL }},
{ &hf_h225_displayName_item,
{ "DisplayName", "h225.DisplayName",
FT_NONE, BASE_NONE, NULL, 0,
"h225.DisplayName", HFILL }},
{ &hf_h225_conferenceID,
{ "conferenceID", "h225.conferenceID",
FT_GUID, BASE_NONE, NULL, 0,
@ -7846,6 +7906,10 @@ void proto_register_h225(void) {
{ "AliasAddress", "h225.AliasAddress",
FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0,
"h225.AliasAddress", HFILL }},
{ &hf_h225_destinationInfo,
{ "destinationInfo", "h225.destinationInfo",
FT_NONE, BASE_NONE, NULL, 0,
"h225.EndpointType", HFILL }},
{ &hf_h225_noBandwidth,
{ "noBandwidth", "h225.noBandwidth",
FT_NONE, BASE_NONE, NULL, 0,
@ -8582,8 +8646,8 @@ void proto_register_h225(void) {
{ "h221NonStandard", "h225.h221NonStandard",
FT_NONE, BASE_NONE, NULL, 0,
"h225.H221NonStandard", HFILL }},
{ &hf_h225_dialedDigits,
{ "dialedDigits", "h225.dialedDigits",
{ &hf_h225_dialledDigits,
{ "dialledDigits", "h225.dialledDigits",
FT_STRING, BASE_NONE, NULL, 0,
"h225.DialedDigits", HFILL }},
{ &hf_h225_h323_ID,
@ -8666,6 +8730,14 @@ void proto_register_h225(void) {
{ "privateNumberDigits", "h225.privateNumberDigits",
FT_STRING, BASE_NONE, NULL, 0,
"h225.NumberDigits", HFILL }},
{ &hf_h225_language_01,
{ "language", "h225.language",
FT_STRING, BASE_NONE, NULL, 0,
"h225.IA5String", HFILL }},
{ &hf_h225_name,
{ "name", "h225.name",
FT_STRING, BASE_NONE, NULL, 0,
"h225.BMPString_SIZE_1_80", HFILL }},
{ &hf_h225_internationalNumber,
{ "internationalNumber", "h225.internationalNumber",
FT_NONE, BASE_NONE, NULL, 0,
@ -10114,7 +10186,7 @@ void proto_register_h225(void) {
{ "DestinationInfo item", "h225.DestinationInfo_item",
FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0,
"h225.DestinationInfo_item", HFILL }},
{ &hf_h225_destinationInfo,
{ &hf_h225_destinationInfo_01,
{ "destinationInfo", "h225.destinationInfo",
FT_UINT32, BASE_DEC, NULL, 0,
"h225.DestinationInfo", HFILL }},
@ -10518,8 +10590,8 @@ void proto_register_h225(void) {
{ "h245", "h225.h245",
FT_NONE, BASE_NONE, NULL, 0,
"h225.TransportChannelInfo", HFILL }},
{ &hf_h225_callSignaling,
{ "callSignaling", "h225.callSignaling",
{ &hf_h225_callSignalling,
{ "callSignalling", "h225.callSignalling",
FT_NONE, BASE_NONE, NULL, 0,
"h225.TransportChannelInfo", HFILL }},
{ &hf_h225_substituteConfIDs,
@ -10649,6 +10721,7 @@ void proto_register_h225(void) {
&ett_h225_SEQUENCE_OF_CryptoH323Token,
&ett_h225_SEQUENCE_OF_AliasAddress,
&ett_h225_SEQUENCE_OF_ServiceControlSession,
&ett_h225_SEQUENCE_OF_DisplayName,
&ett_h225_CallProceeding_UUIE,
&ett_h225_Connect_UUIE,
&ett_h225_Information_UUIE,
@ -10724,6 +10797,7 @@ void proto_register_h225(void) {
&ett_h225_PartyNumber,
&ett_h225_PublicPartyNumber,
&ett_h225_PrivatePartyNumber,
&ett_h225_DisplayName,
&ett_h225_PublicTypeOfNumber,
&ett_h225_PrivateTypeOfNumber,
&ett_h225_MobileUIM,