diff options
author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2006-05-29 13:06:44 +0000 |
---|---|---|
committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2006-05-29 13:06:44 +0000 |
commit | 667fed59159c79cf87c688f031845cbf7343eedc (patch) | |
tree | 9cd332f97ef30ae77fafcd75c5d7d887f5f577d5 /epan | |
parent | 4f6abb316a13f10064fe6a2e5a74ca0194fad8de (diff) |
- h225.asn renamed to H323-MESSAGES.asn
- h245.asn renamed to MULTIMEDIA-SYSTEM-CONTROL.asn
- rollback changes in .asn sources to keep them in original ITU-T form and put necessary changes into .cnf files
- PER dissectors regenerated
svn path=/trunk/; revision=18238
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-h225.c | 578 | ||||
-rw-r--r-- | epan/dissectors/packet-h225.h | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-h245.c | 852 | ||||
-rw-r--r-- | epan/dissectors/packet-h245.h | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-h450.c | 308 |
5 files changed, 985 insertions, 759 deletions
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index 1285ab204c..ab7590e433 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-h225.c */ -/* ../../tools/asn2wrs.py -e -p h225 -c h225.cnf -s packet-h225-template h225.asn */ +/* ../../tools/asn2wrs.py -e -p h225 -c h225.cnf -s packet-h225-template H323-MESSAGES.asn */ /* Input file: packet-h225-template.c */ @@ -36,7 +36,7 @@ * to hack it by hand, but it is incomplete and buggy and it is good when * it will go away." * Ronnie did a great job and all the VoIP users had made good use of it! - * Credit to Tomas Kukosa for developing the Asn2eth compiler. + * Credit to Tomas Kukosa for developing the asn2wrs compiler. * */ @@ -190,7 +190,7 @@ static int hf_h225_information = -1; /* Information_UUIE */ static int hf_h225_releaseComplete = -1; /* ReleaseComplete_UUIE */ static int hf_h225_facility = -1; /* Facility_UUIE */ static int hf_h225_progress = -1; /* Progress_UUIE */ -static int hf_h225_empty_flg = -1; /* T_empty */ +static int hf_h225_empty_flg = -1; /* T_empty_flg */ static int hf_h225_status = -1; /* Status_UUIE */ static int hf_h225_statusInquiry = -1; /* StatusInquiry_UUIE */ static int hf_h225_setupAcknowledge = -1; /* SetupAcknowledge_UUIE */ @@ -199,6 +199,7 @@ 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_H245Control_item = -1; /* H245Control_item */ static int hf_h225_h245Control = -1; /* H245Control */ static int hf_h225_nonStandardControl = -1; /* SEQUENCE_OF_NonStandardParameter */ static int hf_h225_nonStandardControl_item = -1; /* NonStandardParameter */ @@ -212,7 +213,6 @@ static int hf_h225_provisionalRespToH245Tunneling = -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 */ -static int hf_h225_H245Control_item = -1; /* H245Control_item */ static int hf_h225_nonStandard = -1; /* NonStandardParameter */ static int hf_h225_isText = -1; /* NULL */ static int hf_h225_h248Message = -1; /* OCTET_STRING */ @@ -294,6 +294,7 @@ static int hf_h225_sourceCallSignalAddress = -1; /* TransportAddress */ static int hf_h225_uUIE_remoteExtensionAddress = -1; /* AliasAddress */ static int hf_h225_h245SecurityCapability = -1; /* SEQUENCE_OF_H245Security */ static int hf_h225_h245SecurityCapability_item = -1; /* H245Security */ +static int hf_h225_FastStart_item = -1; /* FastStart_item */ static int hf_h225_mediaWaitForConnect = -1; /* BOOLEAN */ static int hf_h225_canOverlapSend = -1; /* BOOLEAN */ static int hf_h225_endpointIdentifier = -1; /* EndpointIdentifier */ @@ -310,11 +311,11 @@ static int hf_h225_desiredFeatures = -1; /* SEQUENCE_OF_FeatureDescript static int hf_h225_desiredFeatures_item = -1; /* FeatureDescriptor */ static int hf_h225_supportedFeatures = -1; /* SEQUENCE_OF_FeatureDescriptor */ static int hf_h225_supportedFeatures_item = -1; /* FeatureDescriptor */ +static int hf_h225_ParallelH245Control_item = -1; /* ParallelH245Control_item */ static int hf_h225_parallelH245Control = -1; /* ParallelH245Control */ 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; /* ParallelH245Control_item */ static int hf_h225_unknown = -1; /* NULL */ static int hf_h225_bChannel = -1; /* NULL */ static int hf_h225_hybrid2x64 = -1; /* NULL */ @@ -348,7 +349,26 @@ static int hf_h225_newTokens = -1; /* NULL */ static int hf_h225_featureSetUpdate = -1; /* NULL */ static int hf_h225_forwardedElements = -1; /* NULL */ static int hf_h225_transportedInformation = -1; /* NULL */ -static int hf_h225_FastStart_item = -1; /* FastStart_item */ +static int hf_h225_h245IpAddress = -1; /* T_h245IpAddress */ +static int hf_h225_h245Ip = -1; /* T_h245Ip */ +static int hf_h225_h245IpPort = -1; /* T_h245IpPort */ +static int hf_h225_h245IpSourceRoute = -1; /* T_h245IpSourceRoute */ +static int hf_h225_ip = -1; /* OCTET_STRING_SIZE_4 */ +static int hf_h225_port = -1; /* INTEGER_0_65535 */ +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_strict = -1; /* NULL */ +static int hf_h225_loose = -1; /* NULL */ +static int hf_h225_h245IpxAddress = -1; /* T_h245IpxAddress */ +static int hf_h225_node = -1; /* OCTET_STRING_SIZE_6 */ +static int hf_h225_netnum = -1; /* OCTET_STRING_SIZE_4 */ +static int hf_h225_h245IpxPort = -1; /* OCTET_STRING_SIZE_2 */ +static int hf_h225_h245Ip6Address = -1; /* T_h245Ip6Address */ +static int hf_h225_h245Ip6 = -1; /* OCTET_STRING_SIZE_16 */ +static int hf_h225_netBios = -1; /* OCTET_STRING_SIZE_16 */ +static int hf_h225_nsap = -1; /* OCTET_STRING_SIZE_1_20 */ +static int hf_h225_nonStandardAddress = -1; /* NonStandardParameter */ static int hf_h225_ipAddress = -1; /* T_ipAddress */ static int hf_h225_ipV4 = -1; /* IpV4 */ static int hf_h225_ipV4_port = -1; /* INTEGER_0_65535 */ @@ -358,34 +378,11 @@ static int hf_h225_ipV4_src_port = -1; /* INTEGER_0_65535 */ 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 */ -static int hf_h225_loose = -1; /* NULL */ static int hf_h225_ipxAddress = -1; /* T_ipxAddress */ -static int hf_h225_node = -1; /* OCTET_STRING_SIZE_6 */ -static int hf_h225_netnum = -1; /* OCTET_STRING_SIZE_4 */ static int hf_h225_ipx_port = -1; /* OCTET_STRING_SIZE_2 */ static int hf_h225_ip6Address = -1; /* T_ip6Address */ static int hf_h225_ipV6 = -1; /* OCTET_STRING_SIZE_16 */ static int hf_h225_ipV6_port = -1; /* INTEGER_0_65535 */ -static int hf_h225_netBios = -1; /* OCTET_STRING_SIZE_16 */ -static int hf_h225_nsap = -1; /* OCTET_STRING_SIZE_1_20 */ -static int hf_h225_nonStandardAddress = -1; /* NonStandardParameter */ -static int hf_h225_h245ipAddress = -1; /* T_h245ipAddress */ -static int hf_h225_h245ipv4 = -1; /* T_h245ipv4 */ -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; /* 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 */ -static int hf_h225_h245ipxport = -1; /* OCTET_STRING_SIZE_2 */ -static int hf_h225_h245ip6Address = -1; /* T_h245ip6Address */ -static int hf_h225_h245ipv6 = -1; /* OCTET_STRING_SIZE_16 */ -static int hf_h225_h245ipv6port = -1; /* INTEGER_0_65535 */ -static int hf_h225_h245netBios = -1; /* OCTET_STRING_SIZE_16 */ -static int hf_h225_h245nsap = -1; /* OCTET_STRING_SIZE_1_20 */ static int hf_h225_vendor = -1; /* VendorIdentifier */ static int hf_h225_gatekeeper = -1; /* GatekeeperInfo */ static int hf_h225_gateway = -1; /* GatewayInfo */ @@ -429,8 +426,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_nsp_data = -1; /* T_data */ -static int hf_h225_nsiOID = -1; /* T_object */ +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_h323_ID = -1; /* BMPString_SIZE_1_256 */ @@ -604,8 +601,8 @@ 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; /* T_cic */ -static int hf_h225_cic_item = -1; /* OCTET_STRING_SIZE_2_4 */ +static int hf_h225_cic_2_4 = -1; /* T_cic_2_4 */ +static int hf_h225_cic_2_4_item = -1; /* OCTET_STRING_SIZE_2_4 */ static int hf_h225_pointCode = -1; /* OCTET_STRING_SIZE_2_5 */ static int hf_h225_member = -1; /* T_member */ static int hf_h225_member_item = -1; /* INTEGER_0_65535 */ @@ -796,6 +793,7 @@ static int hf_h225_notCurrentlyRegistered = -1; /* NULL */ 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_srcInfo = -1; /* SEQUENCE_OF_AliasAddress */ static int hf_h225_srcInfo_item = -1; /* AliasAddress */ @@ -811,7 +809,6 @@ static int hf_h225_transportQOS = -1; /* TransportQOS */ static int hf_h225_gatewayDataRate = -1; /* DataRate */ static int hf_h225_desiredTunnelledProtocol = -1; /* TunnelledProtocol */ static int hf_h225_canMapSrcAlias = -1; /* BOOLEAN */ -static int hf_h225_DestinationInfo_item = -1; /* DestinationInfo_item */ static int hf_h225_pointToPoint = -1; /* NULL */ static int hf_h225_oneToN = -1; /* NULL */ static int hf_h225_nToOne = -1; /* NULL */ @@ -937,11 +934,11 @@ 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_T_h4501SupplementaryService = -1; +static gint ett_h225_H245Control = -1; static gint ett_h225_SEQUENCE_OF_NonStandardParameter = -1; static gint ett_h225_T_tunnelledSignallingMessage = -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_SEQUENCE_OF_ClearToken = -1; @@ -958,11 +955,12 @@ static gint ett_h225_Setup_UUIE = -1; static gint ett_h225_SEQUENCE_OF_CallReferenceValue = -1; static gint ett_h225_T_conferenceGoal = -1; static gint ett_h225_SEQUENCE_OF_H245Security = -1; +static gint ett_h225_FastStart = -1; static gint ett_h225_T_connectionParameters = -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_SEQUENCE_OF_ExtendedAliasAddress = -1; static gint ett_h225_ScnConnectionType = -1; static gint ett_h225_ScnConnectionAggregation = -1; static gint ett_h225_PresentationIndicator = -1; @@ -971,21 +969,20 @@ 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; -static gint ett_h225_FastStart = -1; static gint ett_h225_TransportAddress = -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; static gint ett_h225_T_ipAddress = -1; static gint ett_h225_T_ipSourceRoute = -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; static gint ett_h225_Status_UUIE = -1; static gint ett_h225_StatusInquiry_UUIE = -1; static gint ett_h225_SetupAcknowledge_UUIE = -1; @@ -1065,7 +1062,7 @@ 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_T_cic = -1; +static gint ett_h225_T_cic_2_4 = -1; static gint ett_h225_GroupID = -1; static gint ett_h225_T_member = -1; static gint ett_h225_CarrierInfo = -1; @@ -1281,8 +1278,8 @@ static int dissect_protocolIdentifier(tvbuff_t *tvb, int offset, asn_ctx_t *actx static int -dissect_h225_T_h245ipv4(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 215 "h225.cnf" +dissect_h225_T_h245Ip(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +#line 262 "h225.cnf" tvbuff_t *value_tvb; ipv4_address = 0; @@ -1295,39 +1292,39 @@ dissect_h225_T_h245ipv4(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tr return offset; } -static int dissect_h245ipv4(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_T_h245ipv4(tvb, offset, actx, tree, hf_h225_h245ipv4); +static int dissect_h245Ip(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h225_T_h245Ip(tvb, offset, actx, tree, hf_h225_h245Ip); } static int -dissect_h225_T_h245ipv4port(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +dissect_h225_T_h245IpPort(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 65535U, &ipv4_port, FALSE); return offset; } -static int dissect_h245ipv4port(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_T_h245ipv4port(tvb, offset, actx, tree, hf_h225_h245ipv4port); +static int dissect_h245IpPort(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h225_T_h245IpPort(tvb, offset, actx, tree, hf_h225_h245IpPort); } -static const per_sequence_t T_h245ipAddress_sequence[] = { - { "h245ipv4" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h245ipv4 }, - { "h245ipv4port" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h245ipv4port }, +static const per_sequence_t T_h245IpAddress_sequence[] = { + { "ip" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h245Ip }, + { "port" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h245IpPort }, { NULL, 0, 0, NULL } }; static int -dissect_h225_T_h245ipAddress(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +dissect_h225_T_h245IpAddress(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_h225_T_h245ipAddress, T_h245ipAddress_sequence); + ett_h225_T_h245IpAddress, T_h245IpAddress_sequence); return offset; } -static int dissect_h245ipAddress(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_T_h245ipAddress(tvb, offset, actx, tree, hf_h225_h245ipAddress); +static int dissect_h245IpAddress(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h225_T_h245IpAddress(tvb, offset, actx, tree, hf_h225_h245IpAddress); } @@ -1339,20 +1336,20 @@ dissect_h225_OCTET_STRING_SIZE_4(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, return offset; } -static int dissect_src_route_ipV4(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_OCTET_STRING_SIZE_4(tvb, offset, actx, tree, hf_h225_src_route_ipV4); +static int dissect_ip(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h225_OCTET_STRING_SIZE_4(tvb, offset, actx, tree, hf_h225_ip); } -static int dissect_route_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_OCTET_STRING_SIZE_4(tvb, offset, actx, tree, hf_h225_route_item); +static int dissect_h245Route_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h225_OCTET_STRING_SIZE_4(tvb, offset, actx, tree, hf_h225_h245Route_item); } static int dissect_netnum(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h225_OCTET_STRING_SIZE_4(tvb, offset, actx, tree, hf_h225_netnum); } -static int dissect_h245routeip(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_OCTET_STRING_SIZE_4(tvb, offset, actx, tree, hf_h225_h245routeip); +static int dissect_src_route_ipV4(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h225_OCTET_STRING_SIZE_4(tvb, offset, actx, tree, hf_h225_src_route_ipV4); } -static int dissect_h245route_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_OCTET_STRING_SIZE_4(tvb, offset, actx, tree, hf_h225_h245route_item); +static int dissect_route_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h225_OCTET_STRING_SIZE_4(tvb, offset, actx, tree, hf_h225_route_item); } @@ -1367,6 +1364,9 @@ dissect_h225_INTEGER_0_65535(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, pro static int dissect_numberOfScnConnections(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h225_INTEGER_0_65535(tvb, offset, actx, tree, hf_h225_numberOfScnConnections); } +static int dissect_port(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h225_INTEGER_0_65535(tvb, offset, actx, tree, hf_h225_port); +} static int dissect_ipV4_port(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h225_INTEGER_0_65535(tvb, offset, actx, tree, hf_h225_ipV4_port); } @@ -1376,12 +1376,6 @@ static int dissect_ipV4_src_port(tvbuff_t *tvb, int offset, asn_ctx_t *actx, pro static int dissect_ipV6_port(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h225_INTEGER_0_65535(tvb, offset, actx, tree, hf_h225_ipV6_port); } -static int dissect_h245routeport(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_INTEGER_0_65535(tvb, offset, actx, tree, hf_h225_h245routeport); -} -static int dissect_h245ipv6port(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_INTEGER_0_65535(tvb, offset, actx, tree, hf_h225_h245ipv6port); -} static int dissect_member_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h225_INTEGER_0_65535(tvb, offset, actx, tree, hf_h225_member_item); } @@ -1396,19 +1390,19 @@ static int dissect_segment(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tre } -static const per_sequence_t T_h245route_sequence_of[1] = { - { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h245route_item }, +static const per_sequence_t T_h245Route_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h245Route_item }, }; static int -dissect_h225_T_h245route(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +dissect_h225_T_h245Route(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, actx, tree, hf_index, - ett_h225_T_h245route, T_h245route_sequence_of); + ett_h225_T_h245Route, T_h245Route_sequence_of); return offset; } -static int dissect_h245route(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_T_h245route(tvb, offset, actx, tree, hf_h225_h245route); +static int dissect_h245Route(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h225_T_h245Route(tvb, offset, actx, tree, hf_h225_h245Route); } @@ -1922,48 +1916,48 @@ static int dissect_notAvailable(tvbuff_t *tvb, int offset, asn_ctx_t *actx, prot } -static const value_string h225_T_h245routing_vals[] = { +static const value_string h225_T_h245Routing_vals[] = { { 0, "strict" }, { 1, "loose" }, { 0, NULL } }; -static const per_choice_t T_h245routing_choice[] = { +static const per_choice_t T_h245Routing_choice[] = { { 0, "strict" , ASN1_EXTENSION_ROOT , dissect_strict }, { 1, "loose" , ASN1_EXTENSION_ROOT , dissect_loose }, { 0, NULL, 0, NULL } }; static int -dissect_h225_T_h245routing(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +dissect_h225_T_h245Routing(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, - ett_h225_T_h245routing, T_h245routing_choice, + ett_h225_T_h245Routing, T_h245Routing_choice, NULL); return offset; } -static int dissect_h245routing(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_T_h245routing(tvb, offset, actx, tree, hf_h225_h245routing); +static int dissect_h245Routing(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h225_T_h245Routing(tvb, offset, actx, tree, hf_h225_h245Routing); } -static const per_sequence_t T_h245ipSourceRoute_sequence[] = { - { "h245routeip" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h245routeip }, - { "h245routeport" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h245routeport }, - { "h245route" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h245route }, - { "h245routing" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h245routing }, +static const per_sequence_t T_h245IpSourceRoute_sequence[] = { + { "ip" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ip }, + { "port" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_port }, + { "route" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h245Route }, + { "routing" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h245Routing }, { NULL, 0, 0, NULL } }; static int -dissect_h225_T_h245ipSourceRoute(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +dissect_h225_T_h245IpSourceRoute(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_h225_T_h245ipSourceRoute, T_h245ipSourceRoute_sequence); + ett_h225_T_h245IpSourceRoute, T_h245IpSourceRoute_sequence); return offset; } -static int dissect_h245ipSourceRoute(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_T_h245ipSourceRoute(tvb, offset, actx, tree, hf_h225_h245ipSourceRoute); +static int dissect_h245IpSourceRoute(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h225_T_h245IpSourceRoute(tvb, offset, actx, tree, hf_h225_h245IpSourceRoute); } @@ -1988,30 +1982,30 @@ dissect_h225_OCTET_STRING_SIZE_2(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, return offset; } +static int dissect_h245IpxPort(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h225_OCTET_STRING_SIZE_2(tvb, offset, actx, tree, hf_h225_h245IpxPort); +} static int dissect_ipx_port(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h225_OCTET_STRING_SIZE_2(tvb, offset, actx, tree, hf_h225_ipx_port); } -static int dissect_h245ipxport(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_OCTET_STRING_SIZE_2(tvb, offset, actx, tree, hf_h225_h245ipxport); -} -static const per_sequence_t T_h245ipxAddress_sequence[] = { +static const per_sequence_t T_h245IpxAddress_sequence[] = { { "node" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_node }, { "netnum" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_netnum }, - { "h245ipxport" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h245ipxport }, + { "port" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h245IpxPort }, { NULL, 0, 0, NULL } }; static int -dissect_h225_T_h245ipxAddress(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +dissect_h225_T_h245IpxAddress(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_h225_T_h245ipxAddress, T_h245ipxAddress_sequence); + ett_h225_T_h245IpxAddress, T_h245IpxAddress_sequence); return offset; } -static int dissect_h245ipxAddress(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_T_h245ipxAddress(tvb, offset, actx, tree, hf_h225_h245ipxAddress); +static int dissect_h245IpxAddress(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h225_T_h245IpxAddress(tvb, offset, actx, tree, hf_h225_h245IpxAddress); } @@ -2023,35 +2017,32 @@ dissect_h225_OCTET_STRING_SIZE_16(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_ return offset; } -static int dissect_ipV6(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_OCTET_STRING_SIZE_16(tvb, offset, actx, tree, hf_h225_ipV6); +static int dissect_h245Ip6(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h225_OCTET_STRING_SIZE_16(tvb, offset, actx, tree, hf_h225_h245Ip6); } static int dissect_netBios(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h225_OCTET_STRING_SIZE_16(tvb, offset, actx, tree, hf_h225_netBios); } -static int dissect_h245ipv6(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_OCTET_STRING_SIZE_16(tvb, offset, actx, tree, hf_h225_h245ipv6); -} -static int dissect_h245netBios(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_OCTET_STRING_SIZE_16(tvb, offset, actx, tree, hf_h225_h245netBios); +static int dissect_ipV6(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h225_OCTET_STRING_SIZE_16(tvb, offset, actx, tree, hf_h225_ipV6); } -static const per_sequence_t T_h245ip6Address_sequence[] = { - { "h245ipv6" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h245ipv6 }, - { "h245ipv6port" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h245ipv6port }, +static const per_sequence_t T_h245Ip6Address_sequence[] = { + { "ip" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h245Ip6 }, + { "port" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_port }, { NULL, 0, 0, NULL } }; static int -dissect_h225_T_h245ip6Address(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +dissect_h225_T_h245Ip6Address(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_h225_T_h245ip6Address, T_h245ip6Address_sequence); + ett_h225_T_h245Ip6Address, T_h245Ip6Address_sequence); return offset; } -static int dissect_h245ip6Address(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_T_h245ip6Address(tvb, offset, actx, tree, hf_h225_h245ip6Address); +static int dissect_h245Ip6Address(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h225_T_h245Ip6Address(tvb, offset, actx, tree, hf_h225_h245Ip6Address); } @@ -2066,20 +2057,17 @@ dissect_h225_OCTET_STRING_SIZE_1_20(tvbuff_t *tvb, int offset, asn_ctx_t *actx _ static int dissect_nsap(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h225_OCTET_STRING_SIZE_1_20(tvb, offset, actx, tree, hf_h225_nsap); } -static int dissect_h245nsap(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_OCTET_STRING_SIZE_1_20(tvb, offset, actx, tree, hf_h225_h245nsap); -} static int -dissect_h225_T_object(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +dissect_h225_T_nsiOID(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_per_object_identifier_str(tvb, offset, actx, tree, hf_index, &nsiOID); return offset; } static int dissect_nsiOID(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_T_object(tvb, offset, actx, tree, hf_h225_nsiOID); + return dissect_h225_T_nsiOID(tvb, offset, actx, tree, hf_h225_nsiOID); } @@ -2131,7 +2119,7 @@ static const per_sequence_t H221NonStandard_sequence[] = { static int dissect_h225_H221NonStandard(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 509 "h225.cnf" +#line 556 "h225.cnf" t35CountryCode = 0; t35Extension = 0; manufacturerCode = 0; @@ -2139,7 +2127,7 @@ dissect_h225_H221NonStandard(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, pro offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_H221NonStandard, H221NonStandard_sequence); -#line 513 "h225.cnf" +#line 560 "h225.cnf" h221NonStandard = ((t35CountryCode * 256) + t35Extension) * 65536 + manufacturerCode; proto_tree_add_uint(tree, hf_h221Manufacturer, tvb, (offset>>3)-4, 4, h221NonStandard); @@ -2167,7 +2155,7 @@ static const per_choice_t NonStandardIdentifier_choice[] = { static int dissect_h225_NonStandardIdentifier(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 490 "h225.cnf" +#line 537 "h225.cnf" guint32 value; nsiOID = ""; @@ -2198,8 +2186,8 @@ static int dissect_nonStandardIdentifier(tvbuff_t *tvb, int offset, asn_ctx_t *a static int -dissect_h225_T_data(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 524 "h225.cnf" +dissect_h225_T_nsp_data(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +#line 571 "h225.cnf" tvbuff_t *next_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -2213,7 +2201,7 @@ dissect_h225_T_data(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree * return offset; } static int dissect_nsp_data(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_T_data(tvb, offset, actx, tree, hf_h225_nsp_data); + return dissect_h225_T_nsp_data(tvb, offset, actx, tree, hf_h225_nsp_data); } @@ -2225,7 +2213,7 @@ static const per_sequence_t NonStandardParameter_sequence[] = { int dissect_h225_NonStandardParameter(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 522 "h225.cnf" +#line 569 "h225.cnf" nsp_handle = NULL; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -2257,30 +2245,30 @@ static int dissect_nonStandardUsageFields_item(tvbuff_t *tvb, int offset, asn_ct static const value_string h225_H245TransportAddress_vals[] = { - { 0, "h245ipAddress" }, - { 1, "h245ipSourceRoute" }, - { 2, "h245ipxAddress" }, - { 3, "h245ip6Address" }, - { 4, "h245netBios" }, - { 5, "h245nsap" }, + { 0, "ipAddress" }, + { 1, "ipSourceRoute" }, + { 2, "ipxAddress" }, + { 3, "ip6Address" }, + { 4, "netBios" }, + { 5, "nsap" }, { 6, "nonStandardAddress" }, { 0, NULL } }; static const per_choice_t H245TransportAddress_choice[] = { - { 0, "h245ipAddress" , ASN1_EXTENSION_ROOT , dissect_h245ipAddress }, - { 1, "h245ipSourceRoute" , ASN1_EXTENSION_ROOT , dissect_h245ipSourceRoute }, - { 2, "h245ipxAddress" , ASN1_EXTENSION_ROOT , dissect_h245ipxAddress }, - { 3, "h245ip6Address" , ASN1_EXTENSION_ROOT , dissect_h245ip6Address }, - { 4, "h245netBios" , ASN1_EXTENSION_ROOT , dissect_h245netBios }, - { 5, "h245nsap" , ASN1_EXTENSION_ROOT , dissect_h245nsap }, + { 0, "ipAddress" , ASN1_EXTENSION_ROOT , dissect_h245IpAddress }, + { 1, "ipSourceRoute" , ASN1_EXTENSION_ROOT , dissect_h245IpSourceRoute }, + { 2, "ipxAddress" , ASN1_EXTENSION_ROOT , dissect_h245IpxAddress }, + { 3, "ip6Address" , ASN1_EXTENSION_ROOT , dissect_h245Ip6Address }, + { 4, "netBios" , ASN1_EXTENSION_ROOT , dissect_netBios }, + { 5, "nsap" , ASN1_EXTENSION_ROOT , dissect_nsap }, { 6, "nonStandardAddress" , ASN1_EXTENSION_ROOT , dissect_nonStandardAddress }, { 0, NULL, 0, NULL } }; static int dissect_h225_H245TransportAddress(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 319 "h225.cnf" +#line 366 "h225.cnf" ipv4_address=0; ipv4_port=0; @@ -2289,7 +2277,7 @@ dissect_h225_H245TransportAddress(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_ ett_h225_H245TransportAddress, H245TransportAddress_choice, NULL); -#line 325 "h225.cnf" +#line 372 "h225.cnf" /* we need this info for TAPing */ h225_pi->is_h245 = TRUE; h225_pi->h245_address = ipv4_address; @@ -2321,7 +2309,7 @@ static int dissect_h245Address(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto static int dissect_h225_DialedDigits(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 197 "h225.cnf" +#line 244 "h225.cnf" tvbuff_t *value_tvb = NULL; guint len = 0; @@ -3919,13 +3907,13 @@ static const per_sequence_t TunnelledProtocol_sequence[] = { static int dissect_h225_TunnelledProtocol(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 467 "h225.cnf" +#line 514 "h225.cnf" tpOID = ""; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_TunnelledProtocol, TunnelledProtocol_sequence); -#line 469 "h225.cnf" +#line 516 "h225.cnf" tp_handle = dissector_get_string_handle(tp_dissector_table, tpOID); return offset; @@ -4169,7 +4157,7 @@ static int dissect_callType(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tr static int dissect_h225_T_guid(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 446 "h225.cnf" +#line 493 "h225.cnf" tvbuff_t *guid_tvb; offset = dissect_per_octet_string(tvb,offset,actx,tree,hf_index,GUID_LEN,GUID_LEN,&guid_tvb); @@ -4430,7 +4418,7 @@ static int dissect_cryptoTokens(tvbuff_t *tvb, int offset, asn_ctx_t *actx, prot static int dissect_h225_FastStart_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 164 "h225.cnf" +#line 211 "h225.cnf" tvbuff_t *value_tvb = NULL; char codec_str[50]; @@ -5105,24 +5093,24 @@ dissect_h225_OCTET_STRING_SIZE_2_4(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U return offset; } -static int dissect_cic_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_OCTET_STRING_SIZE_2_4(tvb, offset, actx, tree, hf_h225_cic_item); +static int dissect_cic_2_4_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h225_OCTET_STRING_SIZE_2_4(tvb, offset, actx, tree, hf_h225_cic_2_4_item); } -static const per_sequence_t T_cic_sequence_of[1] = { - { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_cic_item }, +static const per_sequence_t T_cic_2_4_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_cic_2_4_item }, }; static int -dissect_h225_T_cic(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +dissect_h225_T_cic_2_4(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, actx, tree, hf_index, - ett_h225_T_cic, T_cic_sequence_of); + ett_h225_T_cic_2_4, T_cic_2_4_sequence_of); return offset; } static int dissect_cic_2_4(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_T_cic(tvb, offset, actx, tree, hf_h225_cic_2_4); + return dissect_h225_T_cic_2_4(tvb, offset, actx, tree, hf_h225_cic_2_4); } @@ -5488,7 +5476,7 @@ static int dissect_supportedFeatures(tvbuff_t *tvb, int offset, asn_ctx_t *actx, static int dissect_h225_ParallelH245Control_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 226 "h225.cnf" +#line 273 "h225.cnf" tvbuff_t *h245_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -5614,13 +5602,13 @@ static const per_sequence_t Setup_UUIE_sequence[] = { static int dissect_h225_Setup_UUIE(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 273 "h225.cnf" +#line 320 "h225.cnf" contains_faststart = FALSE; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Setup_UUIE, Setup_UUIE_sequence); -#line 277 "h225.cnf" +#line 324 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_SETUP; if (contains_faststart == TRUE ) @@ -5676,7 +5664,7 @@ dissect_h225_CallProceeding_UUIE(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_CallProceeding_UUIE, CallProceeding_UUIE_sequence); -#line 286 "h225.cnf" +#line 333 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_CALL_PROCEDING; if (contains_faststart == TRUE ) @@ -5719,7 +5707,7 @@ dissect_h225_Connect_UUIE(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Connect_UUIE, Connect_UUIE_sequence); -#line 310 "h225.cnf" +#line 357 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_CONNECT; if (contains_faststart == TRUE ) @@ -5760,7 +5748,7 @@ dissect_h225_Alerting_UUIE(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Alerting_UUIE, Alerting_UUIE_sequence); -#line 295 "h225.cnf" +#line 342 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_ALERTING; if (contains_faststart == TRUE ) @@ -5791,7 +5779,7 @@ dissect_h225_Information_UUIE(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, pr offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Information_UUIE, Information_UUIE_sequence); -#line 250 "h225.cnf" +#line 297 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_INFORMATION; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); @@ -5922,7 +5910,7 @@ static const per_choice_t ReleaseCompleteReason_choice[] = { static int dissect_h225_ReleaseCompleteReason(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 439 "h225.cnf" +#line 486 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -5959,7 +5947,7 @@ dissect_h225_ReleaseComplete_UUIE(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_ReleaseComplete_UUIE, ReleaseComplete_UUIE_sequence); -#line 304 "h225.cnf" +#line 351 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_RELEASE_COMPLET; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); @@ -6003,7 +5991,7 @@ static const per_choice_t FacilityReason_choice[] = { static int dissect_h225_FacilityReason(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 363 "h225.cnf" +#line 410 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6085,7 +6073,7 @@ dissect_h225_Facility_UUIE(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Facility_UUIE, Facility_UUIE_sequence); -#line 265 "h225.cnf" +#line 312 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_FACILITY; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); @@ -6117,7 +6105,7 @@ dissect_h225_Progress_UUIE(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Progress_UUIE, Progress_UUIE_sequence); -#line 256 "h225.cnf" +#line 303 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_PROGRESS; if (contains_faststart == TRUE ) @@ -6134,16 +6122,16 @@ static int dissect_progress(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tr static int -dissect_h225_T_empty(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +dissect_h225_T_empty_flg(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_per_null(tvb, offset, actx, tree, hf_index); -#line 240 "h225.cnf" +#line 287 "h225.cnf" h225_pi->cs_type = H225_EMPTY; return offset; } static int dissect_empty_flg(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h225_T_empty(tvb, offset, actx, tree, hf_h225_empty_flg); + return dissect_h225_T_empty_flg(tvb, offset, actx, tree, hf_h225_empty_flg); } @@ -6160,7 +6148,7 @@ dissect_h225_Status_UUIE(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_t offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Status_UUIE, Status_UUIE_sequence); -#line 244 "h225.cnf" +#line 291 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_STATUS; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); @@ -6268,7 +6256,7 @@ static const per_choice_t T_h323_message_body_choice[] = { static int dissect_h225_T_h323_message_body(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 137 "h225.cnf" +#line 184 "h225.cnf" guint32 message_body_val; contains_faststart = FALSE; @@ -6308,7 +6296,7 @@ static int dissect_h323_message_body(tvbuff_t *tvb, int offset, asn_ctx_t *actx, static int dissect_h225_T_h4501SupplementaryService_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 455 "h225.cnf" +#line 502 "h225.cnf" tvbuff_t *h4501_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -6357,7 +6345,7 @@ static int dissect_h245Tunneling(tvbuff_t *tvb, int offset, asn_ctx_t *actx, pro static int dissect_h225_H245Control_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 233 "h225.cnf" +#line 280 "h225.cnf" tvbuff_t *h245_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -6432,7 +6420,7 @@ static int dissect_callLinkage(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto static int dissect_h225_T_messageContent_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 477 "h225.cnf" +#line 524 "h225.cnf" tvbuff_t *next_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -6474,7 +6462,7 @@ static const per_sequence_t T_tunnelledSignallingMessage_sequence[] = { static int dissect_h225_T_tunnelledSignallingMessage(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 475 "h225.cnf" +#line 522 "h225.cnf" tp_handle = NULL; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -7496,7 +7484,7 @@ static const per_choice_t GatekeeperRejectReason_choice[] = { static int dissect_h225_GatekeeperRejectReason(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 370 "h225.cnf" +#line 417 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -7788,7 +7776,7 @@ static const per_choice_t RegistrationRejectReason_choice[] = { static int dissect_h225_RegistrationRejectReason(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 425 "h225.cnf" +#line 472 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -7854,7 +7842,7 @@ static const per_choice_t UnregRequestReason_choice[] = { static int dissect_h225_UnregRequestReason(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 377 "h225.cnf" +#line 424 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -7946,7 +7934,7 @@ static const per_choice_t UnregRejectReason_choice[] = { static int dissect_h225_UnregRejectReason(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 384 "h225.cnf" +#line 431 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -8015,7 +8003,7 @@ static int dissect_callModel(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_t static int dissect_h225_DestinationInfo_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 192 "h225.cnf" +#line 239 "h225.cnf" h225_pi->is_destinationInfo = TRUE; @@ -8271,7 +8259,7 @@ static const per_choice_t AdmissionRejectReason_choice[] = { static int dissect_h225_AdmissionRejectReason(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 411 "h225.cnf" +#line 458 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -8415,7 +8403,7 @@ static const per_choice_t BandRejectReason_choice[] = { static int dissect_h225_BandRejectReason(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 391 "h225.cnf" +#line 438 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -8473,7 +8461,7 @@ static const per_choice_t DisengageReason_choice[] = { static int dissect_h225_DisengageReason(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 398 "h225.cnf" +#line 445 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -8568,7 +8556,7 @@ static const per_choice_t DisengageRejectReason_choice[] = { static int dissect_h225_DisengageRejectReason(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 404 "h225.cnf" +#line 451 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -8725,7 +8713,7 @@ static const per_choice_t LocationRejectReason_choice[] = { static int dissect_h225_LocationRejectReason(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 418 "h225.cnf" +#line 465 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -9152,7 +9140,7 @@ static const per_choice_t InfoRequestNakReason_choice[] = { static int dissect_h225_InfoRequestNakReason(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 432 "h225.cnf" +#line 479 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -9384,7 +9372,7 @@ static const per_choice_t RasMessage_choice[] = { int dissect_h225_RasMessage(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 180 "h225.cnf" +#line 227 "h225.cnf" guint32 rasmessage_value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -9608,6 +9596,10 @@ void proto_register_h225(void) { { "h245Tunneling", "h225.h245Tunneling", FT_BOOLEAN, 8, NULL, 0, "H323-UU-PDU/h245Tunneling", HFILL }}, + { &hf_h225_H245Control_item, + { "Item", "h225.H245Control_item", + FT_UINT32, BASE_DEC, NULL, 0, + "H245Control/_item", HFILL }}, { &hf_h225_h245Control, { "h245Control", "h225.h245Control", FT_UINT32, BASE_DEC, NULL, 0, @@ -9660,10 +9652,6 @@ void proto_register_h225(void) { { "Item", "h225.genericData_item", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }}, - { &hf_h225_H245Control_item, - { "Item", "h225.H245Control_item", - FT_UINT32, BASE_DEC, NULL, 0, - "H245Control/_item", HFILL }}, { &hf_h225_nonStandard, { "nonStandard", "h225.nonStandard", FT_NONE, BASE_NONE, NULL, 0, @@ -9988,6 +9976,10 @@ void proto_register_h225(void) { { "Item", "h225.h245SecurityCapability_item", FT_UINT32, BASE_DEC, VALS(h225_H245Security_vals), 0, "Setup-UUIE/h245SecurityCapability/_item", HFILL }}, + { &hf_h225_FastStart_item, + { "Item", "h225.FastStart_item", + FT_UINT32, BASE_DEC, NULL, 0, + "FastStart/_item", HFILL }}, { &hf_h225_mediaWaitForConnect, { "mediaWaitForConnect", "h225.mediaWaitForConnect", FT_BOOLEAN, 8, NULL, 0, @@ -10052,6 +10044,10 @@ void proto_register_h225(void) { { "Item", "h225.supportedFeatures_item", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }}, + { &hf_h225_ParallelH245Control_item, + { "Item", "h225.ParallelH245Control_item", + FT_UINT32, BASE_DEC, NULL, 0, + "ParallelH245Control/_item", HFILL }}, { &hf_h225_parallelH245Control, { "parallelH245Control", "h225.parallelH245Control", FT_UINT32, BASE_DEC, NULL, 0, @@ -10068,10 +10064,6 @@ void proto_register_h225(void) { { "hopCount", "h225.hopCount", FT_UINT32, BASE_DEC, NULL, 0, "Setup-UUIE/hopCount", HFILL }}, - { &hf_h225_ParallelH245Control_item, - { "Item", "h225.ParallelH245Control_item", - FT_UINT32, BASE_DEC, NULL, 0, - "ParallelH245Control/_item", HFILL }}, { &hf_h225_unknown, { "unknown", "h225.unknown", FT_NONE, BASE_NONE, NULL, 0, @@ -10204,46 +10196,42 @@ void proto_register_h225(void) { { "transportedInformation", "h225.transportedInformation", FT_NONE, BASE_NONE, NULL, 0, "FacilityReason/transportedInformation", HFILL }}, - { &hf_h225_FastStart_item, - { "Item", "h225.FastStart_item", - FT_UINT32, BASE_DEC, NULL, 0, - "FastStart/_item", HFILL }}, - { &hf_h225_ipAddress, + { &hf_h225_h245IpAddress, { "ipAddress", "h225.ipAddress", FT_NONE, BASE_NONE, NULL, 0, - "TransportAddress/ipAddress", HFILL }}, - { &hf_h225_ipV4, + "H245TransportAddress/ipAddress", HFILL }}, + { &hf_h225_h245Ip, { "ip", "h225.ip", FT_IPv4, BASE_NONE, NULL, 0, - "TransportAddress/ipAddress/ip", HFILL }}, - { &hf_h225_ipV4_port, + "H245TransportAddress/ipAddress/ip", HFILL }}, + { &hf_h225_h245IpPort, { "port", "h225.port", FT_UINT32, BASE_DEC, NULL, 0, - "TransportAddress/ipAddress/port", HFILL }}, - { &hf_h225_ipSourceRoute, + "H245TransportAddress/ipAddress/port", HFILL }}, + { &hf_h225_h245IpSourceRoute, { "ipSourceRoute", "h225.ipSourceRoute", FT_NONE, BASE_NONE, NULL, 0, - "TransportAddress/ipSourceRoute", HFILL }}, - { &hf_h225_src_route_ipV4, + "H245TransportAddress/ipSourceRoute", HFILL }}, + { &hf_h225_ip, { "ip", "h225.ip", FT_BYTES, BASE_HEX, NULL, 0, - "TransportAddress/ipSourceRoute/ip", HFILL }}, - { &hf_h225_ipV4_src_port, + "H245TransportAddress/ipSourceRoute/ip", HFILL }}, + { &hf_h225_port, { "port", "h225.port", FT_UINT32, BASE_DEC, NULL, 0, - "TransportAddress/ipSourceRoute/port", HFILL }}, - { &hf_h225_route, + "", HFILL }}, + { &hf_h225_h245Route, { "route", "h225.route", FT_UINT32, BASE_DEC, NULL, 0, - "TransportAddress/ipSourceRoute/route", HFILL }}, - { &hf_h225_route_item, + "H245TransportAddress/ipSourceRoute/route", HFILL }}, + { &hf_h225_h245Route_item, { "Item", "h225.route_item", FT_BYTES, BASE_HEX, NULL, 0, - "TransportAddress/ipSourceRoute/route/_item", HFILL }}, - { &hf_h225_routing, + "H245TransportAddress/ipSourceRoute/route/_item", HFILL }}, + { &hf_h225_h245Routing, { "routing", "h225.routing", - FT_UINT32, BASE_DEC, VALS(h225_T_routing_vals), 0, - "TransportAddress/ipSourceRoute/routing", HFILL }}, + FT_UINT32, BASE_DEC, VALS(h225_T_h245Routing_vals), 0, + "H245TransportAddress/ipSourceRoute/routing", HFILL }}, { &hf_h225_strict, { "strict", "h225.strict", FT_NONE, BASE_NONE, NULL, 0, @@ -10252,10 +10240,10 @@ void proto_register_h225(void) { { "loose", "h225.loose", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }}, - { &hf_h225_ipxAddress, + { &hf_h225_h245IpxAddress, { "ipxAddress", "h225.ipxAddress", FT_NONE, BASE_NONE, NULL, 0, - "TransportAddress/ipxAddress", HFILL }}, + "H245TransportAddress/ipxAddress", HFILL }}, { &hf_h225_node, { "node", "h225.node", FT_BYTES, BASE_HEX, NULL, 0, @@ -10264,98 +10252,86 @@ void proto_register_h225(void) { { "netnum", "h225.netnum", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }}, - { &hf_h225_ipx_port, + { &hf_h225_h245IpxPort, { "port", "h225.port", FT_BYTES, BASE_HEX, NULL, 0, - "TransportAddress/ipxAddress/port", HFILL }}, - { &hf_h225_ip6Address, + "H245TransportAddress/ipxAddress/port", HFILL }}, + { &hf_h225_h245Ip6Address, { "ip6Address", "h225.ip6Address", FT_NONE, BASE_NONE, NULL, 0, - "TransportAddress/ip6Address", HFILL }}, - { &hf_h225_ipV6, + "H245TransportAddress/ip6Address", HFILL }}, + { &hf_h225_h245Ip6, { "ip", "h225.ip", FT_IPv6, BASE_NONE, NULL, 0, - "TransportAddress/ip6Address/ip", HFILL }}, - { &hf_h225_ipV6_port, - { "port", "h225.port", - FT_UINT32, BASE_DEC, NULL, 0, - "TransportAddress/ip6Address/port", HFILL }}, + "H245TransportAddress/ip6Address/ip", HFILL }}, { &hf_h225_netBios, { "netBios", "h225.netBios", FT_BYTES, BASE_HEX, NULL, 0, - "TransportAddress/netBios", HFILL }}, + "", HFILL }}, { &hf_h225_nsap, { "nsap", "h225.nsap", FT_BYTES, BASE_HEX, NULL, 0, - "TransportAddress/nsap", HFILL }}, + "", HFILL }}, { &hf_h225_nonStandardAddress, { "nonStandardAddress", "h225.nonStandardAddress", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }}, - { &hf_h225_h245ipAddress, - { "h245ipAddress", "h225.h245ipAddress", + { &hf_h225_ipAddress, + { "ipAddress", "h225.ipAddress", FT_NONE, BASE_NONE, NULL, 0, - "H245TransportAddress/h245ipAddress", HFILL }}, - { &hf_h225_h245ipv4, - { "h245ipv4", "h225.h245ipv4", + "TransportAddress/ipAddress", HFILL }}, + { &hf_h225_ipV4, + { "ip", "h225.ip", FT_IPv4, BASE_NONE, NULL, 0, - "H245TransportAddress/h245ipAddress/h245ipv4", HFILL }}, - { &hf_h225_h245ipv4port, - { "h245ipv4port", "h225.h245ipv4port", + "TransportAddress/ipAddress/ip", HFILL }}, + { &hf_h225_ipV4_port, + { "port", "h225.port", FT_UINT32, BASE_DEC, NULL, 0, - "H245TransportAddress/h245ipAddress/h245ipv4port", HFILL }}, - { &hf_h225_h245ipSourceRoute, - { "h245ipSourceRoute", "h225.h245ipSourceRoute", + "TransportAddress/ipAddress/port", HFILL }}, + { &hf_h225_ipSourceRoute, + { "ipSourceRoute", "h225.ipSourceRoute", FT_NONE, BASE_NONE, NULL, 0, - "H245TransportAddress/h245ipSourceRoute", HFILL }}, - { &hf_h225_h245routeip, - { "h245routeip", "h225.h245routeip", + "TransportAddress/ipSourceRoute", HFILL }}, + { &hf_h225_src_route_ipV4, + { "ip", "h225.ip", FT_BYTES, BASE_HEX, NULL, 0, - "H245TransportAddress/h245ipSourceRoute/h245routeip", HFILL }}, - { &hf_h225_h245routeport, - { "h245routeport", "h225.h245routeport", + "TransportAddress/ipSourceRoute/ip", HFILL }}, + { &hf_h225_ipV4_src_port, + { "port", "h225.port", FT_UINT32, BASE_DEC, NULL, 0, - "H245TransportAddress/h245ipSourceRoute/h245routeport", HFILL }}, - { &hf_h225_h245route, - { "h245route", "h225.h245route", + "TransportAddress/ipSourceRoute/port", HFILL }}, + { &hf_h225_route, + { "route", "h225.route", FT_UINT32, BASE_DEC, NULL, 0, - "H245TransportAddress/h245ipSourceRoute/h245route", HFILL }}, - { &hf_h225_h245route_item, - { "Item", "h225.h245route_item", + "TransportAddress/ipSourceRoute/route", HFILL }}, + { &hf_h225_route_item, + { "Item", "h225.route_item", FT_BYTES, BASE_HEX, NULL, 0, - "H245TransportAddress/h245ipSourceRoute/h245route/_item", HFILL }}, - { &hf_h225_h245routing, - { "h245routing", "h225.h245routing", - FT_UINT32, BASE_DEC, VALS(h225_T_h245routing_vals), 0, - "H245TransportAddress/h245ipSourceRoute/h245routing", HFILL }}, - { &hf_h225_h245ipxAddress, - { "h245ipxAddress", "h225.h245ipxAddress", - FT_NONE, BASE_NONE, NULL, 0, - "H245TransportAddress/h245ipxAddress", HFILL }}, - { &hf_h225_h245ipxport, - { "h245ipxport", "h225.h245ipxport", + "TransportAddress/ipSourceRoute/route/_item", HFILL }}, + { &hf_h225_routing, + { "routing", "h225.routing", + FT_UINT32, BASE_DEC, VALS(h225_T_routing_vals), 0, + "TransportAddress/ipSourceRoute/routing", HFILL }}, + { &hf_h225_ipxAddress, + { "ipxAddress", "h225.ipxAddress", + FT_NONE, BASE_NONE, NULL, 0, + "TransportAddress/ipxAddress", HFILL }}, + { &hf_h225_ipx_port, + { "port", "h225.port", FT_BYTES, BASE_HEX, NULL, 0, - "H245TransportAddress/h245ipxAddress/h245ipxport", HFILL }}, - { &hf_h225_h245ip6Address, - { "h245ip6Address", "h225.h245ip6Address", + "TransportAddress/ipxAddress/port", HFILL }}, + { &hf_h225_ip6Address, + { "ip6Address", "h225.ip6Address", FT_NONE, BASE_NONE, NULL, 0, - "H245TransportAddress/h245ip6Address", HFILL }}, - { &hf_h225_h245ipv6, - { "h245ipv6", "h225.h245ipv6", + "TransportAddress/ip6Address", HFILL }}, + { &hf_h225_ipV6, + { "ip", "h225.ip", FT_IPv6, BASE_NONE, NULL, 0, - "H245TransportAddress/h245ip6Address/h245ipv6", HFILL }}, - { &hf_h225_h245ipv6port, - { "h245ipv6port", "h225.h245ipv6port", + "TransportAddress/ip6Address/ip", HFILL }}, + { &hf_h225_ipV6_port, + { "port", "h225.port", FT_UINT32, BASE_DEC, NULL, 0, - "H245TransportAddress/h245ip6Address/h245ipv6port", HFILL }}, - { &hf_h225_h245netBios, - { "h245netBios", "h225.h245netBios", - FT_BYTES, BASE_HEX, NULL, 0, - "H245TransportAddress/h245netBios", HFILL }}, - { &hf_h225_h245nsap, - { "h245nsap", "h225.h245nsap", - FT_BYTES, BASE_HEX, NULL, 0, - "H245TransportAddress/h245nsap", HFILL }}, + "TransportAddress/ip6Address/port", HFILL }}, { &hf_h225_vendor, { "vendor", "h225.vendor", FT_NONE, BASE_NONE, NULL, 0, @@ -11232,7 +11208,7 @@ void proto_register_h225(void) { { "cic", "h225.cic", FT_UINT32, BASE_DEC, NULL, 0, "CicInfo/cic", HFILL }}, - { &hf_h225_cic_item, + { &hf_h225_cic_2_4_item, { "Item", "h225.cic_item", FT_BYTES, BASE_HEX, NULL, 0, "CicInfo/cic/_item", HFILL }}, @@ -11996,6 +11972,10 @@ void proto_register_h225(void) { { "callModel", "h225.callModel", FT_UINT32, BASE_DEC, VALS(h225_CallModel_vals), 0, "", HFILL }}, + { &hf_h225_DestinationInfo_item, + { "Item", "h225.DestinationInfo_item", + FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0, + "DestinationInfo/_item", HFILL }}, { &hf_h225_destinationInfo, { "destinationInfo", "h225.destinationInfo", FT_UINT32, BASE_DEC, NULL, 0, @@ -12056,10 +12036,6 @@ void proto_register_h225(void) { { "canMapSrcAlias", "h225.canMapSrcAlias", FT_BOOLEAN, 8, NULL, 0, "", HFILL }}, - { &hf_h225_DestinationInfo_item, - { "Item", "h225.DestinationInfo_item", - FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0, - "DestinationInfo/_item", HFILL }}, { &hf_h225_pointToPoint, { "pointToPoint", "h225.pointToPoint", FT_NONE, BASE_NONE, NULL, 0, @@ -12520,11 +12496,11 @@ void proto_register_h225(void) { &ett_h225_H323_UU_PDU, &ett_h225_T_h323_message_body, &ett_h225_T_h4501SupplementaryService, + &ett_h225_H245Control, &ett_h225_SEQUENCE_OF_NonStandardParameter, &ett_h225_T_tunnelledSignallingMessage, &ett_h225_T_messageContent, &ett_h225_SEQUENCE_OF_GenericData, - &ett_h225_H245Control, &ett_h225_StimulusControl, &ett_h225_Alerting_UUIE, &ett_h225_SEQUENCE_OF_ClearToken, @@ -12541,11 +12517,12 @@ void proto_register_h225(void) { &ett_h225_SEQUENCE_OF_CallReferenceValue, &ett_h225_T_conferenceGoal, &ett_h225_SEQUENCE_OF_H245Security, + &ett_h225_FastStart, &ett_h225_T_connectionParameters, &ett_h225_SEQUENCE_OF_SupportedProtocols, &ett_h225_SEQUENCE_OF_FeatureDescriptor, - &ett_h225_SEQUENCE_OF_ExtendedAliasAddress, &ett_h225_ParallelH245Control, + &ett_h225_SEQUENCE_OF_ExtendedAliasAddress, &ett_h225_ScnConnectionType, &ett_h225_ScnConnectionAggregation, &ett_h225_PresentationIndicator, @@ -12554,21 +12531,20 @@ void proto_register_h225(void) { &ett_h225_ConferenceList, &ett_h225_FacilityReason, &ett_h225_Progress_UUIE, - &ett_h225_FastStart, &ett_h225_TransportAddress, + &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, &ett_h225_T_ipAddress, &ett_h225_T_ipSourceRoute, &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, &ett_h225_Status_UUIE, &ett_h225_StatusInquiry_UUIE, &ett_h225_SetupAcknowledge_UUIE, @@ -12648,7 +12624,7 @@ void proto_register_h225(void) { &ett_h225_CircuitInfo, &ett_h225_CircuitIdentifier, &ett_h225_CicInfo, - &ett_h225_T_cic, + &ett_h225_T_cic_2_4, &ett_h225_GroupID, &ett_h225_T_member, &ett_h225_CarrierInfo, diff --git a/epan/dissectors/packet-h225.h b/epan/dissectors/packet-h225.h index d0237ea7d2..579f673b1f 100644 --- a/epan/dissectors/packet-h225.h +++ b/epan/dissectors/packet-h225.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-h225.h */ -/* ../../tools/asn2wrs.py -e -p h225 -c h225.cnf -s packet-h225-template h225.asn */ +/* ../../tools/asn2wrs.py -e -p h225 -c h225.cnf -s packet-h225-template H323-MESSAGES.asn */ /* Input file: packet-h225-template.h */ @@ -81,7 +81,7 @@ typedef struct _h225_packet_info { /* * the following allows TAP code access to the messages * without having to duplicate it. With MSVC and a - * libethereal.dll, we need a special declaration. + * libwireshark.dll, we need a special declaration. */ #include "packet-per.h" diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index 07f01ca52b..0bbb45a33c 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-h245.c */ -/* ../../tools/asn2wrs.py -e -p h245 -c h245.cnf -s packet-h245-template h245.asn */ +/* ../../tools/asn2wrs.py -e -p h245 -c h245.cnf -s packet-h245-template MULTIMEDIA-SYSTEM-CONTROL.asn */ /* Input file: packet-h245-template.c */ @@ -36,7 +36,7 @@ * to hack it by hand, but it is incomplete and buggy and it is good when * it will go away." * Ronnie did a great job and all the VoIP users had made good use of it! - * Credit to Tomas Kukosa for developing the Asn2eth compiler. + * Credit to Tomas Kukosa for developing the asn2wrs compiler. * */ @@ -372,7 +372,7 @@ static int hf_h245_messageContent = -1; /* SEQUENCE_OF_GenericParamete static int hf_h245_messageContent_item = -1; /* GenericParameter */ static int hf_h245_nonStandardData = -1; /* NonStandardParameter */ static int hf_h245_nonStandardIdentifier = -1; /* NonStandardIdentifier */ -static int hf_h245_nsd_data = -1; /* T_data */ +static int hf_h245_nsd_data = -1; /* T_nsd_data */ static int hf_h245_object = -1; /* T_object */ static int hf_h245_h221NonStandardID = -1; /* H221NonStandardID */ static int hf_h245_t35CountryCode = -1; /* T_t35CountryCode */ @@ -544,8 +544,8 @@ static int hf_h245_redundancyEncodingCapability_item = -1; /* RedundancyEncodin static int hf_h245_logicalChannelSwitchingCapability = -1; /* BOOLEAN */ static int hf_h245_t120DynamicPortCapability = -1; /* BOOLEAN */ static int hf_h245_h261aVideoPacketization = -1; /* BOOLEAN */ -static int hf_h245_rtpPayloadType2 = -1; /* SEQUENCE_SIZE_1_256_OF_RTPPayloadType */ -static int hf_h245_rtpPayloadType2_item = -1; /* RTPPayloadType */ +static int hf_h245_rtpPayloadTypes = -1; /* SEQUENCE_SIZE_1_256_OF_RTPPayloadType */ +static int hf_h245_rtpPayloadTypes_item = -1; /* RTPPayloadType */ static int hf_h245_qosMode = -1; /* QOSMode */ static int hf_h245_tokenRate = -1; /* INTEGER_1_4294967295 */ static int hf_h245_bucketSize = -1; /* INTEGER_1_4294967295 */ @@ -575,8 +575,8 @@ static int hf_h245_mediaChannelCapabilities = -1; /* SEQUENCE_SIZE_1_256_OF_Med static int hf_h245_mediaChannelCapabilities_item = -1; /* MediaChannelCapability */ static int hf_h245_redundancyEncodingMethod = -1; /* RedundancyEncodingMethod */ static int hf_h245_primaryEncoding = -1; /* CapabilityTableEntryNumber */ -static int hf_h245_secondaryEncoding2 = -1; /* SEQUENCE_SIZE_1_256_OF_CapabilityTableEntryNumber */ -static int hf_h245_secondaryEncoding2_item = -1; /* CapabilityTableEntryNumber */ +static int hf_h245_secondaryEncodingCapability = -1; /* SEQUENCE_SIZE_1_256_OF_CapabilityTableEntryNumber */ +static int hf_h245_secondaryEncodingCapability_item = -1; /* CapabilityTableEntryNumber */ static int hf_h245_rtpAudioRedundancyEncoding = -1; /* NULL */ static int hf_h245_rtpH263VideoRedundancyEncoding = -1; /* RTPH263VideoRedundancyEncoding */ static int hf_h245_numberOfThreads = -1; /* INTEGER_1_16 */ @@ -796,13 +796,13 @@ static int hf_h245_annexE = -1; /* BOOLEAN */ static int hf_h245_annexF = -1; /* BOOLEAN */ static int hf_h245_annexG = -1; /* BOOLEAN */ static int hf_h245_annexH = -1; /* BOOLEAN */ -static int hf_h245_g723AnnexCAudioMode = -1; /* G723AnnexCAudioMode */ static int hf_h245_highRateMode0 = -1; /* INTEGER_27_78 */ static int hf_h245_highRateMode1 = -1; /* INTEGER_27_78 */ static int hf_h245_lowRateMode0 = -1; /* INTEGER_23_66 */ static int hf_h245_lowRateMode1 = -1; /* INTEGER_23_66 */ static int hf_h245_sidMode0 = -1; /* INTEGER_6_17 */ static int hf_h245_sidMode1 = -1; /* INTEGER_6_17 */ +static int hf_h245_g723AnnexCAudioMode = -1; /* G723AnnexCAudioMode */ static int hf_h245_audioLayer1 = -1; /* BOOLEAN */ static int hf_h245_audioLayer2 = -1; /* BOOLEAN */ static int hf_h245_audioLayer3 = -1; /* BOOLEAN */ @@ -829,8 +829,6 @@ static int hf_h245_audioUnitSize = -1; /* INTEGER_1_256 */ static int hf_h245_comfortNoise = -1; /* BOOLEAN */ static int hf_h245_scrambled = -1; /* BOOLEAN */ static int hf_h245_vbd_cap_type = -1; /* AudioCapability */ -static int hf_h245_application = -1; /* Application */ -static int hf_h245_maxBitRate2_0_4294967295 = -1; /* INTEGER_0_4294967295 */ static int hf_h245_t120 = -1; /* DataProtocolCapability */ static int hf_h245_dsm_cc = -1; /* DataProtocolCapability */ static int hf_h245_userData = -1; /* DataProtocolCapability */ @@ -839,6 +837,8 @@ static int hf_h245_t84Protocol = -1; /* DataProtocolCapability */ static int hf_h245_t84Profile = -1; /* T84Profile */ static int hf_h245_t434 = -1; /* DataProtocolCapability */ static int hf_h245_h224 = -1; /* DataProtocolCapability */ +static int hf_h245_nlpidProtocol = -1; /* DataProtocolCapability */ +static int hf_h245_nlpidData = -1; /* OCTET_STRING */ static int hf_h245_nlpid = -1; /* Nlpid */ static int hf_h245_dsvdControl = -1; /* NULL */ static int hf_h245_h222DataPartitioning = -1; /* DataProtocolCapability */ @@ -848,6 +848,8 @@ static int hf_h245_t38fax = -1; /* T_t38fax */ static int hf_h245_t38FaxProtocol = -1; /* DataProtocolCapability */ static int hf_h245_t38FaxProfile = -1; /* T38FaxProfile */ static int hf_h245_genericDataCapability = -1; /* GenericCapability */ +static int hf_h245_application = -1; /* Application */ +static int hf_h245_maxBitRate2_0_4294967295 = -1; /* INTEGER_0_4294967295 */ static int hf_h245_v14buffered = -1; /* NULL */ static int hf_h245_v42lapm = -1; /* NULL */ static int hf_h245_hdlcFrameTunnelling = -1; /* NULL */ @@ -903,8 +905,6 @@ static int hf_h245_t38FaxUdpEC = -1; /* T_t38FaxUdpEC */ static int hf_h245_t38UDPFEC = -1; /* NULL */ static int hf_h245_t38UDPRedundancy = -1; /* NULL */ static int hf_h245_t38TCPBidirectionalMode = -1; /* BOOLEAN */ -static int hf_h245_nlpidProtocol = -1; /* DataProtocolCapability */ -static int hf_h245_nlpidData = -1; /* OCTET_STRING */ static int hf_h245_encryptionCapability = -1; /* EncryptionCapability */ static int hf_h245_authenticationCapability = -1; /* AuthenticationCapability */ static int hf_h245_integrityCapability = -1; /* IntegrityCapability */ @@ -912,7 +912,7 @@ static int hf_h245_EncryptionCapability_item = -1; /* MediaEncryptionAlgorithm static int hf_h245_algorithm = -1; /* OBJECT_IDENTIFIER */ static int hf_h245_antiSpamAlgorithm = -1; /* OBJECT_IDENTIFIER */ static int hf_h245_ui_nonStandard = -1; /* SEQUENCE_SIZE_1_16_OF_NonStandardParameter */ -static int hf_h245_nonStandard_item = -1; /* NonStandardParameter */ +static int hf_h245_ui_nonStandard_item = -1; /* NonStandardParameter */ static int hf_h245_basicString = -1; /* NULL */ static int hf_h245_iA5String = -1; /* NULL */ static int hf_h245_generalString = -1; /* NULL */ @@ -924,7 +924,7 @@ static int hf_h245_encryptedIA5String = -1; /* NULL */ static int hf_h245_encryptedGeneralString = -1; /* NULL */ static int hf_h245_secureDTMF = -1; /* NULL */ static int hf_h245_nonStandardParams = -1; /* SEQUENCE_OF_NonStandardParameter */ -static int hf_h245_nonStandardData_item = -1; /* NonStandardParameter */ +static int hf_h245_nonStandardParams_item = -1; /* NonStandardParameter */ static int hf_h245_chairControlCapability = -1; /* BOOLEAN */ static int hf_h245_videoIndicateMixingCapability = -1; /* BOOLEAN */ static int hf_h245_multipointVisualizationCapability = -1; /* BOOLEAN */ @@ -935,7 +935,7 @@ static int hf_h245_nonCollapsing = -1; /* SEQUENCE_OF_GenericParamete static int hf_h245_nonCollapsing_item = -1; /* GenericParameter */ static int hf_h245_nonCollapsingRaw = -1; /* OCTET_STRING */ static int hf_h245_transport = -1; /* DataProtocolCapability */ -static int hf_h245_standardOid = -1; /* T_standard */ +static int hf_h245_standardOid = -1; /* T_standardOid */ static int hf_h245_h221NonStandard = -1; /* NonStandardParameter */ static int hf_h245_uuid = -1; /* OCTET_STRING_SIZE_16 */ static int hf_h245_domainBased = -1; /* IA5String_SIZE_1_64 */ @@ -963,7 +963,7 @@ static int hf_h245_capabilities = -1; /* SET_SIZE_1_256_OF_Alternati static int hf_h245_capabilities_item = -1; /* AlternativeCapabilitySet */ static int hf_h245_fecc_rfc2733 = -1; /* FECC_rfc2733 */ static int hf_h245_redundancyEncodingBool = -1; /* BOOLEAN */ -static int hf_h245_separateStreamBool = -1; /* T_separateStream */ +static int hf_h245_separateStreamBool = -1; /* T_separateStreamBool */ static int hf_h245_separatePort = -1; /* BOOLEAN */ static int hf_h245_samePortBool = -1; /* BOOLEAN */ static int hf_h245_olc_fw_lcn = -1; /* OLC_fw_lcn */ @@ -1019,17 +1019,17 @@ static int hf_h245_pcr_pid = -1; /* INTEGER_0_8191 */ static int hf_h245_programDescriptors = -1; /* OCTET_STRING */ static int hf_h245_streamDescriptors = -1; /* OCTET_STRING */ static int hf_h245_adaptationLayerType = -1; /* T_adaptationLayerType */ -static int hf_h245_h223_al_type_al1Framed = -1; /* T_al1Framed */ -static int hf_h245_h223_al_type_al1NotFramed = -1; /* T_al1NotFramed */ -static int hf_h245_h223_al_type_al2WithoutSequenceNumbers = -1; /* T_al2WithoutSequenceNumbers */ -static int hf_h245_h223_al_type_al2WithSequenceNumbers = -1; /* T_al2WithSequenceNumbers */ -static int hf_h245_h223_al_type_al3 = -1; /* T_al3 */ -static int hf_h245_h223_al_type_al1M = -1; /* T_al1M */ -static int hf_h245_h223_al_type_al2M = -1; /* T_al2M */ -static int hf_h245_h223_al_type_al3M = -1; /* T_al3M */ -static int hf_h245_h223_lc_segmentableFlag = -1; /* T_segmentableFlag */ +static int hf_h245_h223_al_type_al1Framed = -1; /* T_h223_al_type_al1Framed */ +static int hf_h245_h223_al_type_al1NotFramed = -1; /* T_h223_al_type_al1NotFramed */ +static int hf_h245_h223_al_type_al2WithoutSequenceNumbers = -1; /* T_h223_al_type_al2WithoutSequenceNumbers */ +static int hf_h245_h223_al_type_al2WithSequenceNumbers = -1; /* T_h223_al_type_al2WithSequenceNumbers */ static int hf_h245_controlFieldOctets = -1; /* T_controlFieldOctets */ -static int hf_h245_al3_sendBufferSize = -1; /* T_sendBufferSize */ +static int hf_h245_al3_sendBufferSize = -1; /* T_al3_sendBufferSize */ +static int hf_h245_h223_al_type_al3 = -1; /* T_h223_al_type_al3 */ +static int hf_h245_h223_al_type_al1M = -1; /* T_h223_al_type_al1M */ +static int hf_h245_h223_al_type_al2M = -1; /* T_h223_al_type_al2M */ +static int hf_h245_h223_al_type_al3M = -1; /* T_h223_al_type_al3M */ +static int hf_h245_h223_lc_segmentableFlag = -1; /* T_h223_lc_segmentableFlag */ static int hf_h245_transferMode = -1; /* T_transferMode */ static int hf_h245_framed = -1; /* NULL */ static int hf_h245_unframed = -1; /* NULL */ @@ -1046,12 +1046,12 @@ static int hf_h245_crc16bit = -1; /* NULL */ static int hf_h245_crc32bit = -1; /* NULL */ static int hf_h245_crcNotUsed = -1; /* NULL */ static int hf_h245_rcpcCodeRate = -1; /* INTEGER_8_32 */ -static int hf_h245_arqType = -1; /* ArqType */ -static int hf_h245_alsduSplitting = -1; /* BOOLEAN */ -static int hf_h245_rsCodeCorrection = -1; /* INTEGER_0_127 */ static int hf_h245_noArq = -1; /* NULL */ static int hf_h245_typeIArq = -1; /* H223AnnexCArqParameters */ static int hf_h245_typeIIArq = -1; /* H223AnnexCArqParameters */ +static int hf_h245_arqType = -1; /* ArqType */ +static int hf_h245_alsduSplitting = -1; /* BOOLEAN */ +static int hf_h245_rsCodeCorrection = -1; /* INTEGER_0_127 */ static int hf_h245_aL2HeaderFEC = -1; /* AL2HeaderFEC */ static int hf_h245_sebch16_5 = -1; /* NULL */ static int hf_h245_headerFormat = -1; /* T_headerFormat */ @@ -1093,7 +1093,7 @@ static int hf_h245_payloadDescriptor = -1; /* T_payloadDescriptor */ static int hf_h245_rfc_number = -1; /* INTEGER_1_32768_ */ static int hf_h245_oid = -1; /* OBJECT_IDENTIFIER */ static int hf_h245_payloadType = -1; /* INTEGER_0_127 */ -static int hf_h245_secondaryEncoding3 = -1; /* DataType */ +static int hf_h245_secondaryEncoding = -1; /* DataType */ static int hf_h245_rtpRedundancyEncoding = -1; /* T_rtpRedundancyEncoding */ static int hf_h245_primary = -1; /* RedundancyEncodingElement */ static int hf_h245_secondary = -1; /* SEQUENCE_OF_RedundancyEncodingElement */ @@ -1103,11 +1103,11 @@ static int hf_h245_elements_item = -1; /* MultiplePayloadStreamElemen static int hf_h245_rfc2733 = -1; /* RFC2733Data */ static int hf_h245_fec_data_mode = -1; /* FECdata_mode */ static int hf_h245_redundancyEncodingFlag = -1; /* NULL */ -static int hf_h245_separateStream = -1; /* SeparateStream */ static int hf_h245_differentPort = -1; /* T_differentPort */ static int hf_h245_protectedSessionID = -1; /* INTEGER_1_255 */ static int hf_h245_protectedPayloadType = -1; /* INTEGER_0_127 */ static int hf_h245_samePort = -1; /* T_samePort */ +static int hf_h245_separateStream = -1; /* SeparateStream */ static int hf_h245_unicastAddress = -1; /* UnicastAddress */ static int hf_h245_multicastAddress = -1; /* MulticastAddress */ static int hf_h245_iPAddress = -1; /* T_iPAddress */ @@ -1145,8 +1145,8 @@ static int hf_h245_escrowID = -1; /* OBJECT_IDENTIFIER */ static int hf_h245_escrowValue = -1; /* BIT_STRING_SIZE_1_65535 */ static int hf_h245_olc_ack_fw_lcn = -1; /* OLC_ack_fw_lcn */ static int hf_h245_olc_ack_reverseLogicalChannelParameters = -1; /* OLC_ack_reverseLogicalChannelParameters */ -static int hf_h245_reverseLogicalChannelNumber = -1; /* LogicalChannelNumber */ -static int hf_h245_olc_ack_multiplexParameters = -1; /* T_multiplexParameters */ +static int hf_h245_reverseLogicalChannelNumber = -1; /* T_reverseLogicalChannelNumber */ +static int hf_h245_olc_ack_multiplexParameters = -1; /* T_olc_ack_multiplexParameters */ static int hf_h245_forwardMultiplexAckParameters = -1; /* T_forwardMultiplexAckParameters */ static int hf_h245_h2250LogicalChannelAckParameters = -1; /* H2250LogicalChannelAckParameters */ static int hf_h245_forwardLogicalChannelNumber = -1; /* LogicalChannelNumber */ @@ -1168,7 +1168,7 @@ static int hf_h245_sessionID = -1; /* INTEGER_1_255 */ static int hf_h245_ack_mediaChannel = -1; /* Ack_mediaChannel */ static int hf_h245_ack_mediaControlChannel = -1; /* Ack_mediaControlChannel */ static int hf_h245_flowControlToZero = -1; /* BOOLEAN */ -static int hf_h245_cLC_source = -1; /* T_source */ +static int hf_h245_cLC_source = -1; /* T_cLC_source */ static int hf_h245_user = -1; /* NULL */ static int hf_h245_lcse = -1; /* NULL */ static int hf_h245_clc_reason = -1; /* Clc_reason */ @@ -1185,23 +1185,23 @@ static int hf_h245_multiplexTableEntryNumber = -1; /* MultiplexTableEntryNumber static int hf_h245_elementList = -1; /* T_elementList */ static int hf_h245_elementList_item = -1; /* MultiplexElement */ static int hf_h245_me_type = -1; /* Me_type */ -static int hf_h245_logicalChannelNum = -1; /* T_logicalChannelNumber */ +static int hf_h245_logicalChannelNum = -1; /* T_logicalChannelNum */ static int hf_h245_subElementList = -1; /* T_subElementList */ static int hf_h245_subElementList_item = -1; /* MultiplexElement */ static int hf_h245_me_repeatCount = -1; /* ME_repeatCount */ static int hf_h245_me_repeatCount_finite = -1; /* ME_finiteRepeatCount */ static int hf_h245_untilClosingFlag = -1; /* T_untilClosingFlag */ static int hf_h245_multiplexTableEntryNumbers = -1; /* SET_SIZE_1_15_OF_MultiplexTableEntryNumber */ -static int hf_h245_multiplexTableEntryNumber_item = -1; /* MultiplexTableEntryNumber */ -static int hf_h245_rejectionDescriptions1 = -1; /* SET_SIZE_1_15_OF_MultiplexEntryRejectionDescriptions */ -static int hf_h245_rejectionDescriptions1_item = -1; /* MultiplexEntryRejectionDescriptions */ +static int hf_h245_multiplexTableEntryNumbers_item = -1; /* MultiplexTableEntryNumber */ +static int hf_h245_sendRejectionDescriptions = -1; /* SET_SIZE_1_15_OF_MultiplexEntryRejectionDescriptions */ +static int hf_h245_sendRejectionDescriptions_item = -1; /* MultiplexEntryRejectionDescriptions */ static int hf_h245_mux_rej_cause = -1; /* MultiplexEntryRejectionDescriptionsCause */ static int hf_h245_unspecifiedCause = -1; /* NULL */ static int hf_h245_descriptorTooComplex = -1; /* NULL */ static int hf_h245_entryNumbers = -1; /* SET_SIZE_1_15_OF_MultiplexTableEntryNumber */ static int hf_h245_entryNumbers_item = -1; /* MultiplexTableEntryNumber */ -static int hf_h245_rejectionDescriptions2 = -1; /* SET_SIZE_1_15_OF_RequestMultiplexEntryRejectionDescriptions */ -static int hf_h245_rejectionDescriptions2_item = -1; /* RequestMultiplexEntryRejectionDescriptions */ +static int hf_h245_rejectionDescriptions = -1; /* SET_SIZE_1_15_OF_RequestMultiplexEntryRejectionDescriptions */ +static int hf_h245_rejectionDescriptions_item = -1; /* RequestMultiplexEntryRejectionDescriptions */ static int hf_h245_req_mux_rej_cause = -1; /* RequestMultiplexEntryRejectionDescriptionsCause */ static int hf_h245_requestedModes = -1; /* SEQUENCE_SIZE_1_256_OF_ModeDescription */ static int hf_h245_requestedModes_item = -1; /* ModeDescription */ @@ -1231,8 +1231,8 @@ static int hf_h245_multiplexedStreamModeParameters = -1; /* MultiplexedStreamMo static int hf_h245_logicalChannelNumber = -1; /* LogicalChannelNumber */ static int hf_h245_mediaMode = -1; /* T_mediaMode */ static int hf_h245_prmary_dtmode = -1; /* RedundancyEncodingDTModeElement */ -static int hf_h245_secondary2 = -1; /* SEQUENCE_OF_RedundancyEncodingDTModeElement */ -static int hf_h245_secondary2_item = -1; /* RedundancyEncodingDTModeElement */ +static int hf_h245_secondaryDTM = -1; /* SEQUENCE_OF_RedundancyEncodingDTModeElement */ +static int hf_h245_secondaryDTM_item = -1; /* RedundancyEncodingDTModeElement */ static int hf_h245_re_type = -1; /* Re_type */ static int hf_h245_mpsmElements = -1; /* SEQUENCE_OF_MultiplePayloadStreamElementMode */ static int hf_h245_mpsmElements_item = -1; /* MultiplePayloadStreamElementMode */ @@ -1249,7 +1249,7 @@ static int hf_h245_al2M = -1; /* H223AL2MParameters */ static int hf_h245_al3M = -1; /* H223AL3MParameters */ static int hf_h245_segmentableFlag = -1; /* BOOLEAN */ static int hf_h245_redundancyEncodingMode = -1; /* RedundancyEncodingMode */ -static int hf_h245_secondaryEncoding = -1; /* T_secondaryEncoding */ +static int hf_h245_secondaryEncodingMode = -1; /* T_secondaryEncodingMode */ static int hf_h245_h261VideoMode = -1; /* H261VideoMode */ static int hf_h245_h262VideoMode = -1; /* H262VideoMode */ static int hf_h245_h263VideoMode = -1; /* H263VideoMode */ @@ -1339,7 +1339,7 @@ static int hf_h245_communicationModeTable = -1; /* SET_SIZE_1_256_OF_Communica static int hf_h245_communicationModeTable_item = -1; /* CommunicationModeTableEntry */ static int hf_h245_terminalLabel = -1; /* TerminalLabel */ static int hf_h245_sessionDescription = -1; /* BMPString_SIZE_1_128 */ -static int hf_h245_entryDataType = -1; /* T_dataType */ +static int hf_h245_entryDataType = -1; /* T_entryDataType */ static int hf_h245_cm_mediaChannel = -1; /* Cm_mediaChannel */ static int hf_h245_cm_mediaControlChannel = -1; /* TransportAddress */ static int hf_h245_sessionDependency = -1; /* INTEGER_1_255 */ @@ -1409,6 +1409,7 @@ static int hf_h245_maxNumberOfAdditionalConnections = -1; /* INTEGER_1_65535 */ static int hf_h245_addConnectionReq = -1; /* AddConnectionReq */ static int hf_h245_dialingInformation = -1; /* DialingInformation */ static int hf_h245_removeConnectionReq = -1; /* RemoveConnectionReq */ +static int hf_h245_connectionIdentifier = -1; /* ConnectionIdentifier */ static int hf_h245_maximumHeaderIntervalReq = -1; /* MaximumHeaderIntervalReq */ static int hf_h245_requestType = -1; /* T_requestType */ static int hf_h245_currentIntervalInformation = -1; /* NULL */ @@ -1424,7 +1425,6 @@ static int hf_h245_userRejected = -1; /* NULL */ static int hf_h245_removeConnectionResp = -1; /* RemoveConnectionResp */ static int hf_h245_maximumHeaderIntervalResp = -1; /* MaximumHeaderIntervalResp */ static int hf_h245_currentInterval = -1; /* INTEGER_0_65535 */ -static int hf_h245_connectionIdentifier = -1; /* ConnectionIdentifier */ static int hf_h245_crcDesired = -1; /* T_crcDesired */ static int hf_h245_excessiveError = -1; /* T_excessiveError */ static int hf_h245_differential = -1; /* SET_SIZE_1_65535_OF_DialingInformationNumber */ @@ -1456,11 +1456,11 @@ static int hf_h245_encryptionIVRequest = -1; /* NULL */ static int hf_h245_encryptionAlgorithmID = -1; /* T_encryptionAlgorithmID */ static int hf_h245_h233AlgorithmIdentifier = -1; /* SequenceNumber */ static int hf_h245_associatedAlgorithm = -1; /* NonStandardParameter */ -static int hf_h245_scope = -1; /* Scope */ -static int hf_h245_restriction = -1; /* Restriction */ static int hf_h245_wholeMultiplex = -1; /* NULL */ +static int hf_h245_scope = -1; /* Scope */ static int hf_h245_res_maximumBitRate = -1; /* INTEGER_0_16777215 */ static int hf_h245_noRestriction = -1; /* NULL */ +static int hf_h245_restriction = -1; /* Restriction */ static int hf_h245_disconnect = -1; /* NULL */ static int hf_h245_gstnOptions = -1; /* T_gstnOptions */ static int hf_h245_telephonyMode = -1; /* NULL */ @@ -1502,7 +1502,11 @@ static int hf_h245_encryptionUpdateRequest = -1; /* EncryptionUpdateRequest */ static int hf_h245_switchReceiveMediaOff = -1; /* NULL */ static int hf_h245_switchReceiveMediaOn = -1; /* NULL */ static int hf_h245_progressiveRefinementStart = -1; /* T_progressiveRefinementStart */ -static int hf_h245_repeatCount = -1; /* RepeatCount */ +static int hf_h245_repeatCount = -1; /* T_repeatCount */ +static int hf_h245_doOneProgression = -1; /* NULL */ +static int hf_h245_doContinuousProgressions = -1; /* NULL */ +static int hf_h245_doOneIndependentProgression = -1; /* NULL */ +static int hf_h245_doContinuousIndependentProgressions = -1; /* NULL */ static int hf_h245_progressiveRefinementAbortOne = -1; /* NULL */ static int hf_h245_progressiveRefinementAbortContinuous = -1; /* NULL */ static int hf_h245_videoBadMBs = -1; /* T_videoBadMBs */ @@ -1518,10 +1522,6 @@ static int hf_h245_recoveryReferencePicture_item = -1; /* PictureReference */ static int hf_h245_encryptionUpdateCommand = -1; /* T_encryptionUpdateCommand */ static int hf_h245_encryptionUpdateAck = -1; /* T_encryptionUpdateAck */ static int hf_h245_direction = -1; /* EncryptionUpdateDirection */ -static int hf_h245_doOneProgression = -1; /* NULL */ -static int hf_h245_doContinuousProgressions = -1; /* NULL */ -static int hf_h245_doOneIndependentProgression = -1; /* NULL */ -static int hf_h245_doContinuousIndependentProgressions = -1; /* NULL */ static int hf_h245_secureChannel = -1; /* BOOLEAN */ static int hf_h245_sharedSecret = -1; /* BOOLEAN */ static int hf_h245_certProtectedKey = -1; /* BOOLEAN */ @@ -1623,18 +1623,18 @@ static int hf_h245_userInputSupportIndication = -1; /* T_userInputSupportIndica static int hf_h245_signal = -1; /* T_signal */ static int hf_h245_signalType = -1; /* T_signalType */ static int hf_h245_duration = -1; /* INTEGER_1_65535 */ -static int hf_h245_rtp = -1; /* Rtp */ +static int hf_h245_rtp = -1; /* T_rtp */ +static int hf_h245_timestamp = -1; /* INTEGER_0_4294967295 */ +static int hf_h245_expirationTime = -1; /* INTEGER_0_4294967295 */ static int hf_h245_rtpPayloadIndication = -1; /* NULL */ static int hf_h245_paramS = -1; /* Params */ static int hf_h245_encryptedSignalType = -1; /* OCTET_STRING_SIZE_1 */ static int hf_h245_signalUpdate = -1; /* T_signalUpdate */ static int hf_h245_si_rtp = -1; /* Si_rtp */ static int hf_h245_extendedAlphanumeric = -1; /* T_extendedAlphanumeric */ -static int hf_h245_encryptedAlphanumeric = -1; /* EncryptedAlphanumeric */ static int hf_h245_algorithmOID = -1; /* OBJECT_IDENTIFIER */ static int hf_h245_encrypted = -1; /* OCTET_STRING */ -static int hf_h245_timestamp = -1; /* INTEGER_0_4294967295 */ -static int hf_h245_expirationTime = -1; /* INTEGER_0_4294967295 */ +static int hf_h245_encryptedAlphanumeric = -1; /* EncryptedAlphanumeric */ /*--- End of included file: packet-h245-hf.c ---*/ #line 279 "packet-h245-template.c" @@ -1770,6 +1770,7 @@ static gint ett_h245_VBDCapability = -1; static gint ett_h245_DataApplicationCapability = -1; static gint ett_h245_Application = -1; static gint ett_h245_T_t84 = -1; +static gint ett_h245_Nlpid = -1; static gint ett_h245_T_t38fax = -1; static gint ett_h245_DataProtocolCapability = -1; static gint ett_h245_T_v76wCompression = -1; @@ -1782,7 +1783,6 @@ static gint ett_h245_T38FaxRateManagement = -1; static gint ett_h245_T38FaxUdpOptions = -1; static gint ett_h245_T_t38FaxUdpEC = -1; static gint ett_h245_T38FaxTcpOptions = -1; -static gint ett_h245_Nlpid = -1; static gint ett_h245_EncryptionAuthenticationAndIntegrity = -1; static gint ett_h245_EncryptionCapability = -1; static gint ett_h245_MediaEncryptionAlgorithm = -1; @@ -1807,7 +1807,7 @@ static gint ett_h245_NoPTAudioToneCapability = -1; static gint ett_h245_MultiplePayloadStreamCapability = -1; static gint ett_h245_FECCapability = -1; static gint ett_h245_FECC_rfc2733 = -1; -static gint ett_h245_T_separateStream = -1; +static gint ett_h245_T_separateStreamBool = -1; static gint ett_h245_OpenLogicalChannel = -1; static gint ett_h245_T_forwardLogicalChannelParameters = -1; static gint ett_h245_OLC_forw_multiplexParameters = -1; @@ -1861,7 +1861,6 @@ static gint ett_h245_MultiplePayloadStreamElement = -1; static gint ett_h245_FECData = -1; static gint ett_h245_RFC2733Data = -1; static gint ett_h245_FECdata_mode = -1; -static gint ett_h245_Moderfc2733 = -1; static gint ett_h245_SeparateStream = -1; static gint ett_h245_T_differentPort = -1; static gint ett_h245_T_samePort = -1; @@ -1881,14 +1880,14 @@ static gint ett_h245_SEQUENCE_SIZE_1_256_OF_EscrowData = -1; static gint ett_h245_EscrowData = -1; static gint ett_h245_OpenLogicalChannelAck = -1; static gint ett_h245_OLC_ack_reverseLogicalChannelParameters = -1; -static gint ett_h245_T_multiplexParameters = -1; +static gint ett_h245_T_olc_ack_multiplexParameters = -1; static gint ett_h245_T_forwardMultiplexAckParameters = -1; static gint ett_h245_OpenLogicalChannelReject = -1; static gint ett_h245_OpenLogicalChannelRejectCause = -1; static gint ett_h245_OpenLogicalChannelConfirm = -1; static gint ett_h245_H2250LogicalChannelAckParameters = -1; static gint ett_h245_CloseLogicalChannel = -1; -static gint ett_h245_T_source = -1; +static gint ett_h245_T_cLC_source = -1; static gint ett_h245_Clc_reason = -1; static gint ett_h245_CloseLogicalChannelAck = -1; static gint ett_h245_RequestChannelClose = -1; @@ -1947,7 +1946,7 @@ static gint ett_h245_AdaptationLayerType = -1; static gint ett_h245_V76ModeParameters = -1; static gint ett_h245_H2250ModeParameters = -1; static gint ett_h245_RedundancyEncodingMode = -1; -static gint ett_h245_T_secondaryEncoding = -1; +static gint ett_h245_T_secondaryEncodingMode = -1; static gint ett_h245_VideoMode = -1; static gint ett_h245_H261VideoMode = -1; static gint ett_h245_H261Resolution = -1; @@ -1987,7 +1986,7 @@ static gint ett_h245_SET_SIZE_1_256_OF_CommunicationModeTableEntry = -1; static gint ett_h245_CommunicationModeRequest = -1; static gint ett_h245_CommunicationModeResponse = -1; static gint ett_h245_CommunicationModeTableEntry = -1; -static gint ett_h245_T_dataType = -1; +static gint ett_h245_T_entryDataType = -1; static gint ett_h245_ConferenceRequest = -1; static gint ett_h245_T_requestTerminalCertificate = -1; static gint ett_h245_CertSelectionCriteria = -1; @@ -2015,6 +2014,7 @@ static gint ett_h245_T_reject = -1; static gint ett_h245_MultilinkRequest = -1; static gint ett_h245_CallInformationReq = -1; static gint ett_h245_AddConnectionReq = -1; +static gint ett_h245_RemoveConnectionReq = -1; static gint ett_h245_MaximumHeaderIntervalReq = -1; static gint ett_h245_T_requestType = -1; static gint ett_h245_MultilinkResponse = -1; @@ -2022,8 +2022,8 @@ static gint ett_h245_CallInformationResp = -1; static gint ett_h245_AddConnectionResp = -1; static gint ett_h245_T_responseCode = -1; static gint ett_h245_T_rejected = -1; +static gint ett_h245_RemoveConnectionResp = -1; static gint ett_h245_MaximumHeaderIntervalResp = -1; -static gint ett_h245_RemoveConnection = -1; static gint ett_h245_MultilinkIndication = -1; static gint ett_h245_T_crcDesired = -1; static gint ett_h245_T_excessiveError = -1; @@ -2058,12 +2058,12 @@ static gint ett_h245_Mc_type = -1; static gint ett_h245_T_videoFastUpdateGOB = -1; static gint ett_h245_T_videoFastUpdateMB = -1; static gint ett_h245_T_progressiveRefinementStart = -1; +static gint ett_h245_T_repeatCount = -1; static gint ett_h245_T_videoBadMBs = -1; static gint ett_h245_SEQUENCE_OF_PictureReference = -1; static gint ett_h245_T_lostPartialPicture = -1; static gint ett_h245_T_encryptionUpdateCommand = -1; static gint ett_h245_T_encryptionUpdateAck = -1; -static gint ett_h245_RepeatCount = -1; static gint ett_h245_KeyProtectionMethod = -1; static gint ett_h245_EncryptionUpdateRequest = -1; static gint ett_h245_PictureReference = -1; @@ -2108,11 +2108,11 @@ static gint ett_h245_Params = -1; static gint ett_h245_UserInputIndication = -1; static gint ett_h245_T_userInputSupportIndication = -1; static gint ett_h245_T_signal = -1; +static gint ett_h245_T_rtp = -1; static gint ett_h245_T_signalUpdate = -1; static gint ett_h245_Si_rtp = -1; static gint ett_h245_T_extendedAlphanumeric = -1; static gint ett_h245_EncryptedAlphanumeric = -1; -static gint ett_h245_Rtp = -1; static gint ett_h245_FlowControlIndication = -1; static gint ett_h245_MobileMultilinkReconfigurationIndication = -1; @@ -2186,8 +2186,8 @@ static int dissect_h245_DataType(tvbuff_t *tvb, int offset, asn_ctx_t *actx, pro static int dissect_dataType(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h245_DataType(tvb, offset, actx, tree, hf_h245_dataType); } -static int dissect_secondaryEncoding3(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_DataType(tvb, offset, actx, tree, hf_h245_secondaryEncoding3); +static int dissect_secondaryEncoding(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h245_DataType(tvb, offset, actx, tree, hf_h245_secondaryEncoding); } /* MultiplexElement -> MultiplexElement/type -> MultiplexElement/type/subElementList -> MultiplexElement */ @@ -2210,7 +2210,7 @@ static int dissect_vbd_type(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tr return dissect_h245_AudioMode(tvb, offset, actx, tree, hf_h245_vbd_type); } -/* ModeElementType -> MultiplePayloadStreamMode -> MultiplePayloadStreamMode/mpsmElements -> MultiplePayloadStreamElementMode -> ModeElementType */ +/* ModeElementType -> MultiplePayloadStreamMode -> MultiplePayloadStreamMode/elements -> MultiplePayloadStreamElementMode -> ModeElementType */ static int dissect_h245_ModeElementType(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree, int hf_index); static int dissect_type(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { @@ -2282,7 +2282,7 @@ static const per_sequence_t H221NonStandardID_sequence[] = { static int dissect_h245_H221NonStandardID(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 684 "h245.cnf" +#line 697 "h245.cnf" t35CountryCode = 0; t35Extension = 0; manufacturerCode = 0; @@ -2290,7 +2290,7 @@ dissect_h245_H221NonStandardID(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, p offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_H221NonStandardID, H221NonStandardID_sequence); -#line 688 "h245.cnf" +#line 701 "h245.cnf" h221NonStandard = ((t35CountryCode * 256) + t35Extension) * 65536 + manufacturerCode; proto_tree_add_uint(tree, hf_h245Manufacturer, tvb, (offset>>3)-4, 4, h221NonStandard); @@ -2315,7 +2315,7 @@ static const per_choice_t NonStandardIdentifier_choice[] = { static int dissect_h245_NonStandardIdentifier(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 665 "h245.cnf" +#line 678 "h245.cnf" guint32 value; nsiOID = ""; @@ -2349,8 +2349,8 @@ static int dissect_vendor(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree static int -dissect_h245_T_data(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 699 "h245.cnf" +dissect_h245_T_nsd_data(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +#line 712 "h245.cnf" tvbuff_t *next_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -2364,7 +2364,7 @@ dissect_h245_T_data(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree * return offset; } static int dissect_nsd_data(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_T_data(tvb, offset, actx, tree, hf_h245_nsd_data); + return dissect_h245_T_nsd_data(tvb, offset, actx, tree, hf_h245_nsd_data); } @@ -2376,7 +2376,7 @@ static const per_sequence_t NonStandardParameter_sequence[] = { static int dissect_h245_NonStandardParameter(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 697 "h245.cnf" +#line 710 "h245.cnf" nsp_handle = NULL; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -2390,11 +2390,11 @@ static int dissect_nonStandardData(tvbuff_t *tvb, int offset, asn_ctx_t *actx, p static int dissect_nonStandard(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h245_NonStandardParameter(tvb, offset, actx, tree, hf_h245_nonStandard); } -static int dissect_nonStandard_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_NonStandardParameter(tvb, offset, actx, tree, hf_h245_nonStandard_item); +static int dissect_ui_nonStandard_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h245_NonStandardParameter(tvb, offset, actx, tree, hf_h245_ui_nonStandard_item); } -static int dissect_nonStandardData_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_NonStandardParameter(tvb, offset, actx, tree, hf_h245_nonStandardData_item); +static int dissect_nonStandardParams_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h245_NonStandardParameter(tvb, offset, actx, tree, hf_h245_nonStandardParams_item); } static int dissect_h221NonStandard(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h245_NonStandardParameter(tvb, offset, actx, tree, hf_h245_h221NonStandard); @@ -2506,7 +2506,7 @@ dissect_h245_MasterSlaveDetermination(tvbuff_t *tvb, int offset, asn_ctx_t *actx offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_MasterSlaveDetermination, MasterSlaveDetermination_sequence); -#line 448 "h245.cnf" +#line 461 "h245.cnf" h245_pi->msg_type = H245_MastSlvDet; @@ -4357,12 +4357,6 @@ static int dissect_switchReceiveMediaOff(tvbuff_t *tvb, int offset, asn_ctx_t *a static int dissect_switchReceiveMediaOn(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h245_NULL(tvb, offset, actx, tree, hf_h245_switchReceiveMediaOn); } -static int dissect_progressiveRefinementAbortOne(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_NULL(tvb, offset, actx, tree, hf_h245_progressiveRefinementAbortOne); -} -static int dissect_progressiveRefinementAbortContinuous(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_NULL(tvb, offset, actx, tree, hf_h245_progressiveRefinementAbortContinuous); -} static int dissect_doOneProgression(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h245_NULL(tvb, offset, actx, tree, hf_h245_doOneProgression); } @@ -4375,6 +4369,12 @@ static int dissect_doOneIndependentProgression(tvbuff_t *tvb, int offset, asn_ct static int dissect_doContinuousIndependentProgressions(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h245_NULL(tvb, offset, actx, tree, hf_h245_doContinuousIndependentProgressions); } +static int dissect_progressiveRefinementAbortOne(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h245_NULL(tvb, offset, actx, tree, hf_h245_progressiveRefinementAbortOne); +} +static int dissect_progressiveRefinementAbortContinuous(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h245_NULL(tvb, offset, actx, tree, hf_h245_progressiveRefinementAbortContinuous); +} static int dissect_toLevel0(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h245_NULL(tvb, offset, actx, tree, hf_h245_toLevel0); } @@ -4986,6 +4986,9 @@ static int dissect_t434(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree * static int dissect_h224(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h245_DataProtocolCapability(tvb, offset, actx, tree, hf_h245_h224); } +static int dissect_nlpidProtocol(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h245_DataProtocolCapability(tvb, offset, actx, tree, hf_h245_nlpidProtocol); +} static int dissect_h222DataPartitioning(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h245_DataProtocolCapability(tvb, offset, actx, tree, hf_h245_h222DataPartitioning); } @@ -4998,9 +5001,6 @@ static int dissect_t140(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree * static int dissect_t38FaxProtocol(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h245_DataProtocolCapability(tvb, offset, actx, tree, hf_h245_t38FaxProtocol); } -static int dissect_nlpidProtocol(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_DataProtocolCapability(tvb, offset, actx, tree, hf_h245_nlpidProtocol); -} static int dissect_transport(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h245_DataProtocolCapability(tvb, offset, actx, tree, hf_h245_transport); } @@ -5286,17 +5286,17 @@ static int dissect_t38fax(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree static int -dissect_h245_T_standard(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +dissect_h245_T_standardOid(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_per_object_identifier_str(tvb, offset, actx, tree, hf_index, &standard_oid_str); -#line 487 "h245.cnf" +#line 500 "h245.cnf" if(!h245_lc_dissector && strcmp(standard_oid_str,"0.0.8.245.1.1.1") == 0) h245_lc_dissector = amr_handle; return offset; } static int dissect_standardOid(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_T_standard(tvb, offset, actx, tree, hf_h245_standardOid); + return dissect_h245_T_standardOid(tvb, offset, actx, tree, hf_h245_standardOid); } @@ -5645,7 +5645,7 @@ static const per_choice_t Application_choice[] = { static int dissect_h245_Application(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 381 "h245.cnf" +#line 394 "h245.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -5851,8 +5851,8 @@ dissect_h245_RTPPayloadType(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, prot return offset; } -static int dissect_rtpPayloadType2_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_RTPPayloadType(tvb, offset, actx, tree, hf_h245_rtpPayloadType2_item); +static int dissect_rtpPayloadTypes_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h245_RTPPayloadType(tvb, offset, actx, tree, hf_h245_rtpPayloadTypes_item); } static int dissect_rtpPayloadType(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h245_RTPPayloadType(tvb, offset, actx, tree, hf_h245_rtpPayloadType); @@ -5860,7 +5860,7 @@ static int dissect_rtpPayloadType(tvbuff_t *tvb, int offset, asn_ctx_t *actx, pr static const per_sequence_t SEQUENCE_SIZE_1_256_OF_RTPPayloadType_sequence_of[1] = { - { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rtpPayloadType2_item }, + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rtpPayloadTypes_item }, }; static int @@ -5871,14 +5871,14 @@ dissect_h245_SEQUENCE_SIZE_1_256_OF_RTPPayloadType(tvbuff_t *tvb, int offset, as return offset; } -static int dissect_rtpPayloadType2(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_SEQUENCE_SIZE_1_256_OF_RTPPayloadType(tvb, offset, actx, tree, hf_h245_rtpPayloadType2); +static int dissect_rtpPayloadTypes(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h245_SEQUENCE_SIZE_1_256_OF_RTPPayloadType(tvb, offset, actx, tree, hf_h245_rtpPayloadTypes); } static const per_sequence_t MediaPacketizationCapability_sequence[] = { { "h261aVideoPacketization" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_h261aVideoPacketization }, - { "rtpPayloadType2" , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_rtpPayloadType2 }, + { "rtpPayloadType" , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_rtpPayloadTypes }, { NULL, 0, 0, NULL } }; @@ -6333,8 +6333,8 @@ static int dissect_mediaCapability(tvbuff_t *tvb, int offset, asn_ctx_t *actx, p static int dissect_primaryEncoding(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h245_CapabilityTableEntryNumber(tvb, offset, actx, tree, hf_h245_primaryEncoding); } -static int dissect_secondaryEncoding2_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_CapabilityTableEntryNumber(tvb, offset, actx, tree, hf_h245_secondaryEncoding2_item); +static int dissect_secondaryEncodingCapability_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h245_CapabilityTableEntryNumber(tvb, offset, actx, tree, hf_h245_secondaryEncodingCapability_item); } static int dissect_capabilityTableEntryNumbers_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h245_CapabilityTableEntryNumber(tvb, offset, actx, tree, hf_h245_capabilityTableEntryNumbers_item); @@ -6342,7 +6342,7 @@ static int dissect_capabilityTableEntryNumbers_item(tvbuff_t *tvb, int offset, a static const per_sequence_t SEQUENCE_SIZE_1_256_OF_CapabilityTableEntryNumber_sequence_of[1] = { - { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_secondaryEncoding2_item }, + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_secondaryEncodingCapability_item }, }; static int @@ -6353,15 +6353,15 @@ dissect_h245_SEQUENCE_SIZE_1_256_OF_CapabilityTableEntryNumber(tvbuff_t *tvb, in return offset; } -static int dissect_secondaryEncoding2(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_SEQUENCE_SIZE_1_256_OF_CapabilityTableEntryNumber(tvb, offset, actx, tree, hf_h245_secondaryEncoding2); +static int dissect_secondaryEncodingCapability(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h245_SEQUENCE_SIZE_1_256_OF_CapabilityTableEntryNumber(tvb, offset, actx, tree, hf_h245_secondaryEncodingCapability); } static const per_sequence_t RedundancyEncodingCapability_sequence[] = { { "redundancyEncodingMethod" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_redundancyEncodingMethod }, { "primaryEncoding" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_primaryEncoding }, - { "secondaryEncoding2" , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_secondaryEncoding2 }, + { "secondaryEncoding" , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_secondaryEncodingCapability }, { NULL, 0, 0, NULL } }; @@ -7431,7 +7431,7 @@ dissect_h245_H263VideoCapability(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_H263VideoCapability, H263VideoCapability_sequence); -#line 248 "h245.cnf" +#line 261 "h245.cnf" h245_lc_dissector = h263_handle; return offset; @@ -7539,7 +7539,7 @@ static const per_choice_t VideoCapability_choice[] = { static int dissect_h245_VideoCapability(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 372 "h245.cnf" +#line 385 "h245.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -7924,7 +7924,7 @@ static const per_choice_t AudioCapability_choice[] = { static int dissect_h245_AudioCapability(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 363 "h245.cnf" +#line 376 "h245.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -7958,7 +7958,7 @@ static int dissect_h233EncryptionReceiveCapability(tvbuff_t *tvb, int offset, as static const per_sequence_t SEQUENCE_OF_NonStandardParameter_sequence_of[1] = { - { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nonStandardData_item }, + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nonStandardParams_item }, }; static int @@ -8108,7 +8108,7 @@ static int dissect_h235SecurityCapability(tvbuff_t *tvb, int offset, asn_ctx_t * static const per_sequence_t SEQUENCE_SIZE_1_16_OF_NonStandardParameter_sequence_of[1] = { - { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nonStandard_item }, + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ui_nonStandard_item }, }; static int @@ -8319,21 +8319,21 @@ static int dissect_receiveRTPAudioToneCapability(tvbuff_t *tvb, int offset, asn_ } -static const per_sequence_t T_separateStream_sequence[] = { +static const per_sequence_t T_separateStreamBool_sequence[] = { { "separatePort" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_separatePort }, { "samePort" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_samePortBool }, { NULL, 0, 0, NULL } }; static int -dissect_h245_T_separateStream(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +dissect_h245_T_separateStreamBool(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_h245_T_separateStream, T_separateStream_sequence); + ett_h245_T_separateStreamBool, T_separateStreamBool_sequence); return offset; } static int dissect_separateStreamBool(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_T_separateStream(tvb, offset, actx, tree, hf_h245_separateStreamBool); + return dissect_h245_T_separateStreamBool(tvb, offset, actx, tree, hf_h245_separateStreamBool); } @@ -8568,7 +8568,7 @@ dissect_h245_TerminalCapabilitySet(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_TerminalCapabilitySet, TerminalCapabilitySet_sequence); -#line 463 "h245.cnf" +#line 476 "h245.cnf" h245_pi->msg_type = H245_TermCapSet; @@ -8582,7 +8582,7 @@ static int dissect_terminalCapabilitySet(tvbuff_t *tvb, int offset, asn_ctx_t *a static int dissect_h245_LogicalChannelNumber(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 103 "h245.cnf" +#line 116 "h245.cnf" guint32 value; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 1U, 65535U, &value, FALSE); @@ -8601,9 +8601,6 @@ static int dissect_replacementFor(tvbuff_t *tvb, int offset, asn_ctx_t *actx, pr static int dissect_reverseLogicalChannelDependency(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h245_LogicalChannelNumber(tvb, offset, actx, tree, hf_h245_reverseLogicalChannelDependency); } -static int dissect_reverseLogicalChannelNumber(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_LogicalChannelNumber(tvb, offset, actx, tree, hf_h245_reverseLogicalChannelNumber); -} static int dissect_forwardLogicalChannelNumber(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h245_LogicalChannelNumber(tvb, offset, actx, tree, hf_h245_forwardLogicalChannelNumber); } @@ -8635,7 +8632,7 @@ static int dissect_h245_OLC_fw_lcn(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_h245_LogicalChannelNumber(tvb, offset, actx, tree, hf_index); -#line 109 "h245.cnf" +#line 122 "h245.cnf" h223_fw_lc_num = h245_lc_temp; return offset; @@ -8730,7 +8727,7 @@ static int dissect_rtpRedundancyEncoding(tvbuff_t *tvb, int offset, asn_ctx_t *a static const per_sequence_t RedundancyEncoding_sequence[] = { { "redundancyEncodingMethod" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_redundancyEncodingMethod }, - { "secondaryEncoding3" , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_secondaryEncoding3 }, + { "secondaryEncoding" , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_secondaryEncoding }, { "rtpRedundancyEncoding" , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_rtpRedundancyEncoding }, { NULL, 0, 0, NULL } }; @@ -9078,8 +9075,8 @@ static int dissect_h222LogicalChannelParameters(tvbuff_t *tvb, int offset, asn_c static int -dissect_h245_T_al1Framed(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 140 "h245.cnf" +dissect_h245_T_h223_al_type_al1Framed(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +#line 153 "h245.cnf" if(h223_lc_params_temp) h223_lc_params_temp->al_type = al1Framed; @@ -9088,14 +9085,14 @@ dissect_h245_T_al1Framed(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_t return offset; } static int dissect_h223_al_type_al1Framed(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_T_al1Framed(tvb, offset, actx, tree, hf_h245_h223_al_type_al1Framed); + return dissect_h245_T_h223_al_type_al1Framed(tvb, offset, actx, tree, hf_h245_h223_al_type_al1Framed); } static int -dissect_h245_T_al1NotFramed(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 145 "h245.cnf" +dissect_h245_T_h223_al_type_al1NotFramed(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +#line 158 "h245.cnf" if(h223_lc_params_temp) h223_lc_params_temp->al_type = al1NotFramed; @@ -9104,14 +9101,14 @@ dissect_h245_T_al1NotFramed(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, prot return offset; } static int dissect_h223_al_type_al1NotFramed(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_T_al1NotFramed(tvb, offset, actx, tree, hf_h245_h223_al_type_al1NotFramed); + return dissect_h245_T_h223_al_type_al1NotFramed(tvb, offset, actx, tree, hf_h245_h223_al_type_al1NotFramed); } static int -dissect_h245_T_al2WithoutSequenceNumbers(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 150 "h245.cnf" +dissect_h245_T_h223_al_type_al2WithoutSequenceNumbers(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +#line 163 "h245.cnf" if(h223_lc_params_temp) h223_lc_params_temp->al_type = al2WithoutSequenceNumbers; @@ -9120,14 +9117,14 @@ dissect_h245_T_al2WithoutSequenceNumbers(tvbuff_t *tvb, int offset, asn_ctx_t *a return offset; } static int dissect_h223_al_type_al2WithoutSequenceNumbers(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_T_al2WithoutSequenceNumbers(tvb, offset, actx, tree, hf_h245_h223_al_type_al2WithoutSequenceNumbers); + return dissect_h245_T_h223_al_type_al2WithoutSequenceNumbers(tvb, offset, actx, tree, hf_h245_h223_al_type_al2WithoutSequenceNumbers); } static int -dissect_h245_T_al2WithSequenceNumbers(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 155 "h245.cnf" +dissect_h245_T_h223_al_type_al2WithSequenceNumbers(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +#line 168 "h245.cnf" if(h223_lc_params_temp) h223_lc_params_temp->al_type = al2WithSequenceNumbers; @@ -9136,14 +9133,14 @@ dissect_h245_T_al2WithSequenceNumbers(tvbuff_t *tvb, int offset, asn_ctx_t *actx return offset; } static int dissect_h223_al_type_al2WithSequenceNumbers(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_T_al2WithSequenceNumbers(tvb, offset, actx, tree, hf_h245_h223_al_type_al2WithSequenceNumbers); + return dissect_h245_T_h223_al_type_al2WithSequenceNumbers(tvb, offset, actx, tree, hf_h245_h223_al_type_al2WithSequenceNumbers); } static int dissect_h245_T_controlFieldOctets(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 169 "h245.cnf" +#line 182 "h245.cnf" guint32 value; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 2U, &value, FALSE); @@ -9161,8 +9158,8 @@ static int dissect_controlFieldOctets(tvbuff_t *tvb, int offset, asn_ctx_t *actx static int -dissect_h245_T_sendBufferSize(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 178 "h245.cnf" +dissect_h245_T_al3_sendBufferSize(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +#line 191 "h245.cnf" guint32 value; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 16777215U, &value, FALSE); @@ -9174,7 +9171,7 @@ dissect_h245_T_sendBufferSize(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, pr return offset; } static int dissect_al3_sendBufferSize(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_T_sendBufferSize(tvb, offset, actx, tree, hf_h245_al3_sendBufferSize); + return dissect_h245_T_al3_sendBufferSize(tvb, offset, actx, tree, hf_h245_al3_sendBufferSize); } @@ -9198,8 +9195,8 @@ static int dissect_al3(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *t static int -dissect_h245_T_al3(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 160 "h245.cnf" +dissect_h245_T_h223_al_type_al3(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +#line 173 "h245.cnf" if(h223_lc_params_temp) { h223_lc_params_temp->al_type = al3; h223_lc_params_temp->al_params = se_alloc(sizeof(h223_al3_params)); @@ -9210,7 +9207,7 @@ dissect_h245_T_al3(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *t return offset; } static int dissect_h223_al_type_al3(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_T_al3(tvb, offset, actx, tree, hf_h245_h223_al_type_al3); + return dissect_h245_T_h223_al_type_al3(tvb, offset, actx, tree, hf_h245_h223_al_type_al3); } @@ -9426,8 +9423,8 @@ static int dissect_al1M(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree * static int -dissect_h245_T_al1M(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 185 "h245.cnf" +dissect_h245_T_h223_al_type_al1M(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +#line 198 "h245.cnf" if(h223_lc_params_temp) h223_lc_params_temp->al_type = al1M; @@ -9436,7 +9433,7 @@ dissect_h245_T_al1M(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree * return offset; } static int dissect_h223_al_type_al1M(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_T_al1M(tvb, offset, actx, tree, hf_h245_h223_al_type_al1M); + return dissect_h245_T_h223_al_type_al1M(tvb, offset, actx, tree, hf_h245_h223_al_type_al1M); } @@ -9485,8 +9482,8 @@ static int dissect_al2M(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree * static int -dissect_h245_T_al2M(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 190 "h245.cnf" +dissect_h245_T_h223_al_type_al2M(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +#line 203 "h245.cnf" if(h223_lc_params_temp) h223_lc_params_temp->al_type = al2M; @@ -9495,7 +9492,7 @@ dissect_h245_T_al2M(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree * return offset; } static int dissect_h223_al_type_al2M(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_T_al2M(tvb, offset, actx, tree, hf_h245_h223_al_type_al2M); + return dissect_h245_T_h223_al_type_al2M(tvb, offset, actx, tree, hf_h245_h223_al_type_al2M); } @@ -9585,8 +9582,8 @@ static int dissect_al3M(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree * static int -dissect_h245_T_al3M(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 195 "h245.cnf" +dissect_h245_T_h223_al_type_al3M(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +#line 208 "h245.cnf" if(h223_lc_params_temp) h223_lc_params_temp->al_type = al3M; @@ -9595,7 +9592,7 @@ dissect_h245_T_al3M(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree * return offset; } static int dissect_h223_al_type_al3M(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_T_al3M(tvb, offset, actx, tree, hf_h245_h223_al_type_al3M); + return dissect_h245_T_h223_al_type_al3M(tvb, offset, actx, tree, hf_h245_h223_al_type_al3M); } @@ -9640,8 +9637,8 @@ static int dissect_adaptationLayerType(tvbuff_t *tvb, int offset, asn_ctx_t *act static int -dissect_h245_T_segmentableFlag(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 202 "h245.cnf" +dissect_h245_T_h223_lc_segmentableFlag(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +#line 215 "h245.cnf" guint32 value; offset = dissect_per_boolean(tvb, offset, actx, tree, hf_index, &value); @@ -9652,7 +9649,7 @@ dissect_h245_T_segmentableFlag(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, p return offset; } static int dissect_h223_lc_segmentableFlag(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_T_segmentableFlag(tvb, offset, actx, tree, hf_h245_h223_lc_segmentableFlag); + return dissect_h245_T_h223_lc_segmentableFlag(tvb, offset, actx, tree, hf_h245_h223_lc_segmentableFlag); } @@ -9674,7 +9671,7 @@ dissect_h245_H223LogicalChannelParameters(tvbuff_t *tvb, int offset, asn_ctx_t * static int dissect_h245_OLC_fw_h223_params(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 122 "h245.cnf" +#line 135 "h245.cnf" h223_fw_lc_params = se_alloc(sizeof(h223_lc_params)); h223_fw_lc_params->al_type = al_nonStandard; h223_fw_lc_params->al_params = NULL; @@ -9875,7 +9872,7 @@ static int dissect_v76LogicalChannelParameters(tvbuff_t *tvb, int offset, asn_ct static int dissect_h245_Ipv4_network(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 499 "h245.cnf" +#line 512 "h245.cnf" tvbuff_t *value_tvb; @@ -9900,7 +9897,7 @@ static int dissect_ip4_network(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto static int dissect_h245_TsapIdentifier(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 512 "h245.cnf" +#line 525 "h245.cnf" guint32 tsapIdentifier; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, @@ -10219,14 +10216,14 @@ static int dissect_signalAddress(tvbuff_t *tvb, int offset, asn_ctx_t *actx, pro static int dissect_h245_T_mediaChannel(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 530 "h245.cnf" +#line 543 "h245.cnf" media_channel = TRUE; offset = dissect_h245_TransportAddress(tvb, offset, actx, tree, hf_index); -#line 560 "h245.cnf" +#line 573 "h245.cnf" media_channel = FALSE; @@ -10241,14 +10238,14 @@ static int dissect_mediaChannel(tvbuff_t *tvb, int offset, asn_ctx_t *actx, prot static int dissect_h245_T_mediaControlChannel(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 542 "h245.cnf" +#line 555 "h245.cnf" media_control_channel = TRUE; offset = dissect_h245_TransportAddress(tvb, offset, actx, tree, hf_index); -#line 566 "h245.cnf" +#line 579 "h245.cnf" media_control_channel = FALSE; @@ -10437,7 +10434,7 @@ static const per_sequence_t T_forwardLogicalChannelParameters_sequence[] = { static int dissect_h245_T_forwardLogicalChannelParameters(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 113 "h245.cnf" +#line 126 "h245.cnf" h245_lc_dissector = NULL; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_T_forwardLogicalChannelParameters, T_forwardLogicalChannelParameters_sequence); @@ -10458,7 +10455,7 @@ static int dissect_forwardLogicalChannelParameters(tvbuff_t *tvb, int offset, as static int dissect_h245_OLC_rev_h223_params(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 131 "h245.cnf" +#line 144 "h245.cnf" h223_rev_lc_params = se_alloc(sizeof(h223_lc_params)); h223_rev_lc_params->al_type = al_nonStandard; h223_rev_lc_params->al_params = NULL; @@ -10491,7 +10488,7 @@ static const per_choice_t OLC_rev_multiplexParameters_choice[] = { static int dissect_h245_OLC_rev_multiplexParameters(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 616 "h245.cnf" +#line 629 "h245.cnf" media_channel = FALSE; @@ -10502,7 +10499,7 @@ dissect_h245_OLC_rev_multiplexParameters(tvbuff_t *tvb, int offset, asn_ctx_t *a ett_h245_OLC_rev_multiplexParameters, OLC_rev_multiplexParameters_choice, NULL); -#line 624 "h245.cnf" +#line 637 "h245.cnf" if (!actx->pinfo->fd->flags.visited) { if (codec_type && (strcmp(codec_type, "t38fax")==0)) { @@ -10792,7 +10789,7 @@ static const per_sequence_t OpenLogicalChannel_sequence[] = { int dissect_h245_OpenLogicalChannel(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 84 "h245.cnf" +#line 97 "h245.cnf" gint32 temp; h223_fw_lc_num = 0; @@ -10811,7 +10808,7 @@ dissect_h245_OpenLogicalChannel(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, } -#line 474 "h245.cnf" +#line 487 "h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_OpenLogChn; @@ -10822,28 +10819,28 @@ static int dissect_openLogicalChannel(tvbuff_t *tvb, int offset, asn_ctx_t *actx } -static const value_string h245_T_source_vals[] = { +static const value_string h245_T_cLC_source_vals[] = { { 0, "user" }, { 1, "lcse" }, { 0, NULL } }; -static const per_choice_t T_source_choice[] = { +static const per_choice_t T_cLC_source_choice[] = { { 0, "user" , ASN1_NO_EXTENSIONS , dissect_user }, { 1, "lcse" , ASN1_NO_EXTENSIONS , dissect_lcse }, { 0, NULL, 0, NULL } }; static int -dissect_h245_T_source(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +dissect_h245_T_cLC_source(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, - ett_h245_T_source, T_source_choice, + ett_h245_T_cLC_source, T_cLC_source_choice, NULL); return offset; } static int dissect_cLC_source(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_T_source(tvb, offset, actx, tree, hf_h245_cLC_source); + return dissect_h245_T_cLC_source(tvb, offset, actx, tree, hf_h245_cLC_source); } @@ -10886,7 +10883,7 @@ dissect_h245_CloseLogicalChannel(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_CloseLogicalChannel, CloseLogicalChannel_sequence); -#line 428 "h245.cnf" +#line 441 "h245.cnf" h245_pi->msg_type = H245_CloseLogChn; @@ -10948,7 +10945,7 @@ static int dissect_requestChannelClose(tvbuff_t *tvb, int offset, asn_ctx_t *act static int dissect_h245_MultiplexTableEntryNumber(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 28 "h245.cnf" +#line 41 "h245.cnf" guint32 value; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 1U, 15U, &value, FALSE); @@ -10961,8 +10958,8 @@ dissect_h245_MultiplexTableEntryNumber(tvbuff_t *tvb, int offset, asn_ctx_t *act static int dissect_multiplexTableEntryNumber(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h245_MultiplexTableEntryNumber(tvb, offset, actx, tree, hf_h245_multiplexTableEntryNumber); } -static int dissect_multiplexTableEntryNumber_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_MultiplexTableEntryNumber(tvb, offset, actx, tree, hf_h245_multiplexTableEntryNumber_item); +static int dissect_multiplexTableEntryNumbers_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h245_MultiplexTableEntryNumber(tvb, offset, actx, tree, hf_h245_multiplexTableEntryNumbers_item); } static int dissect_entryNumbers_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h245_MultiplexTableEntryNumber(tvb, offset, actx, tree, hf_h245_entryNumbers_item); @@ -10971,8 +10968,8 @@ static int dissect_entryNumbers_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, static int -dissect_h245_T_logicalChannelNumber(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 54 "h245.cnf" +dissect_h245_T_logicalChannelNum(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +#line 67 "h245.cnf" /*MultiplexElement/type/logicalChannelNumber*/ guint32 value; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, @@ -10985,7 +10982,7 @@ dissect_h245_T_logicalChannelNumber(tvbuff_t *tvb, int offset, asn_ctx_t *actx _ return offset; } static int dissect_logicalChannelNum(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_T_logicalChannelNumber(tvb, offset, actx, tree, hf_h245_logicalChannelNum); + return dissect_h245_T_logicalChannelNum(tvb, offset, actx, tree, hf_h245_logicalChannelNum); } @@ -10995,7 +10992,7 @@ static const per_sequence_t T_subElementList_sequence_of[1] = { static int dissect_h245_T_subElementList(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 62 "h245.cnf" +#line 75 "h245.cnf" h223_mux_element dummy_me, *parent_me = h223_me; h223_me = &dummy_me; offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, @@ -11042,7 +11039,7 @@ static int dissect_me_type(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tre static int dissect_h245_ME_finiteRepeatCount(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 77 "h245.cnf" +#line 90 "h245.cnf" guint32 value; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 1U, 65535U, &value, FALSE); @@ -11062,7 +11059,7 @@ static int dissect_h245_T_untilClosingFlag(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_per_null(tvb, offset, actx, tree, hf_index); -#line 71 "h245.cnf" +#line 84 "h245.cnf" h223_me->repeat_count = 0; return offset; @@ -11105,7 +11102,7 @@ static const per_sequence_t MultiplexElement_sequence[] = { static int dissect_h245_MultiplexElement(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 44 "h245.cnf" +#line 57 "h245.cnf" /*MultiplexElement*/ h223_mux_element* me = se_alloc(sizeof(h223_mux_element)); h223_me->next = me; @@ -11125,7 +11122,7 @@ static const per_sequence_t T_elementList_sequence_of[1] = { static int dissect_h245_T_elementList(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 34 "h245.cnf" +#line 47 "h245.cnf" /* create a h223_mux_element to hold onto the head of the list, since * h223_me will track the tail */ h223_mux_element dummy_me; @@ -11153,7 +11150,7 @@ static const per_sequence_t MultiplexEntryDescriptor_sequence[] = { static int dissect_h245_MultiplexEntryDescriptor(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 16 "h245.cnf" +#line 29 "h245.cnf" /*MultiplexEntryDescriptor*/ h223_me = NULL; h223_mc = 0; @@ -11208,7 +11205,7 @@ static int dissect_multiplexEntrySend(tvbuff_t *tvb, int offset, asn_ctx_t *actx static const per_sequence_t SET_SIZE_1_15_OF_MultiplexTableEntryNumber_set_of[1] = { - { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_multiplexTableEntryNumber_item }, + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_multiplexTableEntryNumbers_item }, }; static int @@ -11457,7 +11454,7 @@ static const per_choice_t VideoMode_choice[] = { static int dissect_h245_VideoMode(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 397 "h245.cnf" +#line 410 "h245.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -11820,7 +11817,7 @@ static const per_choice_t AudioMode_choice[] = { static int dissect_h245_AudioMode(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 389 "h245.cnf" +#line 402 "h245.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -11891,7 +11888,7 @@ static const per_choice_t DataModeApplication_choice[] = { static int dissect_h245_DataModeApplication(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 405 "h245.cnf" +#line 418 "h245.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -12022,13 +12019,13 @@ dissect_h245_RedundancyEncodingDTModeElement(tvbuff_t *tvb, int offset, asn_ctx_ static int dissect_prmary_dtmode(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h245_RedundancyEncodingDTModeElement(tvb, offset, actx, tree, hf_h245_prmary_dtmode); } -static int dissect_secondary2_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_RedundancyEncodingDTModeElement(tvb, offset, actx, tree, hf_h245_secondary2_item); +static int dissect_secondaryDTM_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h245_RedundancyEncodingDTModeElement(tvb, offset, actx, tree, hf_h245_secondaryDTM_item); } static const per_sequence_t SEQUENCE_OF_RedundancyEncodingDTModeElement_sequence_of[1] = { - { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_secondary2_item }, + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_secondaryDTM_item }, }; static int @@ -12038,15 +12035,15 @@ dissect_h245_SEQUENCE_OF_RedundancyEncodingDTModeElement(tvbuff_t *tvb, int offs return offset; } -static int dissect_secondary2(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_SEQUENCE_OF_RedundancyEncodingDTModeElement(tvb, offset, actx, tree, hf_h245_secondary2); +static int dissect_secondaryDTM(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h245_SEQUENCE_OF_RedundancyEncodingDTModeElement(tvb, offset, actx, tree, hf_h245_secondaryDTM); } static const per_sequence_t RedundancyEncodingDTMode_sequence[] = { { "redundancyEncodingMethod" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_redundancyEncodingMethod }, { "primary" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_prmary_dtmode }, - { "secondary2" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_secondary2 }, + { "secondary" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_secondaryDTM }, { NULL, 0, 0, NULL } }; @@ -12096,7 +12093,7 @@ static int dissect_mpsmElements(tvbuff_t *tvb, int offset, asn_ctx_t *actx, prot static const per_sequence_t MultiplePayloadStreamMode_sequence[] = { - { "mpsmElements" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_mpsmElements }, + { "elements" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_mpsmElements }, { NULL, 0, 0, NULL } }; @@ -12297,34 +12294,34 @@ static int dissect_v76ModeParameters(tvbuff_t *tvb, int offset, asn_ctx_t *actx, } -static const value_string h245_T_secondaryEncoding_vals[] = { +static const value_string h245_T_secondaryEncodingMode_vals[] = { { 0, "nonStandard" }, { 1, "audioData" }, { 0, NULL } }; -static const per_choice_t T_secondaryEncoding_choice[] = { +static const per_choice_t T_secondaryEncodingMode_choice[] = { { 0, "nonStandard" , ASN1_EXTENSION_ROOT , dissect_nonStandard }, { 1, "audioData" , ASN1_EXTENSION_ROOT , dissect_audioMode }, { 0, NULL, 0, NULL } }; static int -dissect_h245_T_secondaryEncoding(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +dissect_h245_T_secondaryEncodingMode(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, - ett_h245_T_secondaryEncoding, T_secondaryEncoding_choice, + ett_h245_T_secondaryEncodingMode, T_secondaryEncodingMode_choice, NULL); return offset; } -static int dissect_secondaryEncoding(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_T_secondaryEncoding(tvb, offset, actx, tree, hf_h245_secondaryEncoding); +static int dissect_secondaryEncodingMode(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h245_T_secondaryEncodingMode(tvb, offset, actx, tree, hf_h245_secondaryEncodingMode); } static const per_sequence_t RedundancyEncodingMode_sequence[] = { { "redundancyEncodingMethod" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_redundancyEncodingMethod }, - { "secondaryEncoding" , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_secondaryEncoding }, + { "secondaryEncoding" , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_secondaryEncodingMode }, { NULL, 0, 0, NULL } }; @@ -12848,24 +12845,15 @@ static int dissect_connectionIdentifier(tvbuff_t *tvb, int offset, asn_ctx_t *ac } -static const per_sequence_t RemoveConnection_sequence[] = { +static const per_sequence_t RemoveConnectionReq_sequence[] = { { "connectionIdentifier" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_connectionIdentifier }, { NULL, 0, 0, NULL } }; static int -dissect_h245_RemoveConnection(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_h245_RemoveConnection, RemoveConnection_sequence); - - return offset; -} - - - -static int dissect_h245_RemoveConnectionReq(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { - offset = dissect_h245_RemoveConnection(tvb, offset, actx, tree, hf_index); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_h245_RemoveConnectionReq, RemoveConnectionReq_sequence); return offset; } @@ -12985,7 +12973,7 @@ static int dissect_logicalChannelRateRequest(tvbuff_t *tvb, int offset, asn_ctx_ static int dissect_h245_T_subMessageIdentifer(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 492 "h245.cnf" +#line 505 "h245.cnf" guint32 subMessageIdentifer; @@ -13069,7 +13057,7 @@ static const per_choice_t RequestMessage_choice[] = { static int dissect_h245_RequestMessage(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 252 "h245.cnf" +#line 265 "h245.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -13152,7 +13140,7 @@ dissect_h245_MasterSlaveDeterminationAck(tvbuff_t *tvb, int offset, asn_ctx_t *a offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_MasterSlaveDeterminationAck, MasterSlaveDeterminationAck_sequence); -#line 413 "h245.cnf" +#line 426 "h245.cnf" h245_pi->msg_type = H245_MastSlvDetAck; @@ -13196,7 +13184,7 @@ dissect_h245_MasterSlaveDeterminationReject(tvbuff_t *tvb, int offset, asn_ctx_t offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_MasterSlaveDeterminationReject, MasterSlaveDeterminationReject_sequence); -#line 418 "h245.cnf" +#line 431 "h245.cnf" h245_pi->msg_type = H245_MastSlvDetRjc; @@ -13217,7 +13205,7 @@ dissect_h245_TerminalCapabilitySetAck(tvbuff_t *tvb, int offset, asn_ctx_t *actx offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_TerminalCapabilitySetAck, TerminalCapabilitySetAck_sequence); -#line 443 "h245.cnf" +#line 456 "h245.cnf" h245_pi->msg_type = H245_TermCapSetAck; @@ -13293,7 +13281,7 @@ dissect_h245_TerminalCapabilitySetReject(tvbuff_t *tvb, int offset, asn_ctx_t *a offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_TerminalCapabilitySetReject, TerminalCapabilitySetReject_sequence); -#line 453 "h245.cnf" +#line 466 "h245.cnf" h245_pi->msg_type = H245_TermCapSetRjc; @@ -13309,7 +13297,7 @@ static int dissect_h245_OLC_ack_fw_lcn(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_h245_LogicalChannelNumber(tvb, offset, actx, tree, hf_index); -#line 240 "h245.cnf" +#line 253 "h245.cnf" h223_fw_lc_num = h245_lc_temp; return offset; @@ -13319,28 +13307,43 @@ static int dissect_olc_ack_fw_lcn(tvbuff_t *tvb, int offset, asn_ctx_t *actx, pr } -static const value_string h245_T_multiplexParameters_vals[] = { + +static int +dissect_h245_T_reverseLogicalChannelNumber(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { + offset = dissect_h245_LogicalChannelNumber(tvb, offset, actx, tree, hf_index); + +#line 257 "h245.cnf" + h223_rev_lc_num = h245_lc_temp; + + return offset; +} +static int dissect_reverseLogicalChannelNumber(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h245_T_reverseLogicalChannelNumber(tvb, offset, actx, tree, hf_h245_reverseLogicalChannelNumber); +} + + +static const value_string h245_T_olc_ack_multiplexParameters_vals[] = { { 0, "h222LogicalChannelParameters" }, { 1, "h2250LogicalChannelParameters" }, { 0, NULL } }; -static const per_choice_t T_multiplexParameters_choice[] = { +static const per_choice_t T_olc_ack_multiplexParameters_choice[] = { { 0, "h222LogicalChannelParameters", ASN1_EXTENSION_ROOT , dissect_h222LogicalChannelParameters }, { 1, "h2250LogicalChannelParameters", ASN1_NOT_EXTENSION_ROOT, dissect_h2250LogicalChannelParameters }, { 0, NULL, 0, NULL } }; static int -dissect_h245_T_multiplexParameters(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +dissect_h245_T_olc_ack_multiplexParameters(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, - ett_h245_T_multiplexParameters, T_multiplexParameters_choice, + ett_h245_T_olc_ack_multiplexParameters, T_olc_ack_multiplexParameters_choice, NULL); return offset; } static int dissect_olc_ack_multiplexParameters(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_T_multiplexParameters(tvb, offset, actx, tree, hf_h245_olc_ack_multiplexParameters); + return dissect_h245_T_olc_ack_multiplexParameters(tvb, offset, actx, tree, hf_h245_olc_ack_multiplexParameters); } @@ -13367,14 +13370,14 @@ static int dissect_olc_ack_reverseLogicalChannelParameters(tvbuff_t *tvb, int of static int dissect_h245_Ack_mediaChannel(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 524 "h245.cnf" +#line 537 "h245.cnf" media_channel = TRUE; offset = dissect_h245_TransportAddress(tvb, offset, actx, tree, hf_index); -#line 548 "h245.cnf" +#line 561 "h245.cnf" media_channel = FALSE; @@ -13389,14 +13392,14 @@ static int dissect_ack_mediaChannel(tvbuff_t *tvb, int offset, asn_ctx_t *actx, static int dissect_h245_Ack_mediaControlChannel(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 536 "h245.cnf" +#line 549 "h245.cnf" media_control_channel = TRUE; offset = dissect_h245_TransportAddress(tvb, offset, actx, tree, hf_index); -#line 554 "h245.cnf" +#line 567 "h245.cnf" media_control_channel = FALSE; @@ -13443,7 +13446,7 @@ static const per_choice_t T_forwardMultiplexAckParameters_choice[] = { static int dissect_h245_T_forwardMultiplexAckParameters(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 572 "h245.cnf" +#line 585 "h245.cnf" media_channel = FALSE; @@ -13454,7 +13457,7 @@ dissect_h245_T_forwardMultiplexAckParameters(tvbuff_t *tvb, int offset, asn_ctx_ ett_h245_T_forwardMultiplexAckParameters, T_forwardMultiplexAckParameters_choice, NULL); -#line 580 "h245.cnf" +#line 593 "h245.cnf" if (!actx->pinfo->fd->flags.visited) { if (codec_type && strcmp(codec_type, "t38fax")==0) { @@ -13507,7 +13510,7 @@ static const per_sequence_t OpenLogicalChannelAck_sequence[] = { static int dissect_h245_OpenLogicalChannelAck(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 210 "h245.cnf" +#line 223 "h245.cnf" guint32 temp; int p2p_dir; h223_pending_olc *pend; @@ -13539,7 +13542,7 @@ dissect_h245_OpenLogicalChannelAck(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U actx->pinfo->p2p_dir = p2p_dir; -#line 480 "h245.cnf" +#line 493 "h245.cnf" h245_pi->msg_type = H245_OpenLogChnAck; @@ -13610,7 +13613,7 @@ dissect_h245_OpenLogicalChannelReject(tvbuff_t *tvb, int offset, asn_ctx_t *actx offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_OpenLogicalChannelReject, OpenLogicalChannelReject_sequence); -#line 423 "h245.cnf" +#line 436 "h245.cnf" h245_pi->msg_type = H245_OpenLogChnRjc; @@ -13631,7 +13634,7 @@ dissect_h245_CloseLogicalChannelAck(tvbuff_t *tvb, int offset, asn_ctx_t *actx _ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_CloseLogicalChannelAck, CloseLogicalChannelAck_sequence); -#line 433 "h245.cnf" +#line 446 "h245.cnf" h245_pi->msg_type = H245_CloseLogChnAck; @@ -13756,13 +13759,13 @@ dissect_h245_MultiplexEntryRejectionDescriptions(tvbuff_t *tvb, int offset, asn_ return offset; } -static int dissect_rejectionDescriptions1_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_MultiplexEntryRejectionDescriptions(tvb, offset, actx, tree, hf_h245_rejectionDescriptions1_item); +static int dissect_sendRejectionDescriptions_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h245_MultiplexEntryRejectionDescriptions(tvb, offset, actx, tree, hf_h245_sendRejectionDescriptions_item); } static const per_sequence_t SET_SIZE_1_15_OF_MultiplexEntryRejectionDescriptions_set_of[1] = { - { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rejectionDescriptions1_item }, + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_sendRejectionDescriptions_item }, }; static int @@ -13773,14 +13776,14 @@ dissect_h245_SET_SIZE_1_15_OF_MultiplexEntryRejectionDescriptions(tvbuff_t *tvb, return offset; } -static int dissect_rejectionDescriptions1(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_SET_SIZE_1_15_OF_MultiplexEntryRejectionDescriptions(tvb, offset, actx, tree, hf_h245_rejectionDescriptions1); +static int dissect_sendRejectionDescriptions(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h245_SET_SIZE_1_15_OF_MultiplexEntryRejectionDescriptions(tvb, offset, actx, tree, hf_h245_sendRejectionDescriptions); } static const per_sequence_t MultiplexEntrySendReject_sequence[] = { { "sequenceNumber" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_sequenceNumber }, - { "rejectionDescriptions1" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_rejectionDescriptions1 }, + { "rejectionDescriptions" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_sendRejectionDescriptions }, { NULL, 0, 0, NULL } }; @@ -13849,13 +13852,13 @@ dissect_h245_RequestMultiplexEntryRejectionDescriptions(tvbuff_t *tvb, int offse return offset; } -static int dissect_rejectionDescriptions2_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_RequestMultiplexEntryRejectionDescriptions(tvb, offset, actx, tree, hf_h245_rejectionDescriptions2_item); +static int dissect_rejectionDescriptions_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h245_RequestMultiplexEntryRejectionDescriptions(tvb, offset, actx, tree, hf_h245_rejectionDescriptions_item); } static const per_sequence_t SET_SIZE_1_15_OF_RequestMultiplexEntryRejectionDescriptions_set_of[1] = { - { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rejectionDescriptions2_item }, + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rejectionDescriptions_item }, }; static int @@ -13866,14 +13869,14 @@ dissect_h245_SET_SIZE_1_15_OF_RequestMultiplexEntryRejectionDescriptions(tvbuff_ return offset; } -static int dissect_rejectionDescriptions2(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_SET_SIZE_1_15_OF_RequestMultiplexEntryRejectionDescriptions(tvb, offset, actx, tree, hf_h245_rejectionDescriptions2); +static int dissect_rejectionDescriptions(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h245_SET_SIZE_1_15_OF_RequestMultiplexEntryRejectionDescriptions(tvb, offset, actx, tree, hf_h245_rejectionDescriptions); } static const per_sequence_t RequestMultiplexEntryReject_sequence[] = { { "entryNumbers" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_entryNumbers }, - { "rejectionDescriptions2" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_rejectionDescriptions2 }, + { "rejectionDescriptions" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_rejectionDescriptions }, { NULL, 0, 0, NULL } }; @@ -14119,14 +14122,14 @@ static int dissect_sessionDescription(tvbuff_t *tvb, int offset, asn_ctx_t *actx } -static const value_string h245_T_dataType_vals[] = { +static const value_string h245_T_entryDataType_vals[] = { { 0, "videoData" }, { 1, "audioData" }, { 2, "data" }, { 0, NULL } }; -static const per_choice_t T_dataType_choice[] = { +static const per_choice_t T_entryDataType_choice[] = { { 0, "videoData" , ASN1_EXTENSION_ROOT , dissect_videoData }, { 1, "audioData" , ASN1_EXTENSION_ROOT , dissect_audioData }, { 2, "data" , ASN1_EXTENSION_ROOT , dissect_data }, @@ -14134,15 +14137,15 @@ static const per_choice_t T_dataType_choice[] = { }; static int -dissect_h245_T_dataType(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +dissect_h245_T_entryDataType(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, - ett_h245_T_dataType, T_dataType_choice, + ett_h245_T_entryDataType, T_entryDataType_choice, NULL); return offset; } static int dissect_entryDataType(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_T_dataType(tvb, offset, actx, tree, hf_h245_entryDataType); + return dissect_h245_T_entryDataType(tvb, offset, actx, tree, hf_h245_entryDataType); } @@ -14751,10 +14754,15 @@ static int dissect_addConnectionResp(tvbuff_t *tvb, int offset, asn_ctx_t *actx, } +static const per_sequence_t RemoveConnectionResp_sequence[] = { + { "connectionIdentifier" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_connectionIdentifier }, + { NULL, 0, 0, NULL } +}; static int dissect_h245_RemoveConnectionResp(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { - offset = dissect_h245_RemoveConnection(tvb, offset, actx, tree, hf_index); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_h245_RemoveConnectionResp, RemoveConnectionResp_sequence); return offset; } @@ -14935,7 +14943,7 @@ static const per_choice_t ResponseMessage_choice[] = { static int dissect_h245_ResponseMessage(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 290 "h245.cnf" +#line 303 "h245.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -15395,7 +15403,7 @@ static int dissect_encryptionUpdateRequest(tvbuff_t *tvb, int offset, asn_ctx_t } -static const value_string h245_RepeatCount_vals[] = { +static const value_string h245_T_repeatCount_vals[] = { { 0, "doOneProgression" }, { 1, "doContinuousProgressions" }, { 2, "doOneIndependentProgression" }, @@ -15403,7 +15411,7 @@ static const value_string h245_RepeatCount_vals[] = { { 0, NULL } }; -static const per_choice_t RepeatCount_choice[] = { +static const per_choice_t T_repeatCount_choice[] = { { 0, "doOneProgression" , ASN1_EXTENSION_ROOT , dissect_doOneProgression }, { 1, "doContinuousProgressions" , ASN1_EXTENSION_ROOT , dissect_doContinuousProgressions }, { 2, "doOneIndependentProgression" , ASN1_EXTENSION_ROOT , dissect_doOneIndependentProgression }, @@ -15412,15 +15420,15 @@ static const per_choice_t RepeatCount_choice[] = { }; static int -dissect_h245_RepeatCount(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +dissect_h245_T_repeatCount(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, - ett_h245_RepeatCount, RepeatCount_choice, + ett_h245_T_repeatCount, T_repeatCount_choice, NULL); return offset; } static int dissect_repeatCount(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_RepeatCount(tvb, offset, actx, tree, hf_h245_repeatCount); + return dissect_h245_T_repeatCount(tvb, offset, actx, tree, hf_h245_repeatCount); } @@ -16141,7 +16149,7 @@ static const per_choice_t CommandMessage_choice[] = { static int dissect_h245_CommandMessage(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 339 "h245.cnf" +#line 352 "h245.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -16211,7 +16219,7 @@ dissect_h245_MasterSlaveDeterminationRelease(tvbuff_t *tvb, int offset, asn_ctx_ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_MasterSlaveDeterminationRelease, MasterSlaveDeterminationRelease_sequence); -#line 458 "h245.cnf" +#line 471 "h245.cnf" h245_pi->msg_type = H245_MastSlvDetRls; @@ -16231,7 +16239,7 @@ dissect_h245_TerminalCapabilitySetRelease(tvbuff_t *tvb, int offset, asn_ctx_t * offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_TerminalCapabilitySetRelease, TerminalCapabilitySetRelease_sequence); -#line 468 "h245.cnf" +#line 481 "h245.cnf" h245_pi->msg_type = H245_TermCapSetRls; @@ -16252,7 +16260,7 @@ dissect_h245_OpenLogicalChannelConfirm(tvbuff_t *tvb, int offset, asn_ctx_t *act offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_OpenLogicalChannelConfirm, OpenLogicalChannelConfirm_sequence); -#line 438 "h245.cnf" +#line 451 "h245.cnf" h245_pi->msg_type = H245_OpenLogChnCnf; @@ -16759,7 +16767,7 @@ static int dissect_signalType(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_ } -static const per_sequence_t Rtp_sequence[] = { +static const per_sequence_t T_rtp_sequence[] = { { "timestamp" , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_timestamp }, { "expirationTime" , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_expirationTime }, { "logicalChannelNumber" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_logicalChannelNumber }, @@ -16767,14 +16775,14 @@ static const per_sequence_t Rtp_sequence[] = { }; static int -dissect_h245_Rtp(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { +dissect_h245_T_rtp(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_h245_Rtp, Rtp_sequence); + ett_h245_T_rtp, T_rtp_sequence); return offset; } static int dissect_rtp(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h245_Rtp(tvb, offset, actx, tree, hf_h245_rtp); + return dissect_h245_T_rtp(tvb, offset, actx, tree, hf_h245_rtp); } @@ -17349,7 +17357,7 @@ static const per_choice_t IndicationMessage_choice[] = { static int dissect_h245_IndicationMessage(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { -#line 315 "h245.cnf" +#line 328 "h245.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -17408,28 +17416,6 @@ dissect_h245_MultimediaSystemControlMessage(tvbuff_t *tvb, int offset, asn_ctx_t return offset; } - -static const value_string h245_Moderfc2733_vals[] = { - { 0, "redundancyEncoding" }, - { 1, "separateStream" }, - { 0, NULL } -}; - -static const per_choice_t Moderfc2733_choice[] = { - { 0, "redundancyEncoding" , ASN1_EXTENSION_ROOT , dissect_redundancyEncodingFlag }, - { 1, "separateStream" , ASN1_EXTENSION_ROOT , dissect_separateStream }, - { 0, NULL, 0, NULL } -}; - -static int -dissect_h245_Moderfc2733(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, proto_tree *tree, int hf_index) { - offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, - ett_h245_Moderfc2733, Moderfc2733_choice, - NULL); - - return offset; -} - /*--- PDUs ---*/ static void dissect_OpenLogicalChannel_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -18543,14 +18529,14 @@ void proto_register_h245(void) { { "h261aVideoPacketization", "h245.h261aVideoPacketization", FT_BOOLEAN, 8, NULL, 0, "MediaPacketizationCapability/h261aVideoPacketization", HFILL }}, - { &hf_h245_rtpPayloadType2, - { "rtpPayloadType2", "h245.rtpPayloadType2", + { &hf_h245_rtpPayloadTypes, + { "rtpPayloadType", "h245.rtpPayloadType", FT_UINT32, BASE_DEC, NULL, 0, - "MediaPacketizationCapability/rtpPayloadType2", HFILL }}, - { &hf_h245_rtpPayloadType2_item, - { "Item", "h245.rtpPayloadType2_item", + "MediaPacketizationCapability/rtpPayloadType", HFILL }}, + { &hf_h245_rtpPayloadTypes_item, + { "Item", "h245.rtpPayloadType_item", FT_NONE, BASE_NONE, NULL, 0, - "MediaPacketizationCapability/rtpPayloadType2/_item", HFILL }}, + "MediaPacketizationCapability/rtpPayloadType/_item", HFILL }}, { &hf_h245_qosMode, { "qosMode", "h245.qosMode", FT_UINT32, BASE_DEC, VALS(h245_QOSMode_vals), 0, @@ -18667,14 +18653,14 @@ void proto_register_h245(void) { { "primaryEncoding", "h245.primaryEncoding", FT_UINT32, BASE_DEC, NULL, 0, "RedundancyEncodingCapability/primaryEncoding", HFILL }}, - { &hf_h245_secondaryEncoding2, - { "secondaryEncoding2", "h245.secondaryEncoding2", + { &hf_h245_secondaryEncodingCapability, + { "secondaryEncoding", "h245.secondaryEncoding", FT_UINT32, BASE_DEC, NULL, 0, - "RedundancyEncodingCapability/secondaryEncoding2", HFILL }}, - { &hf_h245_secondaryEncoding2_item, - { "Item", "h245.secondaryEncoding2_item", + "RedundancyEncodingCapability/secondaryEncoding", HFILL }}, + { &hf_h245_secondaryEncodingCapability_item, + { "Item", "h245.secondaryEncoding_item", FT_UINT32, BASE_DEC, NULL, 0, - "RedundancyEncodingCapability/secondaryEncoding2/_item", HFILL }}, + "RedundancyEncodingCapability/secondaryEncoding/_item", HFILL }}, { &hf_h245_rtpAudioRedundancyEncoding, { "rtpAudioRedundancyEncoding", "h245.rtpAudioRedundancyEncoding", FT_NONE, BASE_NONE, NULL, 0, @@ -19551,10 +19537,6 @@ void proto_register_h245(void) { { "annexH", "h245.annexH", FT_BOOLEAN, 8, NULL, 0, "G729Extensions/annexH", HFILL }}, - { &hf_h245_g723AnnexCAudioMode, - { "g723AnnexCAudioMode", "h245.g723AnnexCAudioMode", - FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }}, { &hf_h245_highRateMode0, { "highRateMode0", "h245.highRateMode0", FT_UINT32, BASE_DEC, NULL, 0, @@ -19579,6 +19561,10 @@ void proto_register_h245(void) { { "sidMode1", "h245.sidMode1", FT_UINT32, BASE_DEC, NULL, 0, "G723AnnexCAudioMode/sidMode1", HFILL }}, + { &hf_h245_g723AnnexCAudioMode, + { "g723AnnexCAudioMode", "h245.g723AnnexCAudioMode", + FT_NONE, BASE_NONE, NULL, 0, + "", HFILL }}, { &hf_h245_audioLayer1, { "audioLayer1", "h245.audioLayer1", FT_BOOLEAN, 8, NULL, 0, @@ -19683,14 +19669,6 @@ void proto_register_h245(void) { { "type", "h245.type", FT_UINT32, BASE_DEC, VALS(h245_AudioCapability_vals), 0, "VBDCapability/type", HFILL }}, - { &hf_h245_application, - { "application", "h245.application", - FT_UINT32, BASE_DEC, VALS(h245_Application_vals), 0, - "DataApplicationCapability/application", HFILL }}, - { &hf_h245_maxBitRate2_0_4294967295, - { "maxBitRate", "h245.maxBitRate", - FT_UINT32, BASE_DEC, NULL, 0, - "", HFILL }}, { &hf_h245_t120, { "t120", "h245.t120", FT_UINT32, BASE_DEC, VALS(DataProtocolCapability_vals), 0, @@ -19723,6 +19701,14 @@ void proto_register_h245(void) { { "h224", "h245.h224", FT_UINT32, BASE_DEC, VALS(DataProtocolCapability_vals), 0, "", HFILL }}, + { &hf_h245_nlpidProtocol, + { "nlpidProtocol", "h245.nlpidProtocol", + FT_UINT32, BASE_DEC, VALS(DataProtocolCapability_vals), 0, + "Nlpid/nlpidProtocol", HFILL }}, + { &hf_h245_nlpidData, + { "nlpidData", "h245.nlpidData", + FT_BYTES, BASE_HEX, NULL, 0, + "Nlpid/nlpidData", HFILL }}, { &hf_h245_nlpid, { "nlpid", "h245.nlpid", FT_NONE, BASE_NONE, NULL, 0, @@ -19759,6 +19745,14 @@ void proto_register_h245(void) { { "genericDataCapability", "h245.genericDataCapability", FT_NONE, BASE_NONE, NULL, 0, "Application/genericDataCapability", HFILL }}, + { &hf_h245_application, + { "application", "h245.application", + FT_UINT32, BASE_DEC, VALS(h245_Application_vals), 0, + "DataApplicationCapability/application", HFILL }}, + { &hf_h245_maxBitRate2_0_4294967295, + { "maxBitRate", "h245.maxBitRate", + FT_UINT32, BASE_DEC, NULL, 0, + "", HFILL }}, { &hf_h245_v14buffered, { "v14buffered", "h245.v14buffered", FT_NONE, BASE_NONE, NULL, 0, @@ -19979,14 +19973,6 @@ void proto_register_h245(void) { { "t38TCPBidirectionalMode", "h245.t38TCPBidirectionalMode", FT_BOOLEAN, 8, NULL, 0, "T38FaxTcpOptions/t38TCPBidirectionalMode", HFILL }}, - { &hf_h245_nlpidProtocol, - { "nlpidProtocol", "h245.nlpidProtocol", - FT_UINT32, BASE_DEC, VALS(DataProtocolCapability_vals), 0, - "Nlpid/nlpidProtocol", HFILL }}, - { &hf_h245_nlpidData, - { "nlpidData", "h245.nlpidData", - FT_BYTES, BASE_HEX, NULL, 0, - "Nlpid/nlpidData", HFILL }}, { &hf_h245_encryptionCapability, { "encryptionCapability", "h245.encryptionCapability", FT_UINT32, BASE_DEC, NULL, 0, @@ -20015,10 +20001,10 @@ void proto_register_h245(void) { { "nonStandard", "h245.nonStandard", FT_UINT32, BASE_DEC, NULL, 0, "UserInputCapability/nonStandard", HFILL }}, - { &hf_h245_nonStandard_item, + { &hf_h245_ui_nonStandard_item, { "Item", "h245.nonStandard_item", FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }}, + "UserInputCapability/nonStandard/_item", HFILL }}, { &hf_h245_basicString, { "basicString", "h245.basicString", FT_NONE, BASE_NONE, NULL, 0, @@ -20063,10 +20049,10 @@ void proto_register_h245(void) { { "nonStandardData", "h245.nonStandardData", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, - { &hf_h245_nonStandardData_item, + { &hf_h245_nonStandardParams_item, { "Item", "h245.nonStandardData_item", FT_NONE, BASE_NONE, NULL, 0, - "ConferenceCapability/nonStandardData/_item", HFILL }}, + "", HFILL }}, { &hf_h245_chairControlCapability, { "chairControlCapability", "h245.chairControlCapability", FT_BOOLEAN, 8, NULL, 0, @@ -20459,6 +20445,14 @@ void proto_register_h245(void) { { "al2WithSequenceNumbers", "h245.al2WithSequenceNumbers", FT_NONE, BASE_NONE, NULL, 0, "H223LogicalChannelParameters/adaptationLayerType/al2WithSequenceNumbers", HFILL }}, + { &hf_h245_controlFieldOctets, + { "controlFieldOctets", "h245.controlFieldOctets", + FT_UINT32, BASE_DEC, NULL, 0, + "Al3/controlFieldOctets", HFILL }}, + { &hf_h245_al3_sendBufferSize, + { "sendBufferSize", "h245.sendBufferSize", + FT_UINT32, BASE_DEC, NULL, 0, + "Al3/sendBufferSize", HFILL }}, { &hf_h245_h223_al_type_al3, { "al3", "h245.al3", FT_NONE, BASE_NONE, NULL, 0, @@ -20479,14 +20473,6 @@ void proto_register_h245(void) { { "segmentableFlag", "h245.segmentableFlag", FT_BOOLEAN, 8, NULL, 0, "H223LogicalChannelParameters/segmentableFlag", HFILL }}, - { &hf_h245_controlFieldOctets, - { "controlFieldOctets", "h245.controlFieldOctets", - FT_UINT32, BASE_DEC, NULL, 0, - "Al3/controlFieldOctets", HFILL }}, - { &hf_h245_al3_sendBufferSize, - { "sendBufferSize", "h245.sendBufferSize", - FT_UINT32, BASE_DEC, NULL, 0, - "Al3/sendBufferSize", HFILL }}, { &hf_h245_transferMode, { "transferMode", "h245.transferMode", FT_UINT32, BASE_DEC, VALS(h245_T_transferMode_vals), 0, @@ -20551,18 +20537,6 @@ void proto_register_h245(void) { { "rcpcCodeRate", "h245.rcpcCodeRate", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, - { &hf_h245_arqType, - { "arqType", "h245.arqType", - FT_UINT32, BASE_DEC, VALS(h245_ArqType_vals), 0, - "", HFILL }}, - { &hf_h245_alsduSplitting, - { "alsduSplitting", "h245.alsduSplitting", - FT_BOOLEAN, 8, NULL, 0, - "H223AL1MParameters/alsduSplitting", HFILL }}, - { &hf_h245_rsCodeCorrection, - { "rsCodeCorrection", "h245.rsCodeCorrection", - FT_UINT32, BASE_DEC, NULL, 0, - "", HFILL }}, { &hf_h245_noArq, { "noArq", "h245.noArq", FT_NONE, BASE_NONE, NULL, 0, @@ -20575,6 +20549,18 @@ void proto_register_h245(void) { { "typeIIArq", "h245.typeIIArq", FT_NONE, BASE_NONE, NULL, 0, "ArqType/typeIIArq", HFILL }}, + { &hf_h245_arqType, + { "arqType", "h245.arqType", + FT_UINT32, BASE_DEC, VALS(h245_ArqType_vals), 0, + "", HFILL }}, + { &hf_h245_alsduSplitting, + { "alsduSplitting", "h245.alsduSplitting", + FT_BOOLEAN, 8, NULL, 0, + "H223AL1MParameters/alsduSplitting", HFILL }}, + { &hf_h245_rsCodeCorrection, + { "rsCodeCorrection", "h245.rsCodeCorrection", + FT_UINT32, BASE_DEC, NULL, 0, + "", HFILL }}, { &hf_h245_aL2HeaderFEC, { "headerFEC", "h245.headerFEC", FT_UINT32, BASE_DEC, VALS(h245_AL2HeaderFEC_vals), 0, @@ -20739,10 +20725,10 @@ void proto_register_h245(void) { { "payloadType", "h245.payloadType", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, - { &hf_h245_secondaryEncoding3, - { "secondaryEncoding3", "h245.secondaryEncoding3", + { &hf_h245_secondaryEncoding, + { "secondaryEncoding", "h245.secondaryEncoding", FT_UINT32, BASE_DEC, VALS(h245_DataType_vals), 0, - "RedundancyEncoding/secondaryEncoding3", HFILL }}, + "RedundancyEncoding/secondaryEncoding", HFILL }}, { &hf_h245_rtpRedundancyEncoding, { "rtpRedundancyEncoding", "h245.rtpRedundancyEncoding", FT_NONE, BASE_NONE, NULL, 0, @@ -20779,10 +20765,6 @@ void proto_register_h245(void) { { "redundancyEncoding", "h245.redundancyEncoding", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }}, - { &hf_h245_separateStream, - { "separateStream", "h245.separateStream", - FT_UINT32, BASE_DEC, VALS(h245_SeparateStream_vals), 0, - "", HFILL }}, { &hf_h245_differentPort, { "differentPort", "h245.differentPort", FT_NONE, BASE_NONE, NULL, 0, @@ -20799,6 +20781,10 @@ void proto_register_h245(void) { { "samePort", "h245.samePort", FT_NONE, BASE_NONE, NULL, 0, "SeparateStream/samePort", HFILL }}, + { &hf_h245_separateStream, + { "separateStream", "h245.separateStream", + FT_UINT32, BASE_DEC, VALS(h245_SeparateStream_vals), 0, + "", HFILL }}, { &hf_h245_unicastAddress, { "unicastAddress", "h245.unicastAddress", FT_UINT32, BASE_DEC, VALS(h245_UnicastAddress_vals), 0, @@ -20953,7 +20939,7 @@ void proto_register_h245(void) { "OpenLogicalChannelAck/reverseLogicalChannelParameters/reverseLogicalChannelNumber", HFILL }}, { &hf_h245_olc_ack_multiplexParameters, { "multiplexParameters", "h245.multiplexParameters", - FT_UINT32, BASE_DEC, VALS(h245_T_multiplexParameters_vals), 0, + FT_UINT32, BASE_DEC, VALS(h245_T_olc_ack_multiplexParameters_vals), 0, "OpenLogicalChannelAck/reverseLogicalChannelParameters/multiplexParameters", HFILL }}, { &hf_h245_forwardMultiplexAckParameters, { "forwardMultiplexAckParameters", "h245.forwardMultiplexAckParameters", @@ -21041,7 +21027,7 @@ void proto_register_h245(void) { "H2250LogicalChannelAckParameters/flowControlToZero", HFILL }}, { &hf_h245_cLC_source, { "source", "h245.source", - FT_UINT32, BASE_DEC, VALS(h245_T_source_vals), 0, + FT_UINT32, BASE_DEC, VALS(h245_T_cLC_source_vals), 0, "CloseLogicalChannel/source", HFILL }}, { &hf_h245_user, { "user", "h245.user", @@ -21135,18 +21121,18 @@ void proto_register_h245(void) { { "multiplexTableEntryNumber", "h245.multiplexTableEntryNumber", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, - { &hf_h245_multiplexTableEntryNumber_item, + { &hf_h245_multiplexTableEntryNumbers_item, { "Item", "h245.multiplexTableEntryNumber_item", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, - { &hf_h245_rejectionDescriptions1, - { "rejectionDescriptions1", "h245.rejectionDescriptions1", + { &hf_h245_sendRejectionDescriptions, + { "rejectionDescriptions", "h245.rejectionDescriptions", FT_UINT32, BASE_DEC, NULL, 0, - "MultiplexEntrySendReject/rejectionDescriptions1", HFILL }}, - { &hf_h245_rejectionDescriptions1_item, - { "Item", "h245.rejectionDescriptions1_item", + "MultiplexEntrySendReject/rejectionDescriptions", HFILL }}, + { &hf_h245_sendRejectionDescriptions_item, + { "Item", "h245.rejectionDescriptions_item", FT_NONE, BASE_NONE, NULL, 0, - "MultiplexEntrySendReject/rejectionDescriptions1/_item", HFILL }}, + "MultiplexEntrySendReject/rejectionDescriptions/_item", HFILL }}, { &hf_h245_mux_rej_cause, { "cause", "h245.cause", FT_UINT32, BASE_DEC, VALS(h245_MultiplexEntryRejectionDescriptionsCause_vals), 0, @@ -21167,14 +21153,14 @@ void proto_register_h245(void) { { "Item", "h245.entryNumbers_item", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, - { &hf_h245_rejectionDescriptions2, - { "rejectionDescriptions2", "h245.rejectionDescriptions2", + { &hf_h245_rejectionDescriptions, + { "rejectionDescriptions", "h245.rejectionDescriptions", FT_UINT32, BASE_DEC, NULL, 0, - "RequestMultiplexEntryReject/rejectionDescriptions2", HFILL }}, - { &hf_h245_rejectionDescriptions2_item, - { "Item", "h245.rejectionDescriptions2_item", + "RequestMultiplexEntryReject/rejectionDescriptions", HFILL }}, + { &hf_h245_rejectionDescriptions_item, + { "Item", "h245.rejectionDescriptions_item", FT_NONE, BASE_NONE, NULL, 0, - "RequestMultiplexEntryReject/rejectionDescriptions2/_item", HFILL }}, + "RequestMultiplexEntryReject/rejectionDescriptions/_item", HFILL }}, { &hf_h245_req_mux_rej_cause, { "cause", "h245.cause", FT_UINT32, BASE_DEC, VALS(h245_RequestMultiplexEntryRejectionDescriptionsCause_vals), 0, @@ -21291,26 +21277,26 @@ void proto_register_h245(void) { { "primary", "h245.primary", FT_NONE, BASE_NONE, NULL, 0, "RedundancyEncodingDTMode/primary", HFILL }}, - { &hf_h245_secondary2, - { "secondary2", "h245.secondary2", + { &hf_h245_secondaryDTM, + { "secondary", "h245.secondary", FT_UINT32, BASE_DEC, NULL, 0, - "RedundancyEncodingDTMode/secondary2", HFILL }}, - { &hf_h245_secondary2_item, - { "Item", "h245.secondary2_item", + "RedundancyEncodingDTMode/secondary", HFILL }}, + { &hf_h245_secondaryDTM_item, + { "Item", "h245.secondary_item", FT_NONE, BASE_NONE, NULL, 0, - "RedundancyEncodingDTMode/secondary2/_item", HFILL }}, + "RedundancyEncodingDTMode/secondary/_item", HFILL }}, { &hf_h245_re_type, { "type", "h245.type", FT_UINT32, BASE_DEC, VALS(h245_Re_type_vals), 0, "RedundancyEncodingDTModeElement/type", HFILL }}, { &hf_h245_mpsmElements, - { "mpsmElements", "h245.mpsmElements", + { "elements", "h245.elements", FT_UINT32, BASE_DEC, NULL, 0, - "MultiplePayloadStreamMode/mpsmElements", HFILL }}, + "MultiplePayloadStreamMode/elements", HFILL }}, { &hf_h245_mpsmElements_item, - { "Item", "h245.mpsmElements_item", + { "Item", "h245.elements_item", FT_NONE, BASE_NONE, NULL, 0, - "MultiplePayloadStreamMode/mpsmElements/_item", HFILL }}, + "MultiplePayloadStreamMode/elements/_item", HFILL }}, { &hf_h245_rfc2733Mode, { "rfc2733Mode", "h245.rfc2733Mode", FT_NONE, BASE_NONE, NULL, 0, @@ -21363,9 +21349,9 @@ void proto_register_h245(void) { { "redundancyEncodingMode", "h245.redundancyEncodingMode", FT_NONE, BASE_NONE, NULL, 0, "H2250ModeParameters/redundancyEncodingMode", HFILL }}, - { &hf_h245_secondaryEncoding, + { &hf_h245_secondaryEncodingMode, { "secondaryEncoding", "h245.secondaryEncoding", - FT_UINT32, BASE_DEC, VALS(h245_T_secondaryEncoding_vals), 0, + FT_UINT32, BASE_DEC, VALS(h245_T_secondaryEncodingMode_vals), 0, "RedundancyEncodingMode/secondaryEncoding", HFILL }}, { &hf_h245_h261VideoMode, { "h261VideoMode", "h245.h261VideoMode", @@ -21725,7 +21711,7 @@ void proto_register_h245(void) { "CommunicationModeTableEntry/sessionDescription", HFILL }}, { &hf_h245_entryDataType, { "dataType", "h245.dataType", - FT_UINT32, BASE_DEC, VALS(h245_T_dataType_vals), 0, + FT_UINT32, BASE_DEC, VALS(h245_T_entryDataType_vals), 0, "CommunicationModeTableEntry/dataType", HFILL }}, { &hf_h245_cm_mediaChannel, { "mediaChannel", "h245.mediaChannel", @@ -22003,6 +21989,10 @@ void proto_register_h245(void) { { "removeConnection", "h245.removeConnection", FT_NONE, BASE_NONE, NULL, 0, "MultilinkRequest/removeConnection", HFILL }}, + { &hf_h245_connectionIdentifier, + { "connectionIdentifier", "h245.connectionIdentifier", + FT_NONE, BASE_NONE, NULL, 0, + "", HFILL }}, { &hf_h245_maximumHeaderIntervalReq, { "maximumHeaderInterval", "h245.maximumHeaderInterval", FT_NONE, BASE_NONE, NULL, 0, @@ -22063,10 +22053,6 @@ void proto_register_h245(void) { { "currentInterval", "h245.currentInterval", FT_UINT32, BASE_DEC, NULL, 0, "MultilinkResponse/maximumHeaderInterval/currentInterval", HFILL }}, - { &hf_h245_connectionIdentifier, - { "connectionIdentifier", "h245.connectionIdentifier", - FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }}, { &hf_h245_crcDesired, { "crcDesired", "h245.crcDesired", FT_NONE, BASE_NONE, NULL, 0, @@ -22191,18 +22177,14 @@ void proto_register_h245(void) { { "associatedAlgorithm", "h245.associatedAlgorithm", FT_NONE, BASE_NONE, NULL, 0, "EncryptionCommand/encryptionAlgorithmID/associatedAlgorithm", HFILL }}, - { &hf_h245_scope, - { "scope", "h245.scope", - FT_UINT32, BASE_DEC, VALS(h245_Scope_vals), 0, - "", HFILL }}, - { &hf_h245_restriction, - { "restriction", "h245.restriction", - FT_UINT32, BASE_DEC, VALS(h245_Restriction_vals), 0, - "", HFILL }}, { &hf_h245_wholeMultiplex, { "wholeMultiplex", "h245.wholeMultiplex", FT_NONE, BASE_NONE, NULL, 0, "Scope/wholeMultiplex", HFILL }}, + { &hf_h245_scope, + { "scope", "h245.scope", + FT_UINT32, BASE_DEC, VALS(h245_Scope_vals), 0, + "", HFILL }}, { &hf_h245_res_maximumBitRate, { "maximumBitRate", "h245.maximumBitRate", FT_UINT32, BASE_DEC, NULL, 0, @@ -22211,6 +22193,10 @@ void proto_register_h245(void) { { "noRestriction", "h245.noRestriction", FT_NONE, BASE_NONE, NULL, 0, "Restriction/noRestriction", HFILL }}, + { &hf_h245_restriction, + { "restriction", "h245.restriction", + FT_UINT32, BASE_DEC, VALS(h245_Restriction_vals), 0, + "", HFILL }}, { &hf_h245_disconnect, { "disconnect", "h245.disconnect", FT_NONE, BASE_NONE, NULL, 0, @@ -22377,8 +22363,24 @@ void proto_register_h245(void) { "MiscellaneousCommand/type/progressiveRefinementStart", HFILL }}, { &hf_h245_repeatCount, { "repeatCount", "h245.repeatCount", - FT_UINT32, BASE_DEC, VALS(h245_RepeatCount_vals), 0, + FT_UINT32, BASE_DEC, VALS(h245_T_repeatCount_vals), 0, "MiscellaneousCommand/type/progressiveRefinementStart/repeatCount", HFILL }}, + { &hf_h245_doOneProgression, + { "doOneProgression", "h245.doOneProgression", + FT_NONE, BASE_NONE, NULL, 0, + "MiscellaneousCommand/type/progressiveRefinementStart/repeatCount/doOneProgression", HFILL }}, + { &hf_h245_doContinuousProgressions, + { "doContinuousProgressions", "h245.doContinuousProgressions", + FT_NONE, BASE_NONE, NULL, 0, + "MiscellaneousCommand/type/progressiveRefinementStart/repeatCount/doContinuousProgressions", HFILL }}, + { &hf_h245_doOneIndependentProgression, + { "doOneIndependentProgression", "h245.doOneIndependentProgression", + FT_NONE, BASE_NONE, NULL, 0, + "MiscellaneousCommand/type/progressiveRefinementStart/repeatCount/doOneIndependentProgression", HFILL }}, + { &hf_h245_doContinuousIndependentProgressions, + { "doContinuousIndependentProgressions", "h245.doContinuousIndependentProgressions", + FT_NONE, BASE_NONE, NULL, 0, + "MiscellaneousCommand/type/progressiveRefinementStart/repeatCount/doContinuousIndependentProgressions", HFILL }}, { &hf_h245_progressiveRefinementAbortOne, { "progressiveRefinementAbortOne", "h245.progressiveRefinementAbortOne", FT_NONE, BASE_NONE, NULL, 0, @@ -22439,22 +22441,6 @@ void proto_register_h245(void) { { "direction", "h245.direction", FT_UINT32, BASE_DEC, VALS(h245_EncryptionUpdateDirection_vals), 0, "MiscellaneousCommand/direction", HFILL }}, - { &hf_h245_doOneProgression, - { "doOneProgression", "h245.doOneProgression", - FT_NONE, BASE_NONE, NULL, 0, - "RepeatCount/doOneProgression", HFILL }}, - { &hf_h245_doContinuousProgressions, - { "doContinuousProgressions", "h245.doContinuousProgressions", - FT_NONE, BASE_NONE, NULL, 0, - "RepeatCount/doContinuousProgressions", HFILL }}, - { &hf_h245_doOneIndependentProgression, - { "doOneIndependentProgression", "h245.doOneIndependentProgression", - FT_NONE, BASE_NONE, NULL, 0, - "RepeatCount/doOneIndependentProgression", HFILL }}, - { &hf_h245_doContinuousIndependentProgressions, - { "doContinuousIndependentProgressions", "h245.doContinuousIndependentProgressions", - FT_NONE, BASE_NONE, NULL, 0, - "RepeatCount/doContinuousIndependentProgressions", HFILL }}, { &hf_h245_secureChannel, { "secureChannel", "h245.secureChannel", FT_BOOLEAN, 8, NULL, 0, @@ -22863,6 +22849,14 @@ void proto_register_h245(void) { { "rtp", "h245.rtp", FT_NONE, BASE_NONE, NULL, 0, "UserInputIndication/signal/rtp", HFILL }}, + { &hf_h245_timestamp, + { "timestamp", "h245.timestamp", + FT_UINT32, BASE_DEC, NULL, 0, + "UserInputIndication/signal/rtp/timestamp", HFILL }}, + { &hf_h245_expirationTime, + { "expirationTime", "h245.expirationTime", + FT_UINT32, BASE_DEC, NULL, 0, + "UserInputIndication/signal/rtp/expirationTime", HFILL }}, { &hf_h245_rtpPayloadIndication, { "rtpPayloadIndication", "h245.rtpPayloadIndication", FT_NONE, BASE_NONE, NULL, 0, @@ -22887,10 +22881,6 @@ void proto_register_h245(void) { { "extendedAlphanumeric", "h245.extendedAlphanumeric", FT_NONE, BASE_NONE, NULL, 0, "UserInputIndication/extendedAlphanumeric", HFILL }}, - { &hf_h245_encryptedAlphanumeric, - { "encryptedAlphanumeric", "h245.encryptedAlphanumeric", - FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }}, { &hf_h245_algorithmOID, { "algorithmOID", "h245.algorithmOID", FT_OID, BASE_NONE, NULL, 0, @@ -22899,14 +22889,10 @@ void proto_register_h245(void) { { "encrypted", "h245.encrypted", FT_BYTES, BASE_HEX, NULL, 0, "EncryptedAlphanumeric/encrypted", HFILL }}, - { &hf_h245_timestamp, - { "timestamp", "h245.timestamp", - FT_UINT32, BASE_DEC, NULL, 0, - "Rtp/timestamp", HFILL }}, - { &hf_h245_expirationTime, - { "expirationTime", "h245.expirationTime", - FT_UINT32, BASE_DEC, NULL, 0, - "Rtp/expirationTime", HFILL }}, + { &hf_h245_encryptedAlphanumeric, + { "encryptedAlphanumeric", "h245.encryptedAlphanumeric", + FT_NONE, BASE_NONE, NULL, 0, + "", HFILL }}, /*--- End of included file: packet-h245-hfarr.c ---*/ #line 352 "packet-h245-template.c" @@ -23045,6 +23031,7 @@ void proto_register_h245(void) { &ett_h245_DataApplicationCapability, &ett_h245_Application, &ett_h245_T_t84, + &ett_h245_Nlpid, &ett_h245_T_t38fax, &ett_h245_DataProtocolCapability, &ett_h245_T_v76wCompression, @@ -23057,7 +23044,6 @@ void proto_register_h245(void) { &ett_h245_T38FaxUdpOptions, &ett_h245_T_t38FaxUdpEC, &ett_h245_T38FaxTcpOptions, - &ett_h245_Nlpid, &ett_h245_EncryptionAuthenticationAndIntegrity, &ett_h245_EncryptionCapability, &ett_h245_MediaEncryptionAlgorithm, @@ -23082,7 +23068,7 @@ void proto_register_h245(void) { &ett_h245_MultiplePayloadStreamCapability, &ett_h245_FECCapability, &ett_h245_FECC_rfc2733, - &ett_h245_T_separateStream, + &ett_h245_T_separateStreamBool, &ett_h245_OpenLogicalChannel, &ett_h245_T_forwardLogicalChannelParameters, &ett_h245_OLC_forw_multiplexParameters, @@ -23136,7 +23122,6 @@ void proto_register_h245(void) { &ett_h245_FECData, &ett_h245_RFC2733Data, &ett_h245_FECdata_mode, - &ett_h245_Moderfc2733, &ett_h245_SeparateStream, &ett_h245_T_differentPort, &ett_h245_T_samePort, @@ -23156,14 +23141,14 @@ void proto_register_h245(void) { &ett_h245_EscrowData, &ett_h245_OpenLogicalChannelAck, &ett_h245_OLC_ack_reverseLogicalChannelParameters, - &ett_h245_T_multiplexParameters, + &ett_h245_T_olc_ack_multiplexParameters, &ett_h245_T_forwardMultiplexAckParameters, &ett_h245_OpenLogicalChannelReject, &ett_h245_OpenLogicalChannelRejectCause, &ett_h245_OpenLogicalChannelConfirm, &ett_h245_H2250LogicalChannelAckParameters, &ett_h245_CloseLogicalChannel, - &ett_h245_T_source, + &ett_h245_T_cLC_source, &ett_h245_Clc_reason, &ett_h245_CloseLogicalChannelAck, &ett_h245_RequestChannelClose, @@ -23222,7 +23207,7 @@ void proto_register_h245(void) { &ett_h245_V76ModeParameters, &ett_h245_H2250ModeParameters, &ett_h245_RedundancyEncodingMode, - &ett_h245_T_secondaryEncoding, + &ett_h245_T_secondaryEncodingMode, &ett_h245_VideoMode, &ett_h245_H261VideoMode, &ett_h245_H261Resolution, @@ -23262,7 +23247,7 @@ void proto_register_h245(void) { &ett_h245_CommunicationModeRequest, &ett_h245_CommunicationModeResponse, &ett_h245_CommunicationModeTableEntry, - &ett_h245_T_dataType, + &ett_h245_T_entryDataType, &ett_h245_ConferenceRequest, &ett_h245_T_requestTerminalCertificate, &ett_h245_CertSelectionCriteria, @@ -23290,6 +23275,7 @@ void proto_register_h245(void) { &ett_h245_MultilinkRequest, &ett_h245_CallInformationReq, &ett_h245_AddConnectionReq, + &ett_h245_RemoveConnectionReq, &ett_h245_MaximumHeaderIntervalReq, &ett_h245_T_requestType, &ett_h245_MultilinkResponse, @@ -23297,8 +23283,8 @@ void proto_register_h245(void) { &ett_h245_AddConnectionResp, &ett_h245_T_responseCode, &ett_h245_T_rejected, + &ett_h245_RemoveConnectionResp, &ett_h245_MaximumHeaderIntervalResp, - &ett_h245_RemoveConnection, &ett_h245_MultilinkIndication, &ett_h245_T_crcDesired, &ett_h245_T_excessiveError, @@ -23333,12 +23319,12 @@ void proto_register_h245(void) { &ett_h245_T_videoFastUpdateGOB, &ett_h245_T_videoFastUpdateMB, &ett_h245_T_progressiveRefinementStart, + &ett_h245_T_repeatCount, &ett_h245_T_videoBadMBs, &ett_h245_SEQUENCE_OF_PictureReference, &ett_h245_T_lostPartialPicture, &ett_h245_T_encryptionUpdateCommand, &ett_h245_T_encryptionUpdateAck, - &ett_h245_RepeatCount, &ett_h245_KeyProtectionMethod, &ett_h245_EncryptionUpdateRequest, &ett_h245_PictureReference, @@ -23383,11 +23369,11 @@ void proto_register_h245(void) { &ett_h245_UserInputIndication, &ett_h245_T_userInputSupportIndication, &ett_h245_T_signal, + &ett_h245_T_rtp, &ett_h245_T_signalUpdate, &ett_h245_Si_rtp, &ett_h245_T_extendedAlphanumeric, &ett_h245_EncryptedAlphanumeric, - &ett_h245_Rtp, &ett_h245_FlowControlIndication, &ett_h245_MobileMultilinkReconfigurationIndication, diff --git a/epan/dissectors/packet-h245.h b/epan/dissectors/packet-h245.h index 7c4a398ffb..01d061f9b0 100644 --- a/epan/dissectors/packet-h245.h +++ b/epan/dissectors/packet-h245.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-h245.h */ -/* ../../tools/asn2wrs.py -e -p h245 -c h245.cnf -s packet-h245-template h245.asn */ +/* ../../tools/asn2wrs.py -e -p h245 -c h245.cnf -s packet-h245-template MULTIMEDIA-SYSTEM-CONTROL.asn */ /* Input file: packet-h245-template.h */ diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c index afd3d4b444..32d1ca1dec 100644 --- a/epan/dissectors/packet-h450.c +++ b/epan/dissectors/packet-h450.c @@ -32,7 +32,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * Credit to Tomas Kukosa for developing the Asn2eth compiler. + * Credit to Tomas Kukosa for developing the asn2wrs compiler. * */ @@ -318,20 +318,25 @@ static int hf_h450_IntResultList_item = -1; /* IntResult */ static int hf_h450_remoteEnabled = -1; /* BOOLEAN */ static int hf_h450_intResult_extension = -1; /* IntResult_extension */ static int hf_h450_holdNotificArg_extensionArg = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ -static int hf_h450_extensionArg_item = -1; /* MixedExtension */ +static int hf_h450_holdNotificArg_extensionArg_item = -1; /* MixedExtension */ static int hf_h450_retrieveNotificArg_extensionArg = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_retrieveNotificArg_extensionArg_item = -1; /* MixedExtension */ static int hf_h450_remoteHoldArg_extensionArg = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_remoteHoldArg_extensionArg_item = -1; /* MixedExtension */ static int hf_h450_extensionRes = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ static int hf_h450_extensionRes_item = -1; /* MixedExtension */ static int hf_h450_remoteRetrieveArg_extensionArg = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_remoteRetrieveArg_extensionArg_item = -1; /* MixedExtension */ static int hf_h450_mixedExtension_extension = -1; /* Extension */ static int hf_h450_parkingNumber = -1; /* EndpointAddress */ static int hf_h450_parkedNumber = -1; /* EndpointAddress */ static int hf_h450_parkedToNumber = -1; /* EndpointAddress */ static int hf_h450_parkedToPosition = -1; /* ParkedToPosition */ static int hf_h450_cpRequestArg_extensionArg = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_cpRequestArg_extensionArg_item = -1; /* MixedExtension */ static int hf_h450_parkCondition = -1; /* ParkCondition */ static int hf_h450_cpSetupArg_extensionArg = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_cpSetupArg_extensionArg_item = -1; /* MixedExtension */ static int hf_h450_callPickupId = -1; /* CallIdentifier */ static int hf_h450_groupMemberUserNr = -1; /* EndpointAddress */ static int hf_h450_retrieveCallType = -1; /* CallType */ @@ -339,15 +344,23 @@ static int hf_h450_partyToRetrieve = -1; /* EndpointAddress */ static int hf_h450_retrieveAddress = -1; /* EndpointAddress */ static int hf_h450_parkPosition = -1; /* ParkedToPosition */ static int hf_h450_groupIndicationOnArg_extensionArg = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_groupIndicationOnArg_extensionArg_item = -1; /* MixedExtension */ static int hf_h450_groupIndicationOffArg_extensionArg = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_groupIndicationOffArg_extensionArg_item = -1; /* MixedExtension */ static int hf_h450_picking_upNumber = -1; /* EndpointAddress */ static int hf_h450_pickrequArg_extensionArg = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_pickrequArg_extensionArg_item = -1; /* MixedExtension */ static int hf_h450_pickupArg_extensionArg = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_pickupArg_extensionArg_item = -1; /* MixedExtension */ static int hf_h450_pickExeArg_extensionArg = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_pickExeArg_extensionArg_item = -1; /* MixedExtension */ static int hf_h450_cpNotifyArg_extensionArg = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_cpNotifyArg_extensionArg_item = -1; /* MixedExtension */ static int hf_h450_cpickupNotifyArg_extensionArg = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_cpickupNotifyArg_extensionArg_item = -1; /* MixedExtension */ static int hf_h450_nbOfAddWaitingCalls = -1; /* INTEGER_0_255 */ static int hf_h450_callWaitingArg_extensionArg = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_callWaitingArg_extensionArg_item = -1; /* MixedExtension */ static int hf_h450_msgCentreId = -1; /* MsgCentreId */ static int hf_h450_nbOfMessages = -1; /* NbOfMessages */ static int hf_h450_originatingNr = -1; /* EndpointAddress */ @@ -366,6 +379,7 @@ static int hf_h450_numericString = -1; /* NumericString_SIZE_1_10 */ static int hf_h450_ExtensionArg_item = -1; /* MixedExtension */ static int hf_h450_name = -1; /* Name */ static int hf_h450_nameArg_extensionArg = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_nameArg_extensionArg_item = -1; /* MixedExtension */ static int hf_h450_namePresentationAllowed = -1; /* NamePresentationAllowed */ static int hf_h450_namePresentationRestricted = -1; /* NamePresentationRestricted */ static int hf_h450_nameNotAvailable = -1; /* NULL */ @@ -379,36 +393,53 @@ static int hf_h450_service = -1; /* BasicService */ static int hf_h450_can_retain_service = -1; /* BOOLEAN */ static int hf_h450_retain_sig_connection = -1; /* BOOLEAN */ static int hf_h450_ccRequestArg_extension = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ -static int hf_h450_extension_item = -1; /* MixedExtension */ +static int hf_h450_ccRequestArg_extension_item = -1; /* MixedExtension */ static int hf_h450_retain_service = -1; /* BOOLEAN */ static int hf_h450_ccRequestRes_extension = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_ccRequestRes_extension_item = -1; /* MixedExtension */ static int hf_h450_shortArg = -1; /* CcShortArg */ static int hf_h450_longArg = -1; /* CcLongArg */ static int hf_h450_ccShortArg_extension = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_ccShortArg_extension_item = -1; /* MixedExtension */ static int hf_h450_ccLongArg_extension = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_ccLongArg_extension_item = -1; /* MixedExtension */ static int hf_h450_coReqOptArg_extension = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_coReqOptArg_extension_item = -1; /* MixedExtension */ static int hf_h450_rUAlertOptArg_extension = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_rUAlertOptArg_extension_item = -1; /* MixedExtension */ static int hf_h450_cfbOvrOptArg_extension = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_cfbOvrOptArg_extension_item = -1; /* MixedExtension */ static int hf_h450_ciCapabilityLevel = -1; /* CICapabilityLevel */ static int hf_h450_cIRequestArg_argumentExtension = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ -static int hf_h450_argumentExtension_item = -1; /* MixedExtension */ +static int hf_h450_cIRequestArg_argumentExtension_item = -1; /* MixedExtension */ static int hf_h450_ciStatusInformation = -1; /* CIStatusInformation */ static int hf_h450_cIRequestRes_resultExtension = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ -static int hf_h450_resultExtension_item = -1; /* MixedExtension */ +static int hf_h450_cIRequestRes_resultExtension_item = -1; /* MixedExtension */ static int hf_h450_cIGetCIPLOptArg_argumentExtension = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_cIGetCIPLOptArg_argumentExtension_item = -1; /* MixedExtension */ static int hf_h450_ciProtectionLevel = -1; /* CIProtectionLevel */ static int hf_h450_silentMonitoringPermitted = -1; /* NULL */ static int hf_h450_cIGetCIPLRes_resultExtension = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_cIGetCIPLRes_resultExtension_item = -1; /* MixedExtension */ static int hf_h450_cIIsOptArg_argumentExtension = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_cIIsOptArg_argumentExtension_item = -1; /* MixedExtension */ static int hf_h450_cIIsOptRes_resultExtension = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_cIIsOptRes_resultExtension_item = -1; /* MixedExtension */ static int hf_h450_cIFrcRelArg_argumentExtension = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_cIFrcRelArg_argumentExtension_item = -1; /* MixedExtension */ static int hf_h450_cIFrcRelOptRes_resultExtension = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_cIFrcRelOptRes_resultExtension_item = -1; /* MixedExtension */ static int hf_h450_cIWobOptArg_argumentExtension = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_cIWobOptArg_argumentExtension_item = -1; /* MixedExtension */ static int hf_h450_cIWobOptRes_resultExtension = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_cIWobOptRes_resultExtension_item = -1; /* MixedExtension */ static int hf_h450_specificCall = -1; /* CallIdentifier */ static int hf_h450_cISilentArg_argumentExtension = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_cISilentArg_argumentExtension_item = -1; /* MixedExtension */ static int hf_h450_cISilentOptRes_resultExtension = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_cISilentOptRes_resultExtension_item = -1; /* MixedExtension */ static int hf_h450_cINotificationArg_argumentExtension = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_cINotificationArg_argumentExtension_item = -1; /* MixedExtension */ static int hf_h450_callIntrusionImpending = -1; /* NULL */ static int hf_h450_callIntruded = -1; /* NULL */ static int hf_h450_callIsolated = -1; /* NULL */ @@ -419,7 +450,9 @@ static int hf_h450_featureList = -1; /* FeatureList */ static int hf_h450_featureValues = -1; /* FeatureValues */ static int hf_h450_featureControl = -1; /* FeatureControl */ static int hf_h450_cmnArg_extension = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_cmnArg_extension_item = -1; /* MixedExtension */ static int hf_h450_cmnRequestArg_extensionArg = -1; /* SEQUENCE_SIZE_0_255_OF_MixedExtension */ +static int hf_h450_cmnRequestArg_extensionArg_item = -1; /* MixedExtension */ static int hf_h450_ssCFreRoutingSupported = -1; /* NULL */ static int hf_h450_ssCTreRoutingSupported = -1; /* NULL */ static int hf_h450_ssCCBSPossible = -1; /* NULL */ @@ -2611,31 +2644,130 @@ dissect_h450_MixedExtension(tvbuff_t *tvb, int offset, asn_ctx_t *actx _U_, prot return offset; } -static int dissect_extensionArg_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_extensionArg_item); +static int dissect_holdNotificArg_extensionArg_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_holdNotificArg_extensionArg_item); +} +static int dissect_retrieveNotificArg_extensionArg_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_retrieveNotificArg_extensionArg_item); +} +static int dissect_remoteHoldArg_extensionArg_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_remoteHoldArg_extensionArg_item); } static int dissect_extensionRes_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_extensionRes_item); } +static int dissect_remoteRetrieveArg_extensionArg_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_remoteRetrieveArg_extensionArg_item); +} +static int dissect_cpRequestArg_extensionArg_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_cpRequestArg_extensionArg_item); +} +static int dissect_cpSetupArg_extensionArg_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_cpSetupArg_extensionArg_item); +} +static int dissect_groupIndicationOnArg_extensionArg_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_groupIndicationOnArg_extensionArg_item); +} +static int dissect_groupIndicationOffArg_extensionArg_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_groupIndicationOffArg_extensionArg_item); +} +static int dissect_pickrequArg_extensionArg_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_pickrequArg_extensionArg_item); +} +static int dissect_pickupArg_extensionArg_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_pickupArg_extensionArg_item); +} +static int dissect_pickExeArg_extensionArg_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_pickExeArg_extensionArg_item); +} +static int dissect_cpNotifyArg_extensionArg_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_cpNotifyArg_extensionArg_item); +} +static int dissect_cpickupNotifyArg_extensionArg_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_cpickupNotifyArg_extensionArg_item); +} +static int dissect_callWaitingArg_extensionArg_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_callWaitingArg_extensionArg_item); +} static int dissect_MwiDummyRes_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_MwiDummyRes_item); } static int dissect_ExtensionArg_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_ExtensionArg_item); } -static int dissect_extension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_extension_item); +static int dissect_nameArg_extensionArg_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_nameArg_extensionArg_item); +} +static int dissect_ccRequestArg_extension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_ccRequestArg_extension_item); +} +static int dissect_ccRequestRes_extension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_ccRequestRes_extension_item); +} +static int dissect_ccShortArg_extension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_ccShortArg_extension_item); +} +static int dissect_ccLongArg_extension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_ccLongArg_extension_item); +} +static int dissect_coReqOptArg_extension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_coReqOptArg_extension_item); +} +static int dissect_rUAlertOptArg_extension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_rUAlertOptArg_extension_item); +} +static int dissect_cfbOvrOptArg_extension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_cfbOvrOptArg_extension_item); +} +static int dissect_cIRequestArg_argumentExtension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_cIRequestArg_argumentExtension_item); +} +static int dissect_cIRequestRes_resultExtension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_cIRequestRes_resultExtension_item); +} +static int dissect_cIGetCIPLOptArg_argumentExtension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_cIGetCIPLOptArg_argumentExtension_item); +} +static int dissect_cIGetCIPLRes_resultExtension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_cIGetCIPLRes_resultExtension_item); +} +static int dissect_cIIsOptArg_argumentExtension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_cIIsOptArg_argumentExtension_item); +} +static int dissect_cIIsOptRes_resultExtension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_cIIsOptRes_resultExtension_item); } -static int dissect_argumentExtension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_argumentExtension_item); +static int dissect_cIFrcRelArg_argumentExtension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_cIFrcRelArg_argumentExtension_item); } -static int dissect_resultExtension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { - return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_resultExtension_item); +static int dissect_cIFrcRelOptRes_resultExtension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_cIFrcRelOptRes_resultExtension_item); +} +static int dissect_cIWobOptArg_argumentExtension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_cIWobOptArg_argumentExtension_item); +} +static int dissect_cIWobOptRes_resultExtension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_cIWobOptRes_resultExtension_item); +} +static int dissect_cISilentArg_argumentExtension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_cISilentArg_argumentExtension_item); +} +static int dissect_cISilentOptRes_resultExtension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_cISilentOptRes_resultExtension_item); +} +static int dissect_cINotificationArg_argumentExtension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_cINotificationArg_argumentExtension_item); +} +static int dissect_cmnArg_extension_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_cmnArg_extension_item); +} +static int dissect_cmnRequestArg_extensionArg_item(tvbuff_t *tvb, int offset, asn_ctx_t *actx, proto_tree *tree) { + return dissect_h450_MixedExtension(tvb, offset, actx, tree, hf_h450_cmnRequestArg_extensionArg_item); } static const per_sequence_t SEQUENCE_SIZE_0_255_OF_MixedExtension_sequence_of[1] = { - { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_extensionArg_item }, + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_holdNotificArg_extensionArg_item }, }; static int @@ -5387,18 +5519,26 @@ void proto_register_h450(void) { { "extensionArg", "h450.extensionArg", FT_UINT32, BASE_DEC, NULL, 0, "HoldNotificArg/extensionArg", HFILL }}, - { &hf_h450_extensionArg_item, + { &hf_h450_holdNotificArg_extensionArg_item, { "Item", "h450.extensionArg_item", FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, - "", HFILL }}, + "HoldNotificArg/extensionArg/_item", HFILL }}, { &hf_h450_retrieveNotificArg_extensionArg, { "extensionArg", "h450.extensionArg", FT_UINT32, BASE_DEC, NULL, 0, "RetrieveNotificArg/extensionArg", HFILL }}, + { &hf_h450_retrieveNotificArg_extensionArg_item, + { "Item", "h450.extensionArg_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "RetrieveNotificArg/extensionArg/_item", HFILL }}, { &hf_h450_remoteHoldArg_extensionArg, { "extensionArg", "h450.extensionArg", FT_UINT32, BASE_DEC, NULL, 0, "RemoteHoldArg/extensionArg", HFILL }}, + { &hf_h450_remoteHoldArg_extensionArg_item, + { "Item", "h450.extensionArg_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "RemoteHoldArg/extensionArg/_item", HFILL }}, { &hf_h450_extensionRes, { "extensionRes", "h450.extensionRes", FT_UINT32, BASE_DEC, NULL, 0, @@ -5411,6 +5551,10 @@ void proto_register_h450(void) { { "extensionArg", "h450.extensionArg", FT_UINT32, BASE_DEC, NULL, 0, "RemoteRetrieveArg/extensionArg", HFILL }}, + { &hf_h450_remoteRetrieveArg_extensionArg_item, + { "Item", "h450.extensionArg_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "RemoteRetrieveArg/extensionArg/_item", HFILL }}, { &hf_h450_mixedExtension_extension, { "extension", "h450.extension", FT_NONE, BASE_NONE, NULL, 0, @@ -5435,6 +5579,10 @@ void proto_register_h450(void) { { "extensionArg", "h450.extensionArg", FT_UINT32, BASE_DEC, NULL, 0, "CpRequestArg/extensionArg", HFILL }}, + { &hf_h450_cpRequestArg_extensionArg_item, + { "Item", "h450.extensionArg_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CpRequestArg/extensionArg/_item", HFILL }}, { &hf_h450_parkCondition, { "parkCondition", "h450.parkCondition", FT_UINT32, BASE_DEC, VALS(h450_ParkCondition_vals), 0, @@ -5443,6 +5591,10 @@ void proto_register_h450(void) { { "extensionArg", "h450.extensionArg", FT_UINT32, BASE_DEC, NULL, 0, "CpSetupArg/extensionArg", HFILL }}, + { &hf_h450_cpSetupArg_extensionArg_item, + { "Item", "h450.extensionArg_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CpSetupArg/extensionArg/_item", HFILL }}, { &hf_h450_callPickupId, { "callPickupId", "h450.callPickupId", FT_NONE, BASE_NONE, NULL, 0, @@ -5471,10 +5623,18 @@ void proto_register_h450(void) { { "extensionArg", "h450.extensionArg", FT_UINT32, BASE_DEC, NULL, 0, "GroupIndicationOnArg/extensionArg", HFILL }}, + { &hf_h450_groupIndicationOnArg_extensionArg_item, + { "Item", "h450.extensionArg_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "GroupIndicationOnArg/extensionArg/_item", HFILL }}, { &hf_h450_groupIndicationOffArg_extensionArg, { "extensionArg", "h450.extensionArg", FT_UINT32, BASE_DEC, NULL, 0, "GroupIndicationOffArg/extensionArg", HFILL }}, + { &hf_h450_groupIndicationOffArg_extensionArg_item, + { "Item", "h450.extensionArg_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "GroupIndicationOffArg/extensionArg/_item", HFILL }}, { &hf_h450_picking_upNumber, { "picking-upNumber", "h450.picking_upNumber", FT_NONE, BASE_NONE, NULL, 0, @@ -5483,22 +5643,42 @@ void proto_register_h450(void) { { "extensionArg", "h450.extensionArg", FT_UINT32, BASE_DEC, NULL, 0, "PickrequArg/extensionArg", HFILL }}, + { &hf_h450_pickrequArg_extensionArg_item, + { "Item", "h450.extensionArg_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "PickrequArg/extensionArg/_item", HFILL }}, { &hf_h450_pickupArg_extensionArg, { "extensionArg", "h450.extensionArg", FT_UINT32, BASE_DEC, NULL, 0, "PickupArg/extensionArg", HFILL }}, + { &hf_h450_pickupArg_extensionArg_item, + { "Item", "h450.extensionArg_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "PickupArg/extensionArg/_item", HFILL }}, { &hf_h450_pickExeArg_extensionArg, { "extensionArg", "h450.extensionArg", FT_UINT32, BASE_DEC, NULL, 0, "PickExeArg/extensionArg", HFILL }}, + { &hf_h450_pickExeArg_extensionArg_item, + { "Item", "h450.extensionArg_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "PickExeArg/extensionArg/_item", HFILL }}, { &hf_h450_cpNotifyArg_extensionArg, { "extensionArg", "h450.extensionArg", FT_UINT32, BASE_DEC, NULL, 0, "CpNotifyArg/extensionArg", HFILL }}, + { &hf_h450_cpNotifyArg_extensionArg_item, + { "Item", "h450.extensionArg_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CpNotifyArg/extensionArg/_item", HFILL }}, { &hf_h450_cpickupNotifyArg_extensionArg, { "extensionArg", "h450.extensionArg", FT_UINT32, BASE_DEC, NULL, 0, "CpickupNotifyArg/extensionArg", HFILL }}, + { &hf_h450_cpickupNotifyArg_extensionArg_item, + { "Item", "h450.extensionArg_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CpickupNotifyArg/extensionArg/_item", HFILL }}, { &hf_h450_nbOfAddWaitingCalls, { "nbOfAddWaitingCalls", "h450.nbOfAddWaitingCalls", FT_UINT32, BASE_DEC, NULL, 0, @@ -5507,6 +5687,10 @@ void proto_register_h450(void) { { "extensionArg", "h450.extensionArg", FT_UINT32, BASE_DEC, NULL, 0, "CallWaitingArg/extensionArg", HFILL }}, + { &hf_h450_callWaitingArg_extensionArg_item, + { "Item", "h450.extensionArg_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CallWaitingArg/extensionArg/_item", HFILL }}, { &hf_h450_msgCentreId, { "msgCentreId", "h450.msgCentreId", FT_UINT32, BASE_DEC, VALS(h450_MsgCentreId_vals), 0, @@ -5579,6 +5763,10 @@ void proto_register_h450(void) { { "extensionArg", "h450.extensionArg", FT_UINT32, BASE_DEC, NULL, 0, "NameArg/extensionArg", HFILL }}, + { &hf_h450_nameArg_extensionArg_item, + { "Item", "h450.extensionArg_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "NameArg/extensionArg/_item", HFILL }}, { &hf_h450_namePresentationAllowed, { "namePresentationAllowed", "h450.namePresentationAllowed", FT_UINT32, BASE_DEC, VALS(h450_NamePresentationAllowed_vals), 0, @@ -5631,10 +5819,10 @@ void proto_register_h450(void) { { "extension", "h450.extension", FT_UINT32, BASE_DEC, NULL, 0, "CcRequestArg/extension", HFILL }}, - { &hf_h450_extension_item, + { &hf_h450_ccRequestArg_extension_item, { "Item", "h450.extension_item", FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, - "", HFILL }}, + "CcRequestArg/extension/_item", HFILL }}, { &hf_h450_retain_service, { "retain-service", "h450.retain_service", FT_BOOLEAN, 8, NULL, 0, @@ -5643,6 +5831,10 @@ void proto_register_h450(void) { { "extension", "h450.extension", FT_UINT32, BASE_DEC, NULL, 0, "CcRequestRes/extension", HFILL }}, + { &hf_h450_ccRequestRes_extension_item, + { "Item", "h450.extension_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CcRequestRes/extension/_item", HFILL }}, { &hf_h450_shortArg, { "shortArg", "h450.shortArg", FT_NONE, BASE_NONE, NULL, 0, @@ -5655,22 +5847,42 @@ void proto_register_h450(void) { { "extension", "h450.extension", FT_UINT32, BASE_DEC, NULL, 0, "CcShortArg/extension", HFILL }}, + { &hf_h450_ccShortArg_extension_item, + { "Item", "h450.extension_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CcShortArg/extension/_item", HFILL }}, { &hf_h450_ccLongArg_extension, { "extension", "h450.extension", FT_UINT32, BASE_DEC, NULL, 0, "CcLongArg/extension", HFILL }}, + { &hf_h450_ccLongArg_extension_item, + { "Item", "h450.extension_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CcLongArg/extension/_item", HFILL }}, { &hf_h450_coReqOptArg_extension, { "extension", "h450.extension", FT_UINT32, BASE_DEC, NULL, 0, "CoReqOptArg/extension", HFILL }}, + { &hf_h450_coReqOptArg_extension_item, + { "Item", "h450.extension_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CoReqOptArg/extension/_item", HFILL }}, { &hf_h450_rUAlertOptArg_extension, { "extension", "h450.extension", FT_UINT32, BASE_DEC, NULL, 0, "RUAlertOptArg/extension", HFILL }}, + { &hf_h450_rUAlertOptArg_extension_item, + { "Item", "h450.extension_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "RUAlertOptArg/extension/_item", HFILL }}, { &hf_h450_cfbOvrOptArg_extension, { "extension", "h450.extension", FT_UINT32, BASE_DEC, NULL, 0, "CfbOvrOptArg/extension", HFILL }}, + { &hf_h450_cfbOvrOptArg_extension_item, + { "Item", "h450.extension_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CfbOvrOptArg/extension/_item", HFILL }}, { &hf_h450_ciCapabilityLevel, { "ciCapabilityLevel", "h450.ciCapabilityLevel", FT_UINT32, BASE_DEC, VALS(h450_CICapabilityLevel_vals), 0, @@ -5679,10 +5891,10 @@ void proto_register_h450(void) { { "argumentExtension", "h450.argumentExtension", FT_UINT32, BASE_DEC, NULL, 0, "CIRequestArg/argumentExtension", HFILL }}, - { &hf_h450_argumentExtension_item, + { &hf_h450_cIRequestArg_argumentExtension_item, { "Item", "h450.argumentExtension_item", FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, - "", HFILL }}, + "CIRequestArg/argumentExtension/_item", HFILL }}, { &hf_h450_ciStatusInformation, { "ciStatusInformation", "h450.ciStatusInformation", FT_UINT32, BASE_DEC, VALS(h450_CIStatusInformation_vals), 0, @@ -5691,14 +5903,18 @@ void proto_register_h450(void) { { "resultExtension", "h450.resultExtension", FT_UINT32, BASE_DEC, NULL, 0, "CIRequestRes/resultExtension", HFILL }}, - { &hf_h450_resultExtension_item, + { &hf_h450_cIRequestRes_resultExtension_item, { "Item", "h450.resultExtension_item", FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, - "", HFILL }}, + "CIRequestRes/resultExtension/_item", HFILL }}, { &hf_h450_cIGetCIPLOptArg_argumentExtension, { "argumentExtension", "h450.argumentExtension", FT_UINT32, BASE_DEC, NULL, 0, "CIGetCIPLOptArg/argumentExtension", HFILL }}, + { &hf_h450_cIGetCIPLOptArg_argumentExtension_item, + { "Item", "h450.argumentExtension_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CIGetCIPLOptArg/argumentExtension/_item", HFILL }}, { &hf_h450_ciProtectionLevel, { "ciProtectionLevel", "h450.ciProtectionLevel", FT_UINT32, BASE_DEC, VALS(h450_CIProtectionLevel_vals), 0, @@ -5711,30 +5927,58 @@ void proto_register_h450(void) { { "resultExtension", "h450.resultExtension", FT_UINT32, BASE_DEC, NULL, 0, "CIGetCIPLRes/resultExtension", HFILL }}, + { &hf_h450_cIGetCIPLRes_resultExtension_item, + { "Item", "h450.resultExtension_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CIGetCIPLRes/resultExtension/_item", HFILL }}, { &hf_h450_cIIsOptArg_argumentExtension, { "argumentExtension", "h450.argumentExtension", FT_UINT32, BASE_DEC, NULL, 0, "CIIsOptArg/argumentExtension", HFILL }}, + { &hf_h450_cIIsOptArg_argumentExtension_item, + { "Item", "h450.argumentExtension_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CIIsOptArg/argumentExtension/_item", HFILL }}, { &hf_h450_cIIsOptRes_resultExtension, { "resultExtension", "h450.resultExtension", FT_UINT32, BASE_DEC, NULL, 0, "CIIsOptRes/resultExtension", HFILL }}, + { &hf_h450_cIIsOptRes_resultExtension_item, + { "Item", "h450.resultExtension_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CIIsOptRes/resultExtension/_item", HFILL }}, { &hf_h450_cIFrcRelArg_argumentExtension, { "argumentExtension", "h450.argumentExtension", FT_UINT32, BASE_DEC, NULL, 0, "CIFrcRelArg/argumentExtension", HFILL }}, + { &hf_h450_cIFrcRelArg_argumentExtension_item, + { "Item", "h450.argumentExtension_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CIFrcRelArg/argumentExtension/_item", HFILL }}, { &hf_h450_cIFrcRelOptRes_resultExtension, { "resultExtension", "h450.resultExtension", FT_UINT32, BASE_DEC, NULL, 0, "CIFrcRelOptRes/resultExtension", HFILL }}, + { &hf_h450_cIFrcRelOptRes_resultExtension_item, + { "Item", "h450.resultExtension_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CIFrcRelOptRes/resultExtension/_item", HFILL }}, { &hf_h450_cIWobOptArg_argumentExtension, { "argumentExtension", "h450.argumentExtension", FT_UINT32, BASE_DEC, NULL, 0, "CIWobOptArg/argumentExtension", HFILL }}, + { &hf_h450_cIWobOptArg_argumentExtension_item, + { "Item", "h450.argumentExtension_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CIWobOptArg/argumentExtension/_item", HFILL }}, { &hf_h450_cIWobOptRes_resultExtension, { "resultExtension", "h450.resultExtension", FT_UINT32, BASE_DEC, NULL, 0, "CIWobOptRes/resultExtension", HFILL }}, + { &hf_h450_cIWobOptRes_resultExtension_item, + { "Item", "h450.resultExtension_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CIWobOptRes/resultExtension/_item", HFILL }}, { &hf_h450_specificCall, { "specificCall", "h450.specificCall", FT_NONE, BASE_NONE, NULL, 0, @@ -5743,14 +5987,26 @@ void proto_register_h450(void) { { "argumentExtension", "h450.argumentExtension", FT_UINT32, BASE_DEC, NULL, 0, "CISilentArg/argumentExtension", HFILL }}, + { &hf_h450_cISilentArg_argumentExtension_item, + { "Item", "h450.argumentExtension_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CISilentArg/argumentExtension/_item", HFILL }}, { &hf_h450_cISilentOptRes_resultExtension, { "resultExtension", "h450.resultExtension", FT_UINT32, BASE_DEC, NULL, 0, "CISilentOptRes/resultExtension", HFILL }}, + { &hf_h450_cISilentOptRes_resultExtension_item, + { "Item", "h450.resultExtension_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CISilentOptRes/resultExtension/_item", HFILL }}, { &hf_h450_cINotificationArg_argumentExtension, { "argumentExtension", "h450.argumentExtension", FT_UINT32, BASE_DEC, NULL, 0, "CINotificationArg/argumentExtension", HFILL }}, + { &hf_h450_cINotificationArg_argumentExtension_item, + { "Item", "h450.argumentExtension_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CINotificationArg/argumentExtension/_item", HFILL }}, { &hf_h450_callIntrusionImpending, { "callIntrusionImpending", "h450.callIntrusionImpending", FT_NONE, BASE_NONE, NULL, 0, @@ -5791,10 +6047,18 @@ void proto_register_h450(void) { { "extension", "h450.extension", FT_UINT32, BASE_DEC, NULL, 0, "CmnArg/extension", HFILL }}, + { &hf_h450_cmnArg_extension_item, + { "Item", "h450.extension_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CmnArg/extension/_item", HFILL }}, { &hf_h450_cmnRequestArg_extensionArg, { "extensionArg", "h450.extensionArg", FT_UINT32, BASE_DEC, NULL, 0, "CmnRequestArg/extensionArg", HFILL }}, + { &hf_h450_cmnRequestArg_extensionArg_item, + { "Item", "h450.extensionArg_item", + FT_UINT32, BASE_DEC, VALS(h450_MixedExtension_vals), 0, + "CmnRequestArg/extensionArg/_item", HFILL }}, { &hf_h450_ssCFreRoutingSupported, { "ssCFreRoutingSupported", "h450.ssCFreRoutingSupported", FT_NONE, BASE_NONE, NULL, 0, |