diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2005-07-15 15:20:40 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2005-07-15 15:20:40 +0000 |
| commit | 13742311485296cc057c622be436c53c321dfc0e (patch) | |
| tree | 4338f742ba8f715b20416bdac38d8c198eda476e | |
| parent | c3467685d5d69b4e4859cd2acd5540625d3d4b71 (diff) | |
- PER helper functions for SET/SEQUENCE OF dissection were changed to have prototype similar to BER (per_sequence_t is used as parameter)
- asn2eth was updated to support new PER helper functions for SET/SEQUENCE OF
- #.FN_PARS implemented for SET/SEQUENCE OF and REAL
- PER SET/SEQUENCE OF field can be FT_UINTxx to display number of items
- PER dissectors regenerated
svn path=/trunk/; revision=14921
| -rw-r--r-- | epan/dissectors/packet-h225.c | 501 | ||||
| -rw-r--r-- | epan/dissectors/packet-h245.c | 563 | ||||
| -rw-r--r-- | epan/dissectors/packet-h450.c | 182 | ||||
| -rw-r--r-- | epan/dissectors/packet-per.c | 51 | ||||
| -rw-r--r-- | epan/dissectors/packet-per.h | 14 | ||||
| -rw-r--r-- | tools/asn2eth.py | 204 |
6 files changed, 986 insertions, 529 deletions
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index 85ce2dc390..bd6bdd026f 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* ./packet-h225.c */ +/* .\packet-h225.c */ /* ../../tools/asn2eth.py -X -e -p h225 -c h225.cnf -s packet-h225-template h225.asn */ /* Input file: packet-h225-template.c */ @@ -1212,15 +1212,12 @@ static int dissect_protocolIdentifier(tvbuff_t *tvb, int offset, packet_info *pi static int dissect_h225_T_h245ipv4(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - tvbuff_t *value_tvb; offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index, - 4, 4, - &value_tvb); - tvb_memcpy(value_tvb, (char *)&ipv4_address, 0, 4); - + 4, 4, &value_tvb); + tvb_memcpy(value_tvb, (char *)&ipv4_address, 0, 4); return offset; } @@ -1233,8 +1230,7 @@ static int dissect_h245ipv4(tvbuff_t *tvb, int offset, packet_info *pinfo, proto static int dissect_h225_T_h245ipv4port(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0U, 65535U, &ipv4_port, NULL, FALSE); - + 0U, 65535U, &ipv4_port, NULL, FALSE); return offset; } @@ -1325,10 +1321,14 @@ static int dissect_segment(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_ } +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, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_T_h245route, dissect_h245route_item); + ett_h225_T_h245route, T_h245route_sequence_of); return offset; } @@ -2117,12 +2117,14 @@ static int dissect_nonStandardIdentifier(tvbuff_t *tvb, int offset, packet_info static int dissect_h225_T_data(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { tvbuff_t *next_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index, -1, -1, &next_tvb); if (next_tvb && tvb_length(next_tvb)) { call_dissector((nsp_handle)?nsp_handle:data_handle, next_tvb, pinfo, tree); } + return offset; } static int dissect_nsp_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { @@ -2297,10 +2299,14 @@ static int dissect_ipAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, prot } +static const per_sequence_t T_route_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_route_item }, +}; + static int dissect_h225_T_route(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_T_route, dissect_route_item); + ett_h225_T_route, T_route_sequence_of); return offset; } @@ -2924,10 +2930,14 @@ static int dissect_sourceEndpointInfo_item(tvbuff_t *tvb, int offset, packet_inf } +static const per_sequence_t SEQUENCE_OF_AliasAddress_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_alertingAddress_item }, +}; + static int dissect_h225_SEQUENCE_OF_AliasAddress(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_AliasAddress, dissect_alertingAddress_item); + ett_h225_SEQUENCE_OF_AliasAddress, SEQUENCE_OF_AliasAddress_sequence_of); return offset; } @@ -3125,10 +3135,14 @@ static int dissect_gatewayDataRate(tvbuff_t *tvb, int offset, packet_info *pinfo } +static const per_sequence_t SEQUENCE_OF_DataRate_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_dataRatesSupported_item }, +}; + static int dissect_h225_SEQUENCE_OF_DataRate(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_DataRate, dissect_dataRatesSupported_item); + ett_h225_SEQUENCE_OF_DataRate, SEQUENCE_OF_DataRate_sequence_of); return offset; } @@ -3154,10 +3168,14 @@ static int dissect_supportedPrefixes_item(tvbuff_t *tvb, int offset, packet_info } +static const per_sequence_t SEQUENCE_OF_SupportedPrefix_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_supportedPrefixes_item }, +}; + static int dissect_h225_SEQUENCE_OF_SupportedPrefix(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_SupportedPrefix, dissect_supportedPrefixes_item); + ett_h225_SEQUENCE_OF_SupportedPrefix, SEQUENCE_OF_SupportedPrefix_sequence_of); return offset; } @@ -3420,10 +3438,14 @@ static int dissect_protocols_item(tvbuff_t *tvb, int offset, packet_info *pinfo, } +static const per_sequence_t SEQUENCE_OF_SupportedProtocols_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_desiredProtocols_item }, +}; + static int dissect_h225_SEQUENCE_OF_SupportedProtocols(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_SupportedProtocols, dissect_desiredProtocols_item); + ett_h225_SEQUENCE_OF_SupportedProtocols, SEQUENCE_OF_SupportedProtocols_sequence_of); return offset; } @@ -3491,10 +3513,11 @@ static int dissect_terminal(tvbuff_t *tvb, int offset, packet_info *pinfo, proto } + static int dissect_h225_BOOLEAN(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_boolean(tvb, offset, pinfo, tree, hf_index, - NULL, NULL); + NULL, NULL); return offset; } @@ -3775,10 +3798,14 @@ static int dissect_desiredTunnelledProtocol(tvbuff_t *tvb, int offset, packet_in } +static const per_sequence_t SEQUENCE_OF_TunnelledProtocol_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_supportedTunnelledProtocols_item }, +}; + static int dissect_h225_SEQUENCE_OF_TunnelledProtocol(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_TunnelledProtocol, dissect_supportedTunnelledProtocols_item); + ett_h225_SEQUENCE_OF_TunnelledProtocol, SEQUENCE_OF_TunnelledProtocol_sequence_of); return offset; } @@ -3840,10 +3867,14 @@ static int dissect_callReferenceValue(tvbuff_t *tvb, int offset, packet_info *pi } +static const per_sequence_t SEQUENCE_OF_CallReferenceValue_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_destExtraCRV_item }, +}; + static int dissect_h225_SEQUENCE_OF_CallReferenceValue(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_CallReferenceValue, dissect_destExtraCRV_item); + ett_h225_SEQUENCE_OF_CallReferenceValue, SEQUENCE_OF_CallReferenceValue_sequence_of); return offset; } @@ -4105,10 +4136,14 @@ static int dissect_h245SecurityCapability_item(tvbuff_t *tvb, int offset, packet } +static const per_sequence_t SEQUENCE_OF_H245Security_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h245SecurityCapability_item }, +}; + static int dissect_h225_SEQUENCE_OF_H245Security(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_H245Security, dissect_h245SecurityCapability_item); + ett_h225_SEQUENCE_OF_H245Security, SEQUENCE_OF_H245Security_sequence_of); return offset; } @@ -4117,10 +4152,14 @@ static int dissect_h245SecurityCapability(tvbuff_t *tvb, int offset, packet_info } +static const per_sequence_t SEQUENCE_OF_ClearToken_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_tokens_item }, +}; + static int dissect_h225_SEQUENCE_OF_ClearToken(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_ClearToken, dissect_tokens_item); + ett_h225_SEQUENCE_OF_ClearToken, SEQUENCE_OF_ClearToken_sequence_of); return offset; } @@ -4217,10 +4256,14 @@ static int dissect_cryptoTokens_item(tvbuff_t *tvb, int offset, packet_info *pin } +static const per_sequence_t SEQUENCE_OF_CryptoH323Token_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_cryptoTokens_item }, +}; + static int dissect_h225_SEQUENCE_OF_CryptoH323Token(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_CryptoH323Token, dissect_cryptoTokens_item); + ett_h225_SEQUENCE_OF_CryptoH323Token, SEQUENCE_OF_CryptoH323Token_sequence_of); return offset; } @@ -4258,10 +4301,14 @@ static int dissect_FastStart_item(tvbuff_t *tvb, int offset, packet_info *pinfo, } +static const per_sequence_t FastStart_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_FastStart_item }, +}; + static int dissect_h225_FastStart(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_FastStart, dissect_FastStart_item); + ett_h225_FastStart, FastStart_sequence_of); return offset; } @@ -4380,10 +4427,14 @@ static int dissect_language_item(tvbuff_t *tvb, int offset, packet_info *pinfo, } +static const per_sequence_t Language_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_language_item }, +}; + static int dissect_h225_Language(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_Language, dissect_language_item); + ett_h225_Language, Language_sequence_of); return offset; } @@ -4431,7 +4482,7 @@ const value_string h225_ScreeningIndicator_vals[] = { int dissect_h225_ScreeningIndicator(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0, 3, NULL, NULL, TRUE); + 0, 3, NULL, NULL, TRUE); return offset; } @@ -4656,10 +4707,14 @@ static int dissect_serviceControl_item(tvbuff_t *tvb, int offset, packet_info *p } +static const per_sequence_t SEQUENCE_OF_ServiceControlSession_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_serviceControl_item }, +}; + static int dissect_h225_SEQUENCE_OF_ServiceControlSession(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_ServiceControlSession, dissect_serviceControl_item); + ett_h225_SEQUENCE_OF_ServiceControlSession, SEQUENCE_OF_ServiceControlSession_sequence_of); return offset; } @@ -4780,10 +4835,14 @@ static int dissect_sipGwCallsAvailable_item(tvbuff_t *tvb, int offset, packet_in } +static const per_sequence_t SEQUENCE_OF_CallsAvailable_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_voiceGwCallsAvailable_item }, +}; + static int dissect_h225_SEQUENCE_OF_CallsAvailable(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_CallsAvailable, dissect_voiceGwCallsAvailable_item); + ett_h225_SEQUENCE_OF_CallsAvailable, SEQUENCE_OF_CallsAvailable_sequence_of); return offset; } @@ -4885,10 +4944,14 @@ static int dissect_cic_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto } +static const per_sequence_t T_cic_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_cic_item }, +}; + static int dissect_h225_T_cic(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_T_cic, dissect_cic_item); + ett_h225_T_cic, T_cic_sequence_of); return offset; } @@ -4927,10 +4990,14 @@ static int dissect_cic(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree } +static const per_sequence_t T_member_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_member_item }, +}; + static int dissect_h225_T_member(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_T_member, dissect_member_item); + ett_h225_T_member, T_member_sequence_of); return offset; } @@ -5060,11 +5127,15 @@ static int dissect_unicode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_ } +static const per_sequence_t SEQUENCE_SIZE_1_512_OF_EnumeratedParameter_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_parameters_item }, +}; + static int dissect_h225_SEQUENCE_SIZE_1_512_OF_EnumeratedParameter(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_SIZE_1_512_OF_EnumeratedParameter, dissect_parameters_item, - 1, 512); + ett_h225_SEQUENCE_SIZE_1_512_OF_EnumeratedParameter, SEQUENCE_SIZE_1_512_OF_EnumeratedParameter_sequence_of, + 1, 512); return offset; } @@ -5076,11 +5147,15 @@ static int dissect_compound(tvbuff_t *tvb, int offset, packet_info *pinfo, proto } +static const per_sequence_t SEQUENCE_SIZE_1_16_OF_GenericData_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nested_item }, +}; + static int dissect_h225_SEQUENCE_SIZE_1_16_OF_GenericData(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_SIZE_1_16_OF_GenericData, dissect_nested_item, - 1, 16); + ett_h225_SEQUENCE_SIZE_1_16_OF_GenericData, SEQUENCE_SIZE_1_16_OF_GenericData_sequence_of, + 1, 16); return offset; } @@ -5162,10 +5237,14 @@ dissect_h225_GenericData(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot } +static const per_sequence_t SEQUENCE_OF_GenericData_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_genericData_item }, +}; + static int dissect_h225_SEQUENCE_OF_GenericData(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_GenericData, dissect_genericData_item); + ett_h225_SEQUENCE_OF_GenericData, SEQUENCE_OF_GenericData_sequence_of); return offset; } @@ -5209,10 +5288,14 @@ static int dissect_supportedFeatures_item(tvbuff_t *tvb, int offset, packet_info } +static const per_sequence_t SEQUENCE_OF_FeatureDescriptor_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_neededFeatures_item }, +}; + static int dissect_h225_SEQUENCE_OF_FeatureDescriptor(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_FeatureDescriptor, dissect_neededFeatures_item); + ett_h225_SEQUENCE_OF_FeatureDescriptor, SEQUENCE_OF_FeatureDescriptor_sequence_of); return offset; } @@ -5231,12 +5314,14 @@ static int dissect_supportedFeatures(tvbuff_t *tvb, int offset, packet_info *pin static int dissect_h225_ParallelH245Control_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { tvbuff_t *h245_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index, -1, -1, &h245_tvb); if (h245_tvb && tvb_length(h245_tvb)) { call_dissector(h245dg_handle, h245_tvb, pinfo, tree); } + return offset; } static int dissect_ParallelH245Control_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { @@ -5244,10 +5329,14 @@ static int dissect_ParallelH245Control_item(tvbuff_t *tvb, int offset, packet_in } +static const per_sequence_t ParallelH245Control_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ParallelH245Control_item }, +}; + static int dissect_h225_ParallelH245Control(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_ParallelH245Control, dissect_ParallelH245Control_item); + ett_h225_ParallelH245Control, ParallelH245Control_sequence_of); return offset; } @@ -5274,10 +5363,14 @@ static int dissect_additionalSourceAddresses_item(tvbuff_t *tvb, int offset, pac } +static const per_sequence_t SEQUENCE_OF_ExtendedAliasAddress_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_additionalSourceAddresses_item }, +}; + static int dissect_h225_SEQUENCE_OF_ExtendedAliasAddress(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_ExtendedAliasAddress, dissect_additionalSourceAddresses_item); + ett_h225_SEQUENCE_OF_ExtendedAliasAddress, SEQUENCE_OF_ExtendedAliasAddress_sequence_of); return offset; } @@ -5743,10 +5836,14 @@ static int dissect_conferences_item(tvbuff_t *tvb, int offset, packet_info *pinf } +static const per_sequence_t SEQUENCE_OF_ConferenceList_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_conferences_item }, +}; + static int dissect_h225_SEQUENCE_OF_ConferenceList(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_ConferenceList, dissect_conferences_item); + ett_h225_SEQUENCE_OF_ConferenceList, SEQUENCE_OF_ConferenceList_sequence_of); return offset; } @@ -5992,9 +6089,10 @@ static int dissect_h323_message_body(tvbuff_t *tvb, int offset, packet_info *pin static int dissect_h225_T_h4501SupplementaryService_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - tvbuff_t *h4501_tvb = NULL; - offset=dissect_per_octet_string(tvb, offset, pinfo, tree, -1, -1, -1, &h4501_tvb); + + offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index, + -1, -1, &h4501_tvb); if(tvb_length(h4501_tvb)){ call_dissector(h4501_handle, h4501_tvb, pinfo, tree); @@ -6007,10 +6105,14 @@ static int dissect_h4501SupplementaryService_item(tvbuff_t *tvb, int offset, pac } +static const per_sequence_t T_h4501SupplementaryService_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h4501SupplementaryService_item }, +}; + static int dissect_h225_T_h4501SupplementaryService(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_T_h4501SupplementaryService, dissect_h4501SupplementaryService_item); + ett_h225_T_h4501SupplementaryService, T_h4501SupplementaryService_sequence_of); return offset; } @@ -6019,9 +6121,11 @@ static int dissect_h4501SupplementaryService(tvbuff_t *tvb, int offset, packet_i } + static int dissect_h225_T_h245Tunneling(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset=dissect_per_boolean(tvb, offset, pinfo, tree, hf_h225_h245Tunneling, &(h225_pi->is_h245Tunneling), NULL); + offset = dissect_per_boolean(tvb, offset, pinfo, tree, hf_index, + &(h225_pi->is_h245Tunneling), NULL); return offset; } @@ -6034,12 +6138,14 @@ static int dissect_h245Tunneling(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_h225_H245Control_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { tvbuff_t *h245_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index, -1, -1, &h245_tvb); if (h245_tvb && tvb_length(h245_tvb)) { call_dissector(h245dg_handle, h245_tvb, pinfo, tree); } + return offset; } static int dissect_H245Control_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { @@ -6047,10 +6153,14 @@ static int dissect_H245Control_item(tvbuff_t *tvb, int offset, packet_info *pinf } +static const per_sequence_t H245Control_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_H245Control_item }, +}; + static int dissect_h225_H245Control(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_H245Control, dissect_H245Control_item); + ett_h225_H245Control, H245Control_sequence_of); return offset; } @@ -6059,10 +6169,14 @@ static int dissect_h245Control(tvbuff_t *tvb, int offset, packet_info *pinfo, pr } +static const per_sequence_t SEQUENCE_OF_NonStandardParameter_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nonStandardControl_item }, +}; + static int dissect_h225_SEQUENCE_OF_NonStandardParameter(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_NonStandardParameter, dissect_nonStandardControl_item); + ett_h225_SEQUENCE_OF_NonStandardParameter, SEQUENCE_OF_NonStandardParameter_sequence_of); return offset; } @@ -6098,12 +6212,14 @@ static int dissect_callLinkage(tvbuff_t *tvb, int offset, packet_info *pinfo, pr static int dissect_h225_T_messageContent_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { tvbuff_t *next_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index, -1, -1, &next_tvb); if (next_tvb && tvb_length(next_tvb)) { call_dissector((tp_handle)?tp_handle:data_handle, next_tvb, pinfo, tree); } + return offset; } static int dissect_messageContent_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { @@ -6111,10 +6227,14 @@ static int dissect_messageContent_item(tvbuff_t *tvb, int offset, packet_info *p } +static const per_sequence_t T_messageContent_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_messageContent_item }, +}; + static int dissect_h225_T_messageContent(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_T_messageContent, dissect_messageContent_item); + ett_h225_T_messageContent, T_messageContent_sequence_of); return offset; } @@ -6279,10 +6399,14 @@ static int dissect_endpointAliasPattern_item(tvbuff_t *tvb, int offset, packet_i } +static const per_sequence_t SEQUENCE_OF_TransportAddress_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_callSignalAddress_item }, +}; + static int dissect_h225_SEQUENCE_OF_TransportAddress(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_TransportAddress, dissect_callSignalAddress_item); + ett_h225_SEQUENCE_OF_TransportAddress, SEQUENCE_OF_TransportAddress_sequence_of); return offset; } @@ -6410,10 +6534,14 @@ static int dissect_alternateGatekeeper_item(tvbuff_t *tvb, int offset, packet_in } +static const per_sequence_t SEQUENCE_OF_AlternateGK_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_alternateGatekeeper_item }, +}; + static int dissect_h225_SEQUENCE_OF_AlternateGK(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_AlternateGK, dissect_alternateGatekeeper_item); + ett_h225_SEQUENCE_OF_AlternateGK, SEQUENCE_OF_AlternateGK_sequence_of); return offset; } @@ -6476,8 +6604,7 @@ static int dissect_securityError(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_h225_RequestSeqNum(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 1U, 65535U, &(h225_pi->requestSeqNum), NULL, FALSE); - + 1U, 65535U, &(h225_pi->requestSeqNum), NULL, FALSE); return offset; } @@ -6918,10 +7045,14 @@ static int dissect_hopCount(tvbuff_t *tvb, int offset, packet_info *pinfo, proto } +static const per_sequence_t T_associatedSessionIds_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_associatedSessionIds_item }, +}; + static int dissect_h225_T_associatedSessionIds(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_T_associatedSessionIds, dissect_associatedSessionIds_item); + ett_h225_T_associatedSessionIds, T_associatedSessionIds_sequence_of); return offset; } @@ -6956,10 +7087,14 @@ static int dissect_video_item(tvbuff_t *tvb, int offset, packet_info *pinfo, pro } +static const per_sequence_t SEQUENCE_OF_Endpoint_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_alternateEndpoints_item }, +}; + static int dissect_h225_SEQUENCE_OF_Endpoint(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_Endpoint, dissect_alternateEndpoints_item); + ett_h225_SEQUENCE_OF_Endpoint, SEQUENCE_OF_Endpoint_sequence_of); return offset; } @@ -6974,10 +7109,14 @@ static int dissect_destAlternatives(tvbuff_t *tvb, int offset, packet_info *pinf } +static const per_sequence_t SEQUENCE_OF_AuthenticationMechanism_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_authenticationCapability_item }, +}; + static int dissect_h225_SEQUENCE_OF_AuthenticationMechanism(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_AuthenticationMechanism, dissect_authenticationCapability_item); + ett_h225_SEQUENCE_OF_AuthenticationMechanism, SEQUENCE_OF_AuthenticationMechanism_sequence_of); return offset; } @@ -6986,10 +7125,14 @@ static int dissect_authenticationCapability(tvbuff_t *tvb, int offset, packet_in } +static const per_sequence_t T_algorithmOIDs_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_algorithmOIDs_item }, +}; + static int dissect_h225_T_algorithmOIDs(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_T_algorithmOIDs, dissect_algorithmOIDs_item); + ett_h225_T_algorithmOIDs, T_algorithmOIDs_sequence_of); return offset; } @@ -6998,10 +7141,14 @@ static int dissect_algorithmOIDs(tvbuff_t *tvb, int offset, packet_info *pinfo, } +static const per_sequence_t SEQUENCE_OF_IntegrityMechanism_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_integrity_item }, +}; + static int dissect_h225_SEQUENCE_OF_IntegrityMechanism(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_IntegrityMechanism, dissect_integrity_item); + ett_h225_SEQUENCE_OF_IntegrityMechanism, SEQUENCE_OF_IntegrityMechanism_sequence_of); return offset; } @@ -7139,10 +7286,14 @@ static int dissect_gatekeeperReject(tvbuff_t *tvb, int offset, packet_info *pinf } +static const per_sequence_t SEQUENCE_OF_AddressPattern_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_terminalAliasPattern_item }, +}; + static int dissect_h225_SEQUENCE_OF_AddressPattern(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_AddressPattern, dissect_terminalAliasPattern_item); + ett_h225_SEQUENCE_OF_AddressPattern, SEQUENCE_OF_AddressPattern_sequence_of); return offset; } @@ -7154,10 +7305,14 @@ static int dissect_endpointAliasPattern(tvbuff_t *tvb, int offset, packet_info * } +static const per_sequence_t SEQUENCE_OF_H248PackagesDescriptor_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_supportedH248Packages_item }, +}; + static int dissect_h225_SEQUENCE_OF_H248PackagesDescriptor(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_H248PackagesDescriptor, dissect_supportedH248Packages_item); + ett_h225_SEQUENCE_OF_H248PackagesDescriptor, SEQUENCE_OF_H248PackagesDescriptor_sequence_of); return offset; } @@ -7256,10 +7411,14 @@ static int dissect_preGrantedARQ(tvbuff_t *tvb, int offset, packet_info *pinfo, } +static const per_sequence_t SEQUENCE_OF_RasUsageSpecification_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_usageSpec_item }, +}; + static int dissect_h225_SEQUENCE_OF_RasUsageSpecification(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_RasUsageSpecification, dissect_usageSpec_item); + ett_h225_SEQUENCE_OF_RasUsageSpecification, SEQUENCE_OF_RasUsageSpecification_sequence_of); return offset; } @@ -7596,10 +7755,14 @@ static int dissect_DestinationInfo_item(tvbuff_t *tvb, int offset, packet_info * } +static const per_sequence_t DestinationInfo_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_DestinationInfo_item }, +}; + static int dissect_h225_DestinationInfo(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_DestinationInfo, dissect_DestinationInfo_item); + ett_h225_DestinationInfo, DestinationInfo_sequence_of); return offset; } @@ -7759,10 +7922,14 @@ static int dissect_admissionConfirmSequence_item(tvbuff_t *tvb, int offset, pack } +static const per_sequence_t SEQUENCE_OF_PartyNumber_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_routeCallToSCN_item }, +}; + static int dissect_h225_SEQUENCE_OF_PartyNumber(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_PartyNumber, dissect_routeCallToSCN_item); + ett_h225_SEQUENCE_OF_PartyNumber, SEQUENCE_OF_PartyNumber_sequence_of); return offset; } @@ -7868,10 +8035,14 @@ static int dissect_admissionReject(tvbuff_t *tvb, int offset, packet_info *pinfo } +static const per_sequence_t SEQUENCE_OF_BandwidthDetails_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_bandwidthDetails_item }, +}; + static int dissect_h225_SEQUENCE_OF_BandwidthDetails(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_BandwidthDetails, dissect_bandwidthDetails_item); + ett_h225_SEQUENCE_OF_BandwidthDetails, SEQUENCE_OF_BandwidthDetails_sequence_of); return offset; } @@ -8325,10 +8496,14 @@ static int dissect_infoRequest(tvbuff_t *tvb, int offset, packet_info *pinfo, pr } +static const per_sequence_t SEQUENCE_OF_RTPSession_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_audio_item }, +}; + static int dissect_h225_SEQUENCE_OF_RTPSession(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_RTPSession, dissect_audio_item); + ett_h225_SEQUENCE_OF_RTPSession, SEQUENCE_OF_RTPSession_sequence_of); return offset; } @@ -8340,10 +8515,14 @@ static int dissect_video(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr } +static const per_sequence_t SEQUENCE_OF_TransportChannelInfo_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_data_item }, +}; + static int dissect_h225_SEQUENCE_OF_TransportChannelInfo(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_TransportChannelInfo, dissect_data_item); + ett_h225_SEQUENCE_OF_TransportChannelInfo, SEQUENCE_OF_TransportChannelInfo_sequence_of); return offset; } @@ -8352,10 +8531,14 @@ static int dissect_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre } +static const per_sequence_t SEQUENCE_OF_ConferenceIdentifier_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_substituteConfIDs_item }, +}; + static int dissect_h225_SEQUENCE_OF_ConferenceIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_ConferenceIdentifier, dissect_substituteConfIDs_item); + ett_h225_SEQUENCE_OF_ConferenceIdentifier, SEQUENCE_OF_ConferenceIdentifier_sequence_of); return offset; } @@ -8381,10 +8564,14 @@ static int dissect_pdu_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto } +static const per_sequence_t T_pdu_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_pdu_item }, +}; + static int dissect_h225_T_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_T_pdu, dissect_pdu_item); + ett_h225_T_pdu, T_pdu_sequence_of); return offset; } @@ -8428,10 +8615,14 @@ static int dissect_perCallInfo_item(tvbuff_t *tvb, int offset, packet_info *pinf } +static const per_sequence_t T_perCallInfo_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_perCallInfo_item }, +}; + static int dissect_h225_T_perCallInfo(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_T_perCallInfo, dissect_perCallInfo_item); + ett_h225_T_perCallInfo, T_perCallInfo_sequence_of); return offset; } @@ -8782,10 +8973,14 @@ static int dissect_serviceControlResponse(tvbuff_t *tvb, int offset, packet_info } +static const per_sequence_t SEQUENCE_OF_AdmissionConfirm_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_admissionConfirmSequence_item }, +}; + static int dissect_h225_SEQUENCE_OF_AdmissionConfirm(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h225_SEQUENCE_OF_AdmissionConfirm, dissect_admissionConfirmSequence_item); + ett_h225_SEQUENCE_OF_AdmissionConfirm, SEQUENCE_OF_AdmissionConfirm_sequence_of); return offset; } @@ -9067,7 +9262,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_h4501SupplementaryService, { "h4501SupplementaryService", "h225.h4501SupplementaryService", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "H323-UU-PDU/h4501SupplementaryService", HFILL }}, { &hf_h225_h4501SupplementaryService_item, { "Item", "h225.h4501SupplementaryService_item", @@ -9079,11 +9274,11 @@ void proto_register_h225(void) { "H323-UU-PDU/h245Tunneling", HFILL }}, { &hf_h225_h245Control, { "h245Control", "h225.h245Control", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "H323-UU-PDU/h245Control", HFILL }}, { &hf_h225_nonStandardControl, { "nonStandardControl", "h225.nonStandardControl", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "H323-UU-PDU/nonStandardControl", HFILL }}, { &hf_h225_nonStandardControl_item, { "Item", "h225.nonStandardControl_item", @@ -9103,7 +9298,7 @@ void proto_register_h225(void) { "H323-UU-PDU/tunnelledSignallingMessage/tunnelledProtocolID", HFILL }}, { &hf_h225_messageContent, { "messageContent", "h225.messageContent", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "H323-UU-PDU/tunnelledSignallingMessage/messageContent", HFILL }}, { &hf_h225_messageContent_item, { "Item", "h225.messageContent_item", @@ -9123,7 +9318,7 @@ void proto_register_h225(void) { "H323-UU-PDU/stimulusControl", HFILL }}, { &hf_h225_genericData, { "genericData", "h225.genericData", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_genericData_item, { "Item", "h225.genericData_item", @@ -9167,7 +9362,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_tokens, { "tokens", "h225.tokens", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_tokens_item, { "Item", "h225.tokens_item", @@ -9175,7 +9370,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_cryptoTokens, { "cryptoTokens", "h225.cryptoTokens", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_cryptoTokens_item, { "Item", "h225.cryptoTokens_item", @@ -9183,7 +9378,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_fastStart, { "fastStart", "h225.fastStart", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_multipleCalls, { "multipleCalls", "h225.multipleCalls", @@ -9195,7 +9390,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_alertingAddress, { "alertingAddress", "h225.alertingAddress", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Alerting-UUIE/alertingAddress", HFILL }}, { &hf_h225_alertingAddress_item, { "Item", "h225.alertingAddress_item", @@ -9215,7 +9410,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_serviceControl, { "serviceControl", "h225.serviceControl", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_serviceControl_item, { "Item", "h225.serviceControl_item", @@ -9235,7 +9430,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_language, { "language", "h225.language", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_language_item, { "Item", "h225.language_item", @@ -9243,7 +9438,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_connectedAddress, { "connectedAddress", "h225.connectedAddress", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Connect-UUIE/connectedAddress", HFILL }}, { &hf_h225_connectedAddress_item, { "Item", "h225.connectedAddress_item", @@ -9259,7 +9454,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_busyAddress, { "busyAddress", "h225.busyAddress", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ReleaseComplete-UUIE/busyAddress", HFILL }}, { &hf_h225_busyAddress_item, { "Item", "h225.busyAddress_item", @@ -9367,7 +9562,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_sourceAddress, { "sourceAddress", "h225.sourceAddress", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Setup-UUIE/sourceAddress", HFILL }}, { &hf_h225_sourceAddress_item, { "Item", "h225.sourceAddress_item", @@ -9379,7 +9574,7 @@ void proto_register_h225(void) { "Setup-UUIE/sourceInfo", HFILL }}, { &hf_h225_destinationAddress, { "destinationAddress", "h225.destinationAddress", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Setup-UUIE/destinationAddress", HFILL }}, { &hf_h225_destinationAddress_item, { "Item", "h225.destinationAddress_item", @@ -9391,7 +9586,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_destExtraCallInfo, { "destExtraCallInfo", "h225.destExtraCallInfo", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_destExtraCallInfo_item, { "Item", "h225.destExtraCallInfo_item", @@ -9399,7 +9594,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_destExtraCRV, { "destExtraCRV", "h225.destExtraCRV", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Setup-UUIE/destExtraCRV", HFILL }}, { &hf_h225_destExtraCRV_item, { "Item", "h225.destExtraCRV_item", @@ -9451,7 +9646,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_h245SecurityCapability, { "h245SecurityCapability", "h225.h245SecurityCapability", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Setup-UUIE/h245SecurityCapability", HFILL }}, { &hf_h225_h245SecurityCapability_item, { "Item", "h225.h245SecurityCapability_item", @@ -9491,7 +9686,7 @@ void proto_register_h225(void) { "Setup-UUIE/symmetricOperationRequired", HFILL }}, { &hf_h225_desiredProtocols, { "desiredProtocols", "h225.desiredProtocols", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_desiredProtocols_item, { "Item", "h225.desiredProtocols_item", @@ -9499,7 +9694,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_neededFeatures, { "neededFeatures", "h225.neededFeatures", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_neededFeatures_item, { "Item", "h225.neededFeatures_item", @@ -9507,7 +9702,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_desiredFeatures, { "desiredFeatures", "h225.desiredFeatures", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_desiredFeatures_item, { "Item", "h225.desiredFeatures_item", @@ -9515,7 +9710,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_supportedFeatures, { "supportedFeatures", "h225.supportedFeatures", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_supportedFeatures_item, { "Item", "h225.supportedFeatures_item", @@ -9523,11 +9718,11 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_parallelH245Control, { "parallelH245Control", "h225.parallelH245Control", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Setup-UUIE/parallelH245Control", HFILL }}, { &hf_h225_additionalSourceAddresses, { "additionalSourceAddresses", "h225.additionalSourceAddresses", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Setup-UUIE/additionalSourceAddresses", HFILL }}, { &hf_h225_additionalSourceAddresses_item, { "Item", "h225.additionalSourceAddresses_item", @@ -9611,7 +9806,7 @@ void proto_register_h225(void) { "Facility-UUIE/alternativeAddress", HFILL }}, { &hf_h225_alternativeAliasAddress, { "alternativeAliasAddress", "h225.alternativeAliasAddress", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Facility-UUIE/alternativeAliasAddress", HFILL }}, { &hf_h225_alternativeAliasAddress_item, { "Item", "h225.alternativeAliasAddress_item", @@ -9623,7 +9818,7 @@ void proto_register_h225(void) { "Facility-UUIE/reason", HFILL }}, { &hf_h225_conferences, { "conferences", "h225.conferences", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Facility-UUIE/conferences", HFILL }}, { &hf_h225_conferences_item, { "Item", "h225.conferences_item", @@ -9703,7 +9898,7 @@ void proto_register_h225(void) { "TransportAddress/ipSourceRoute/port", HFILL }}, { &hf_h225_route, { "route", "h225.route", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "TransportAddress/ipSourceRoute/route", HFILL }}, { &hf_h225_route_item, { "Item", "h225.route_item", @@ -9787,7 +9982,7 @@ void proto_register_h225(void) { "H245TransportAddress/h245ipSourceRoute/h245routeport", HFILL }}, { &hf_h225_h245route, { "h245route", "h225.h245route", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "H245TransportAddress/h245ipSourceRoute/h245route", HFILL }}, { &hf_h225_h245route_item, { "Item", "h225.h245route_item", @@ -9859,7 +10054,7 @@ void proto_register_h225(void) { "EndpointType/set", HFILL }}, { &hf_h225_supportedTunnelledProtocols, { "supportedTunnelledProtocols", "h225.supportedTunnelledProtocols", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "EndpointType/supportedTunnelledProtocols", HFILL }}, { &hf_h225_supportedTunnelledProtocols_item, { "Item", "h225.supportedTunnelledProtocols_item", @@ -9867,7 +10062,7 @@ void proto_register_h225(void) { "EndpointType/supportedTunnelledProtocols/_item", HFILL }}, { &hf_h225_protocol, { "protocol", "h225.protocol", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_protocol_item, { "Item", "h225.protocol_item", @@ -9919,7 +10114,7 @@ void proto_register_h225(void) { "SupportedProtocols/sip", HFILL }}, { &hf_h225_dataRatesSupported, { "dataRatesSupported", "h225.dataRatesSupported", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_dataRatesSupported_item, { "Item", "h225.dataRatesSupported_item", @@ -9927,7 +10122,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_supportedPrefixes, { "supportedPrefixes", "h225.supportedPrefixes", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_supportedPrefixes_item, { "Item", "h225.supportedPrefixes_item", @@ -10211,7 +10406,7 @@ void proto_register_h225(void) { "ExtendedAliasAddress/address", HFILL }}, { &hf_h225_aliasAddress, { "aliasAddress", "h225.aliasAddress", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Endpoint/aliasAddress", HFILL }}, { &hf_h225_aliasAddress_item, { "Item", "h225.aliasAddress_item", @@ -10219,7 +10414,7 @@ void proto_register_h225(void) { "Endpoint/aliasAddress/_item", HFILL }}, { &hf_h225_callSignalAddress, { "callSignalAddress", "h225.callSignalAddress", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_callSignalAddress_item, { "Item", "h225.callSignalAddress_item", @@ -10227,7 +10422,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_rasAddress, { "rasAddress", "h225.rasAddress", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_rasAddress_item, { "Item", "h225.rasAddress_item", @@ -10243,7 +10438,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_remoteExtensionAddress, { "remoteExtensionAddress", "h225.remoteExtensionAddress", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_remoteExtensionAddress_item, { "Item", "h225.remoteExtensionAddress_item", @@ -10255,7 +10450,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_annexE, { "annexE", "h225.annexE", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AlternateTransportAddresses/annexE", HFILL }}, { &hf_h225_annexE_item, { "Item", "h225.annexE_item", @@ -10263,7 +10458,7 @@ void proto_register_h225(void) { "AlternateTransportAddresses/annexE/_item", HFILL }}, { &hf_h225_sctp, { "sctp", "h225.sctp", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AlternateTransportAddresses/sctp", HFILL }}, { &hf_h225_sctp_item, { "Item", "h225.sctp_item", @@ -10295,7 +10490,7 @@ void proto_register_h225(void) { "AlternateGK/needToRegister", HFILL }}, { &hf_h225_alternateGatekeeper, { "alternateGatekeeper", "h225.alternateGatekeeper", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_alternateGatekeeper_item, { "Item", "h225.alternateGatekeeper_item", @@ -10575,7 +10770,7 @@ void proto_register_h225(void) { "CallCapacity/currentCallCapacity", HFILL }}, { &hf_h225_voiceGwCallsAvailable, { "voiceGwCallsAvailable", "h225.voiceGwCallsAvailable", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CallCapacityInfo/voiceGwCallsAvailable", HFILL }}, { &hf_h225_voiceGwCallsAvailable_item, { "Item", "h225.voiceGwCallsAvailable_item", @@ -10583,7 +10778,7 @@ void proto_register_h225(void) { "CallCapacityInfo/voiceGwCallsAvailable/_item", HFILL }}, { &hf_h225_h310GwCallsAvailable, { "h310GwCallsAvailable", "h225.h310GwCallsAvailable", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CallCapacityInfo/h310GwCallsAvailable", HFILL }}, { &hf_h225_h310GwCallsAvailable_item, { "Item", "h225.h310GwCallsAvailable_item", @@ -10591,7 +10786,7 @@ void proto_register_h225(void) { "CallCapacityInfo/h310GwCallsAvailable/_item", HFILL }}, { &hf_h225_h320GwCallsAvailable, { "h320GwCallsAvailable", "h225.h320GwCallsAvailable", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CallCapacityInfo/h320GwCallsAvailable", HFILL }}, { &hf_h225_h320GwCallsAvailable_item, { "Item", "h225.h320GwCallsAvailable_item", @@ -10599,7 +10794,7 @@ void proto_register_h225(void) { "CallCapacityInfo/h320GwCallsAvailable/_item", HFILL }}, { &hf_h225_h321GwCallsAvailable, { "h321GwCallsAvailable", "h225.h321GwCallsAvailable", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CallCapacityInfo/h321GwCallsAvailable", HFILL }}, { &hf_h225_h321GwCallsAvailable_item, { "Item", "h225.h321GwCallsAvailable_item", @@ -10607,7 +10802,7 @@ void proto_register_h225(void) { "CallCapacityInfo/h321GwCallsAvailable/_item", HFILL }}, { &hf_h225_h322GwCallsAvailable, { "h322GwCallsAvailable", "h225.h322GwCallsAvailable", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CallCapacityInfo/h322GwCallsAvailable", HFILL }}, { &hf_h225_h322GwCallsAvailable_item, { "Item", "h225.h322GwCallsAvailable_item", @@ -10615,7 +10810,7 @@ void proto_register_h225(void) { "CallCapacityInfo/h322GwCallsAvailable/_item", HFILL }}, { &hf_h225_h323GwCallsAvailable, { "h323GwCallsAvailable", "h225.h323GwCallsAvailable", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CallCapacityInfo/h323GwCallsAvailable", HFILL }}, { &hf_h225_h323GwCallsAvailable_item, { "Item", "h225.h323GwCallsAvailable_item", @@ -10623,7 +10818,7 @@ void proto_register_h225(void) { "CallCapacityInfo/h323GwCallsAvailable/_item", HFILL }}, { &hf_h225_h324GwCallsAvailable, { "h324GwCallsAvailable", "h225.h324GwCallsAvailable", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CallCapacityInfo/h324GwCallsAvailable", HFILL }}, { &hf_h225_h324GwCallsAvailable_item, { "Item", "h225.h324GwCallsAvailable_item", @@ -10631,7 +10826,7 @@ void proto_register_h225(void) { "CallCapacityInfo/h324GwCallsAvailable/_item", HFILL }}, { &hf_h225_t120OnlyGwCallsAvailable, { "t120OnlyGwCallsAvailable", "h225.t120OnlyGwCallsAvailable", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CallCapacityInfo/t120OnlyGwCallsAvailable", HFILL }}, { &hf_h225_t120OnlyGwCallsAvailable_item, { "Item", "h225.t120OnlyGwCallsAvailable_item", @@ -10639,7 +10834,7 @@ void proto_register_h225(void) { "CallCapacityInfo/t120OnlyGwCallsAvailable/_item", HFILL }}, { &hf_h225_t38FaxAnnexbOnlyGwCallsAvailable, { "t38FaxAnnexbOnlyGwCallsAvailable", "h225.t38FaxAnnexbOnlyGwCallsAvailable", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CallCapacityInfo/t38FaxAnnexbOnlyGwCallsAvailable", HFILL }}, { &hf_h225_t38FaxAnnexbOnlyGwCallsAvailable_item, { "Item", "h225.t38FaxAnnexbOnlyGwCallsAvailable_item", @@ -10647,7 +10842,7 @@ void proto_register_h225(void) { "CallCapacityInfo/t38FaxAnnexbOnlyGwCallsAvailable/_item", HFILL }}, { &hf_h225_terminalCallsAvailable, { "terminalCallsAvailable", "h225.terminalCallsAvailable", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CallCapacityInfo/terminalCallsAvailable", HFILL }}, { &hf_h225_terminalCallsAvailable_item, { "Item", "h225.terminalCallsAvailable_item", @@ -10655,7 +10850,7 @@ void proto_register_h225(void) { "CallCapacityInfo/terminalCallsAvailable/_item", HFILL }}, { &hf_h225_mcuCallsAvailable, { "mcuCallsAvailable", "h225.mcuCallsAvailable", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CallCapacityInfo/mcuCallsAvailable", HFILL }}, { &hf_h225_mcuCallsAvailable_item, { "Item", "h225.mcuCallsAvailable_item", @@ -10663,7 +10858,7 @@ void proto_register_h225(void) { "CallCapacityInfo/mcuCallsAvailable/_item", HFILL }}, { &hf_h225_sipGwCallsAvailable, { "sipGwCallsAvailable", "h225.sipGwCallsAvailable", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CallCapacityInfo/sipGwCallsAvailable", HFILL }}, { &hf_h225_sipGwCallsAvailable_item, { "Item", "h225.sipGwCallsAvailable_item", @@ -10699,7 +10894,7 @@ void proto_register_h225(void) { "CircuitIdentifier/group", HFILL }}, { &hf_h225_cic_2_4, { "cic", "h225.cic", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CicInfo/cic", HFILL }}, { &hf_h225_cic_item, { "Item", "h225.cic_item", @@ -10711,7 +10906,7 @@ void proto_register_h225(void) { "CicInfo/pointCode", HFILL }}, { &hf_h225_member, { "member", "h225.member", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GroupID/member", HFILL }}, { &hf_h225_member_item, { "Item", "h225.member_item", @@ -10763,7 +10958,7 @@ void proto_register_h225(void) { "ServiceControlSession/reason/close", HFILL }}, { &hf_h225_nonStandardUsageTypes, { "nonStandardUsageTypes", "h225.nonStandardUsageTypes", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RasUsageInfoTypes/nonStandardUsageTypes", HFILL }}, { &hf_h225_nonStandardUsageTypes_item, { "Item", "h225.nonStandardUsageTypes_item", @@ -10815,7 +11010,7 @@ void proto_register_h225(void) { "RasUsageSpecification/required", HFILL }}, { &hf_h225_nonStandardUsageFields, { "nonStandardUsageFields", "h225.nonStandardUsageFields", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RasUsageInformation/nonStandardUsageFields", HFILL }}, { &hf_h225_nonStandardUsageFields_item, { "Item", "h225.nonStandardUsageFields_item", @@ -10895,7 +11090,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_parameters, { "parameters", "h225.parameters", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GenericData/parameters", HFILL }}, { &hf_h225_parameters_item, { "Item", "h225.parameters_item", @@ -10951,7 +11146,7 @@ void proto_register_h225(void) { "Content/transport", HFILL }}, { &hf_h225_compound, { "compound", "h225.compound", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Content/compound", HFILL }}, { &hf_h225_compound_item, { "Item", "h225.compound_item", @@ -10959,7 +11154,7 @@ void proto_register_h225(void) { "Content/compound/_item", HFILL }}, { &hf_h225_nested, { "nested", "h225.nested", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Content/nested", HFILL }}, { &hf_h225_nested_item, { "Item", "h225.nested_item", @@ -10999,7 +11194,7 @@ void proto_register_h225(void) { "RTPSession/sessionId", HFILL }}, { &hf_h225_associatedSessionIds, { "associatedSessionIds", "h225.associatedSessionIds", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RTPSession/associatedSessionIds", HFILL }}, { &hf_h225_associatedSessionIds_item, { "Item", "h225.associatedSessionIds_item", @@ -11139,7 +11334,7 @@ void proto_register_h225(void) { "RasMessage/serviceControlResponse", HFILL }}, { &hf_h225_admissionConfirmSequence, { "admissionConfirmSequence", "h225.admissionConfirmSequence", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RasMessage/admissionConfirmSequence", HFILL }}, { &hf_h225_admissionConfirmSequence_item, { "Item", "h225.admissionConfirmSequence_item", @@ -11155,7 +11350,7 @@ void proto_register_h225(void) { "GatekeeperRequest/rasAddress", HFILL }}, { &hf_h225_endpointAlias, { "endpointAlias", "h225.endpointAlias", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_endpointAlias_item, { "Item", "h225.endpointAlias_item", @@ -11163,7 +11358,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_alternateEndpoints, { "alternateEndpoints", "h225.alternateEndpoints", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_alternateEndpoints_item, { "Item", "h225.alternateEndpoints_item", @@ -11171,7 +11366,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_authenticationCapability, { "authenticationCapability", "h225.authenticationCapability", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GatekeeperRequest/authenticationCapability", HFILL }}, { &hf_h225_authenticationCapability_item, { "Item", "h225.authenticationCapability_item", @@ -11179,7 +11374,7 @@ void proto_register_h225(void) { "GatekeeperRequest/authenticationCapability/_item", HFILL }}, { &hf_h225_algorithmOIDs, { "algorithmOIDs", "h225.algorithmOIDs", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GatekeeperRequest/algorithmOIDs", HFILL }}, { &hf_h225_algorithmOIDs_item, { "Item", "h225.algorithmOIDs_item", @@ -11187,7 +11382,7 @@ void proto_register_h225(void) { "GatekeeperRequest/algorithmOIDs/_item", HFILL }}, { &hf_h225_integrity, { "integrity", "h225.integrity", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_integrity_item, { "Item", "h225.integrity_item", @@ -11243,7 +11438,7 @@ void proto_register_h225(void) { "RegistrationRequest/terminalType", HFILL }}, { &hf_h225_terminalAlias, { "terminalAlias", "h225.terminalAlias", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_terminalAlias_item, { "Item", "h225.terminalAlias_item", @@ -11271,7 +11466,7 @@ void proto_register_h225(void) { "RegistrationRequest/additiveRegistration", HFILL }}, { &hf_h225_terminalAliasPattern, { "terminalAliasPattern", "h225.terminalAliasPattern", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_terminalAliasPattern_item, { "Item", "h225.terminalAliasPattern_item", @@ -11283,7 +11478,7 @@ void proto_register_h225(void) { "RegistrationRequest/usageReportingCapability", HFILL }}, { &hf_h225_supportedH248Packages, { "supportedH248Packages", "h225.supportedH248Packages", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RegistrationRequest/supportedH248Packages", HFILL }}, { &hf_h225_supportedH248Packages_item, { "Item", "h225.supportedH248Packages_item", @@ -11347,7 +11542,7 @@ void proto_register_h225(void) { "RegistrationConfirm/supportsAdditiveRegistration", HFILL }}, { &hf_h225_usageSpec, { "usageSpec", "h225.usageSpec", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_usageSpec_item, { "Item", "h225.usageSpec_item", @@ -11379,7 +11574,7 @@ void proto_register_h225(void) { "RegistrationRejectReason/invalidRASAddress", HFILL }}, { &hf_h225_duplicateAlias, { "duplicateAlias", "h225.duplicateAlias", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RegistrationRejectReason/duplicateAlias", HFILL }}, { &hf_h225_duplicateAlias_item, { "Item", "h225.duplicateAlias_item", @@ -11423,7 +11618,7 @@ void proto_register_h225(void) { "UnregistrationRequest/reason", HFILL }}, { &hf_h225_endpointAliasPattern, { "endpointAliasPattern", "h225.endpointAliasPattern", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "UnregistrationRequest/endpointAliasPattern", HFILL }}, { &hf_h225_endpointAliasPattern_item, { "Item", "h225.endpointAliasPattern_item", @@ -11467,11 +11662,11 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_destinationInfo, { "destinationInfo", "h225.destinationInfo", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_srcInfo, { "srcInfo", "h225.srcInfo", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AdmissionRequest/srcInfo", HFILL }}, { &hf_h225_srcInfo_item, { "Item", "h225.srcInfo_item", @@ -11495,7 +11690,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_srcAlternatives, { "srcAlternatives", "h225.srcAlternatives", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AdmissionRequest/srcAlternatives", HFILL }}, { &hf_h225_srcAlternatives_item, { "Item", "h225.srcAlternatives_item", @@ -11503,7 +11698,7 @@ void proto_register_h225(void) { "AdmissionRequest/srcAlternatives/_item", HFILL }}, { &hf_h225_destAlternatives, { "destAlternatives", "h225.destAlternatives", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AdmissionRequest/destAlternatives", HFILL }}, { &hf_h225_destAlternatives_item, { "Item", "h225.destAlternatives_item", @@ -11579,7 +11774,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_supportedProtocols, { "supportedProtocols", "h225.supportedProtocols", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_supportedProtocols_item, { "Item", "h225.supportedProtocols_item", @@ -11587,7 +11782,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_modifiedSrcInfo, { "modifiedSrcInfo", "h225.modifiedSrcInfo", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h225_modifiedSrcInfo_item, { "Item", "h225.modifiedSrcInfo_item", @@ -11675,7 +11870,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_routeCallToSCN, { "routeCallToSCN", "h225.routeCallToSCN", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AdmissionRejectReason/routeCallToSCN", HFILL }}, { &hf_h225_routeCallToSCN_item, { "Item", "h225.routeCallToSCN_item", @@ -11711,7 +11906,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_bandwidthDetails, { "bandwidthDetails", "h225.bandwidthDetails", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "BandwidthRequest/bandwidthDetails", HFILL }}, { &hf_h225_bandwidthDetails_item, { "Item", "h225.bandwidthDetails_item", @@ -11743,7 +11938,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_sourceInfo, { "sourceInfo", "h225.sourceInfo", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "LocationRequest/sourceInfo", HFILL }}, { &hf_h225_sourceInfo_item, { "Item", "h225.sourceInfo_item", @@ -11755,7 +11950,7 @@ void proto_register_h225(void) { "LocationRequest/hopCount", HFILL }}, { &hf_h225_sourceEndpointInfo, { "sourceEndpointInfo", "h225.sourceEndpointInfo", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "LocationRequest/sourceEndpointInfo", HFILL }}, { &hf_h225_sourceEndpointInfo_item, { "Item", "h225.sourceEndpointInfo_item", @@ -11779,7 +11974,7 @@ void proto_register_h225(void) { "", HFILL }}, { &hf_h225_routeCalltoSCN, { "routeCalltoSCN", "h225.routeCalltoSCN", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "LocationRejectReason/routeCalltoSCN", HFILL }}, { &hf_h225_routeCalltoSCN_item, { "Item", "h225.routeCalltoSCN_item", @@ -11831,7 +12026,7 @@ void proto_register_h225(void) { "InfoRequestResponse/rasAddress", HFILL }}, { &hf_h225_perCallInfo, { "perCallInfo", "h225.perCallInfo", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "InfoRequestResponse/perCallInfo", HFILL }}, { &hf_h225_perCallInfo_item, { "Item", "h225.perCallInfo_item", @@ -11843,7 +12038,7 @@ void proto_register_h225(void) { "InfoRequestResponse/perCallInfo/_item/originator", HFILL }}, { &hf_h225_audio, { "audio", "h225.audio", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "InfoRequestResponse/perCallInfo/_item/audio", HFILL }}, { &hf_h225_audio_item, { "Item", "h225.audio_item", @@ -11851,7 +12046,7 @@ void proto_register_h225(void) { "InfoRequestResponse/perCallInfo/_item/audio/_item", HFILL }}, { &hf_h225_video, { "video", "h225.video", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "InfoRequestResponse/perCallInfo/_item/video", HFILL }}, { &hf_h225_video_item, { "Item", "h225.video_item", @@ -11859,7 +12054,7 @@ void proto_register_h225(void) { "InfoRequestResponse/perCallInfo/_item/video/_item", HFILL }}, { &hf_h225_data, { "data", "h225.data", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "InfoRequestResponse/perCallInfo/_item/data", HFILL }}, { &hf_h225_data_item, { "Item", "h225.data_item", @@ -11875,7 +12070,7 @@ void proto_register_h225(void) { "InfoRequestResponse/perCallInfo/_item/callSignaling", HFILL }}, { &hf_h225_substituteConfIDs, { "substituteConfIDs", "h225.substituteConfIDs", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "InfoRequestResponse/perCallInfo/_item/substituteConfIDs", HFILL }}, { &hf_h225_substituteConfIDs_item, { "Item", "h225.substituteConfIDs_item", @@ -11883,7 +12078,7 @@ void proto_register_h225(void) { "InfoRequestResponse/perCallInfo/_item/substituteConfIDs/_item", HFILL }}, { &hf_h225_pdu, { "pdu", "h225.pdu", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "InfoRequestResponse/perCallInfo/_item/pdu", HFILL }}, { &hf_h225_pdu_item, { "Item", "h225.pdu_item", @@ -11939,7 +12134,7 @@ void proto_register_h225(void) { "RequestInProgress/delay", HFILL }}, { &hf_h225_protocols, { "protocols", "h225.protocols", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ResourcesAvailableIndicate/protocols", HFILL }}, { &hf_h225_protocols_item, { "Item", "h225.protocols_item", diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index b43a65e03e..7ca31a45b6 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -2280,12 +2280,14 @@ static int dissect_vendor(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t static int dissect_h245_T_data(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { tvbuff_t *next_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index, -1, -1, &next_tvb); if (next_tvb && tvb_length(next_tvb)) { call_dissector((nsp_handle)?nsp_handle:data_handle, next_tvb, pinfo, tree); } + return offset; } static int dissect_nsd_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { @@ -2567,10 +2569,11 @@ static int dissect_maximumStringLength(tvbuff_t *tvb, int offset, packet_info *p } + static int dissect_h245_BOOLEAN(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_boolean(tvb, offset, pinfo, tree, hf_index, - NULL, NULL); + NULL, NULL); return offset; } @@ -3473,11 +3476,15 @@ static int dissect_q2931Address(tvbuff_t *tvb, int offset, packet_info *pinfo, p } +static const per_sequence_t SET_SIZE_1_256_OF_Q2931Address_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_gatewayAddress_item }, +}; + static int dissect_h245_SET_SIZE_1_256_OF_Q2931Address(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SET_SIZE_1_256_OF_Q2931Address, dissect_gatewayAddress_item, - 1, 256); + ett_h245_SET_SIZE_1_256_OF_Q2931Address, SET_SIZE_1_256_OF_Q2931Address_set_of, + 1, 256); return offset; } @@ -3532,10 +3539,14 @@ static int dissect_vcCapability_item(tvbuff_t *tvb, int offset, packet_info *pin } +static const per_sequence_t SET_OF_VCCapability_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_vcCapability_item }, +}; + static int dissect_h245_SET_OF_VCCapability(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SET_OF_VCCapability, dissect_vcCapability_item); + ett_h245_SET_OF_VCCapability, SET_OF_VCCapability_set_of); return offset; } @@ -5185,8 +5196,7 @@ static int dissect_t38fax(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t static int dissect_h245_T_standard(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_object_identifier(tvb, offset, pinfo, tree, hf_index, - standard_oid_str); - + standard_oid_str); return offset; } @@ -5358,10 +5368,14 @@ static int dissect_supersedes_item(tvbuff_t *tvb, int offset, packet_info *pinfo } +static const per_sequence_t SEQUENCE_OF_GenericParameter_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_messageContent_item }, +}; + static int dissect_h245_SEQUENCE_OF_GenericParameter(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_OF_GenericParameter, dissect_messageContent_item); + ett_h245_SEQUENCE_OF_GenericParameter, SEQUENCE_OF_GenericParameter_sequence_of); return offset; } @@ -5416,10 +5430,14 @@ static int dissect_parameterValue(tvbuff_t *tvb, int offset, packet_info *pinfo, } +static const per_sequence_t SEQUENCE_OF_ParameterIdentifier_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_supersedes_item }, +}; + static int dissect_h245_SEQUENCE_OF_ParameterIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_OF_ParameterIdentifier, dissect_supersedes_item); + ett_h245_SEQUENCE_OF_ParameterIdentifier, SEQUENCE_OF_ParameterIdentifier_sequence_of); return offset; } @@ -5577,10 +5595,14 @@ static int dissect_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre } +static const per_sequence_t SEQUENCE_OF_DataApplicationCapability_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_centralizedData_item }, +}; + static int dissect_h245_SEQUENCE_OF_DataApplicationCapability(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_OF_DataApplicationCapability, dissect_centralizedData_item); + ett_h245_SEQUENCE_OF_DataApplicationCapability, SEQUENCE_OF_DataApplicationCapability_sequence_of); return offset; } @@ -5615,10 +5637,14 @@ static int dissect_mediaDistributionCapability_item(tvbuff_t *tvb, int offset, p } +static const per_sequence_t SEQUENCE_OF_MediaDistributionCapability_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_mediaDistributionCapability_item }, +}; + static int dissect_h245_SEQUENCE_OF_MediaDistributionCapability(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_OF_MediaDistributionCapability, dissect_mediaDistributionCapability_item); + ett_h245_SEQUENCE_OF_MediaDistributionCapability, SEQUENCE_OF_MediaDistributionCapability_sequence_of); return offset; } @@ -5728,11 +5754,15 @@ static int dissect_rtpPayloadType(tvbuff_t *tvb, int offset, packet_info *pinfo, } +static const per_sequence_t SEQUENCE_SIZE_1_256_OF_RTPPayloadType_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rtpPayloadType2_item }, +}; + static int dissect_h245_SEQUENCE_SIZE_1_256_OF_RTPPayloadType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_SIZE_1_256_OF_RTPPayloadType, dissect_rtpPayloadType2_item, - 1, 256); + ett_h245_SEQUENCE_SIZE_1_256_OF_RTPPayloadType, SEQUENCE_SIZE_1_256_OF_RTPPayloadType_sequence_of, + 1, 256); return offset; } @@ -5874,11 +5904,15 @@ static int dissect_qosCapability(tvbuff_t *tvb, int offset, packet_info *pinfo, } +static const per_sequence_t SEQUENCE_SIZE_1_256_OF_QOSCapability_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_qOSCapabilities_item }, +}; + static int dissect_h245_SEQUENCE_SIZE_1_256_OF_QOSCapability(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_SIZE_1_256_OF_QOSCapability, dissect_qOSCapabilities_item, - 1, 256); + ett_h245_SEQUENCE_SIZE_1_256_OF_QOSCapability, SEQUENCE_SIZE_1_256_OF_QOSCapability_sequence_of, + 1, 256); return offset; } @@ -5950,11 +5984,15 @@ static int dissect_mediaChannelCapabilities_item(tvbuff_t *tvb, int offset, pack } +static const per_sequence_t SEQUENCE_SIZE_1_256_OF_MediaChannelCapability_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_mediaChannelCapabilities_item }, +}; + static int dissect_h245_SEQUENCE_SIZE_1_256_OF_MediaChannelCapability(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_SIZE_1_256_OF_MediaChannelCapability, dissect_mediaChannelCapabilities_item, - 1, 256); + ett_h245_SEQUENCE_SIZE_1_256_OF_MediaChannelCapability, SEQUENCE_SIZE_1_256_OF_MediaChannelCapability_sequence_of, + 1, 256); return offset; } @@ -6019,11 +6057,15 @@ static int dissect_skippedFrameCount(tvbuff_t *tvb, int offset, packet_info *pin } +static const per_sequence_t T_frameSequence_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_frameSequence_item }, +}; + static int dissect_h245_T_frameSequence(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_frameSequence, dissect_frameSequence_item, - 1, 256); + ett_h245_T_frameSequence, T_frameSequence_sequence_of, + 1, 256); return offset; } @@ -6049,11 +6091,15 @@ static int dissect_custom_item(tvbuff_t *tvb, int offset, packet_info *pinfo, pr } +static const per_sequence_t SEQUENCE_SIZE_1_256_OF_RTPH263VideoRedundancyFrameMapping_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_custom_item }, +}; + static int dissect_h245_SEQUENCE_SIZE_1_256_OF_RTPH263VideoRedundancyFrameMapping(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_SIZE_1_256_OF_RTPH263VideoRedundancyFrameMapping, dissect_custom_item, - 1, 256); + ett_h245_SEQUENCE_SIZE_1_256_OF_RTPH263VideoRedundancyFrameMapping, SEQUENCE_SIZE_1_256_OF_RTPH263VideoRedundancyFrameMapping_sequence_of, + 1, 256); return offset; } @@ -6087,11 +6133,15 @@ static int dissect_frameToThreadMapping(tvbuff_t *tvb, int offset, packet_info * } +static const per_sequence_t T_containedThreads_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_containedThreads_item }, +}; + static int dissect_h245_T_containedThreads(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_containedThreads, dissect_containedThreads_item, - 1, 256); + ett_h245_T_containedThreads, T_containedThreads_sequence_of, + 1, 256); return offset; } @@ -6177,11 +6227,15 @@ static int dissect_capabilityTableEntryNumbers_item(tvbuff_t *tvb, int offset, p } +static const per_sequence_t SEQUENCE_SIZE_1_256_OF_CapabilityTableEntryNumber_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_secondaryEncoding2_item }, +}; + static int dissect_h245_SEQUENCE_SIZE_1_256_OF_CapabilityTableEntryNumber(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_SIZE_1_256_OF_CapabilityTableEntryNumber, dissect_secondaryEncoding2_item, - 1, 256); + ett_h245_SEQUENCE_SIZE_1_256_OF_CapabilityTableEntryNumber, SEQUENCE_SIZE_1_256_OF_CapabilityTableEntryNumber_sequence_of, + 1, 256); return offset; } @@ -6208,11 +6262,15 @@ static int dissect_redundancyEncodingCapability_item(tvbuff_t *tvb, int offset, } +static const per_sequence_t SEQUENCE_SIZE_1_256_OF_RedundancyEncodingCapability_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_redundancyEncodingCapability_item }, +}; + static int dissect_h245_SEQUENCE_SIZE_1_256_OF_RedundancyEncodingCapability(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_SIZE_1_256_OF_RedundancyEncodingCapability, dissect_redundancyEncodingCapability_item, - 1, 256); + ett_h245_SEQUENCE_SIZE_1_256_OF_RedundancyEncodingCapability, SEQUENCE_SIZE_1_256_OF_RedundancyEncodingCapability_sequence_of, + 1, 256); return offset; } @@ -6713,11 +6771,15 @@ static int dissect_customPictureClockFrequency_item(tvbuff_t *tvb, int offset, p } +static const per_sequence_t SET_SIZE_1_16_OF_CustomPictureClockFrequency_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_customPictureClockFrequency_item }, +}; + static int dissect_h245_SET_SIZE_1_16_OF_CustomPictureClockFrequency(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SET_SIZE_1_16_OF_CustomPictureClockFrequency, dissect_customPictureClockFrequency_item, - 1, 16); + ett_h245_SET_SIZE_1_16_OF_CustomPictureClockFrequency, SET_SIZE_1_16_OF_CustomPictureClockFrequency_set_of, + 1, 16); return offset; } @@ -6757,11 +6819,15 @@ static int dissect_customPCF_item(tvbuff_t *tvb, int offset, packet_info *pinfo, } +static const per_sequence_t T_customPCF_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_customPCF_item }, +}; + static int dissect_h245_T_customPCF(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_customPCF, dissect_customPCF_item, - 1, 16); + ett_h245_T_customPCF, T_customPCF_set_of, + 1, 16); return offset; } @@ -6800,11 +6866,15 @@ static int dissect_pixelAspectCode_item(tvbuff_t *tvb, int offset, packet_info * } +static const per_sequence_t T_pixelAspectCode_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_pixelAspectCode_item }, +}; + static int dissect_h245_T_pixelAspectCode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_pixelAspectCode, dissect_pixelAspectCode_item, - 1, 14); + ett_h245_T_pixelAspectCode, T_pixelAspectCode_set_of, + 1, 14); return offset; } @@ -6830,11 +6900,15 @@ static int dissect_extendedPAR_item(tvbuff_t *tvb, int offset, packet_info *pinf } +static const per_sequence_t T_extendedPAR_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_extendedPAR_item }, +}; + static int dissect_h245_T_extendedPAR(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_extendedPAR, dissect_extendedPAR_item, - 1, 256); + ett_h245_T_extendedPAR, T_extendedPAR_set_of, + 1, 256); return offset; } @@ -6891,11 +6965,15 @@ static int dissect_customPictureFormat_item(tvbuff_t *tvb, int offset, packet_in } +static const per_sequence_t SET_SIZE_1_16_OF_CustomPictureFormat_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_customPictureFormat_item }, +}; + static int dissect_h245_SET_SIZE_1_16_OF_CustomPictureFormat(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SET_SIZE_1_16_OF_CustomPictureFormat, dissect_customPictureFormat_item, - 1, 16); + ett_h245_SET_SIZE_1_16_OF_CustomPictureFormat, SET_SIZE_1_16_OF_CustomPictureFormat_set_of, + 1, 16); return offset; } @@ -6968,11 +7046,15 @@ static int dissect_h263VideoCoupledModes_item(tvbuff_t *tvb, int offset, packet_ } +static const per_sequence_t SET_SIZE_1_16_OF_H263ModeComboFlags_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h263VideoCoupledModes_item }, +}; + static int dissect_h245_SET_SIZE_1_16_OF_H263ModeComboFlags(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SET_SIZE_1_16_OF_H263ModeComboFlags, dissect_h263VideoCoupledModes_item, - 1, 16); + ett_h245_SET_SIZE_1_16_OF_H263ModeComboFlags, SET_SIZE_1_16_OF_H263ModeComboFlags_set_of, + 1, 16); return offset; } @@ -6998,11 +7080,15 @@ static int dissect_modeCombos_item(tvbuff_t *tvb, int offset, packet_info *pinfo } +static const per_sequence_t SET_SIZE_1_16_OF_H263VideoModeCombos_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_modeCombos_item }, +}; + static int dissect_h245_SET_SIZE_1_16_OF_H263VideoModeCombos(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SET_SIZE_1_16_OF_H263VideoModeCombos, dissect_modeCombos_item, - 1, 16); + ett_h245_SET_SIZE_1_16_OF_H263VideoModeCombos, SET_SIZE_1_16_OF_H263VideoModeCombos_set_of, + 1, 16); return offset; } @@ -7094,11 +7180,15 @@ static int dissect_enhancementOptions(tvbuff_t *tvb, int offset, packet_info *pi } +static const per_sequence_t SET_SIZE_1_14_OF_EnhancementOptions_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_snrEnhancement_item }, +}; + static int dissect_h245_SET_SIZE_1_14_OF_EnhancementOptions(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SET_SIZE_1_14_OF_EnhancementOptions, dissect_snrEnhancement_item, - 1, 14); + ett_h245_SET_SIZE_1_14_OF_EnhancementOptions, SET_SIZE_1_14_OF_EnhancementOptions_set_of, + 1, 14); return offset; } @@ -7140,11 +7230,15 @@ static int dissect_bPictureEnhancement_item(tvbuff_t *tvb, int offset, packet_in } +static const per_sequence_t SET_SIZE_1_14_OF_BEnhancementParameters_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_bPictureEnhancement_item }, +}; + static int dissect_h245_SET_SIZE_1_14_OF_BEnhancementParameters(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SET_SIZE_1_14_OF_BEnhancementParameters, dissect_bPictureEnhancement_item, - 1, 14); + ett_h245_SET_SIZE_1_14_OF_BEnhancementParameters, SET_SIZE_1_14_OF_BEnhancementParameters_set_of, + 1, 14); return offset; } @@ -7231,10 +7325,14 @@ static int dissect_is11172VideoCapability(tvbuff_t *tvb, int offset, packet_info } +static const per_sequence_t SEQUENCE_OF_VideoCapability_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_videoCapability_item }, +}; + static int dissect_h245_SEQUENCE_OF_VideoCapability(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_OF_VideoCapability, dissect_videoCapability_item); + ett_h245_SEQUENCE_OF_VideoCapability, SEQUENCE_OF_VideoCapability_sequence_of); return offset; } @@ -7243,10 +7341,14 @@ static int dissect_videoCapability(tvbuff_t *tvb, int offset, packet_info *pinfo } +static const per_sequence_t SEQUENCE_OF_GenericCapability_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_videoCapabilityExtension_item }, +}; + static int dissect_h245_SEQUENCE_OF_GenericCapability(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_OF_GenericCapability, dissect_videoCapabilityExtension_item); + ett_h245_SEQUENCE_OF_GenericCapability, SEQUENCE_OF_GenericCapability_sequence_of); return offset; } @@ -7698,10 +7800,14 @@ static int dissect_h233EncryptionReceiveCapability(tvbuff_t *tvb, int offset, pa } +static const per_sequence_t SEQUENCE_OF_NonStandardParameter_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nonStandardData_item }, +}; + static int dissect_h245_SEQUENCE_OF_NonStandardParameter(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_OF_NonStandardParameter, dissect_nonStandardData_item); + ett_h245_SEQUENCE_OF_NonStandardParameter, SEQUENCE_OF_NonStandardParameter_sequence_of); return offset; } @@ -7754,11 +7860,15 @@ static int dissect_EncryptionCapability_item(tvbuff_t *tvb, int offset, packet_i } +static const per_sequence_t EncryptionCapability_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_EncryptionCapability_item }, +}; + static int dissect_h245_EncryptionCapability(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_EncryptionCapability, dissect_EncryptionCapability_item, - 1, 256); + ett_h245_EncryptionCapability, EncryptionCapability_sequence_of, + 1, 256); return offset; } @@ -7835,11 +7945,15 @@ static int dissect_h235SecurityCapability(tvbuff_t *tvb, int offset, packet_info } +static const per_sequence_t SEQUENCE_SIZE_1_16_OF_NonStandardParameter_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nonStandard_item }, +}; + static int dissect_h245_SEQUENCE_SIZE_1_16_OF_NonStandardParameter(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_SIZE_1_16_OF_NonStandardParameter, dissect_nonStandard_item, - 1, 16); + ett_h245_SEQUENCE_SIZE_1_16_OF_NonStandardParameter, SEQUENCE_SIZE_1_16_OF_NonStandardParameter_sequence_of, + 1, 16); return offset; } @@ -7924,11 +8038,15 @@ static int dissect_multiplexFormat(tvbuff_t *tvb, int offset, packet_info *pinfo } +static const per_sequence_t AlternativeCapabilitySet_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_AlternativeCapabilitySet_item }, +}; + static int dissect_h245_AlternativeCapabilitySet(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_AlternativeCapabilitySet, dissect_AlternativeCapabilitySet_item, - 1, 256); + ett_h245_AlternativeCapabilitySet, AlternativeCapabilitySet_sequence_of, + 1, 256); return offset; } @@ -7943,11 +8061,15 @@ static int dissect_capabilities_item(tvbuff_t *tvb, int offset, packet_info *pin } +static const per_sequence_t SET_SIZE_1_256_OF_AlternativeCapabilitySet_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_simultaneousCapabilities_item }, +}; + static int dissect_h245_SET_SIZE_1_256_OF_AlternativeCapabilitySet(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SET_SIZE_1_256_OF_AlternativeCapabilitySet, dissect_simultaneousCapabilities_item, - 1, 256); + ett_h245_SET_SIZE_1_256_OF_AlternativeCapabilitySet, SET_SIZE_1_256_OF_AlternativeCapabilitySet_set_of, + 1, 256); return offset; } @@ -8195,11 +8317,15 @@ static int dissect_capabilityTable_item(tvbuff_t *tvb, int offset, packet_info * } +static const per_sequence_t SET_SIZE_1_256_OF_CapabilityTableEntry_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_capabilityTable_item }, +}; + static int dissect_h245_SET_SIZE_1_256_OF_CapabilityTableEntry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SET_SIZE_1_256_OF_CapabilityTableEntry, dissect_capabilityTable_item, - 1, 256); + ett_h245_SET_SIZE_1_256_OF_CapabilityTableEntry, SET_SIZE_1_256_OF_CapabilityTableEntry_set_of, + 1, 256); return offset; } @@ -8241,11 +8367,15 @@ static int dissect_capabilityDescriptors_item(tvbuff_t *tvb, int offset, packet_ } +static const per_sequence_t SET_SIZE_1_256_OF_CapabilityDescriptor_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_capabilityDescriptors_item }, +}; + static int dissect_h245_SET_SIZE_1_256_OF_CapabilityDescriptor(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SET_SIZE_1_256_OF_CapabilityDescriptor, dissect_capabilityDescriptors_item, - 1, 256); + ett_h245_SET_SIZE_1_256_OF_CapabilityDescriptor, SET_SIZE_1_256_OF_CapabilityDescriptor_set_of, + 1, 256); return offset; } @@ -8370,10 +8500,14 @@ static int dissect_secondary_item(tvbuff_t *tvb, int offset, packet_info *pinfo, } +static const per_sequence_t SEQUENCE_OF_RedundancyEncodingElement_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_secondary_item }, +}; + static int dissect_h245_SEQUENCE_OF_RedundancyEncodingElement(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_OF_RedundancyEncodingElement, dissect_secondary_item); + ett_h245_SEQUENCE_OF_RedundancyEncodingElement, SEQUENCE_OF_RedundancyEncodingElement_sequence_of); return offset; } @@ -8434,10 +8568,14 @@ static int dissect_elements_item(tvbuff_t *tvb, int offset, packet_info *pinfo, } +static const per_sequence_t SEQUENCE_OF_MultiplePayloadStreamElement_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_elements_item }, +}; + static int dissect_h245_SEQUENCE_OF_MultiplePayloadStreamElement(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_OF_MultiplePayloadStreamElement, dissect_elements_item); + ett_h245_SEQUENCE_OF_MultiplePayloadStreamElement, SEQUENCE_OF_MultiplePayloadStreamElement_sequence_of); return offset; } @@ -9355,12 +9493,11 @@ static int dissect_ip4_network(tvbuff_t *tvb, int offset, packet_info *pinfo, pr static int dissect_h245_TsapIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -guint32 tsapIdentifier; + guint32 tsapIdentifier; + offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, + 0U, 65535U, &tsapIdentifier, NULL, FALSE); - offset=dissect_per_constrained_integer(tvb, offset, pinfo, tree, - hf_h245_tsapIdentifier, 0, 65535, - &tsapIdentifier, NULL, FALSE); if ( media_channel ) ipv4_port = tsapIdentifier; @@ -9500,10 +9637,14 @@ static int dissect_routing(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_ } +static const per_sequence_t T_route_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_route_item }, +}; + static int dissect_h245_T_route(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_T_route, dissect_route_item); + ett_h245_T_route, T_route_sequence_of); return offset; } @@ -10120,11 +10261,15 @@ static int dissect_escrowentry_item(tvbuff_t *tvb, int offset, packet_info *pinf } +static const per_sequence_t SEQUENCE_SIZE_1_256_OF_EscrowData_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_escrowentry_item }, +}; + static int dissect_h245_SEQUENCE_SIZE_1_256_OF_EscrowData(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_SIZE_1_256_OF_EscrowData, dissect_escrowentry_item, - 1, 256); + ett_h245_SEQUENCE_SIZE_1_256_OF_EscrowData, SEQUENCE_SIZE_1_256_OF_EscrowData_sequence_of, + 1, 256); return offset; } @@ -10315,11 +10460,15 @@ static int dissect_entryNumbers_item(tvbuff_t *tvb, int offset, packet_info *pin } +static const per_sequence_t SEQUENCE_SIZE_2_255_OF_MultiplexElement_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_subElementList_item }, +}; + static int dissect_h245_SEQUENCE_SIZE_2_255_OF_MultiplexElement(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_SIZE_2_255_OF_MultiplexElement, dissect_subElementList_item, - 2, 255); + ett_h245_SEQUENCE_SIZE_2_255_OF_MultiplexElement, SEQUENCE_SIZE_2_255_OF_MultiplexElement_sequence_of, + 2, 255); return offset; } @@ -10392,11 +10541,15 @@ dissect_h245_MultiplexElement(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, } +static const per_sequence_t SEQUENCE_SIZE_1_256_OF_MultiplexElement_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_elementList_item }, +}; + static int dissect_h245_SEQUENCE_SIZE_1_256_OF_MultiplexElement(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_SIZE_1_256_OF_MultiplexElement, dissect_elementList_item, - 1, 256); + ett_h245_SEQUENCE_SIZE_1_256_OF_MultiplexElement, SEQUENCE_SIZE_1_256_OF_MultiplexElement_sequence_of, + 1, 256); return offset; } @@ -10422,11 +10575,15 @@ static int dissect_multiplexEntryDescriptors_item(tvbuff_t *tvb, int offset, pac } +static const per_sequence_t SET_SIZE_1_15_OF_MultiplexEntryDescriptor_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_multiplexEntryDescriptors_item }, +}; + static int dissect_h245_SET_SIZE_1_15_OF_MultiplexEntryDescriptor(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SET_SIZE_1_15_OF_MultiplexEntryDescriptor, dissect_multiplexEntryDescriptors_item, - 1, 15); + ett_h245_SET_SIZE_1_15_OF_MultiplexEntryDescriptor, SET_SIZE_1_15_OF_MultiplexEntryDescriptor_set_of, + 1, 15); return offset; } @@ -10452,11 +10609,15 @@ static int dissect_multiplexEntrySend(tvbuff_t *tvb, int offset, packet_info *pi } +static const per_sequence_t SET_SIZE_1_15_OF_MultiplexTableEntryNumber_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_multiplexTableEntryNumber_item }, +}; + static int dissect_h245_SET_SIZE_1_15_OF_MultiplexTableEntryNumber(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SET_SIZE_1_15_OF_MultiplexTableEntryNumber, dissect_multiplexTableEntryNumber_item, - 1, 15); + ett_h245_SET_SIZE_1_15_OF_MultiplexTableEntryNumber, SET_SIZE_1_15_OF_MultiplexTableEntryNumber_set_of, + 1, 15); return offset; } @@ -11246,10 +11407,14 @@ static int dissect_secondary2_item(tvbuff_t *tvb, int offset, packet_info *pinfo } +static const per_sequence_t SEQUENCE_OF_RedundancyEncodingDTModeElement_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_secondary2_item }, +}; + static int dissect_h245_SEQUENCE_OF_RedundancyEncodingDTModeElement(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_OF_RedundancyEncodingDTModeElement, dissect_secondary2_item); + ett_h245_SEQUENCE_OF_RedundancyEncodingDTModeElement, SEQUENCE_OF_RedundancyEncodingDTModeElement_sequence_of); return offset; } @@ -11292,10 +11457,14 @@ static int dissect_mpsmElements_item(tvbuff_t *tvb, int offset, packet_info *pin } +static const per_sequence_t SEQUENCE_OF_MultiplePayloadStreamElementMode_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_mpsmElements_item }, +}; + static int dissect_h245_SEQUENCE_OF_MultiplePayloadStreamElementMode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_OF_MultiplePayloadStreamElementMode, dissect_mpsmElements_item); + ett_h245_SEQUENCE_OF_MultiplePayloadStreamElementMode, SEQUENCE_OF_MultiplePayloadStreamElementMode_sequence_of); return offset; } @@ -11599,11 +11768,15 @@ static int dissect_ModeDescription_item(tvbuff_t *tvb, int offset, packet_info * } +static const per_sequence_t ModeDescription_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ModeDescription_item }, +}; + static int dissect_h245_ModeDescription(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_ModeDescription, dissect_ModeDescription_item, - 1, 256); + ett_h245_ModeDescription, ModeDescription_set_of, + 1, 256); return offset; } @@ -11612,11 +11785,15 @@ static int dissect_requestedModes_item(tvbuff_t *tvb, int offset, packet_info *p } +static const per_sequence_t SEQUENCE_SIZE_1_256_OF_ModeDescription_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_requestedModes_item }, +}; + static int dissect_h245_SEQUENCE_SIZE_1_256_OF_ModeDescription(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_SIZE_1_256_OF_ModeDescription, dissect_requestedModes_item, - 1, 256); + ett_h245_SEQUENCE_SIZE_1_256_OF_ModeDescription, SEQUENCE_SIZE_1_256_OF_ModeDescription_sequence_of, + 1, 256); return offset; } @@ -11733,11 +11910,15 @@ static int dissect_CertSelectionCriteria_item(tvbuff_t *tvb, int offset, packet_ } +static const per_sequence_t CertSelectionCriteria_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_CertSelectionCriteria_item }, +}; + static int dissect_h245_CertSelectionCriteria(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_CertSelectionCriteria, dissect_CertSelectionCriteria_item, - 1, 16); + ett_h245_CertSelectionCriteria, CertSelectionCriteria_sequence_of, + 1, 16); return offset; } @@ -11913,11 +12094,15 @@ static int dissect_networkType_item(tvbuff_t *tvb, int offset, packet_info *pinf } +static const per_sequence_t SET_SIZE_1_255_OF_DialingInformationNetworkType_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_networkType_item }, +}; + static int dissect_h245_SET_SIZE_1_255_OF_DialingInformationNetworkType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SET_SIZE_1_255_OF_DialingInformationNetworkType, dissect_networkType_item, - 1, 255); + ett_h245_SET_SIZE_1_255_OF_DialingInformationNetworkType, SET_SIZE_1_255_OF_DialingInformationNetworkType_set_of, + 1, 255); return offset; } @@ -11944,11 +12129,15 @@ static int dissect_differential_item(tvbuff_t *tvb, int offset, packet_info *pin } +static const per_sequence_t SET_SIZE_1_65535_OF_DialingInformationNumber_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_differential_item }, +}; + static int dissect_h245_SET_SIZE_1_65535_OF_DialingInformationNumber(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SET_SIZE_1_65535_OF_DialingInformationNumber, dissect_differential_item, - 1, 65535); + ett_h245_SET_SIZE_1_65535_OF_DialingInformationNumber, SET_SIZE_1_65535_OF_DialingInformationNumber_set_of, + 1, 65535); return offset; } @@ -12151,12 +12340,10 @@ static int dissect_logicalChannelRateRequest(tvbuff_t *tvb, int offset, packet_i static int dissect_h245_T_subMessageIdentifer(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - -guint32 subMessageIdentifer; + guint32 subMessageIdentifer; offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0U, 127U, &subMessageIdentifer, NULL, FALSE); - + 0U, 127U, &subMessageIdentifer, NULL, FALSE); return offset; } @@ -12825,11 +13012,15 @@ static int dissect_rejectionDescriptions1_item(tvbuff_t *tvb, int offset, packet } +static const per_sequence_t SET_SIZE_1_15_OF_MultiplexEntryRejectionDescriptions_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rejectionDescriptions1_item }, +}; + static int dissect_h245_SET_SIZE_1_15_OF_MultiplexEntryRejectionDescriptions(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SET_SIZE_1_15_OF_MultiplexEntryRejectionDescriptions, dissect_rejectionDescriptions1_item, - 1, 15); + ett_h245_SET_SIZE_1_15_OF_MultiplexEntryRejectionDescriptions, SET_SIZE_1_15_OF_MultiplexEntryRejectionDescriptions_set_of, + 1, 15); return offset; } @@ -12911,11 +13102,15 @@ static int dissect_rejectionDescriptions2_item(tvbuff_t *tvb, int offset, packet } +static const per_sequence_t SET_SIZE_1_15_OF_RequestMultiplexEntryRejectionDescriptions_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rejectionDescriptions2_item }, +}; + static int dissect_h245_SET_SIZE_1_15_OF_RequestMultiplexEntryRejectionDescriptions(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SET_SIZE_1_15_OF_RequestMultiplexEntryRejectionDescriptions, dissect_rejectionDescriptions2_item, - 1, 15); + ett_h245_SET_SIZE_1_15_OF_RequestMultiplexEntryRejectionDescriptions, SET_SIZE_1_15_OF_RequestMultiplexEntryRejectionDescriptions_set_of, + 1, 15); return offset; } @@ -13231,11 +13426,15 @@ static int dissect_communicationModeTable_item(tvbuff_t *tvb, int offset, packet } +static const per_sequence_t SET_SIZE_1_256_OF_CommunicationModeTableEntry_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_communicationModeTable_item }, +}; + static int dissect_h245_SET_SIZE_1_256_OF_CommunicationModeTableEntry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SET_SIZE_1_256_OF_CommunicationModeTableEntry, dissect_communicationModeTable_item, - 1, 256); + ett_h245_SET_SIZE_1_256_OF_CommunicationModeTableEntry, SET_SIZE_1_256_OF_CommunicationModeTableEntry_set_of, + 1, 256); return offset; } @@ -13377,11 +13576,15 @@ static int dissect_passwordResponse(tvbuff_t *tvb, int offset, packet_info *pinf } +static const per_sequence_t SET_SIZE_1_256_OF_TerminalLabel_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_terminalListResponse_item }, +}; + static int dissect_h245_SET_SIZE_1_256_OF_TerminalLabel(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SET_SIZE_1_256_OF_TerminalLabel, dissect_terminalListResponse_item, - 1, 256); + ett_h245_SET_SIZE_1_256_OF_TerminalLabel, SET_SIZE_1_256_OF_TerminalLabel_set_of, + 1, 256); return offset; } @@ -13557,10 +13760,14 @@ static int dissect_terminalInformation_item(tvbuff_t *tvb, int offset, packet_in } +static const per_sequence_t SEQUENCE_OF_TerminalInformation_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_terminalInformation_item }, +}; + static int dissect_h245_SEQUENCE_OF_TerminalInformation(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_OF_TerminalInformation, dissect_terminalInformation_item); + ett_h245_SEQUENCE_OF_TerminalInformation, SEQUENCE_OF_TerminalInformation_sequence_of); return offset; } @@ -13999,11 +14206,15 @@ static int dissect_maintenanceLoopOffCommand(tvbuff_t *tvb, int offset, packet_i } +static const per_sequence_t SET_SIZE_1_65535_OF_CapabilityTableEntryNumber_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_capabilityTableEntryNumbers_item }, +}; + static int dissect_h245_SET_SIZE_1_65535_OF_CapabilityTableEntryNumber(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SET_SIZE_1_65535_OF_CapabilityTableEntryNumber, dissect_capabilityTableEntryNumbers_item, - 1, 65535); + ett_h245_SET_SIZE_1_65535_OF_CapabilityTableEntryNumber, SET_SIZE_1_65535_OF_CapabilityTableEntryNumber_set_of, + 1, 65535); return offset; } @@ -14012,11 +14223,15 @@ static int dissect_capabilityTableEntryNumbers(tvbuff_t *tvb, int offset, packet } +static const per_sequence_t SET_SIZE_1_256_OF_CapabilityDescriptorNumber_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_capabilityDescriptorNumbers_item }, +}; + static int dissect_h245_SET_SIZE_1_256_OF_CapabilityDescriptorNumber(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SET_SIZE_1_256_OF_CapabilityDescriptorNumber, dissect_capabilityDescriptorNumbers_item, - 1, 256); + ett_h245_SET_SIZE_1_256_OF_CapabilityDescriptorNumber, SET_SIZE_1_256_OF_CapabilityDescriptorNumber_set_of, + 1, 256); return offset; } @@ -14503,10 +14718,14 @@ static int dissect_recoveryReferencePicture_item(tvbuff_t *tvb, int offset, pack } +static const per_sequence_t SEQUENCE_OF_PictureReference_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_lostPicture_item }, +}; + static int dissect_h245_SEQUENCE_OF_PictureReference(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h245_SEQUENCE_OF_PictureReference, dissect_lostPicture_item); + ett_h245_SEQUENCE_OF_PictureReference, SEQUENCE_OF_PictureReference_sequence_of); return offset; } @@ -16767,7 +16986,7 @@ void proto_register_h245(void) { "GenericMessage/subMessageIdentifer", HFILL }}, { &hf_h245_messageContent, { "messageContent", "h245.messageContent", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GenericMessage/messageContent", HFILL }}, { &hf_h245_messageContent_item, { "Item", "h245.messageContent_item", @@ -16847,7 +17066,7 @@ void proto_register_h245(void) { "TerminalCapabilitySet/multiplexCapability", HFILL }}, { &hf_h245_capabilityTable, { "capabilityTable", "h245.capabilityTable", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "TerminalCapabilitySet/capabilityTable", HFILL }}, { &hf_h245_capabilityTable_item, { "Item", "h245.capabilityTable_item", @@ -16855,7 +17074,7 @@ void proto_register_h245(void) { "TerminalCapabilitySet/capabilityTable/_item", HFILL }}, { &hf_h245_capabilityDescriptors, { "capabilityDescriptors", "h245.capabilityDescriptors", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "TerminalCapabilitySet/capabilityDescriptors", HFILL }}, { &hf_h245_capabilityDescriptors_item, { "Item", "h245.capabilityDescriptors_item", @@ -16875,11 +17094,11 @@ void proto_register_h245(void) { "CapabilityDescriptor/capabilityDescriptorNumber", HFILL }}, { &hf_h245_simultaneousCapabilities, { "simultaneousCapabilities", "h245.simultaneousCapabilities", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CapabilityDescriptor/simultaneousCapabilities", HFILL }}, { &hf_h245_simultaneousCapabilities_item, { "Item", "h245.simultaneousCapabilities_item", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CapabilityDescriptor/simultaneousCapabilities/_item", HFILL }}, { &hf_h245_AlternativeCapabilitySet_item, { "Item", "h245.AlternativeCapabilitySet_item", @@ -17055,7 +17274,7 @@ void proto_register_h245(void) { "H222Capability/numberOfVCs", HFILL }}, { &hf_h245_vcCapability, { "vcCapability", "h245.vcCapability", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "H222Capability/vcCapability", HFILL }}, { &hf_h245_vcCapability_item, { "Item", "h245.vcCapability_item", @@ -17151,7 +17370,7 @@ void proto_register_h245(void) { "VCCapability/aal1ViaGateway", HFILL }}, { &hf_h245_gatewayAddress, { "gatewayAddress", "h245.gatewayAddress", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "VCCapability/aal1ViaGateway/gatewayAddress", HFILL }}, { &hf_h245_gatewayAddress_item, { "Item", "h245.gatewayAddress_item", @@ -17451,7 +17670,7 @@ void proto_register_h245(void) { "", HFILL }}, { &hf_h245_redundancyEncodingCapability, { "redundancyEncodingCapability", "h245.redundancyEncodingCapability", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "H2250Capability/redundancyEncodingCapability", HFILL }}, { &hf_h245_redundancyEncodingCapability_item, { "Item", "h245.redundancyEncodingCapability_item", @@ -17471,7 +17690,7 @@ void proto_register_h245(void) { "MediaPacketizationCapability/h261aVideoPacketization", HFILL }}, { &hf_h245_rtpPayloadType2, { "rtpPayloadType2", "h245.rtpPayloadType2", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MediaPacketizationCapability/rtpPayloadType2", HFILL }}, { &hf_h245_rtpPayloadType2_item, { "Item", "h245.rtpPayloadType2_item", @@ -17571,7 +17790,7 @@ void proto_register_h245(void) { "MediaChannelCapability/mediaTransport", HFILL }}, { &hf_h245_qOSCapabilities, { "qOSCapabilities", "h245.qOSCapabilities", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "TransportCapability/qOSCapabilities", HFILL }}, { &hf_h245_qOSCapabilities_item, { "Item", "h245.qOSCapabilities_item", @@ -17579,7 +17798,7 @@ void proto_register_h245(void) { "TransportCapability/qOSCapabilities/_item", HFILL }}, { &hf_h245_mediaChannelCapabilities, { "mediaChannelCapabilities", "h245.mediaChannelCapabilities", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "TransportCapability/mediaChannelCapabilities", HFILL }}, { &hf_h245_mediaChannelCapabilities_item, { "Item", "h245.mediaChannelCapabilities_item", @@ -17595,7 +17814,7 @@ void proto_register_h245(void) { "RedundancyEncodingCapability/primaryEncoding", HFILL }}, { &hf_h245_secondaryEncoding2, { "secondaryEncoding2", "h245.secondaryEncoding2", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RedundancyEncodingCapability/secondaryEncoding2", HFILL }}, { &hf_h245_secondaryEncoding2_item, { "Item", "h245.secondaryEncoding2_item", @@ -17627,7 +17846,7 @@ void proto_register_h245(void) { "RTPH263VideoRedundancyEncoding/frameToThreadMapping/roundrobin", HFILL }}, { &hf_h245_custom, { "custom", "h245.custom", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RTPH263VideoRedundancyEncoding/frameToThreadMapping/custom", HFILL }}, { &hf_h245_custom_item, { "Item", "h245.custom_item", @@ -17635,7 +17854,7 @@ void proto_register_h245(void) { "RTPH263VideoRedundancyEncoding/frameToThreadMapping/custom/_item", HFILL }}, { &hf_h245_containedThreads, { "containedThreads", "h245.containedThreads", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RTPH263VideoRedundancyEncoding/containedThreads", HFILL }}, { &hf_h245_containedThreads_item, { "Item", "h245.containedThreads_item", @@ -17647,7 +17866,7 @@ void proto_register_h245(void) { "RTPH263VideoRedundancyFrameMapping/threadNumber", HFILL }}, { &hf_h245_frameSequence, { "frameSequence", "h245.frameSequence", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RTPH263VideoRedundancyFrameMapping/frameSequence", HFILL }}, { &hf_h245_frameSequence_item, { "Item", "h245.frameSequence_item", @@ -17663,7 +17882,7 @@ void proto_register_h245(void) { "MultipointCapability/multiUniCastConference", HFILL }}, { &hf_h245_mediaDistributionCapability, { "mediaDistributionCapability", "h245.mediaDistributionCapability", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MultipointCapability/mediaDistributionCapability", HFILL }}, { &hf_h245_mediaDistributionCapability_item, { "Item", "h245.mediaDistributionCapability_item", @@ -17695,7 +17914,7 @@ void proto_register_h245(void) { "MediaDistributionCapability/distributedVideo", HFILL }}, { &hf_h245_centralizedData, { "centralizedData", "h245.centralizedData", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MediaDistributionCapability/centralizedData", HFILL }}, { &hf_h245_centralizedData_item, { "Item", "h245.centralizedData_item", @@ -17703,7 +17922,7 @@ void proto_register_h245(void) { "MediaDistributionCapability/centralizedData/_item", HFILL }}, { &hf_h245_distributedData, { "distributedData", "h245.distributedData", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MediaDistributionCapability/distributedData", HFILL }}, { &hf_h245_distributedData_item, { "Item", "h245.distributedData_item", @@ -17735,7 +17954,7 @@ void proto_register_h245(void) { "VideoCapability/extendedVideoCapability", HFILL }}, { &hf_h245_videoCapability, { "videoCapability", "h245.videoCapability", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ExtendedVideoCapability/videoCapability", HFILL }}, { &hf_h245_videoCapability_item, { "Item", "h245.videoCapability_item", @@ -17743,7 +17962,7 @@ void proto_register_h245(void) { "ExtendedVideoCapability/videoCapability/_item", HFILL }}, { &hf_h245_videoCapabilityExtension, { "videoCapabilityExtension", "h245.videoCapabilityExtension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ExtendedVideoCapability/videoCapabilityExtension", HFILL }}, { &hf_h245_videoCapabilityExtension_item, { "Item", "h245.videoCapabilityExtension_item", @@ -17927,7 +18146,7 @@ void proto_register_h245(void) { "EnhancementLayerInfo/baseBitRateConstrained", HFILL }}, { &hf_h245_snrEnhancement, { "snrEnhancement", "h245.snrEnhancement", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "EnhancementLayerInfo/snrEnhancement", HFILL }}, { &hf_h245_snrEnhancement_item, { "Item", "h245.snrEnhancement_item", @@ -17935,7 +18154,7 @@ void proto_register_h245(void) { "EnhancementLayerInfo/snrEnhancement/_item", HFILL }}, { &hf_h245_spatialEnhancement, { "spatialEnhancement", "h245.spatialEnhancement", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "EnhancementLayerInfo/spatialEnhancement", HFILL }}, { &hf_h245_spatialEnhancement_item, { "Item", "h245.spatialEnhancement_item", @@ -17943,7 +18162,7 @@ void proto_register_h245(void) { "EnhancementLayerInfo/spatialEnhancement/_item", HFILL }}, { &hf_h245_bPictureEnhancement, { "bPictureEnhancement", "h245.bPictureEnhancement", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "EnhancementLayerInfo/bPictureEnhancement", HFILL }}, { &hf_h245_bPictureEnhancement_item, { "Item", "h245.bPictureEnhancement_item", @@ -18063,7 +18282,7 @@ void proto_register_h245(void) { "H263Options/refPictureSelection", HFILL }}, { &hf_h245_customPictureClockFrequency, { "customPictureClockFrequency", "h245.customPictureClockFrequency", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "H263Options/customPictureClockFrequency", HFILL }}, { &hf_h245_customPictureClockFrequency_item, { "Item", "h245.customPictureClockFrequency_item", @@ -18071,7 +18290,7 @@ void proto_register_h245(void) { "H263Options/customPictureClockFrequency/_item", HFILL }}, { &hf_h245_customPictureFormat, { "customPictureFormat", "h245.customPictureFormat", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "H263Options/customPictureFormat", HFILL }}, { &hf_h245_customPictureFormat_item, { "Item", "h245.customPictureFormat_item", @@ -18079,7 +18298,7 @@ void proto_register_h245(void) { "H263Options/customPictureFormat/_item", HFILL }}, { &hf_h245_modeCombos, { "modeCombos", "h245.modeCombos", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "H263Options/modeCombos", HFILL }}, { &hf_h245_modeCombos_item, { "Item", "h245.modeCombos_item", @@ -18239,7 +18458,7 @@ void proto_register_h245(void) { "CustomPictureFormat/mPI/standardMPI", HFILL }}, { &hf_h245_customPCF, { "customPCF", "h245.customPCF", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CustomPictureFormat/mPI/customPCF", HFILL }}, { &hf_h245_customPCF_item, { "Item", "h245.customPCF_item", @@ -18259,7 +18478,7 @@ void proto_register_h245(void) { "CustomPictureFormat/pixelAspectInformation/anyPixelAspectRatio", HFILL }}, { &hf_h245_pixelAspectCode, { "pixelAspectCode", "h245.pixelAspectCode", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CustomPictureFormat/pixelAspectInformation/pixelAspectCode", HFILL }}, { &hf_h245_pixelAspectCode_item, { "Item", "h245.pixelAspectCode_item", @@ -18267,7 +18486,7 @@ void proto_register_h245(void) { "CustomPictureFormat/pixelAspectInformation/pixelAspectCode/_item", HFILL }}, { &hf_h245_extendedPAR, { "extendedPAR", "h245.extendedPAR", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CustomPictureFormat/pixelAspectInformation/extendedPAR", HFILL }}, { &hf_h245_extendedPAR_item, { "Item", "h245.extendedPAR_item", @@ -18287,7 +18506,7 @@ void proto_register_h245(void) { "H263VideoModeCombos/h263VideoUncoupledModes", HFILL }}, { &hf_h245_h263VideoCoupledModes, { "h263VideoCoupledModes", "h245.h263VideoCoupledModes", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "H263VideoModeCombos/h263VideoCoupledModes", HFILL }}, { &hf_h245_h263VideoCoupledModes_item, { "Item", "h245.h263VideoCoupledModes_item", @@ -18915,7 +19134,7 @@ void proto_register_h245(void) { "Nlpid/nlpidData", HFILL }}, { &hf_h245_encryptionCapability, { "encryptionCapability", "h245.encryptionCapability", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "EncryptionAuthenticationAndIntegrity/encryptionCapability", HFILL }}, { &hf_h245_authenticationCapability, { "authenticationCapability", "h245.authenticationCapability", @@ -18939,7 +19158,7 @@ void proto_register_h245(void) { "AuthenticationCapability/antiSpamAlgorithm", HFILL }}, { &hf_h245_ui_nonStandard, { "nonStandard", "h245.nonStandard", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "UserInputCapability/nonStandard", HFILL }}, { &hf_h245_nonStandard_item, { "Item", "h245.nonStandard_item", @@ -18987,7 +19206,7 @@ void proto_register_h245(void) { "UserInputCapability/secureDTMF", HFILL }}, { &hf_h245_nonStandardParams, { "nonStandardData", "h245.nonStandardData", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h245_nonStandardData_item, { "Item", "h245.nonStandardData_item", @@ -19011,7 +19230,7 @@ void proto_register_h245(void) { "GenericCapability/capabilityIdentifier", HFILL }}, { &hf_h245_collapsing, { "collapsing", "h245.collapsing", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GenericCapability/collapsing", HFILL }}, { &hf_h245_collapsing_item, { "Item", "h245.collapsing_item", @@ -19019,7 +19238,7 @@ void proto_register_h245(void) { "GenericCapability/collapsing/_item", HFILL }}, { &hf_h245_nonCollapsing, { "nonCollapsing", "h245.nonCollapsing", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GenericCapability/nonCollapsing", HFILL }}, { &hf_h245_nonCollapsing_item, { "Item", "h245.nonCollapsing_item", @@ -19059,7 +19278,7 @@ void proto_register_h245(void) { "GenericParameter/parameterValue", HFILL }}, { &hf_h245_supersedes, { "supersedes", "h245.supersedes", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GenericParameter/supersedes", HFILL }}, { &hf_h245_supersedes_item, { "Item", "h245.supersedes_item", @@ -19099,7 +19318,7 @@ void proto_register_h245(void) { "ParameterValue/octetString", HFILL }}, { &hf_h245_genericParameter, { "genericParameter", "h245.genericParameter", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ParameterValue/genericParameter", HFILL }}, { &hf_h245_genericParameter_item, { "Item", "h245.genericParameter_item", @@ -19115,11 +19334,11 @@ void proto_register_h245(void) { "", HFILL }}, { &hf_h245_capabilityOnMuxStream, { "capabilityOnMuxStream", "h245.capabilityOnMuxStream", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MultiplexedStreamCapability/capabilityOnMuxStream", HFILL }}, { &hf_h245_capabilityOnMuxStream_item, { "Item", "h245.capabilityOnMuxStream_item", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MultiplexedStreamCapability/capabilityOnMuxStream/_item", HFILL }}, { &hf_h245_dynamicRTPPayloadType, { "dynamicRTPPayloadType", "h245.dynamicRTPPayloadType", @@ -19131,11 +19350,11 @@ void proto_register_h245(void) { "", HFILL }}, { &hf_h245_capabilities, { "capabilities", "h245.capabilities", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MultiplePayloadStreamCapability/capabilities", HFILL }}, { &hf_h245_capabilities_item, { "Item", "h245.capabilities_item", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MultiplePayloadStreamCapability/capabilities/_item", HFILL }}, { &hf_h245_fecc_rfc2733, { "rfc2733", "h245.rfc2733", @@ -19671,7 +19890,7 @@ void proto_register_h245(void) { "RedundancyEncoding/rtpRedundancyEncoding/primary", HFILL }}, { &hf_h245_secondary, { "secondary", "h245.secondary", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RedundancyEncoding/rtpRedundancyEncoding/secondary", HFILL }}, { &hf_h245_secondary_item, { "Item", "h245.secondary_item", @@ -19679,7 +19898,7 @@ void proto_register_h245(void) { "RedundancyEncoding/rtpRedundancyEncoding/secondary/_item", HFILL }}, { &hf_h245_elements, { "elements", "h245.elements", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MultiplePayloadStream/elements", HFILL }}, { &hf_h245_elements_item, { "Item", "h245.elements_item", @@ -19795,7 +20014,7 @@ void proto_register_h245(void) { "UnicastAddress/iPSourceRouteAddress/tsapIdentifier", HFILL }}, { &hf_h245_route, { "route", "h245.route", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "UnicastAddress/iPSourceRouteAddress/route", HFILL }}, { &hf_h245_route_item, { "Item", "h245.route_item", @@ -19843,7 +20062,7 @@ void proto_register_h245(void) { "EncryptionSync/h235Key", HFILL }}, { &hf_h245_escrowentry, { "escrowentry", "h245.escrowentry", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "EncryptionSync/escrowentry", HFILL }}, { &hf_h245_escrowentry_item, { "Item", "h245.escrowentry_item", @@ -19995,7 +20214,7 @@ void proto_register_h245(void) { "RequestChannelCloseReject/cause", HFILL }}, { &hf_h245_multiplexEntryDescriptors, { "multiplexEntryDescriptors", "h245.multiplexEntryDescriptors", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MultiplexEntrySend/multiplexEntryDescriptors", HFILL }}, { &hf_h245_multiplexEntryDescriptors_item, { "Item", "h245.multiplexEntryDescriptors_item", @@ -20007,7 +20226,7 @@ void proto_register_h245(void) { "", HFILL }}, { &hf_h245_elementList, { "elementList", "h245.elementList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MultiplexEntryDescriptor/elementList", HFILL }}, { &hf_h245_elementList_item, { "Item", "h245.elementList_item", @@ -20023,7 +20242,7 @@ void proto_register_h245(void) { "MultiplexElement/type/logicalChannelNumber", HFILL }}, { &hf_h245_subElementList, { "subElementList", "h245.subElementList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MultiplexElement/type/subElementList", HFILL }}, { &hf_h245_subElementList_item, { "Item", "h245.subElementList_item", @@ -20043,7 +20262,7 @@ void proto_register_h245(void) { "MultiplexElement/repeatCount/untilClosingFlag", HFILL }}, { &hf_h245_multiplexTableEntryNumbers, { "multiplexTableEntryNumber", "h245.multiplexTableEntryNumber", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h245_multiplexTableEntryNumber_item, { "Item", "h245.multiplexTableEntryNumber_item", @@ -20051,7 +20270,7 @@ void proto_register_h245(void) { "", HFILL }}, { &hf_h245_rejectionDescriptions1, { "rejectionDescriptions1", "h245.rejectionDescriptions1", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MultiplexEntrySendReject/rejectionDescriptions1", HFILL }}, { &hf_h245_rejectionDescriptions1_item, { "Item", "h245.rejectionDescriptions1_item", @@ -20071,7 +20290,7 @@ void proto_register_h245(void) { "MultiplexEntryRejectionDescriptions/cause/descriptorTooComplex", HFILL }}, { &hf_h245_entryNumbers, { "entryNumbers", "h245.entryNumbers", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h245_entryNumbers_item, { "Item", "h245.entryNumbers_item", @@ -20079,7 +20298,7 @@ void proto_register_h245(void) { "", HFILL }}, { &hf_h245_rejectionDescriptions2, { "rejectionDescriptions2", "h245.rejectionDescriptions2", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RequestMultiplexEntryReject/rejectionDescriptions2", HFILL }}, { &hf_h245_rejectionDescriptions2_item, { "Item", "h245.rejectionDescriptions2_item", @@ -20091,11 +20310,11 @@ void proto_register_h245(void) { "RequestMultiplexEntryRejectionDescriptions/cause", HFILL }}, { &hf_h245_requestedModes, { "requestedModes", "h245.requestedModes", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RequestMode/requestedModes", HFILL }}, { &hf_h245_requestedModes_item, { "Item", "h245.requestedModes_item", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RequestMode/requestedModes/_item", HFILL }}, { &hf_h245_req_mode_ack_response, { "response", "h245.response", @@ -20203,7 +20422,7 @@ void proto_register_h245(void) { "RedundancyEncodingDTMode/primary", HFILL }}, { &hf_h245_secondary2, { "secondary2", "h245.secondary2", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RedundancyEncodingDTMode/secondary2", HFILL }}, { &hf_h245_secondary2_item, { "Item", "h245.secondary2_item", @@ -20215,7 +20434,7 @@ void proto_register_h245(void) { "RedundancyEncodingDTModeElement/type", HFILL }}, { &hf_h245_mpsmElements, { "mpsmElements", "h245.mpsmElements", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MultiplePayloadStreamMode/mpsmElements", HFILL }}, { &hf_h245_mpsmElements_item, { "Item", "h245.mpsmElements_item", @@ -20583,7 +20802,7 @@ void proto_register_h245(void) { "MaintenanceLoopReject/cause/canNotPerformLoop", HFILL }}, { &hf_h245_communicationModeTable, { "communicationModeTable", "h245.communicationModeTable", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h245_communicationModeTable_item, { "Item", "h245.communicationModeTable_item", @@ -20659,7 +20878,7 @@ void proto_register_h245(void) { "ConferenceRequest/requestTerminalCertificate", HFILL }}, { &hf_h245_certSelectionCriteria, { "certSelectionCriteria", "h245.certSelectionCriteria", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ConferenceRequest/requestTerminalCertificate/certSelectionCriteria", HFILL }}, { &hf_h245_sRandom, { "sRandom", "h245.sRandom", @@ -20735,7 +20954,7 @@ void proto_register_h245(void) { "ConferenceResponse/passwordResponse/password", HFILL }}, { &hf_h245_terminalListResponse, { "terminalListResponse", "h245.terminalListResponse", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ConferenceResponse/terminalListResponse", HFILL }}, { &hf_h245_terminalListResponse_item, { "Item", "h245.terminalListResponse_item", @@ -20827,7 +21046,7 @@ void proto_register_h245(void) { "ConferenceResponse/remoteMCResponse", HFILL }}, { &hf_h245_terminalInformation, { "terminalInformation", "h245.terminalInformation", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RequestAllTerminalIDsResponse/terminalInformation", HFILL }}, { &hf_h245_terminalInformation_item, { "Item", "h245.terminalInformation_item", @@ -20951,7 +21170,7 @@ void proto_register_h245(void) { "MultilinkIndication/excessiveError", HFILL }}, { &hf_h245_differential, { "differential", "h245.differential", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "DialingInformation/differential", HFILL }}, { &hf_h245_differential_item, { "Item", "h245.differential_item", @@ -20971,7 +21190,7 @@ void proto_register_h245(void) { "DialingInformationNumber/subAddress", HFILL }}, { &hf_h245_networkType, { "networkType", "h245.networkType", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "DialingInformationNumber/networkType", HFILL }}, { &hf_h245_networkType_item, { "Item", "h245.networkType_item", @@ -21027,7 +21246,7 @@ void proto_register_h245(void) { "SendTerminalCapabilitySet/specificRequest/multiplexCapability", HFILL }}, { &hf_h245_capabilityTableEntryNumbers, { "capabilityTableEntryNumbers", "h245.capabilityTableEntryNumbers", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "SendTerminalCapabilitySet/specificRequest/capabilityTableEntryNumbers", HFILL }}, { &hf_h245_capabilityTableEntryNumbers_item, { "Item", "h245.capabilityTableEntryNumbers_item", @@ -21035,7 +21254,7 @@ void proto_register_h245(void) { "SendTerminalCapabilitySet/specificRequest/capabilityTableEntryNumbers/_item", HFILL }}, { &hf_h245_capabilityDescriptorNumbers, { "capabilityDescriptorNumbers", "h245.capabilityDescriptorNumbers", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "SendTerminalCapabilitySet/specificRequest/capabilityDescriptorNumbers", HFILL }}, { &hf_h245_capabilityDescriptorNumbers_item, { "Item", "h245.capabilityDescriptorNumbers_item", @@ -21279,7 +21498,7 @@ void proto_register_h245(void) { "MiscellaneousCommand/type/videoBadMBs/temporalReference", HFILL }}, { &hf_h245_lostPicture, { "lostPicture", "h245.lostPicture", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MiscellaneousCommand/type/lostPicture", HFILL }}, { &hf_h245_lostPicture_item, { "Item", "h245.lostPicture_item", @@ -21295,7 +21514,7 @@ void proto_register_h245(void) { "MiscellaneousCommand/type/lostPartialPicture/pictureReference", HFILL }}, { &hf_h245_recoveryReferencePicture, { "recoveryReferencePicture", "h245.recoveryReferencePicture", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MiscellaneousCommand/type/recoveryReferencePicture", HFILL }}, { &hf_h245_recoveryReferencePicture_item, { "Item", "h245.recoveryReferencePicture_item", diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c index 6c120bff0d..a75ed80c6d 100644 --- a/epan/dissectors/packet-h450.c +++ b/epan/dissectors/packet-h450.c @@ -429,7 +429,7 @@ static int hf_h450_ssCHDoNotHold = -1; /* NULL */ static int hf_h450_ssCTDoNotTransfer = -1; /* NULL */ static int hf_h450_ssMWICallbackCall = -1; /* NULL */ static int hf_h450_ssCISilentMonitorPermitted = -1; /* NULL */ -static int hf_h450_Unspecified_extension = -1; /* Extension */ +static int hf_h450_unspecified_extension = -1; /* Extension */ static int hf_h450_nonStandard = -1; /* NonStandardParameter */ static int hf_h450_extensionId = -1; /* OBJECT_IDENTIFIER */ static int hf_h450_extensionArgument = -1; /* ExtensionArgument */ @@ -922,10 +922,14 @@ static int dissect_interpretationApdu(tvbuff_t *tvb, int offset, packet_info *pi } +static const per_sequence_t SEQUENCE_OF_ROSxxx_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rosApdus_item }, +}; + static int dissect_h450_SEQUENCE_OF_ROSxxx(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h450_SEQUENCE_OF_ROSxxx, dissect_rosApdus_item); + ett_h450_SEQUENCE_OF_ROSxxx, SEQUENCE_OF_ROSxxx_sequence_of); return offset; } @@ -995,10 +999,11 @@ static int dissect_subaddressInformation(tvbuff_t *tvb, int offset, packet_info } + static int dissect_h450_BOOLEAN(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_boolean(tvb, offset, pinfo, tree, hf_index, - NULL, NULL); + NULL, NULL); return offset; } @@ -1248,10 +1253,14 @@ dissect_h450_PresentedNumberUnscreened(tvbuff_t *tvb, int offset, packet_info *p } +static const per_sequence_t SEQUENCE_OF_AliasAddress_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_destinationAddress_item }, +}; + static int dissect_h450_SEQUENCE_OF_AliasAddress(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h450_SEQUENCE_OF_AliasAddress, dissect_destinationAddress_item); + ett_h450_SEQUENCE_OF_AliasAddress, SEQUENCE_OF_AliasAddress_sequence_of); return offset; } @@ -1368,10 +1377,11 @@ static int dissect_numberB(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_ } + static int dissect_h450_PresentationAllowedIndicator(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_boolean(tvb, offset, pinfo, tree, hf_index, - NULL, NULL); + NULL, NULL); return offset; } @@ -1424,15 +1434,19 @@ static int dissect_ExtensionSeq_item(tvbuff_t *tvb, int offset, packet_info *pin static int dissect_mixedExtension_extension(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { return dissect_h450_Extension(tvb, offset, pinfo, tree, hf_h450_mixedExtension_extension); } -static int dissect_Unspecified_extension(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h450_Extension(tvb, offset, pinfo, tree, hf_h450_Unspecified_extension); +static int dissect_unspecified_extension(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { + return dissect_h450_Extension(tvb, offset, pinfo, tree, hf_h450_unspecified_extension); } +static const per_sequence_t ExtensionSeq_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ExtensionSeq_item }, +}; + static int dissect_h450_ExtensionSeq(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h450_ExtensionSeq, dissect_ExtensionSeq_item); + ett_h450_ExtensionSeq, ExtensionSeq_sequence_of); return offset; } @@ -1656,7 +1670,7 @@ static const value_string h450_EndDesignation_vals[] = { static int dissect_h450_EndDesignation(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0, 1, NULL, NULL, TRUE); + 0, 1, NULL, NULL, TRUE); return offset; } @@ -1675,7 +1689,7 @@ static const value_string h450_CallStatus_vals[] = { static int dissect_h450_CallStatus(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0, 1, NULL, NULL, TRUE); + 0, 1, NULL, NULL, TRUE); return offset; } @@ -1827,7 +1841,7 @@ static const value_string h450_Procedure_vals[] = { static int dissect_h450_Procedure(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0, 2, NULL, NULL, TRUE); + 0, 2, NULL, NULL, TRUE); return offset; } @@ -1884,7 +1898,7 @@ static const value_string h450_BasicService_vals[] = { static int dissect_h450_BasicService(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0, 75, NULL, NULL, FALSE); + 0, 75, NULL, NULL, FALSE); return offset; } @@ -2113,11 +2127,15 @@ static int dissect_IntResultList_item(tvbuff_t *tvb, int offset, packet_info *pi } +static const per_sequence_t IntResultList_set_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IntResultList_item }, +}; + static int dissect_h450_IntResultList(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_set_of(tvb, offset, pinfo, tree, hf_index, - ett_h450_IntResultList, dissect_IntResultList_item, - 0, 29); + ett_h450_IntResultList, IntResultList_set_of, + 0, 29); return offset; } @@ -2206,7 +2224,7 @@ static const value_string h450_DiversionReason_vals[] = { static int dissect_h450_DiversionReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0, 3, NULL, NULL, TRUE); + 0, 3, NULL, NULL, TRUE); return offset; } @@ -2248,7 +2266,7 @@ static const value_string h450_SubscriptionOption_vals[] = { static int dissect_h450_SubscriptionOption(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0, 2, NULL, NULL, TRUE); + 0, 2, NULL, NULL, TRUE); return offset; } @@ -2569,11 +2587,15 @@ static int dissect_resultExtension_item(tvbuff_t *tvb, int offset, packet_info * } +static const per_sequence_t SEQUENCE_SIZE_0_255_OF_MixedExtension_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_extensionArg_item }, +}; + static int dissect_h450_SEQUENCE_SIZE_0_255_OF_MixedExtension(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h450_SEQUENCE_SIZE_0_255_OF_MixedExtension, dissect_extensionArg_item, - 0, 255); + ett_h450_SEQUENCE_SIZE_0_255_OF_MixedExtension, SEQUENCE_SIZE_0_255_OF_MixedExtension_sequence_of, + 0, 255); return offset; } @@ -2816,7 +2838,7 @@ static const value_string h450_ParkCondition_vals[] = { static int dissect_h450_ParkCondition(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0, 3, NULL, NULL, TRUE); + 0, 3, NULL, NULL, TRUE); return offset; } @@ -2884,7 +2906,7 @@ static const value_string h450_CallType_vals[] = { static int dissect_h450_CallType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0, 1, NULL, NULL, TRUE); + 0, 1, NULL, NULL, TRUE); return offset; } @@ -3187,11 +3209,15 @@ static int dissect_priority(tvbuff_t *tvb, int offset, packet_info *pinfo, proto } +static const per_sequence_t ExtensionArg_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ExtensionArg_item }, +}; + static int dissect_h450_ExtensionArg(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h450_ExtensionArg, dissect_ExtensionArg_item, - 0, 255); + ett_h450_ExtensionArg, ExtensionArg_sequence_of, + 0, 255); return offset; } @@ -3287,11 +3313,15 @@ dissect_h450_MwiInterrogate(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, p } +static const per_sequence_t MwiDummyRes_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_MwiDummyRes_item }, +}; + static int dissect_h450_MwiDummyRes(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h450_MwiDummyRes, dissect_MwiDummyRes_item, - 0, 255); + ett_h450_MwiDummyRes, MwiDummyRes_sequence_of, + 0, 255); return offset; } @@ -3319,11 +3349,15 @@ static int dissect_MWIInterrogateRes_item(tvbuff_t *tvb, int offset, packet_info } +static const per_sequence_t MWIInterrogateRes_sequence_of[1] = { + { "" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_MWIInterrogateRes_item }, +}; + static int dissect_h450_MWIInterrogateRes(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_sequence_of(tvb, offset, pinfo, tree, hf_index, - ett_h450_MWIInterrogateRes, dissect_MWIInterrogateRes_item, - 1, 64); + ett_h450_MWIInterrogateRes, MWIInterrogateRes_sequence_of, + 1, 64); return offset; } @@ -3869,7 +3903,7 @@ static const value_string h450_PartyCategory_vals[] = { static int dissect_h450_PartyCategory(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0, 3, NULL, NULL, TRUE); + 0, 3, NULL, NULL, TRUE); return offset; } @@ -3963,7 +3997,7 @@ static const value_string h450_Unspecified_vals[] = { }; static const per_choice_t Unspecified_choice[] = { - { 0, "extension" , ASN1_NO_EXTENSIONS , dissect_Unspecified_extension }, + { 0, "extension" , ASN1_NO_EXTENSIONS , dissect_unspecified_extension }, { 1, "nonStandard" , ASN1_NO_EXTENSIONS , dissect_nonStandard }, { 0, NULL, 0, NULL } }; @@ -4758,7 +4792,7 @@ void proto_register_h450(void) { "InterpretationApdu/rejectAnyUnrecognizedInvokePdu", HFILL }}, { &hf_h450_rosApdus, { "rosApdus", "h450.rosApdus", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ServiceApdus/rosApdus", HFILL }}, { &hf_h450_rosApdus_item, { "Item", "h450.rosApdus_item", @@ -4818,7 +4852,7 @@ void proto_register_h450(void) { "", HFILL }}, { &hf_h450_destinationAddress, { "destinationAddress", "h450.destinationAddress", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "EndpointAddress/destinationAddress", HFILL }}, { &hf_h450_destinationAddress_item, { "Item", "h450.destinationAddress_item", @@ -4862,7 +4896,7 @@ void proto_register_h450(void) { "UserSpecifiedSubaddress/oddCountIndicator", HFILL }}, { &hf_h450_extensionSeq, { "extensionSeq", "h450.extensionSeq", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h450_nonStandardData, { "nonStandardData", "h450.nonStandardData", @@ -5114,7 +5148,7 @@ void proto_register_h450(void) { "IntResult/extension", HFILL }}, { &hf_h450_holdNotificArg_extensionArg, { "extensionArg", "h450.extensionArg", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "HoldNotificArg/extensionArg", HFILL }}, { &hf_h450_extensionArg_item, { "Item", "h450.extensionArg_item", @@ -5122,15 +5156,15 @@ void proto_register_h450(void) { "", HFILL }}, { &hf_h450_retrieveNotificArg_extensionArg, { "extensionArg", "h450.extensionArg", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RetrieveNotificArg/extensionArg", HFILL }}, { &hf_h450_remoteHoldArg_extensionArg, { "extensionArg", "h450.extensionArg", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RemoteHoldArg/extensionArg", HFILL }}, { &hf_h450_extensionRes, { "extensionRes", "h450.extensionRes", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h450_extensionRes_item, { "Item", "h450.extensionRes_item", @@ -5138,7 +5172,7 @@ void proto_register_h450(void) { "", HFILL }}, { &hf_h450_remoteRetrieveArg_extensionArg, { "extensionArg", "h450.extensionArg", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RemoteRetrieveArg/extensionArg", HFILL }}, { &hf_h450_mixedExtension_extension, { "extension", "h450.extension", @@ -5162,7 +5196,7 @@ void proto_register_h450(void) { "", HFILL }}, { &hf_h450_cpRequestArg_extensionArg, { "extensionArg", "h450.extensionArg", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CpRequestArg/extensionArg", HFILL }}, { &hf_h450_parkCondition, { "parkCondition", "h450.parkCondition", @@ -5170,7 +5204,7 @@ void proto_register_h450(void) { "", HFILL }}, { &hf_h450_cpSetupArg_extensionArg, { "extensionArg", "h450.extensionArg", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CpSetupArg/extensionArg", HFILL }}, { &hf_h450_callPickupId, { "callPickupId", "h450.callPickupId", @@ -5198,11 +5232,11 @@ void proto_register_h450(void) { "", HFILL }}, { &hf_h450_groupIndicationOnArg_extensionArg, { "extensionArg", "h450.extensionArg", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GroupIndicationOnArg/extensionArg", HFILL }}, { &hf_h450_groupIndicationOffArg_extensionArg, { "extensionArg", "h450.extensionArg", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GroupIndicationOffArg/extensionArg", HFILL }}, { &hf_h450_picking_upNumber, { "picking-upNumber", "h450.picking_upNumber", @@ -5210,23 +5244,23 @@ void proto_register_h450(void) { "", HFILL }}, { &hf_h450_pickrequArg_extensionArg, { "extensionArg", "h450.extensionArg", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PickrequArg/extensionArg", HFILL }}, { &hf_h450_pickupArg_extensionArg, { "extensionArg", "h450.extensionArg", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PickupArg/extensionArg", HFILL }}, { &hf_h450_pickExeArg_extensionArg, { "extensionArg", "h450.extensionArg", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PickExeArg/extensionArg", HFILL }}, { &hf_h450_cpNotifyArg_extensionArg, { "extensionArg", "h450.extensionArg", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CpNotifyArg/extensionArg", HFILL }}, { &hf_h450_cpickupNotifyArg_extensionArg, { "extensionArg", "h450.extensionArg", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CpickupNotifyArg/extensionArg", HFILL }}, { &hf_h450_nbOfAddWaitingCalls, { "nbOfAddWaitingCalls", "h450.nbOfAddWaitingCalls", @@ -5234,7 +5268,7 @@ void proto_register_h450(void) { "CallWaitingArg/nbOfAddWaitingCalls", HFILL }}, { &hf_h450_callWaitingArg_extensionArg, { "extensionArg", "h450.extensionArg", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CallWaitingArg/extensionArg", HFILL }}, { &hf_h450_msgCentreId, { "msgCentreId", "h450.msgCentreId", @@ -5258,7 +5292,7 @@ void proto_register_h450(void) { "", HFILL }}, { &hf_h450_mWIActivateArg_extensionArg, { "extensionArg", "h450.extensionArg", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MWIActivateArg/extensionArg", HFILL }}, { &hf_h450_MwiDummyRes_item, { "Item", "h450.MwiDummyRes_item", @@ -5270,11 +5304,11 @@ void proto_register_h450(void) { "", HFILL }}, { &hf_h450_mWIDeactivateArg_extensionArg, { "extensionArg", "h450.extensionArg", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MWIDeactivateArg/extensionArg", HFILL }}, { &hf_h450_mWIInterrogateArg_extensionArg, { "extensionArg", "h450.extensionArg", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MWIInterrogateArg/extensionArg", HFILL }}, { &hf_h450_MWIInterrogateRes_item, { "Item", "h450.MWIInterrogateRes_item", @@ -5282,7 +5316,7 @@ void proto_register_h450(void) { "MWIInterrogateRes/_item", HFILL }}, { &hf_h450_mWIInterrogateResElt_extensionArg, { "extensionArg", "h450.extensionArg", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MWIInterrogateResElt/extensionArg", HFILL }}, { &hf_h450_integer, { "integer", "h450.integer", @@ -5306,7 +5340,7 @@ void proto_register_h450(void) { "NameArg/name", HFILL }}, { &hf_h450_nameArg_extensionArg, { "extensionArg", "h450.extensionArg", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "NameArg/extensionArg", HFILL }}, { &hf_h450_namePresentationAllowed, { "namePresentationAllowed", "h450.namePresentationAllowed", @@ -5358,7 +5392,7 @@ void proto_register_h450(void) { "CcRequestArg/retain-sig-connection", HFILL }}, { &hf_h450_ccRequestArg_extension, { "extension", "h450.extension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CcRequestArg/extension", HFILL }}, { &hf_h450_extension_item, { "Item", "h450.extension_item", @@ -5370,7 +5404,7 @@ void proto_register_h450(void) { "CcRequestRes/retain-service", HFILL }}, { &hf_h450_ccRequestRes_extension, { "extension", "h450.extension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CcRequestRes/extension", HFILL }}, { &hf_h450_shortArg, { "shortArg", "h450.shortArg", @@ -5382,23 +5416,23 @@ void proto_register_h450(void) { "CcArg/longArg", HFILL }}, { &hf_h450_ccShortArg_extension, { "extension", "h450.extension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CcShortArg/extension", HFILL }}, { &hf_h450_ccLongArg_extension, { "extension", "h450.extension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CcLongArg/extension", HFILL }}, { &hf_h450_coReqOptArg_extension, { "extension", "h450.extension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CoReqOptArg/extension", HFILL }}, { &hf_h450_rUAlertOptArg_extension, { "extension", "h450.extension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RUAlertOptArg/extension", HFILL }}, { &hf_h450_cfbOvrOptArg_extension, { "extension", "h450.extension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CfbOvrOptArg/extension", HFILL }}, { &hf_h450_ciCapabilityLevel, { "ciCapabilityLevel", "h450.ciCapabilityLevel", @@ -5406,7 +5440,7 @@ void proto_register_h450(void) { "", HFILL }}, { &hf_h450_cIRequestArg_argumentExtension, { "argumentExtension", "h450.argumentExtension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CIRequestArg/argumentExtension", HFILL }}, { &hf_h450_argumentExtension_item, { "Item", "h450.argumentExtension_item", @@ -5418,7 +5452,7 @@ void proto_register_h450(void) { "", HFILL }}, { &hf_h450_cIRequestRes_resultExtension, { "resultExtension", "h450.resultExtension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CIRequestRes/resultExtension", HFILL }}, { &hf_h450_resultExtension_item, { "Item", "h450.resultExtension_item", @@ -5426,7 +5460,7 @@ void proto_register_h450(void) { "", HFILL }}, { &hf_h450_cIGetCIPLOptArg_argumentExtension, { "argumentExtension", "h450.argumentExtension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CIGetCIPLOptArg/argumentExtension", HFILL }}, { &hf_h450_ciProtectionLevel, { "ciProtectionLevel", "h450.ciProtectionLevel", @@ -5438,31 +5472,31 @@ void proto_register_h450(void) { "CIGetCIPLRes/silentMonitoringPermitted", HFILL }}, { &hf_h450_cIGetCIPLRes_resultExtension, { "resultExtension", "h450.resultExtension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CIGetCIPLRes/resultExtension", HFILL }}, { &hf_h450_cIIsOptArg_argumentExtension, { "argumentExtension", "h450.argumentExtension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CIIsOptArg/argumentExtension", HFILL }}, { &hf_h450_cIIsOptRes_resultExtension, { "resultExtension", "h450.resultExtension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CIIsOptRes/resultExtension", HFILL }}, { &hf_h450_cIFrcRelArg_argumentExtension, { "argumentExtension", "h450.argumentExtension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CIFrcRelArg/argumentExtension", HFILL }}, { &hf_h450_cIFrcRelOptRes_resultExtension, { "resultExtension", "h450.resultExtension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CIFrcRelOptRes/resultExtension", HFILL }}, { &hf_h450_cIWobOptArg_argumentExtension, { "argumentExtension", "h450.argumentExtension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CIWobOptArg/argumentExtension", HFILL }}, { &hf_h450_cIWobOptRes_resultExtension, { "resultExtension", "h450.resultExtension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CIWobOptRes/resultExtension", HFILL }}, { &hf_h450_specificCall, { "specificCall", "h450.specificCall", @@ -5470,15 +5504,15 @@ void proto_register_h450(void) { "CISilentArg/specificCall", HFILL }}, { &hf_h450_cISilentArg_argumentExtension, { "argumentExtension", "h450.argumentExtension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CISilentArg/argumentExtension", HFILL }}, { &hf_h450_cISilentOptRes_resultExtension, { "resultExtension", "h450.resultExtension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CISilentOptRes/resultExtension", HFILL }}, { &hf_h450_cINotificationArg_argumentExtension, { "argumentExtension", "h450.argumentExtension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CINotificationArg/argumentExtension", HFILL }}, { &hf_h450_callIntrusionImpending, { "callIntrusionImpending", "h450.callIntrusionImpending", @@ -5518,11 +5552,11 @@ void proto_register_h450(void) { "CmnArg/featureControl", HFILL }}, { &hf_h450_cmnArg_extension, { "extension", "h450.extension", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CmnArg/extension", HFILL }}, { &hf_h450_cmnRequestArg_extensionArg, { "extensionArg", "h450.extensionArg", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CmnRequestArg/extensionArg", HFILL }}, { &hf_h450_ssCFreRoutingSupported, { "ssCFreRoutingSupported", "h450.ssCFreRoutingSupported", @@ -5600,7 +5634,7 @@ void proto_register_h450(void) { { "ssCISilentMonitorPermitted", "h450.ssCISilentMonitorPermitted", FT_NONE, BASE_NONE, NULL, 0, "FeatureControl/ssCISilentMonitorPermitted", HFILL }}, - { &hf_h450_Unspecified_extension, + { &hf_h450_unspecified_extension, { "extension", "h450.extension", FT_NONE, BASE_NONE, NULL, 0, "Unspecified/extension", HFILL }}, diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index 5250d6734a..916f7bb84a 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -239,28 +239,35 @@ DEBUG_ENTRY("dissect_per_sequence_of_helper"); return offset; } guint32 -dissect_per_sequence_of(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *parent_tree, int hf_index, gint ett_index, int (*func)(tvbuff_t *, int , packet_info *, proto_tree *)) +dissect_per_sequence_of(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *parent_tree, int hf_index, gint ett_index, const per_sequence_t *seq) { proto_item *item; proto_tree *tree; guint32 old_offset=offset; guint32 length; proto_tree *etr = NULL; + header_field_info *hfi; DEBUG_ENTRY("dissect_per_sequence_of"); - item=proto_tree_add_item(parent_tree, hf_index, tvb, offset>>3, 0, FALSE); - tree=proto_item_add_subtree(item, ett_index); - /* semi-constrained whole number for number of elements */ /* each element encoded as 10.9 */ if(display_internal_per_fields){ - etr=tree; + etr=parent_tree; } offset=dissect_per_length_determinant(tvb, offset, pinfo, etr, hf_per_sequence_of_length, &length); - offset=dissect_per_sequence_of_helper(tvb, offset, pinfo, tree, func, length); + hfi = proto_registrar_get_nth(hf_index); + if (IS_FT_UINT(hfi->type)) { + item = proto_tree_add_uint(parent_tree, hf_index, tvb, offset>>3, 0, length); + proto_item_append_text(item, (length==1)?" item":" items"); + } else { + item=proto_tree_add_item(parent_tree, hf_index, tvb, offset>>3, 0, FALSE); + } + tree=proto_item_add_subtree(item, ett_index); + + offset=dissect_per_sequence_of_helper(tvb, offset, pinfo, tree, seq->func, length); proto_item_set_len(item, (offset>>3)!=(old_offset>>3)?(offset>>3)-(old_offset>>3):1); @@ -490,17 +497,16 @@ dissect_per_BMPString(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_t /* this function dissects a constrained sequence of */ guint32 -dissect_per_constrained_sequence_of(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *parent_tree, int hf_index, gint ett_index, int (*func)(tvbuff_t *, int , packet_info *, proto_tree *), int min_len, int max_len) +dissect_per_constrained_sequence_of(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *parent_tree, int hf_index, gint ett_index, const per_sequence_t *seq, int min_len, int max_len) { proto_item *item; proto_tree *tree; guint32 old_offset=offset; guint32 length; + header_field_info *hfi; DEBUG_ENTRY("dissect_per_constrained_sequence_of"); - item=proto_tree_add_item(parent_tree, hf_index, tvb, offset>>3, 0, FALSE); - tree=proto_item_add_subtree(item, ett_index); /* 19.5 if min==max and min,max<64k ==> no length determinant */ if((min_len==max_len) && (min_len<65536)){ @@ -513,21 +519,28 @@ DEBUG_ENTRY("dissect_per_constrained_sequence_of"); guint32 start_offset=offset; /* semi-constrained whole number for number of elements */ /* each element encoded as 10.9 */ - offset=dissect_per_length_determinant(tvb, offset, pinfo, tree, -1, &length); + offset=dissect_per_length_determinant(tvb, offset, pinfo, parent_tree, -1, &length); length+=min_len; - proto_tree_add_uint(tree, hf_per_sequence_of_length, tvb, start_offset>>3, (offset>>3)!=(start_offset>>3)?(offset>>3)-(start_offset>>3):1, length); + proto_tree_add_uint(parent_tree, hf_per_sequence_of_length, tvb, start_offset>>3, (offset>>3)!=(start_offset>>3)?(offset>>3)-(start_offset>>3):1, length); goto call_sohelper; } /* constrained whole number for number of elements */ offset=dissect_per_constrained_integer(tvb, offset, pinfo, - tree, hf_per_sequence_of_length, min_len, max_len, + parent_tree, hf_per_sequence_of_length, min_len, max_len, &length, NULL, FALSE); - - call_sohelper: - offset=dissect_per_sequence_of_helper(tvb, offset, pinfo, tree, func, length); + hfi = proto_registrar_get_nth(hf_index); + if (IS_FT_UINT(hfi->type)) { + item = proto_tree_add_uint(parent_tree, hf_index, tvb, offset>>3, 0, length); + proto_item_append_text(item, (length==1)?" item":" items"); + } else { + item=proto_tree_add_item(parent_tree, hf_index, tvb, offset>>3, 0, FALSE); + } + tree=proto_item_add_subtree(item, ett_index); + + offset=dissect_per_sequence_of_helper(tvb, offset, pinfo, tree, seq->func, length); proto_item_set_len(item, (offset>>3)!=(old_offset>>3)?(offset>>3)-(old_offset>>3):1); @@ -536,11 +549,11 @@ call_sohelper: /* this function dissects a constrained set of */ guint32 -dissect_per_constrained_set_of(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *parent_tree, int hf_index, gint ett_index, int (*func)(tvbuff_t *, int , packet_info *, proto_tree *), int min_len, int max_len) +dissect_per_constrained_set_of(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *parent_tree, int hf_index, gint ett_index, const per_sequence_t *seq, int min_len, int max_len) { /* for basic-per a set-of is encoded in the same way as a sequence-of */ DEBUG_ENTRY("dissect_per_constrained_set_of"); - offset=dissect_per_constrained_sequence_of(tvb, offset, pinfo, parent_tree, hf_index, ett_index, func, min_len, max_len); + offset=dissect_per_constrained_sequence_of(tvb, offset, pinfo, parent_tree, hf_index, ett_index, seq, min_len, max_len); return offset; } @@ -551,11 +564,11 @@ DEBUG_ENTRY("dissect_per_constrained_set_of"); /* this function dissects a set of */ guint32 -dissect_per_set_of(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *parent_tree, int hf_index, gint ett_index, int (*func)(tvbuff_t *, int , packet_info *, proto_tree *)) +dissect_per_set_of(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *parent_tree, int hf_index, gint ett_index, const per_sequence_t *seq) { /* for basic-per a set-of is encoded in the same way as a sequence-of */ DEBUG_ENTRY("dissect_per_set_of"); - offset=dissect_per_sequence_of(tvb, offset, pinfo, parent_tree, hf_index, ett_index, func); + offset=dissect_per_sequence_of(tvb, offset, pinfo, parent_tree, hf_index, ett_index, seq); return offset; } diff --git a/epan/dissectors/packet-per.h b/epan/dissectors/packet-per.h index 173f2b9a9f..3752f01e20 100644 --- a/epan/dissectors/packet-per.h +++ b/epan/dissectors/packet-per.h @@ -34,6 +34,8 @@ if (check_col(pinfo->cinfo, COL_INFO)){ \ } \ tvb_get_guint8(tvb, 9999); +typedef int (*per_callback)(tvbuff_t *, int, packet_info *, proto_tree *); + /* in all functions here, offset is guint32 and is byteposition<<3 + bitposition */ @@ -51,14 +53,14 @@ typedef struct _per_choice_t { int value; char *name; int extension; - int (*func)(tvbuff_t *, int, packet_info *, proto_tree *); + per_callback func; } per_choice_t; typedef struct _per_sequence_t { char *name; int extension; int optional; - int (*func)(tvbuff_t *, int, packet_info *, proto_tree *); + per_callback func; } per_sequence_t; @@ -68,7 +70,7 @@ extern guint32 dissect_per_null(tvbuff_t *tvb, guint32 offset, packet_info *pinf extern guint32 dissect_per_GeneralString(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *tree, int hf_index); -extern guint32 dissect_per_sequence_of(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *parent_tree, int hf_index, gint ett_index, int (*func)(tvbuff_t *, int , packet_info *, proto_tree *)); +extern guint32 dissect_per_sequence_of(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *parent_tree, int hf_index, gint ett_index, const per_sequence_t *seq); extern guint32 dissect_per_IA5String(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *tree, int hf_index, int min_len, int max_len); @@ -80,11 +82,11 @@ extern guint32 dissect_per_VisibleString(tvbuff_t *tvb, guint32 offset, packet_i extern guint32 dissect_per_BMPString(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *tree, int hf_index, int min_len, int max_len); -extern guint32 dissect_per_constrained_sequence_of(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *parent_tree, int hf_index, gint ett_index, int (*func)(tvbuff_t *, int , packet_info *, proto_tree *), int min_len, int max_len); +extern guint32 dissect_per_constrained_sequence_of(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *parent_tree, int hf_index, gint ett_index, const per_sequence_t *seq, int min_len, int max_len); -extern guint32 dissect_per_constrained_set_of(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *parent_tree, int hf_index, gint ett_index, int (*func)(tvbuff_t *, int , packet_info *, proto_tree *), int min_len, int max_len); +extern guint32 dissect_per_constrained_set_of(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *parent_tree, int hf_index, gint ett_index, const per_sequence_t *seq, int min_len, int max_len); -extern guint32 dissect_per_set_of(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *parent_tree, int hf_index, gint ett_index, int (*func)(tvbuff_t *, int , packet_info *, proto_tree *)); +extern guint32 dissect_per_set_of(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *parent_tree, int hf_index, gint ett_index, const per_sequence_t *seq); extern guint32 dissect_per_object_identifier(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *tree, int hf_index, char *value_string); diff --git a/tools/asn2eth.py b/tools/asn2eth.py index 5b1430dcea..da3b33115c 100644 --- a/tools/asn2eth.py +++ b/tools/asn2eth.py @@ -1772,7 +1772,7 @@ class Type (Node): print self.str_depth(1) return '' - def eth_type_default_table(self, ectx): + def eth_type_default_table(self, ectx, tname): return '' def eth_type_default_body(self, ectx): @@ -1780,8 +1780,9 @@ class Type (Node): print self.str_depth(1) return '' - def eth_type_default_pars(self, ectx): + def eth_type_default_pars(self, ectx, tname): pars = { + 'TNAME' : tname, 'ER' : ectx.encp(), 'PINFO' : 'pinfo', 'TREE' : 'tree', @@ -1792,14 +1793,13 @@ class Type (Node): 'IMPLICIT_TAG' : 'implicit_tag', 'CREATED_ITEM_PTR' : 'NULL', } + if ectx.eth_type[tname]['tree']: + pars['ETT_INDEX'] = ectx.eth_type[tname]['tree'] return pars def eth_type_fn(self, proto, tname, ectx): - out = '\n' - out += self.eth_type_default_table(ectx) - out += ectx.eth_type_fn_hdr(tname) body = self.eth_type_default_body(ectx, tname) - pars = self.eth_type_default_pars(ectx) + pars = self.eth_type_default_pars(ectx, tname) if ectx.conform.check_item('FN_PARS', tname): pars.update(ectx.conform.use_item('FN_PARS', tname)) elif ectx.conform.check_item('FN_PARS', ectx.eth_type[tname]['ref'][0]): @@ -1807,6 +1807,9 @@ class Type (Node): pars['DEFAULT_BODY'] = body for i in range(4): for k in pars.keys(): pars[k] = pars[k] % pars + out = '\n' + out += self.eth_type_default_table(ectx, tname) % pars + out += ectx.eth_type_fn_hdr(tname) out += ectx.eth_type_fn_body(tname, body, pars=pars) out += ectx.eth_type_fn_ftr(tname) return out @@ -2025,7 +2028,7 @@ class SqType (Type): % (ef, ext, opt, ectx.eth_type[ectx.eth_hf[ef]['ethtype']]['proto'], ectx.eth_hf[ef]['ethtype']) elif (ectx.OPer()): out = ' { %-30s, %-23s, %-17s, dissect_%s },\n' \ - % ('"'+val.name+'"', ext, opt, efd) + % ('"'+(val.name or '')+'"', ext, opt, efd) else: out = '' return out @@ -2059,10 +2062,7 @@ class SequenceOfType (SqType): return '#' + self.type + '_' + str(id(self)) def eth_ftype(self, ectx): - if (ectx.NAPI()): - return ('FT_UINT32', 'BASE_DEC') - else: - return ('FT_NONE', 'BASE_NONE') + return ('FT_UINT32', 'BASE_DEC') def eth_need_tree(self): return True @@ -2070,51 +2070,52 @@ class SequenceOfType (SqType): def GetTTag(self, ectx): return ('BER_CLASS_UNI', 'BER_UNI_TAG_SEQUENCE') - def eth_type_fn(self, proto, tname, ectx): + def eth_type_default_pars(self, ectx, tname): + pars = Type.eth_type_default_pars(self, ectx, tname) + (pars['MIN_VAL'], pars['MAX_VAL'], pars['EXT']) = self.eth_get_size_constr() + pars['TABLE'] = '%(TNAME)s_sequence_of' + return pars + + def eth_type_default_table(self, ectx, tname): + #print "eth_type_default_table(tname='%s')" % (tname) fname = ectx.eth_type[tname]['ref'][0] if self.val.IsNamed (): f = fname + '/' + self.val.name else: f = fname + '/' + '_item' - ef = ectx.field[f]['ethname'] - out = '' - if (not ectx.OPer()): - out = "static const %s_sequence_t %s_sequence_of[1] = {\n" % (ectx.encp(), tname) - out += self.out_item(f, self.val, False, '', ectx) - out += "};\n" - out += ectx.eth_type_fn_hdr(tname) - (minv, maxv, ext) = self.eth_get_size_constr() - if (ectx.OBer()): - body = ectx.eth_fn_call('dissect_ber_sequence_of', ret='offset', - par=(('implicit_tag', 'pinfo', 'tree', 'tvb', 'offset'), - (tname+'_sequence_of', 'hf_index', ectx.eth_type[tname]['tree']))) - elif (ectx.NPer()): - if not self.HasConstraint(): - body = ectx.eth_fn_call('dissect_pern_sequence_of', ret='offset', - par=(('tvb', 'offset', 'pinfo', 'tree'), - ('hf_index', 'item', 'private_data'), - (ectx.eth_type[tname]['tree'], ef, 'dissect_%s_%s' % (ectx.eth_type[ectx.eth_hf[ef]['ethtype']]['proto'], ectx.eth_hf[ef]['ethtype'])))) + table = "static const %(ER)s_sequence_t %(TABLE)s[1] = {\n" + table += self.out_item(f, self.val, False, 'ASN1_NO_EXTENSIONS', ectx) + table += "};\n" + return table + + def eth_type_default_body(self, ectx, tname): + if (ectx.Ber()): + body = ectx.eth_fn_call('dissect_%(ER)s_sequence_of', ret='offset', + par=(('%(IMPLICIT_TAG)s', '%(PINFO)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'), + ('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),)) + elif (not self.HasConstraint()): + if (ectx.NAPI()): + body = ectx.eth_fn_call('dissect_%(ER)s_sequence_of', ret='offset', + par=(('%(TVB)s', '%(OFFSET)s', '%(PINFO)s', '%(TREE)s', '%(HF_INDEX)s', 'item', 'private_data'), + ('%(ETT_INDEX)s', '%(TABLE)s',),)) else: - body = ectx.eth_fn_call('dissect_pern_constrained_sequence_of', ret='offset', - par=(('tvb', 'offset', 'pinfo', 'tree'), - ('hf_index', 'item', 'private_data'), - (ectx.eth_type[tname]['tree'], ef, 'dissect_%s_%s' % (ectx.eth_type[ectx.eth_hf[ef]['ethtype']]['proto'], ectx.eth_hf[ef]['ethtype'])) - (minv, maxv, ext))) - elif (ectx.OPer()): - if not self.HasConstraint(): - body = ectx.eth_fn_call('dissect_per_sequence_of', ret='offset', - par=(('tvb', 'offset', 'pinfo', 'tree', 'hf_index'), - (ectx.eth_type[tname]['tree'], 'dissect_'+ef))) + body = ectx.eth_fn_call('dissect_%(ER)s_sequence_of', ret='offset', + par=(('%(TVB)s', '%(OFFSET)s', '%(PINFO)s', '%(TREE)s', '%(HF_INDEX)s'), + ('%(ETT_INDEX)s', '%(TABLE)s',),)) + elif (self.constr.type == 'Size'): + if (ectx.NAPI()): + body = ectx.eth_fn_call('dissect_%(ER)s_constrained_sequence_of', ret='offset', + par=(('%(TVB)s', '%(OFFSET)s', '%(PINFO)s', '%(TREE)s', '%(HF_INDEX)s', 'item', 'private_data'), + ('%(ETT_INDEX)s', '%(TABLE)s',), + ('%(MIN_VAL)s', '%(MAX_VAL)s', '%(EXT)s',),)) else: - body = ectx.eth_fn_call('dissect_per_constrained_sequence_of', ret='offset', - par=(('tvb', 'offset', 'pinfo', 'tree', 'hf_index'), - (ectx.eth_type[tname]['tree'], 'dissect_'+ef), - (minv, maxv))) + body = ectx.eth_fn_call('dissect_%(ER)s_constrained_sequence_of', ret='offset', + par=(('%(TVB)s', '%(OFFSET)s', '%(PINFO)s', '%(TREE)s', '%(HF_INDEX)s'), + ('%(ETT_INDEX)s', '%(TABLE)s',), + ('%(MIN_VAL)s', '%(MAX_VAL)s',),)) else: body = '#error Can not decode %s' % (tname) - out += ectx.eth_type_fn_body(tname, body) - out += ectx.eth_type_fn_ftr(tname) - return out + return body #--- SetOfType ---------------------------------------------------------------- @@ -2136,10 +2137,7 @@ class SetOfType (SqType): return '#' + self.type + '_' + str(id(self)) def eth_ftype(self, ectx): - if (ectx.NAPI()): - return ('FT_UINT32', 'BASE_DEC') - else: - return ('FT_NONE', 'BASE_NONE') + return ('FT_UINT32', 'BASE_DEC') def eth_need_tree(self): return True @@ -2147,48 +2145,52 @@ class SetOfType (SqType): def GetTTag(self, ectx): return ('BER_CLASS_UNI', 'BER_UNI_TAG_SET') - def eth_type_fn(self, proto, tname, ectx): + def eth_type_default_pars(self, ectx, tname): + pars = Type.eth_type_default_pars(self, ectx, tname) + (pars['MIN_VAL'], pars['MAX_VAL'], pars['EXT']) = self.eth_get_size_constr() + pars['TABLE'] = '%(TNAME)s_set_of' + return pars + + def eth_type_default_table(self, ectx, tname): + #print "eth_type_default_table(tname='%s')" % (tname) fname = ectx.eth_type[tname]['ref'][0] - f = fname + '/' + '_item' - ef = ectx.field[f]['ethname'] - out = '' - if (not ectx.OPer()): - out = "static const %s_sequence_t %s_set_of[1] = {\n" % (ectx.encp(), tname) - out += self.out_item(f, self.val, False, '', ectx) - out += "};\n" - out += ectx.eth_type_fn_hdr(tname) - (minv, maxv, ext) = self.eth_get_size_constr() - if (ectx.OBer()): - body = ectx.eth_fn_call('dissect_ber_set_of', ret='offset', - par=(('implicit_tag', 'pinfo', 'tree', 'tvb', 'offset'), - (tname+'_set_of', 'hf_index', ectx.eth_type[tname]['tree']))) - elif (ectx.NPer()): - if not self.HasConstraint(): - body = ectx.eth_fn_call('dissect_pern_set_of', ret='offset', - par=(('tvb', 'offset', 'pinfo', 'tree'), - ('hf_index', 'item', 'private_data'), - (ectx.eth_type[tname]['tree'], ef, 'dissect_%s_%s' % (ectx.eth_type[ectx.eth_hf[ef]['ethtype']]['proto'], ectx.eth_hf[ef]['ethtype'])))) + if self.val.IsNamed (): + f = fname + '/' + self.val.name + else: + f = fname + '/' + '_item' + table = "static const %(ER)s_sequence_t %(TABLE)s[1] = {\n" + table += self.out_item(f, self.val, False, 'ASN1_NO_EXTENSIONS', ectx) + table += "};\n" + return table + + def eth_type_default_body(self, ectx, tname): + if (ectx.Ber()): + body = ectx.eth_fn_call('dissect_%(ER)s_set_of', ret='offset', + par=(('%(IMPLICIT_TAG)s', '%(PINFO)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'), + ('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),)) + elif (not self.HasConstraint()): + if (ectx.NAPI()): + body = ectx.eth_fn_call('dissect_%(ER)s_set_of', ret='offset', + par=(('%(TVB)s', '%(OFFSET)s', '%(PINFO)s', '%(TREE)s', '%(HF_INDEX)s', 'item', 'private_data'), + ('%(ETT_INDEX)s', '%(TABLE)s',),)) else: - body = ectx.eth_fn_call('dissect_pern_constrained_set_of', ret='offset', - par=(('tvb', 'offset', 'pinfo', 'tree'), - ('hf_index', 'item', 'private_data'), - (ectx.eth_type[tname]['tree'], ef, 'dissect_%s_%s' % (ectx.eth_type[ectx.eth_hf[ef]['ethtype']]['proto'], ectx.eth_hf[ef]['ethtype'])) - (minv, maxv, ext))) - elif (ectx.OPer()): - if not self.HasConstraint(): - body = ectx.eth_fn_call('dissect_per_set_of', ret='offset', - par=(('tvb', 'offset', 'pinfo', 'tree', 'hf_index'), - (ectx.eth_type[tname]['tree'], 'dissect_'+ef))) + body = ectx.eth_fn_call('dissect_%(ER)s_set_of', ret='offset', + par=(('%(TVB)s', '%(OFFSET)s', '%(PINFO)s', '%(TREE)s', '%(HF_INDEX)s'), + ('%(ETT_INDEX)s', '%(TABLE)s',),)) + elif (self.constr.type == 'Size'): + if (ectx.NAPI()): + body = ectx.eth_fn_call('dissect_%(ER)s_constrained_set_of', ret='offset', + par=(('%(TVB)s', '%(OFFSET)s', '%(PINFO)s', '%(TREE)s', '%(HF_INDEX)s', 'item', 'private_data'), + ('%(ETT_INDEX)s', '%(TABLE)s',), + ('%(MIN_VAL)s', '%(MAX_VAL)s', '%(EXT)s',),)) else: - body = ectx.eth_fn_call('dissect_per_constrained_set_of', ret='offset', - par=(('tvb', 'offset', 'pinfo', 'tree', 'hf_index'), - (ectx.eth_type[tname]['tree'], 'dissect_'+ef), - (minv, maxv))) + body = ectx.eth_fn_call('dissect_%(ER)s_constrained_set_of', ret='offset', + par=(('%(TVB)s', '%(OFFSET)s', '%(PINFO)s', '%(TREE)s', '%(HF_INDEX)s'), + ('%(ETT_INDEX)s', '%(TABLE)s',), + ('%(MIN_VAL)s', '%(MAX_VAL)s',),)) else: body = '#error Can not decode %s' % (tname) - out += ectx.eth_type_fn_body(tname, body) - out += ectx.eth_type_fn_ftr(tname) - return out + return body def mk_tag_str (ctx, cls, typ, num): @@ -2614,8 +2616,8 @@ class EnumeratedType (Type): out += ectx.eth_vals(tname, vals) return out - def eth_type_default_pars(self, ectx): - pars = Type.eth_type_default_pars(self, ectx) + def eth_type_default_pars(self, ectx, tname): + pars = Type.eth_type_default_pars(self, ectx, tname) (xxxx, maxv) = self.get_vals_maxv(ectx) maxv = str(maxv) if self.ext is None: @@ -2696,17 +2698,9 @@ class RealType (Type): def eth_tname(self): return 'REAL' - def eth_type_fn(self, proto, tname, ectx): - out = ectx.eth_type_fn_hdr(tname) - #out += " offset = dissect_per_real_new(tvb, offset, pinfo, tree,\n" \ - # " hf_index, item, NULL);\n" - # - # XXX - "PER_NOT_DECODED_YET()" or "BER_NOT_DECODED_YET()"? - # - body = 'NOT_DECODED_YET("%s");\n' % (tname) - out += ectx.eth_type_fn_body(tname, body) - out += ectx.eth_type_fn_ftr(tname) - return out + def eth_type_default_body(self, ectx, tname): + body = '#error Can not decode %s' % (tname) + return body #--- BooleanType -------------------------------------------------------------- class BooleanType (Type): @@ -2756,8 +2750,8 @@ class OctetStringType (Type): def GetTTag(self, ectx): return ('BER_CLASS_UNI', 'BER_UNI_TAG_OCTETSTRING') - def eth_type_default_pars(self, ectx): - pars = Type.eth_type_default_pars(self, ectx) + def eth_type_default_pars(self, ectx, tname): + pars = Type.eth_type_default_pars(self, ectx, tname) (pars['MIN_VAL'], pars['MAX_VAL'], pars['EXT']) = self.eth_get_size_constr() return pars @@ -3059,8 +3053,8 @@ class IntegerType (Type): out += ectx.eth_vals(tname, vals) return out - def eth_type_default_pars(self, ectx): - pars = Type.eth_type_default_pars(self, ectx) + def eth_type_default_pars(self, ectx, tname): + pars = Type.eth_type_default_pars(self, ectx, tname) if self.HasConstraint() and ((self.constr.type == 'SingleValue') or (self.constr.type == 'ValueRange')): if self.constr.type == 'SingleValue': minv = self.constr.subtype |