diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-06-05 14:47:11 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-06-05 14:47:11 +0000 |
| commit | 74df26eb29493a436064330be44c0d35a902a422 (patch) | |
| tree | 4926b65d4b2e4c5db4efd9ba06ddd87837a76a1f /epan | |
| parent | 8207c2dd7e082472d7a5540aef5f3a5d6a20f572 (diff) | |
Regenerate the MMS dissector with -T and -X options.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22047 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-mms.c | 4800 | ||||
| -rw-r--r-- | epan/dissectors/packet-mms.h | 2 |
2 files changed, 1561 insertions, 3241 deletions
diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index be93b083ae..2220f23046 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-mms.c */ -/* ../../tools/asn2wrs.py -b -e -p mms -c mms.cnf -s packet-mms-template mms.asn */ +/* ../../tools/asn2wrs.py -b -X -T -e -p mms -c mms.cnf -s packet-mms-template mms.asn */ /* Input file: packet-mms-template.c */ @@ -943,54 +943,12 @@ static gint ett_mms_FileAttributes = -1; /* TypeSpecification -> TypeSpecification/structure -> TypeSpecification/structure/components -> TypeSpecification/structure/components/_item -> TypeSpecification */ static int dissect_mms_TypeSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -static int dissect_elementType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_TypeSpecification(FALSE, tvb, offset, actx, tree, hf_mms_elementType); -} -static int dissect_componentType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_TypeSpecification(FALSE, tvb, offset, actx, tree, hf_mms_componentType); -} -static int dissect_typeSpecification(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_TypeSpecification(FALSE, tvb, offset, actx, tree, hf_mms_typeSpecification); -} - /* VariableSpecification -> ScatteredAccessDescription -> ScatteredAccessDescription/_item -> VariableSpecification */ static int dissect_mms_VariableSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -static int dissect_variableSpecification(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_VariableSpecification(FALSE, tvb, offset, actx, tree, hf_mms_variableSpecification); -} -static int dissect_monitoredVariable(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_VariableSpecification(FALSE, tvb, offset, actx, tree, hf_mms_monitoredVariable); -} -static int dissect_variableReference(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_VariableSpecification(FALSE, tvb, offset, actx, tree, hf_mms_variableReference); -} - /* Data -> Data/array -> Data */ static int dissect_mms_Data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -static int dissect_listOfData_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Data(FALSE, tvb, offset, actx, tree, hf_mms_listOfData_item); -} -static int dissect_array_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Data(FALSE, tvb, offset, actx, tree, hf_mms_array_item); -} -static int dissect_structure_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Data(FALSE, tvb, offset, actx, tree, hf_mms_structure_item); -} -static int dissect_valueSpecification(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Data(FALSE, tvb, offset, actx, tree, hf_mms_valueSpecification); -} - - -/*--- Fields for imported types ---*/ - -static int dissect_coded(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_acse_EXTERNALt(FALSE, tvb, offset, actx, tree, hf_mms_coded); -} -static int dissect_encodedString(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_acse_EXTERNALt(FALSE, tvb, offset, actx, tree, hf_mms_encodedString); -} @@ -1001,69 +959,6 @@ dissect_mms_Unsigned32(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_invokeID(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned32(FALSE, tvb, offset, actx, tree, hf_mms_invokeID); -} -static int dissect_invokeID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned32(TRUE, tvb, offset, actx, tree, hf_mms_invokeID); -} -static int dissect_modifierPosition_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned32(TRUE, tvb, offset, actx, tree, hf_mms_modifierPosition); -} -static int dissect_originalInvokeID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned32(TRUE, tvb, offset, actx, tree, hf_mms_originalInvokeID); -} -static int dissect_numberOfElements_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned32(TRUE, tvb, offset, actx, tree, hf_mms_numberOfElements); -} -static int dissect_index_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned32(TRUE, tvb, offset, actx, tree, hf_mms_index); -} -static int dissect_lowIndex_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned32(TRUE, tvb, offset, actx, tree, hf_mms_lowIndex); -} -static int dissect_numberMatched_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned32(TRUE, tvb, offset, actx, tree, hf_mms_numberMatched); -} -static int dissect_numberDeleted_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned32(TRUE, tvb, offset, actx, tree, hf_mms_numberDeleted); -} -static int dissect_numericAddress_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned32(TRUE, tvb, offset, actx, tree, hf_mms_numericAddress); -} -static int dissect_acceptableDelay_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned32(TRUE, tvb, offset, actx, tree, hf_mms_acceptableDelay); -} -static int dissect_controlTimeOut_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned32(TRUE, tvb, offset, actx, tree, hf_mms_controlTimeOut); -} -static int dissect_remainingTimeOut_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned32(TRUE, tvb, offset, actx, tree, hf_mms_remainingTimeOut); -} -static int dissect_inputTimeOut_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned32(TRUE, tvb, offset, actx, tree, hf_mms_inputTimeOut); -} -static int dissect_evaluationInterval_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned32(TRUE, tvb, offset, actx, tree, hf_mms_evaluationInterval); -} -static int dissect_numberOfEventEnrollments_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned32(TRUE, tvb, offset, actx, tree, hf_mms_numberOfEventEnrollments); -} -static int dissect_remainingAcceptableDelay_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned32(TRUE, tvb, offset, actx, tree, hf_mms_remainingAcceptableDelay); -} -static int dissect_timeSequenceIdentifier_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned32(TRUE, tvb, offset, actx, tree, hf_mms_timeSequenceIdentifier); -} -static int dissect_currentEntries_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned32(TRUE, tvb, offset, actx, tree, hf_mms_currentEntries); -} -static int dissect_initialPosition_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned32(TRUE, tvb, offset, actx, tree, hf_mms_initialPosition); -} -static int dissect_sizeOfFile_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned32(TRUE, tvb, offset, actx, tree, hf_mms_sizeOfFile); -} @@ -1075,90 +970,21 @@ dissect_mms_Identifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_vmd_specific_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(TRUE, tvb, offset, actx, tree, hf_mms_vmd_specific); -} -static int dissect_domainId(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(FALSE, tvb, offset, actx, tree, hf_mms_domainId); -} -static int dissect_itemId(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(FALSE, tvb, offset, actx, tree, hf_mms_itemId); -} -static int dissect_aa_specific_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(TRUE, tvb, offset, actx, tree, hf_mms_aa_specific); -} -static int dissect_domainSpecific_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(TRUE, tvb, offset, actx, tree, hf_mms_domainSpecific); -} -static int dissect_continueAfter_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(TRUE, tvb, offset, actx, tree, hf_mms_continueAfter); -} -static int dissect_listOfIdentifier_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(FALSE, tvb, offset, actx, tree, hf_mms_listOfIdentifier_item); -} -static int dissect_newIdentifier_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(TRUE, tvb, offset, actx, tree, hf_mms_newIdentifier); -} -static int dissect_domainName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(TRUE, tvb, offset, actx, tree, hf_mms_domainName); -} -static int dissect_listOfProgramInvocations_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(FALSE, tvb, offset, actx, tree, hf_mms_listOfProgramInvocations_item); -} -static int dissect_programInvocationName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(TRUE, tvb, offset, actx, tree, hf_mms_programInvocationName); -} -static int dissect_listOfDomainName_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(FALSE, tvb, offset, actx, tree, hf_mms_listOfDomainName_item); -} -static int dissect_listOfDomainNames_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(FALSE, tvb, offset, actx, tree, hf_mms_listOfDomainNames_item); -} -static int dissect_componentName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(TRUE, tvb, offset, actx, tree, hf_mms_componentName); -} -static int dissect_component_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(TRUE, tvb, offset, actx, tree, hf_mms_component); -} -static int dissect_namedToken_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(TRUE, tvb, offset, actx, tree, hf_mms_namedToken); -} -static int dissect_nameToStartAfter_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(TRUE, tvb, offset, actx, tree, hf_mms_nameToStartAfter); -} -static int dissect_freeNamedToken_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(TRUE, tvb, offset, actx, tree, hf_mms_freeNamedToken); -} -static int dissect_ownedNamedToken_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(TRUE, tvb, offset, actx, tree, hf_mms_ownedNamedToken); -} -static int dissect_hungNamedToken_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(TRUE, tvb, offset, actx, tree, hf_mms_hungNamedToken); -} -static int dissect_operatorStationName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(TRUE, tvb, offset, actx, tree, hf_mms_operatorStationName); -} -static int dissect_domain_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identifier(TRUE, tvb, offset, actx, tree, hf_mms_domain); -} -static const ber_old_sequence_t T_domain_specific_sequence[] = { - { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_domainId }, - { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_itemId }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_domain_specific_sequence[] = { + { &hf_mms_domainId , BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_mms_Identifier }, + { &hf_mms_itemId , BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_mms_Identifier }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_domain_specific(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - T_domain_specific_sequence, hf_index, ett_mms_T_domain_specific); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_domain_specific_sequence, hf_index, ett_mms_T_domain_specific); return offset; } -static int dissect_domain_specific_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_domain_specific(TRUE, tvb, offset, actx, tree, hf_mms_domain_specific); -} static const value_string mms_ObjectName_vals[] = { @@ -1168,87 +994,21 @@ static const value_string mms_ObjectName_vals[] = { { 0, NULL } }; -static const ber_old_choice_t ObjectName_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_vmd_specific_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_domain_specific_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_aa_specific_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t ObjectName_choice[] = { + { 0, &hf_mms_vmd_specific , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { 1, &hf_mms_domain_specific , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_T_domain_specific }, + { 2, &hf_mms_aa_specific , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_ObjectName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - ObjectName_choice, hf_index, ett_mms_ObjectName, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + ObjectName_choice, hf_index, ett_mms_ObjectName, + NULL); return offset; } -static int dissect_currentName(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_currentName); -} -static int dissect_typeName(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_typeName); -} -static int dissect_name(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_name); -} -static int dissect_variableName(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_variableName); -} -static int dissect_scatteredAccessName(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_scatteredAccessName); -} -static int dissect_listOfName_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_listOfName_item); -} -static int dissect_variableListName(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_variableListName); -} -static int dissect_listOfVariableListName_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_listOfVariableListName_item); -} -static int dissect_listOfTypeName_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_listOfTypeName_item); -} -static int dissect_semaphoreName(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_semaphoreName); -} -static int dissect_eventConditionName(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_eventConditionName); -} -static int dissect_specific_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_specific_item); -} -static int dissect_eventActionName(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_eventActionName); -} -static int dissect_eventEnrollmentName(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_eventEnrollmentName); -} -static int dissect_ec(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_ec); -} -static int dissect_ea(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_ea); -} -static int dissect_eventEnrollmentNames_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_eventEnrollmentNames_item); -} -static int dissect_continueAfter_02(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_continueAfter_02); -} -static int dissect_eventCondition(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_eventCondition); -} -static int dissect_eventAction(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_eventAction); -} -static int dissect_eventActioName(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_eventActioName); -} -static int dissect_journalName(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObjectName(FALSE, tvb, offset, actx, tree, hf_mms_journalName); -} static const asn_namedbit Transitions_bits[] = { @@ -1270,35 +1030,23 @@ dissect_mms_Transitions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_eventConditionTransition_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Transitions(TRUE, tvb, offset, actx, tree, hf_mms_eventConditionTransition); -} -static int dissect_eventConditionTransitions_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Transitions(TRUE, tvb, offset, actx, tree, hf_mms_eventConditionTransitions); -} -static int dissect_causingTransitions_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Transitions(TRUE, tvb, offset, actx, tree, hf_mms_causingTransitions); -} -static const ber_old_sequence_t AttachToEventCondition_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventEnrollmentName }, - { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_eventConditionName }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_causingTransitions_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_acceptableDelay_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t AttachToEventCondition_sequence[] = { + { &hf_mms_eventEnrollmentName, BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_eventConditionName, BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_causingTransitions, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_Transitions }, + { &hf_mms_acceptableDelay , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_AttachToEventCondition(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - AttachToEventCondition_sequence, hf_index, ett_mms_AttachToEventCondition); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + AttachToEventCondition_sequence, hf_index, ett_mms_AttachToEventCondition); return offset; } -static int dissect_attach_To_Event_Condition_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_AttachToEventCondition(TRUE, tvb, offset, actx, tree, hf_mms_attach_To_Event_Condition); -} @@ -1309,24 +1057,6 @@ dissect_mms_Unsigned8(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ return offset; } -static int dissect_integer_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned8(TRUE, tvb, offset, actx, tree, hf_mms_integer); -} -static int dissect_unsigned_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned8(TRUE, tvb, offset, actx, tree, hf_mms_unsigned); -} -static int dissect_bcd_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned8(TRUE, tvb, offset, actx, tree, hf_mms_bcd); -} -static int dissect_severity_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned8(TRUE, tvb, offset, actx, tree, hf_mms_severity); -} -static int dissect_mostSevere_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned8(TRUE, tvb, offset, actx, tree, hf_mms_mostSevere); -} -static int dissect_leastSevere_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned8(TRUE, tvb, offset, actx, tree, hf_mms_leastSevere); -} @@ -1336,12 +1066,6 @@ dissect_mms_Priority(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U return offset; } -static int dissect_priority_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Priority(TRUE, tvb, offset, actx, tree, hf_mms_priority); -} -static int dissect_prio_rity_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Priority(TRUE, tvb, offset, actx, tree, hf_mms_prio_rity); -} @@ -1351,83 +1075,26 @@ dissect_mms_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ return offset; } -static int dissect_moreFollows_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_mms_moreFollows); -} -static int dissect_sharable_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_mms_sharable); -} -static int dissect_mmsDeletable_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_mms_mmsDeletable); -} -static int dissect_reusable_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_mms_reusable); -} -static int dissect_monitorType_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_mms_monitorType); -} -static int dissect_monitor_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_mms_monitor); -} -static int dissect_packed_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_mms_packed); -} -static int dissect_binary_time_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_mms_binary_time); -} -static int dissect_specificationWithResult_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_mms_specificationWithResult); -} -static int dissect_boolean_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_mms_boolean_01); -} -static int dissect_abortOnTimeOut_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_mms_abortOnTimeOut); -} -static int dissect_relinquishIfConnectionLost_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_mms_relinquishIfConnectionLost); -} -static int dissect_echo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_mms_echo); -} -static int dissect_alarmSummaryReports_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_mms_alarmSummaryReports); -} -static int dissect_enabled_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_mms_enabled); -} -static int dissect_notificationLost_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_mms_notificationLost); -} -static int dissect_enrollmentsOnly_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_mms_enrollmentsOnly); -} -static int dissect_activeAlarmsOnly_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_mms_activeAlarmsOnly); -} -static const ber_old_sequence_t AttachToSemaphore_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_semaphoreName }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_namedToken_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_priority_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_acceptableDelay_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_controlTimeOut_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_abortOnTimeOut_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_relinquishIfConnectionLost_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t AttachToSemaphore_sequence[] = { + { &hf_mms_semaphoreName , BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_namedToken , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { &hf_mms_priority , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Priority }, + { &hf_mms_acceptableDelay , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { &hf_mms_controlTimeOut , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { &hf_mms_abortOnTimeOut , BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_relinquishIfConnectionLost, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_AttachToSemaphore(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - AttachToSemaphore_sequence, hf_index, ett_mms_AttachToSemaphore); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + AttachToSemaphore_sequence, hf_index, ett_mms_AttachToSemaphore); return offset; } -static int dissect_attach_To_Semaphore_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_AttachToSemaphore(TRUE, tvb, offset, actx, tree, hf_mms_attach_To_Semaphore); -} static const value_string mms_Modifier_vals[] = { @@ -1436,42 +1103,33 @@ static const value_string mms_Modifier_vals[] = { { 0, NULL } }; -static const ber_old_choice_t Modifier_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_attach_To_Event_Condition_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_attach_To_Semaphore_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t Modifier_choice[] = { + { 0, &hf_mms_attach_To_Event_Condition, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_AttachToEventCondition }, + { 1, &hf_mms_attach_To_Semaphore, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_AttachToSemaphore }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_Modifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - Modifier_choice, hf_index, ett_mms_Modifier, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + Modifier_choice, hf_index, ett_mms_Modifier, + NULL); return offset; } -static int dissect_listOfModifier_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Modifier(FALSE, tvb, offset, actx, tree, hf_mms_listOfModifier_item); -} -static const ber_old_sequence_t SEQUENCE_OF_Modifier_sequence_of[1] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listOfModifier_item }, +static const ber_sequence_t SEQUENCE_OF_Modifier_sequence_of[1] = { + { &hf_mms_listOfModifier_item, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_Modifier }, }; static int dissect_mms_SEQUENCE_OF_Modifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_Modifier_sequence_of, hf_index, ett_mms_SEQUENCE_OF_Modifier); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_Modifier_sequence_of, hf_index, ett_mms_SEQUENCE_OF_Modifier); return offset; } -static int dissect_listOfModifier(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_Modifier(FALSE, tvb, offset, actx, tree, hf_mms_listOfModifier); -} -static int dissect_listOfModifier_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_Modifier(TRUE, tvb, offset, actx, tree, hf_mms_listOfModifier); -} @@ -1481,9 +1139,6 @@ dissect_mms_Status_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off return offset; } -static int dissect_status_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Status_Request(TRUE, tvb, offset, actx, tree, hf_mms_status); -} static const value_string mms_T_objectClass_vals[] = { @@ -1510,9 +1165,6 @@ dissect_mms_T_objectClass(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs return offset; } -static int dissect_objectClass_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_objectClass(TRUE, tvb, offset, actx, tree, hf_mms_objectClass); -} static const value_string mms_T_extendedObjectClass_vals[] = { @@ -1520,22 +1172,19 @@ static const value_string mms_T_extendedObjectClass_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_extendedObjectClass_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_objectClass_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_extendedObjectClass_choice[] = { + { 0, &hf_mms_objectClass , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_T_objectClass }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_extendedObjectClass(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_extendedObjectClass_choice, hf_index, ett_mms_T_extendedObjectClass, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_extendedObjectClass_choice, hf_index, ett_mms_T_extendedObjectClass, + NULL); return offset; } -static int dissect_extendedObjectClass(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_extendedObjectClass(FALSE, tvb, offset, actx, tree, hf_mms_extendedObjectClass); -} @@ -1545,42 +1194,6 @@ dissect_mms_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a return offset; } -static int dissect_vmdSpecific_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_NULL(TRUE, tvb, offset, actx, tree, hf_mms_vmdSpecific); -} -static int dissect_aaSpecific_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_NULL(TRUE, tvb, offset, actx, tree, hf_mms_aaSpecific); -} -static int dissect_boolean_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_NULL(TRUE, tvb, offset, actx, tree, hf_mms_boolean); -} -static int dissect_generalized_time_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_NULL(TRUE, tvb, offset, actx, tree, hf_mms_generalized_time); -} -static int dissect_objId_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_NULL(TRUE, tvb, offset, actx, tree, hf_mms_objId); -} -static int dissect_allElements_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_NULL(TRUE, tvb, offset, actx, tree, hf_mms_allElements); -} -static int dissect_success_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_NULL(TRUE, tvb, offset, actx, tree, hf_mms_success); -} -static int dissect_invalidated_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_NULL(TRUE, tvb, offset, actx, tree, hf_mms_invalidated); -} -static int dissect_noResult_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_NULL(TRUE, tvb, offset, actx, tree, hf_mms_noResult); -} -static int dissect_aa_specific_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_NULL(TRUE, tvb, offset, actx, tree, hf_mms_aa_specific_01); -} -static int dissect_vmd_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_NULL(TRUE, tvb, offset, actx, tree, hf_mms_vmd); -} -static int dissect_undefined_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_NULL(TRUE, tvb, offset, actx, tree, hf_mms_undefined); -} static const value_string mms_T_objectScope_vals[] = { @@ -1590,43 +1203,37 @@ static const value_string mms_T_objectScope_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_objectScope_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_vmdSpecific_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_domainSpecific_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_aaSpecific_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_objectScope_choice[] = { + { 0, &hf_mms_vmdSpecific , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_NULL }, + { 1, &hf_mms_domainSpecific , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { 2, &hf_mms_aaSpecific , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_NULL }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_objectScope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_objectScope_choice, hf_index, ett_mms_T_objectScope, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_objectScope_choice, hf_index, ett_mms_T_objectScope, + NULL); return offset; } -static int dissect_objectScope(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_objectScope(FALSE, tvb, offset, actx, tree, hf_mms_objectScope); -} -static const ber_old_sequence_t GetNameList_Request_sequence[] = { - { BER_CLASS_CON, 0, 0, dissect_extendedObjectClass }, - { BER_CLASS_CON, 1, 0, dissect_objectScope }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_continueAfter_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t GetNameList_Request_sequence[] = { + { &hf_mms_extendedObjectClass, BER_CLASS_CON, 0, 0, dissect_mms_T_extendedObjectClass }, + { &hf_mms_objectScope , BER_CLASS_CON, 1, 0, dissect_mms_T_objectScope }, + { &hf_mms_continueAfter , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_GetNameList_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - GetNameList_Request_sequence, hf_index, ett_mms_GetNameList_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + GetNameList_Request_sequence, hf_index, ett_mms_GetNameList_Request); return offset; } -static int dissect_getNameList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetNameList_Request(TRUE, tvb, offset, actx, tree, hf_mms_getNameList); -} @@ -1636,9 +1243,6 @@ dissect_mms_Identify_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o return offset; } -static int dissect_identify_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identify_Request(TRUE, tvb, offset, actx, tree, hf_mms_identify); -} static const value_string mms_T_objectClass_01_vals[] = { @@ -1665,9 +1269,6 @@ dissect_mms_T_objectClass_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o return offset; } -static int dissect_objectClass_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_objectClass_01(TRUE, tvb, offset, actx, tree, hf_mms_objectClass_01); -} static const value_string mms_T_extendedObjectClass_01_vals[] = { @@ -1675,41 +1276,35 @@ static const value_string mms_T_extendedObjectClass_01_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_extendedObjectClass_01_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_objectClass_01_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_extendedObjectClass_01_choice[] = { + { 0, &hf_mms_objectClass_01 , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_T_objectClass_01 }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_extendedObjectClass_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_extendedObjectClass_01_choice, hf_index, ett_mms_T_extendedObjectClass_01, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_extendedObjectClass_01_choice, hf_index, ett_mms_T_extendedObjectClass_01, + NULL); return offset; } -static int dissect_extendedObjectClass_01(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_extendedObjectClass_01(FALSE, tvb, offset, actx, tree, hf_mms_extendedObjectClass_01); -} -static const ber_old_sequence_t Rename_Request_sequence[] = { - { BER_CLASS_CON, 0, 0, dissect_extendedObjectClass_01 }, - { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_currentName }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_newIdentifier_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t Rename_Request_sequence[] = { + { &hf_mms_extendedObjectClass_01, BER_CLASS_CON, 0, 0, dissect_mms_T_extendedObjectClass_01 }, + { &hf_mms_currentName , BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_newIdentifier , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_Rename_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Rename_Request_sequence, hf_index, ett_mms_Rename_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Rename_Request_sequence, hf_index, ett_mms_Rename_Request); return offset; } -static int dissect_rename_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Rename_Request(TRUE, tvb, offset, actx, tree, hf_mms_rename); -} @@ -1721,51 +1316,6 @@ dissect_mms_VisibleString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs return offset; } -static int dissect_additionalDescription_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_VisibleString(TRUE, tvb, offset, actx, tree, hf_mms_additionalDescription); -} -static int dissect_vendorName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_VisibleString(TRUE, tvb, offset, actx, tree, hf_mms_vendorName); -} -static int dissect_modelName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_VisibleString(TRUE, tvb, offset, actx, tree, hf_mms_modelName); -} -static int dissect_revision_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_VisibleString(TRUE, tvb, offset, actx, tree, hf_mms_revision); -} -static int dissect_continueAfter_01(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_VisibleString(FALSE, tvb, offset, actx, tree, hf_mms_continueAfter_01); -} -static int dissect_listOfCapabilities_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_VisibleString(FALSE, tvb, offset, actx, tree, hf_mms_listOfCapabilities_item); -} -static int dissect_simpleString_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_VisibleString(TRUE, tvb, offset, actx, tree, hf_mms_simpleString); -} -static int dissect_startArgument_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_VisibleString(TRUE, tvb, offset, actx, tree, hf_mms_startArgument); -} -static int dissect_visible_string_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_VisibleString(TRUE, tvb, offset, actx, tree, hf_mms_visible_string_01); -} -static int dissect_symbolicAddress_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_VisibleString(TRUE, tvb, offset, actx, tree, hf_mms_symbolicAddress); -} -static int dissect_listOfPromptData_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_VisibleString(FALSE, tvb, offset, actx, tree, hf_mms_listOfPromptData_item); -} -static int dissect_listOfOutputData_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_VisibleString(FALSE, tvb, offset, actx, tree, hf_mms_listOfOutputData_item); -} -static int dissect_listOfVariables_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_VisibleString(FALSE, tvb, offset, actx, tree, hf_mms_listOfVariables_item); -} -static int dissect_variableTag_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_VisibleString(TRUE, tvb, offset, actx, tree, hf_mms_variableTag); -} -static int dissect_annotation_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_VisibleString(TRUE, tvb, offset, actx, tree, hf_mms_annotation); -} @@ -1776,36 +1326,6 @@ dissect_mms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse return offset; } -static int dissect_non_coded_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_OCTET_STRING(TRUE, tvb, offset, actx, tree, hf_mms_non_coded); -} -static int dissect_octet_string_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_OCTET_STRING(TRUE, tvb, offset, actx, tree, hf_mms_octet_string_01); -} -static int dissect_unconstrainedAddress_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_OCTET_STRING(TRUE, tvb, offset, actx, tree, hf_mms_unconstrainedAddress); -} -static int dissect_entryIdToStartAfter_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_OCTET_STRING(TRUE, tvb, offset, actx, tree, hf_mms_entryIdToStartAfter); -} -static int dissect_entryId_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_OCTET_STRING(TRUE, tvb, offset, actx, tree, hf_mms_entryId); -} -static int dissect_startingEntry_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_OCTET_STRING(TRUE, tvb, offset, actx, tree, hf_mms_startingEntry); -} -static int dissect_entrySpecification_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_OCTET_STRING(TRUE, tvb, offset, actx, tree, hf_mms_entrySpecification); -} -static int dissect_entryIdentifier_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_OCTET_STRING(TRUE, tvb, offset, actx, tree, hf_mms_entryIdentifier); -} -static int dissect_limitingEntry_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_OCTET_STRING(TRUE, tvb, offset, actx, tree, hf_mms_limitingEntry); -} -static int dissect_fileData_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_OCTET_STRING(TRUE, tvb, offset, actx, tree, hf_mms_fileData); -} static const value_string mms_Address_vals[] = { @@ -1815,95 +1335,80 @@ static const value_string mms_Address_vals[] = { { 0, NULL } }; -static const ber_old_choice_t Address_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_numericAddress_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_symbolicAddress_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_unconstrainedAddress_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t Address_choice[] = { + { 0, &hf_mms_numericAddress , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { 1, &hf_mms_symbolicAddress , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_VisibleString }, + { 2, &hf_mms_unconstrainedAddress, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_OCTET_STRING }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - Address_choice, hf_index, ett_mms_Address, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + Address_choice, hf_index, ett_mms_Address, + NULL); return offset; } -static int dissect_address(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Address(FALSE, tvb, offset, actx, tree, hf_mms_address); -} -static const ber_old_sequence_t T_array_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_packed_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberOfElements_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_NOTCHKTAG, dissect_elementType }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_array_sequence[] = { + { &hf_mms_packed , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_numberOfElements, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { &hf_mms_elementType , BER_CLASS_CON, 2, BER_FLAGS_NOTCHKTAG, dissect_mms_TypeSpecification }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_array(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - T_array_sequence, hf_index, ett_mms_T_array); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_array_sequence, hf_index, ett_mms_T_array); return offset; } -static int dissect_array_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_array(TRUE, tvb, offset, actx, tree, hf_mms_array); -} -static const ber_old_sequence_t T_components_item_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_componentName_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_componentType }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_components_item_sequence[] = { + { &hf_mms_componentName , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { &hf_mms_componentType , BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_mms_TypeSpecification }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_components_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - T_components_item_sequence, hf_index, ett_mms_T_components_item); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_components_item_sequence, hf_index, ett_mms_T_components_item); return offset; } -static int dissect_components_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_components_item(FALSE, tvb, offset, actx, tree, hf_mms_components_item); -} -static const ber_old_sequence_t T_components_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_components_item }, +static const ber_sequence_t T_components_sequence_of[1] = { + { &hf_mms_components_item , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mms_T_components_item }, }; static int dissect_mms_T_components(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - T_components_sequence_of, hf_index, ett_mms_T_components); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + T_components_sequence_of, hf_index, ett_mms_T_components); return offset; } -static int dissect_components_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_components(TRUE, tvb, offset, actx, tree, hf_mms_components); -} -static const ber_old_sequence_t T_structure_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_packed_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_components_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_structure_sequence[] = { + { &hf_mms_packed , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_components , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_T_components }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_structure(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - T_structure_sequence, hf_index, ett_mms_T_structure); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_structure_sequence, hf_index, ett_mms_T_structure); return offset; } -static int dissect_structure_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_structure(TRUE, tvb, offset, actx, tree, hf_mms_structure); -} @@ -1914,30 +1419,6 @@ dissect_mms_Integer32(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ return offset; } -static int dissect_localDetailCalling_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Integer32(TRUE, tvb, offset, actx, tree, hf_mms_localDetailCalling); -} -static int dissect_localDetailCalled_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Integer32(TRUE, tvb, offset, actx, tree, hf_mms_localDetailCalled); -} -static int dissect_ulsmID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Integer32(TRUE, tvb, offset, actx, tree, hf_mms_ulsmID); -} -static int dissect_bit_string_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Integer32(TRUE, tvb, offset, actx, tree, hf_mms_bit_string); -} -static int dissect_octet_string_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Integer32(TRUE, tvb, offset, actx, tree, hf_mms_octet_string); -} -static int dissect_visible_string_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Integer32(TRUE, tvb, offset, actx, tree, hf_mms_visible_string); -} -static int dissect_numberOfEntries_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Integer32(TRUE, tvb, offset, actx, tree, hf_mms_numberOfEntries); -} -static int dissect_frsmID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Integer32(TRUE, tvb, offset, actx, tree, hf_mms_frsmID); -} static const value_string mms_TypeSpecification_vals[] = { @@ -1957,67 +1438,61 @@ static const value_string mms_TypeSpecification_vals[] = { { 0, NULL } }; -static const ber_old_choice_t TypeSpecification_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_typeName }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_array_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_structure_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_boolean_impl }, - { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_bit_string_impl }, - { 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_integer_impl }, - { 6, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_unsigned_impl }, - { 9, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_octet_string_impl }, - { 10, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_visible_string_impl }, - { 11, BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_generalized_time_impl }, - { 12, BER_CLASS_CON, 12, BER_FLAGS_IMPLTAG, dissect_binary_time_impl }, - { 13, BER_CLASS_CON, 13, BER_FLAGS_IMPLTAG, dissect_bcd_impl }, - { 15, BER_CLASS_CON, 15, BER_FLAGS_IMPLTAG, dissect_objId_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t TypeSpecification_choice[] = { + { 0, &hf_mms_typeName , BER_CLASS_CON, 0, 0, dissect_mms_ObjectName }, + { 1, &hf_mms_array , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_T_array }, + { 2, &hf_mms_structure , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_T_structure }, + { 3, &hf_mms_boolean , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_mms_NULL }, + { 4, &hf_mms_bit_string , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mms_Integer32 }, + { 5, &hf_mms_integer , BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned8 }, + { 6, &hf_mms_unsigned , BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned8 }, + { 9, &hf_mms_octet_string , BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_mms_Integer32 }, + { 10, &hf_mms_visible_string , BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_mms_Integer32 }, + { 11, &hf_mms_generalized_time, BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_mms_NULL }, + { 12, &hf_mms_binary_time , BER_CLASS_CON, 12, BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { 13, &hf_mms_bcd , BER_CLASS_CON, 13, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned8 }, + { 15, &hf_mms_objId , BER_CLASS_CON, 15, BER_FLAGS_IMPLTAG, dissect_mms_NULL }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_TypeSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - TypeSpecification_choice, hf_index, ett_mms_TypeSpecification, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + TypeSpecification_choice, hf_index, ett_mms_TypeSpecification, + NULL); return offset; } -static const ber_old_sequence_t T_variableDescription_sequence[] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_address }, - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeSpecification }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_variableDescription_sequence[] = { + { &hf_mms_address , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_Address }, + { &hf_mms_typeSpecification, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_TypeSpecification }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_variableDescription(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - T_variableDescription_sequence, hf_index, ett_mms_T_variableDescription); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_variableDescription_sequence, hf_index, ett_mms_T_variableDescription); return offset; } -static int dissect_variableDescription_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_variableDescription(TRUE, tvb, offset, actx, tree, hf_mms_variableDescription); -} -static const ber_old_sequence_t T_indexRange_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_lowIndex_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberOfElements_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_indexRange_sequence[] = { + { &hf_mms_lowIndex , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { &hf_mms_numberOfElements, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_indexRange(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - T_indexRange_sequence, hf_index, ett_mms_T_indexRange); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_indexRange_sequence, hf_index, ett_mms_T_indexRange); return offset; } -static int dissect_indexRange_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_indexRange(TRUE, tvb, offset, actx, tree, hf_mms_indexRange); -} static const value_string mms_T_selectAccess_vals[] = { @@ -2028,25 +1503,22 @@ static const value_string mms_T_selectAccess_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_selectAccess_choice[] = { - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_component_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_index_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_indexRange_impl }, - { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_allElements_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_selectAccess_choice[] = { + { 1, &hf_mms_component , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { 2, &hf_mms_index , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { 3, &hf_mms_indexRange , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_mms_T_indexRange }, + { 4, &hf_mms_allElements , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mms_NULL }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_selectAccess(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_selectAccess_choice, hf_index, ett_mms_T_selectAccess, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_selectAccess_choice, hf_index, ett_mms_T_selectAccess, + NULL); return offset; } -static int dissect_selectAccess(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_selectAccess(FALSE, tvb, offset, actx, tree, hf_mms_selectAccess); -} static const value_string mms_AlternateAccessSelection_vals[] = { @@ -2054,43 +1526,34 @@ static const value_string mms_AlternateAccessSelection_vals[] = { { 0, NULL } }; -static const ber_old_choice_t AlternateAccessSelection_choice[] = { - { -1/*choice*/, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_selectAccess }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t AlternateAccessSelection_choice[] = { + { -1/*choice*/, &hf_mms_selectAccess , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_mms_T_selectAccess }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_AlternateAccessSelection(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - AlternateAccessSelection_choice, hf_index, ett_mms_AlternateAccessSelection, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + AlternateAccessSelection_choice, hf_index, ett_mms_AlternateAccessSelection, + NULL); return offset; } -static int dissect_unnamed(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_AlternateAccessSelection(FALSE, tvb, offset, actx, tree, hf_mms_unnamed); -} -static int dissect_accesst(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_AlternateAccessSelection(FALSE, tvb, offset, actx, tree, hf_mms_accesst); -} -static const ber_old_sequence_t T_named_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_componentName_impl }, - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_accesst }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_named_sequence[] = { + { &hf_mms_componentName , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { &hf_mms_accesst , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_AlternateAccessSelection }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_named(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - T_named_sequence, hf_index, ett_mms_T_named); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_named_sequence, hf_index, ett_mms_T_named); return offset; } -static int dissect_named_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_named(TRUE, tvb, offset, actx, tree, hf_mms_named); -} static const value_string mms_AlternateAccess_item_vals[] = { @@ -2099,74 +1562,62 @@ static const value_string mms_AlternateAccess_item_vals[] = { { 0, NULL } }; -static const ber_old_choice_t AlternateAccess_item_choice[] = { - { 0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_unnamed }, - { 1, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_named_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t AlternateAccess_item_choice[] = { + { 0, &hf_mms_unnamed , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_mms_AlternateAccessSelection }, + { 1, &hf_mms_named , BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_mms_T_named }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_AlternateAccess_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - AlternateAccess_item_choice, hf_index, ett_mms_AlternateAccess_item, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + AlternateAccess_item_choice, hf_index, ett_mms_AlternateAccess_item, + NULL); return offset; } -static int dissect_AlternateAccess_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_AlternateAccess_item(FALSE, tvb, offset, actx, tree, hf_mms_AlternateAccess_item); -} -static const ber_old_sequence_t AlternateAccess_sequence_of[1] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_AlternateAccess_item }, +static const ber_sequence_t AlternateAccess_sequence_of[1] = { + { &hf_mms_AlternateAccess_item, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_AlternateAccess_item }, }; static int dissect_mms_AlternateAccess(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - AlternateAccess_sequence_of, hf_index, ett_mms_AlternateAccess); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + AlternateAccess_sequence_of, hf_index, ett_mms_AlternateAccess); return offset; } -static int dissect_alternateAccess_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_AlternateAccess(TRUE, tvb, offset, actx, tree, hf_mms_alternateAccess); -} -static const ber_old_sequence_t ScatteredAccessDescription_item_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_componentName_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_variableSpecification }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alternateAccess_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t ScatteredAccessDescription_item_sequence[] = { + { &hf_mms_componentName , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { &hf_mms_variableSpecification, BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_mms_VariableSpecification }, + { &hf_mms_alternateAccess , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_AlternateAccess }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_ScatteredAccessDescription_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - ScatteredAccessDescription_item_sequence, hf_index, ett_mms_ScatteredAccessDescription_item); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ScatteredAccessDescription_item_sequence, hf_index, ett_mms_ScatteredAccessDescription_item); return offset; } -static int dissect_ScatteredAccessDescription_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ScatteredAccessDescription_item(FALSE, tvb, offset, actx, tree, hf_mms_ScatteredAccessDescription_item); -} -static const ber_old_sequence_t ScatteredAccessDescription_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ScatteredAccessDescription_item }, +static const ber_sequence_t ScatteredAccessDescription_sequence_of[1] = { + { &hf_mms_ScatteredAccessDescription_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mms_ScatteredAccessDescription_item }, }; static int dissect_mms_ScatteredAccessDescription(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - ScatteredAccessDescription_sequence_of, hf_index, ett_mms_ScatteredAccessDescription); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + ScatteredAccessDescription_sequence_of, hf_index, ett_mms_ScatteredAccessDescription); return offset; } -static int dissect_scatteredAccessDescription_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ScatteredAccessDescription(TRUE, tvb, offset, actx, tree, hf_mms_scatteredAccessDescription); -} static const value_string mms_VariableSpecification_vals[] = { @@ -2178,57 +1629,51 @@ static const value_string mms_VariableSpecification_vals[] = { { 0, NULL } }; -static const ber_old_choice_t VariableSpecification_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_name }, - { 1, BER_CLASS_CON, 1, 0, dissect_address }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_variableDescription_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_scatteredAccessDescription_impl }, - { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_invalidated_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t VariableSpecification_choice[] = { + { 0, &hf_mms_name , BER_CLASS_CON, 0, 0, dissect_mms_ObjectName }, + { 1, &hf_mms_address , BER_CLASS_CON, 1, 0, dissect_mms_Address }, + { 2, &hf_mms_variableDescription, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_T_variableDescription }, + { 3, &hf_mms_scatteredAccessDescription, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_mms_ScatteredAccessDescription }, + { 4, &hf_mms_invalidated , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mms_NULL }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_VariableSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - VariableSpecification_choice, hf_index, ett_mms_VariableSpecification, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + VariableSpecification_choice, hf_index, ett_mms_VariableSpecification, + NULL); return offset; } -static const ber_old_sequence_t T_listOfVariable_item_02_sequence[] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableSpecification }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alternateAccess_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_listOfVariable_item_02_sequence[] = { + { &hf_mms_variableSpecification, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_VariableSpecification }, + { &hf_mms_alternateAccess , BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_AlternateAccess }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_listOfVariable_item_02(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - T_listOfVariable_item_02_sequence, hf_index, ett_mms_T_listOfVariable_item_02); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_listOfVariable_item_02_sequence, hf_index, ett_mms_T_listOfVariable_item_02); return offset; } -static int dissect_listOfVariable_item_02(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_listOfVariable_item_02(FALSE, tvb, offset, actx, tree, hf_mms_listOfVariable_item_02); -} -static const ber_old_sequence_t T_listOfVariable_02_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfVariable_item_02 }, +static const ber_sequence_t T_listOfVariable_02_sequence_of[1] = { + { &hf_mms_listOfVariable_item_02, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mms_T_listOfVariable_item_02 }, }; static int dissect_mms_T_listOfVariable_02(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - T_listOfVariable_02_sequence_of, hf_index, ett_mms_T_listOfVariable_02); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + T_listOfVariable_02_sequence_of, hf_index, ett_mms_T_listOfVariable_02); return offset; } -static int dissect_listOfVariable_02_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_listOfVariable_02(TRUE, tvb, offset, actx, tree, hf_mms_listOfVariable_02); -} static const value_string mms_VariableAccessSpecification_vals[] = { @@ -2237,66 +1682,48 @@ static const value_string mms_VariableAccessSpecification_vals[] = { { 0, NULL } }; -static const ber_old_choice_t VariableAccessSpecification_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfVariable_02_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_variableListName }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t VariableAccessSpecification_choice[] = { + { 0, &hf_mms_listOfVariable_02, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_T_listOfVariable_02 }, + { 1, &hf_mms_variableListName, BER_CLASS_CON, 1, 0, dissect_mms_ObjectName }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_VariableAccessSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - VariableAccessSpecification_choice, hf_index, ett_mms_VariableAccessSpecification, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + VariableAccessSpecification_choice, hf_index, ett_mms_VariableAccessSpecification, + NULL); return offset; } -static int dissect_variableAccessSpecificatn(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_VariableAccessSpecification(FALSE, tvb, offset, actx, tree, hf_mms_variableAccessSpecificatn); -} -static int dissect_variableAccessSpecification(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_VariableAccessSpecification(FALSE, tvb, offset, actx, tree, hf_mms_variableAccessSpecification); -} -static const ber_old_sequence_t Read_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_specificationWithResult_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_variableAccessSpecificatn }, - { 0, 0, 0, NULL } +static const ber_sequence_t Read_Request_sequence[] = { + { &hf_mms_specificationWithResult, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_variableAccessSpecificatn, BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_mms_VariableAccessSpecification }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_Read_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Read_Request_sequence, hf_index, ett_mms_Read_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Read_Request_sequence, hf_index, ett_mms_Read_Request); return offset; } -static int dissect_read_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Read_Request(TRUE, tvb, offset, actx, tree, hf_mms_read); -} -static const ber_old_sequence_t SEQUENCE_OF_Data_sequence_of[1] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listOfData_item }, +static const ber_sequence_t SEQUENCE_OF_Data_sequence_of[1] = { + { &hf_mms_listOfData_item , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_Data }, }; static int dissect_mms_SEQUENCE_OF_Data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_Data_sequence_of, hf_index, ett_mms_SEQUENCE_OF_Data); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_Data_sequence_of, hf_index, ett_mms_SEQUENCE_OF_Data); return offset; } -static int dissect_listOfData_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_Data(TRUE, tvb, offset, actx, tree, hf_mms_listOfData); -} -static int dissect_array_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_Data(TRUE, tvb, offset, actx, tree, hf_mms_array_01); -} -static int dissect_structure_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_Data(TRUE, tvb, offset, actx, tree, hf_mms_structure_01); -} @@ -2308,12 +1735,6 @@ dissect_mms_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_bit_string_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_BIT_STRING(TRUE, tvb, offset, actx, tree, hf_mms_bit_string_01); -} -static int dissect_booleanArray_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_BIT_STRING(TRUE, tvb, offset, actx, tree, hf_mms_booleanArray); -} @@ -2324,24 +1745,6 @@ dissect_mms_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ return offset; } -static int dissect_foo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_INTEGER(FALSE, tvb, offset, actx, tree, hf_mms_foo); -} -static int dissect_others_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_INTEGER(TRUE, tvb, offset, actx, tree, hf_mms_others); -} -static int dissect_additionalCode_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_INTEGER(TRUE, tvb, offset, actx, tree, hf_mms_additionalCode); -} -static int dissect_integer_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_INTEGER(TRUE, tvb, offset, actx, tree, hf_mms_integer_01); -} -static int dissect_unsigned_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_INTEGER(TRUE, tvb, offset, actx, tree, hf_mms_unsigned_01); -} -static int dissect_bcd_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_INTEGER(TRUE, tvb, offset, actx, tree, hf_mms_bcd_01); -} @@ -2352,9 +1755,6 @@ dissect_mms_FloatingPoint(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs return offset; } -static int dissect_floating_point_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FloatingPoint(TRUE, tvb, offset, actx, tree, hf_mms_floating_point); -} @@ -2365,27 +1765,6 @@ dissect_mms_TimeOfDay(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ return offset; } -static int dissect_binary_time_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_TimeOfDay(TRUE, tvb, offset, actx, tree, hf_mms_binary_time_01); -} -static int dissect_timeOfDayT_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_TimeOfDay(TRUE, tvb, offset, actx, tree, hf_mms_timeOfDayT); -} -static int dissect_startingTime_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_TimeOfDay(TRUE, tvb, offset, actx, tree, hf_mms_startingTime); -} -static int dissect_endingTime_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_TimeOfDay(TRUE, tvb, offset, actx, tree, hf_mms_endingTime); -} -static int dissect_timeSpecification_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_TimeOfDay(TRUE, tvb, offset, actx, tree, hf_mms_timeSpecification); -} -static int dissect_limitingTime_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_TimeOfDay(TRUE, tvb, offset, actx, tree, hf_mms_limitingTime); -} -static int dissect_occurenceTime_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_TimeOfDay(TRUE, tvb, offset, actx, tree, hf_mms_occurenceTime); -} static const value_string mms_Data_vals[] = { @@ -2404,48 +1783,45 @@ static const value_string mms_Data_vals[] = { { 0, NULL } }; -static const ber_old_choice_t Data_choice[] = { - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_array_01_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_structure_01_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_boolean_01_impl }, - { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_bit_string_01_impl }, - { 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_integer_01_impl }, - { 6, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_unsigned_01_impl }, - { 7, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_floating_point_impl }, - { 9, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_octet_string_01_impl }, - { 10, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_visible_string_01_impl }, - { 12, BER_CLASS_CON, 12, BER_FLAGS_IMPLTAG, dissect_binary_time_01_impl }, - { 13, BER_CLASS_CON, 13, BER_FLAGS_IMPLTAG, dissect_bcd_01_impl }, - { 14, BER_CLASS_CON, 14, BER_FLAGS_IMPLTAG, dissect_booleanArray_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t Data_choice[] = { + { 1, &hf_mms_array_01 , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_Data }, + { 2, &hf_mms_structure_01 , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_Data }, + { 3, &hf_mms_boolean_01 , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { 4, &hf_mms_bit_string_01 , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mms_BIT_STRING }, + { 5, &hf_mms_integer_01 , BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_mms_INTEGER }, + { 6, &hf_mms_unsigned_01 , BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_mms_INTEGER }, + { 7, &hf_mms_floating_point , BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_mms_FloatingPoint }, + { 9, &hf_mms_octet_string_01 , BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_mms_OCTET_STRING }, + { 10, &hf_mms_visible_string_01, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_mms_VisibleString }, + { 12, &hf_mms_binary_time_01 , BER_CLASS_CON, 12, BER_FLAGS_IMPLTAG, dissect_mms_TimeOfDay }, + { 13, &hf_mms_bcd_01 , BER_CLASS_CON, 13, BER_FLAGS_IMPLTAG, dissect_mms_INTEGER }, + { 14, &hf_mms_booleanArray , BER_CLASS_CON, 14, BER_FLAGS_IMPLTAG, dissect_mms_BIT_STRING }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_Data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - Data_choice, hf_index, ett_mms_Data, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + Data_choice, hf_index, ett_mms_Data, + NULL); return offset; } -static const ber_old_sequence_t Write_Request_sequence[] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableAccessSpecificatn }, - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfData_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t Write_Request_sequence[] = { + { &hf_mms_variableAccessSpecificatn, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_VariableAccessSpecification }, + { &hf_mms_listOfData , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_Data }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_Write_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Write_Request_sequence, hf_index, ett_mms_Write_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Write_Request_sequence, hf_index, ett_mms_Write_Request); return offset; } -static int dissect_write_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Write_Request(TRUE, tvb, offset, actx, tree, hf_mms_write); -} static const value_string mms_GetVariableAccessAttributes_Request_vals[] = { @@ -2454,60 +1830,51 @@ static const value_string mms_GetVariableAccessAttributes_Request_vals[] = { { 0, NULL } }; -static const ber_old_choice_t GetVariableAccessAttributes_Request_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_name }, - { 1, BER_CLASS_CON, 1, 0, dissect_address }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t GetVariableAccessAttributes_Request_choice[] = { + { 0, &hf_mms_name , BER_CLASS_CON, 0, 0, dissect_mms_ObjectName }, + { 1, &hf_mms_address , BER_CLASS_CON, 1, 0, dissect_mms_Address }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_GetVariableAccessAttributes_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - GetVariableAccessAttributes_Request_choice, hf_index, ett_mms_GetVariableAccessAttributes_Request, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + GetVariableAccessAttributes_Request_choice, hf_index, ett_mms_GetVariableAccessAttributes_Request, + NULL); return offset; } -static int dissect_getVariableAccessAttributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetVariableAccessAttributes_Request(FALSE, tvb, offset, actx, tree, hf_mms_getVariableAccessAttributes); -} -static const ber_old_sequence_t DefineNamedVariable_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_variableName }, - { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_address }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_typeSpecification }, - { 0, 0, 0, NULL } +static const ber_sequence_t DefineNamedVariable_Request_sequence[] = { + { &hf_mms_variableName , BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_address , BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_mms_Address }, + { &hf_mms_typeSpecification, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_mms_TypeSpecification }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_DefineNamedVariable_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - DefineNamedVariable_Request_sequence, hf_index, ett_mms_DefineNamedVariable_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + DefineNamedVariable_Request_sequence, hf_index, ett_mms_DefineNamedVariable_Request); return offset; } -static int dissect_defineNamedVariable_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DefineNamedVariable_Request(TRUE, tvb, offset, actx, tree, hf_mms_defineNamedVariable); -} -static const ber_old_sequence_t DefineScatteredAccess_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_scatteredAccessName }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_scatteredAccessDescription_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t DefineScatteredAccess_Request_sequence[] = { + { &hf_mms_scatteredAccessName, BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_scatteredAccessDescription, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_ScatteredAccessDescription }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_DefineScatteredAccess_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - DefineScatteredAccess_Request_sequence, hf_index, ett_mms_DefineScatteredAccess_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + DefineScatteredAccess_Request_sequence, hf_index, ett_mms_DefineScatteredAccess_Request); return offset; } -static int dissect_defineScatteredAccess_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DefineScatteredAccess_Request(TRUE, tvb, offset, actx, tree, hf_mms_defineScatteredAccess); -} @@ -2517,9 +1884,6 @@ dissect_mms_GetScatteredAccessAttributes_Request(gboolean implicit_tag _U_, tvbu return offset; } -static int dissect_getScatteredAccessAttributes_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetScatteredAccessAttributes_Request(TRUE, tvb, offset, actx, tree, hf_mms_getScatteredAccessAttributes); -} static const value_string mms_T_scopeOfDelete_vals[] = { @@ -2538,108 +1902,78 @@ dissect_mms_T_scopeOfDelete(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of return offset; } -static int dissect_scopeOfDelete_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_scopeOfDelete(TRUE, tvb, offset, actx, tree, hf_mms_scopeOfDelete); -} -static const ber_old_sequence_t SEQUENCE_OF_ObjectName_sequence_of[1] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listOfName_item }, +static const ber_sequence_t SEQUENCE_OF_ObjectName_sequence_of[1] = { + { &hf_mms_listOfName_item , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, }; static int dissect_mms_SEQUENCE_OF_ObjectName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_ObjectName_sequence_of, hf_index, ett_mms_SEQUENCE_OF_ObjectName); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_ObjectName_sequence_of, hf_index, ett_mms_SEQUENCE_OF_ObjectName); return offset; } -static int dissect_listOfName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_ObjectName(TRUE, tvb, offset, actx, tree, hf_mms_listOfName); -} -static int dissect_listOfVariableListName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_ObjectName(TRUE, tvb, offset, actx, tree, hf_mms_listOfVariableListName); -} -static int dissect_listOfTypeName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_ObjectName(TRUE, tvb, offset, actx, tree, hf_mms_listOfTypeName); -} -static int dissect_specific_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_ObjectName(TRUE, tvb, offset, actx, tree, hf_mms_specific); -} -static int dissect_eventEnrollmentNames_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_ObjectName(TRUE, tvb, offset, actx, tree, hf_mms_eventEnrollmentNames); -} -static const ber_old_sequence_t DeleteVariableAccess_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_scopeOfDelete_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfName_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_domainName_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t DeleteVariableAccess_Request_sequence[] = { + { &hf_mms_scopeOfDelete , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_T_scopeOfDelete }, + { &hf_mms_listOfName , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_ObjectName }, + { &hf_mms_domainName , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_DeleteVariableAccess_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - DeleteVariableAccess_Request_sequence, hf_index, ett_mms_DeleteVariableAccess_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + DeleteVariableAccess_Request_sequence, hf_index, ett_mms_DeleteVariableAccess_Request); return offset; } -static int dissect_deleteVariableAccess_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteVariableAccess_Request(TRUE, tvb, offset, actx, tree, hf_mms_deleteVariableAccess); -} -static const ber_old_sequence_t T_listOfVariable_item_sequence[] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableSpecification }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alternateAccess_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_listOfVariable_item_sequence[] = { + { &hf_mms_variableSpecification, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_VariableSpecification }, + { &hf_mms_alternateAccess , BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_AlternateAccess }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_listOfVariable_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - T_listOfVariable_item_sequence, hf_index, ett_mms_T_listOfVariable_item); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_listOfVariable_item_sequence, hf_index, ett_mms_T_listOfVariable_item); return offset; } -static int dissect_listOfVariable_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_listOfVariable_item(FALSE, tvb, offset, actx, tree, hf_mms_listOfVariable_item); -} -static const ber_old_sequence_t T_listOfVariable_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfVariable_item }, +static const ber_sequence_t T_listOfVariable_sequence_of[1] = { + { &hf_mms_listOfVariable_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mms_T_listOfVariable_item }, }; static int dissect_mms_T_listOfVariable(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - T_listOfVariable_sequence_of, hf_index, ett_mms_T_listOfVariable); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + T_listOfVariable_sequence_of, hf_index, ett_mms_T_listOfVariable); return offset; } -static int dissect_listOfVariable_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_listOfVariable(TRUE, tvb, offset, actx, tree, hf_mms_listOfVariable); -} -static const ber_old_sequence_t DefineNamedVariableList_Request_sequence[] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableListName }, - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfVariable_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t DefineNamedVariableList_Request_sequence[] = { + { &hf_mms_variableListName, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_listOfVariable , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_T_listOfVariable }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_DefineNamedVariableList_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - DefineNamedVariableList_Request_sequence, hf_index, ett_mms_DefineNamedVariableList_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + DefineNamedVariableList_Request_sequence, hf_index, ett_mms_DefineNamedVariableList_Request); return offset; } -static int dissect_defineNamedVariableList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DefineNamedVariableList_Request(TRUE, tvb, offset, actx, tree, hf_mms_defineNamedVariableList); -} @@ -2649,9 +1983,6 @@ dissect_mms_GetNamedVariableListAttributes_Request(gboolean implicit_tag _U_, tv return offset; } -static int dissect_getNamedVariableListAttributes_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetNamedVariableListAttributes_Request(TRUE, tvb, offset, actx, tree, hf_mms_getNamedVariableListAttributes); -} static const value_string mms_T_scopeOfDelete_01_vals[] = { @@ -2670,46 +2001,37 @@ dissect_mms_T_scopeOfDelete_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_scopeOfDelete_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_scopeOfDelete_01(TRUE, tvb, offset, actx, tree, hf_mms_scopeOfDelete_01); -} -static const ber_old_sequence_t DeleteNamedVariableList_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_scopeOfDelete_01_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfVariableListName_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_domainName_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t DeleteNamedVariableList_Request_sequence[] = { + { &hf_mms_scopeOfDelete_01, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_T_scopeOfDelete_01 }, + { &hf_mms_listOfVariableListName, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_ObjectName }, + { &hf_mms_domainName , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_DeleteNamedVariableList_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - DeleteNamedVariableList_Request_sequence, hf_index, ett_mms_DeleteNamedVariableList_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + DeleteNamedVariableList_Request_sequence, hf_index, ett_mms_DeleteNamedVariableList_Request); return offset; } -static int dissect_deleteNamedVariableList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteNamedVariableList_Request(TRUE, tvb, offset, actx, tree, hf_mms_deleteNamedVariableList); -} -static const ber_old_sequence_t DefineNamedType_Request_sequence[] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeName }, - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeSpecification }, - { 0, 0, 0, NULL } +static const ber_sequence_t DefineNamedType_Request_sequence[] = { + { &hf_mms_typeName , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_typeSpecification, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_TypeSpecification }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_DefineNamedType_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - DefineNamedType_Request_sequence, hf_index, ett_mms_DefineNamedType_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + DefineNamedType_Request_sequence, hf_index, ett_mms_DefineNamedType_Request); return offset; } -static int dissect_defineNamedType_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DefineNamedType_Request(TRUE, tvb, offset, actx, tree, hf_mms_defineNamedType); -} @@ -2719,9 +2041,6 @@ dissect_mms_GetNamedTypeAttributes_Request(gboolean implicit_tag _U_, tvbuff_t * return offset; } -static int dissect_getNamedTypeAttributes_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetNamedTypeAttributes_Request(TRUE, tvb, offset, actx, tree, hf_mms_getNamedTypeAttributes); -} static const value_string mms_T_scopeOfDelete_02_vals[] = { @@ -2740,98 +2059,80 @@ dissect_mms_T_scopeOfDelete_02(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_scopeOfDelete_02_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_scopeOfDelete_02(TRUE, tvb, offset, actx, tree, hf_mms_scopeOfDelete_02); -} -static const ber_old_sequence_t DeleteNamedType_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_scopeOfDelete_02_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfTypeName_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_domainName_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t DeleteNamedType_Request_sequence[] = { + { &hf_mms_scopeOfDelete_02, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_T_scopeOfDelete_02 }, + { &hf_mms_listOfTypeName , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_ObjectName }, + { &hf_mms_domainName , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_DeleteNamedType_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - DeleteNamedType_Request_sequence, hf_index, ett_mms_DeleteNamedType_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + DeleteNamedType_Request_sequence, hf_index, ett_mms_DeleteNamedType_Request); return offset; } -static int dissect_deleteNamedType_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteNamedType_Request(TRUE, tvb, offset, actx, tree, hf_mms_deleteNamedType); -} -static const ber_old_sequence_t T_listOfPromptData_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfPromptData_item }, +static const ber_sequence_t T_listOfPromptData_sequence_of[1] = { + { &hf_mms_listOfPromptData_item, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_mms_VisibleString }, }; static int dissect_mms_T_listOfPromptData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - T_listOfPromptData_sequence_of, hf_index, ett_mms_T_listOfPromptData); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + T_listOfPromptData_sequence_of, hf_index, ett_mms_T_listOfPromptData); return offset; } -static int dissect_listOfPromptData_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_listOfPromptData(TRUE, tvb, offset, actx, tree, hf_mms_listOfPromptData); -} -static const ber_old_sequence_t Input_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_operatorStationName_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_echo_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfPromptData_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inputTimeOut_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t Input_Request_sequence[] = { + { &hf_mms_operatorStationName, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { &hf_mms_echo , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_listOfPromptData, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_T_listOfPromptData }, + { &hf_mms_inputTimeOut , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_Input_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Input_Request_sequence, hf_index, ett_mms_Input_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Input_Request_sequence, hf_index, ett_mms_Input_Request); return offset; } -static int dissect_input_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Input_Request(TRUE, tvb, offset, actx, tree, hf_mms_input); -} -static const ber_old_sequence_t T_listOfOutputData_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfOutputData_item }, +static const ber_sequence_t T_listOfOutputData_sequence_of[1] = { + { &hf_mms_listOfOutputData_item, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_mms_VisibleString }, }; static int dissect_mms_T_listOfOutputData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - T_listOfOutputData_sequence_of, hf_index, ett_mms_T_listOfOutputData); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + T_listOfOutputData_sequence_of, hf_index, ett_mms_T_listOfOutputData); return offset; } -static int dissect_listOfOutputData_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_listOfOutputData(TRUE, tvb, offset, actx, tree, hf_mms_listOfOutputData); -} -static const ber_old_sequence_t Output_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_operatorStationName_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfOutputData_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t Output_Request_sequence[] = { + { &hf_mms_operatorStationName, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { &hf_mms_listOfOutputData, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_T_listOfOutputData }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_Output_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Output_Request_sequence, hf_index, ett_mms_Output_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Output_Request_sequence, hf_index, ett_mms_Output_Request); return offset; } -static int dissect_output_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Output_Request(TRUE, tvb, offset, actx, tree, hf_mms_output); -} @@ -2844,9 +2145,6 @@ dissect_mms_T_ap_title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_ap_title(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_ap_title(FALSE, tvb, offset, actx, tree, hf_mms_ap_title); -} @@ -2859,9 +2157,6 @@ dissect_mms_T_ap_invocation_id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_ap_invocation_id(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_ap_invocation_id(FALSE, tvb, offset, actx, tree, hf_mms_ap_invocation_id); -} @@ -2874,9 +2169,6 @@ dissect_mms_T_ae_qualifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off return offset; } -static int dissect_ae_qualifier(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_ae_qualifier(FALSE, tvb, offset, actx, tree, hf_mms_ae_qualifier); -} @@ -2889,86 +2181,59 @@ dissect_mms_T_ae_invocation_id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_ae_invocation_id(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_ae_invocation_id(FALSE, tvb, offset, actx, tree, hf_mms_ae_invocation_id); -} -static const ber_old_sequence_t ApplicationReference_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_ap_title }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_ap_invocation_id }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_ae_qualifier }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_ae_invocation_id }, - { 0, 0, 0, NULL } +static const ber_sequence_t ApplicationReference_sequence[] = { + { &hf_mms_ap_title , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_mms_T_ap_title }, + { &hf_mms_ap_invocation_id, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_mms_T_ap_invocation_id }, + { &hf_mms_ae_qualifier , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_mms_T_ae_qualifier }, + { &hf_mms_ae_invocation_id, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_mms_T_ae_invocation_id }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_ApplicationReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - ApplicationReference_sequence, hf_index, ett_mms_ApplicationReference); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ApplicationReference_sequence, hf_index, ett_mms_ApplicationReference); return offset; } -static int dissect_thirdParty_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ApplicationReference(TRUE, tvb, offset, actx, tree, hf_mms_thirdParty); -} -static int dissect_applicationToPreempt_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ApplicationReference(TRUE, tvb, offset, actx, tree, hf_mms_applicationToPreempt); -} -static int dissect_applicationReference(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ApplicationReference(FALSE, tvb, offset, actx, tree, hf_mms_applicationReference); -} -static int dissect_clientApplication(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ApplicationReference(FALSE, tvb, offset, actx, tree, hf_mms_clientApplication); -} -static int dissect_originatingApplication(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ApplicationReference(FALSE, tvb, offset, actx, tree, hf_mms_originatingApplication); -} -static int dissect_sourceFileServer_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ApplicationReference(TRUE, tvb, offset, actx, tree, hf_mms_sourceFileServer); -} -static const ber_old_sequence_t TakeControl_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_semaphoreName }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_namedToken_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_priority_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_acceptableDelay_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_controlTimeOut_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_abortOnTimeOut_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_relinquishIfConnectionLost_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_applicationToPreempt_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t TakeControl_Request_sequence[] = { + { &hf_mms_semaphoreName , BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_namedToken , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { &hf_mms_priority , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Priority }, + { &hf_mms_acceptableDelay , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { &hf_mms_controlTimeOut , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { &hf_mms_abortOnTimeOut , BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_relinquishIfConnectionLost, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_applicationToPreempt, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_ApplicationReference }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_TakeControl_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - TakeControl_Request_sequence, hf_index, ett_mms_TakeControl_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + TakeControl_Request_sequence, hf_index, ett_mms_TakeControl_Request); return offset; } -static int dissect_takeControl_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_TakeControl_Request(TRUE, tvb, offset, actx, tree, hf_mms_takeControl); -} -static const ber_old_sequence_t RelinquishControl_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_semaphoreName }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_namedToken_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t RelinquishControl_Request_sequence[] = { + { &hf_mms_semaphoreName , BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_namedToken , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_RelinquishControl_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - RelinquishControl_Request_sequence, hf_index, ett_mms_RelinquishControl_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + RelinquishControl_Request_sequence, hf_index, ett_mms_RelinquishControl_Request); return offset; } -static int dissect_relinquishControl_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_RelinquishControl_Request(TRUE, tvb, offset, actx, tree, hf_mms_relinquishControl); -} @@ -2979,36 +2244,21 @@ dissect_mms_Unsigned16(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_numbersOfTokens_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned16(TRUE, tvb, offset, actx, tree, hf_mms_numbersOfTokens); -} -static int dissect_numberOfTokens_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned16(TRUE, tvb, offset, actx, tree, hf_mms_numberOfTokens); -} -static int dissect_numberOfOwnedTokens_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned16(TRUE, tvb, offset, actx, tree, hf_mms_numberOfOwnedTokens); -} -static int dissect_numberOfHungTokens_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unsigned16(TRUE, tvb, offset, actx, tree, hf_mms_numberOfHungTokens); -} -static const ber_old_sequence_t DefineSemaphore_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_semaphoreName }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numbersOfTokens_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t DefineSemaphore_Request_sequence[] = { + { &hf_mms_semaphoreName , BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_numbersOfTokens , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned16 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_DefineSemaphore_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - DefineSemaphore_Request_sequence, hf_index, ett_mms_DefineSemaphore_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + DefineSemaphore_Request_sequence, hf_index, ett_mms_DefineSemaphore_Request); return offset; } -static int dissect_defineSemaphore_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DefineSemaphore_Request(TRUE, tvb, offset, actx, tree, hf_mms_defineSemaphore); -} @@ -3018,9 +2268,6 @@ dissect_mms_DeleteSemaphore_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ return offset; } -static int dissect_deleteSemaphore_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteSemaphore_Request(TRUE, tvb, offset, actx, tree, hf_mms_deleteSemaphore); -} @@ -3030,27 +2277,21 @@ dissect_mms_ReportSemaphoreStatus_Request(gboolean implicit_tag _U_, tvbuff_t *t return offset; } -static int dissect_reportSemaphoreStatus_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ReportSemaphoreStatus_Request(TRUE, tvb, offset, actx, tree, hf_mms_reportSemaphoreStatus); -} -static const ber_old_sequence_t ReportPoolSemaphoreStatus_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_semaphoreName }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_nameToStartAfter_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t ReportPoolSemaphoreStatus_Request_sequence[] = { + { &hf_mms_semaphoreName , BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_nameToStartAfter, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_ReportPoolSemaphoreStatus_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - ReportPoolSemaphoreStatus_Request_sequence, hf_index, ett_mms_ReportPoolSemaphoreStatus_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ReportPoolSemaphoreStatus_Request_sequence, hf_index, ett_mms_ReportPoolSemaphoreStatus_Request); return offset; } -static int dissect_reportPoolSemaphoreStatus_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ReportPoolSemaphoreStatus_Request(TRUE, tvb, offset, actx, tree, hf_mms_reportPoolSemaphoreStatus); -} static const value_string mms_T_state_vals[] = { @@ -3068,63 +2309,51 @@ dissect_mms_T_state(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ return offset; } -static int dissect_state_02_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_state(TRUE, tvb, offset, actx, tree, hf_mms_state_02); -} -static const ber_old_sequence_t ReportSemaphoreEntryStatus_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_semaphoreName }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_state_02_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_entryIdToStartAfter_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t ReportSemaphoreEntryStatus_Request_sequence[] = { + { &hf_mms_semaphoreName , BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_state_02 , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_T_state }, + { &hf_mms_entryIdToStartAfter, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_OCTET_STRING }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_ReportSemaphoreEntryStatus_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - ReportSemaphoreEntryStatus_Request_sequence, hf_index, ett_mms_ReportSemaphoreEntryStatus_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ReportSemaphoreEntryStatus_Request_sequence, hf_index, ett_mms_ReportSemaphoreEntryStatus_Request); return offset; } -static int dissect_reportSemaphoreEntryStatus_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ReportSemaphoreEntryStatus_Request(TRUE, tvb, offset, actx, tree, hf_mms_reportSemaphoreEntryStatus); -} -static const ber_old_sequence_t T_listOfCapabilities_01_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfCapabilities_item }, +static const ber_sequence_t T_listOfCapabilities_01_sequence_of[1] = { + { &hf_mms_listOfCapabilities_item, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_mms_VisibleString }, }; static int dissect_mms_T_listOfCapabilities_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - T_listOfCapabilities_01_sequence_of, hf_index, ett_mms_T_listOfCapabilities_01); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + T_listOfCapabilities_01_sequence_of, hf_index, ett_mms_T_listOfCapabilities_01); return offset; } -static int dissect_listOfCapabilities_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_listOfCapabilities_01(TRUE, tvb, offset, actx, tree, hf_mms_listOfCapabilities_01); -} -static const ber_old_sequence_t InitiateDownloadSequence_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_domainName_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfCapabilities_01_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_sharable_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t InitiateDownloadSequence_Request_sequence[] = { + { &hf_mms_domainName , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { &hf_mms_listOfCapabilities_01, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_T_listOfCapabilities_01 }, + { &hf_mms_sharable , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_InitiateDownloadSequence_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - InitiateDownloadSequence_Request_sequence, hf_index, ett_mms_InitiateDownloadSequence_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + InitiateDownloadSequence_Request_sequence, hf_index, ett_mms_InitiateDownloadSequence_Request); return offset; } -static int dissect_initiateDownloadSequence_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_InitiateDownloadSequence_Request(TRUE, tvb, offset, actx, tree, hf_mms_initiateDownloadSequence); -} @@ -3134,9 +2363,6 @@ dissect_mms_DownloadSegment_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ return offset; } -static int dissect_downloadSegment_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DownloadSegment_Request(TRUE, tvb, offset, actx, tree, hf_mms_downloadSegment); -} static const value_string mms_T_vmd_state_vals[] = { @@ -3156,9 +2382,6 @@ dissect_mms_T_vmd_state(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_vmd_state_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_vmd_state(TRUE, tvb, offset, actx, tree, hf_mms_vmd_state); -} static const value_string mms_T_application_reference_vals[] = { @@ -3178,9 +2401,6 @@ dissect_mms_T_application_reference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ return offset; } -static int dissect_application_reference_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_application_reference(TRUE, tvb, offset, actx, tree, hf_mms_application_reference); -} static const value_string mms_T_definition_vals[] = { @@ -3202,9 +2422,6 @@ dissect_mms_T_definition(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse return offset; } -static int dissect_definition_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_definition(TRUE, tvb, offset, actx, tree, hf_mms_definition); -} static const value_string mms_T_resource_vals[] = { @@ -3225,9 +2442,6 @@ dissect_mms_T_resource(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_resource_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_resource(TRUE, tvb, offset, actx, tree, hf_mms_resource); -} static const value_string mms_T_service_vals[] = { @@ -3248,9 +2462,6 @@ dissect_mms_T_service(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ return offset; } -static int dissect_service_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_service(TRUE, tvb, offset, actx, tree, hf_mms_service); -} static const value_string mms_T_service_preempt_vals[] = { @@ -3269,9 +2480,6 @@ dissect_mms_T_service_preempt(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_service_preempt_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_service_preempt(TRUE, tvb, offset, actx, tree, hf_mms_service_preempt); -} static const value_string mms_T_time_resolution_vals[] = { @@ -3288,9 +2496,6 @@ dissect_mms_T_time_resolution(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_time_resolution_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_time_resolution(TRUE, tvb, offset, actx, tree, hf_mms_time_resolution); -} static const value_string mms_T_access_vals[] = { @@ -3310,9 +2515,6 @@ dissect_mms_T_access(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U return offset; } -static int dissect_access_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_access(TRUE, tvb, offset, actx, tree, hf_mms_access); -} static const value_string mms_T_initiate_vals[] = { @@ -3335,9 +2537,6 @@ dissect_mms_T_initiate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_initiate_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_initiate(TRUE, tvb, offset, actx, tree, hf_mms_initiate); -} static const value_string mms_T_conclude_vals[] = { @@ -3354,9 +2553,6 @@ dissect_mms_T_conclude(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_conclude_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_conclude(TRUE, tvb, offset, actx, tree, hf_mms_conclude); -} static const value_string mms_T_cancel_vals[] = { @@ -3374,9 +2570,6 @@ dissect_mms_T_cancel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U return offset; } -static int dissect_cancel_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_cancel(TRUE, tvb, offset, actx, tree, hf_mms_cancel); -} static const value_string mms_T_file_vals[] = { @@ -3401,9 +2594,6 @@ dissect_mms_T_file(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, return offset; } -static int dissect_file_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_file(TRUE, tvb, offset, actx, tree, hf_mms_file); -} static const value_string mms_T_errorClass_vals[] = { @@ -3423,34 +2613,31 @@ static const value_string mms_T_errorClass_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_errorClass_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_vmd_state_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_application_reference_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_definition_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_resource_impl }, - { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_service_impl }, - { 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_service_preempt_impl }, - { 6, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_time_resolution_impl }, - { 7, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_access_impl }, - { 8, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_initiate_impl }, - { 9, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_conclude_impl }, - { 10, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_cancel_impl }, - { 11, BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_file_impl }, - { 12, BER_CLASS_CON, 12, BER_FLAGS_IMPLTAG, dissect_others_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_errorClass_choice[] = { + { 0, &hf_mms_vmd_state , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_T_vmd_state }, + { 1, &hf_mms_application_reference, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_T_application_reference }, + { 2, &hf_mms_definition , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_T_definition }, + { 3, &hf_mms_resource , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_mms_T_resource }, + { 4, &hf_mms_service , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mms_T_service }, + { 5, &hf_mms_service_preempt , BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_mms_T_service_preempt }, + { 6, &hf_mms_time_resolution , BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_mms_T_time_resolution }, + { 7, &hf_mms_access , BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_mms_T_access }, + { 8, &hf_mms_initiate , BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mms_T_initiate }, + { 9, &hf_mms_conclude , BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_mms_T_conclude }, + { 10, &hf_mms_cancel , BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_mms_T_cancel }, + { 11, &hf_mms_file , BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_mms_T_file }, + { 12, &hf_mms_others , BER_CLASS_CON, 12, BER_FLAGS_IMPLTAG, dissect_mms_INTEGER }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_errorClass(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_errorClass_choice, hf_index, ett_mms_T_errorClass, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_errorClass_choice, hf_index, ett_mms_T_errorClass, + NULL); return offset; } -static int dissect_errorClass(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_errorClass(FALSE, tvb, offset, actx, tree, hf_mms_errorClass); -} static const value_string mms_ObtainFile_Error_vals[] = { @@ -3467,9 +2654,6 @@ dissect_mms_ObtainFile_Error(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o return offset; } -static int dissect_obtainFile_02_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObtainFile_Error(TRUE, tvb, offset, actx, tree, hf_mms_obtainFile_02); -} static const value_string mms_ProgramInvocationState_vals[] = { @@ -3493,9 +2677,6 @@ dissect_mms_ProgramInvocationState(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_state_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ProgramInvocationState(TRUE, tvb, offset, actx, tree, hf_mms_state_01); -} @@ -3505,9 +2686,6 @@ dissect_mms_Start_Error(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_start_02_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Start_Error(TRUE, tvb, offset, actx, tree, hf_mms_start_02); -} @@ -3517,9 +2695,6 @@ dissect_mms_Stop_Error(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_stop_02_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Stop_Error(TRUE, tvb, offset, actx, tree, hf_mms_stop_02); -} @@ -3529,9 +2704,6 @@ dissect_mms_Resume_Error(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse return offset; } -static int dissect_resume_02_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Resume_Error(TRUE, tvb, offset, actx, tree, hf_mms_resume_02); -} @@ -3541,9 +2713,6 @@ dissect_mms_Reset_Error(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_reset_02_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Reset_Error(TRUE, tvb, offset, actx, tree, hf_mms_reset_02); -} @@ -3553,9 +2722,6 @@ dissect_mms_DeleteVariableAccess_Error(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static int dissect_deleteVariableAccess_02_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteVariableAccess_Error(TRUE, tvb, offset, actx, tree, hf_mms_deleteVariableAccess_02); -} @@ -3565,9 +2731,6 @@ dissect_mms_DeleteNamedVariableList_Error(gboolean implicit_tag _U_, tvbuff_t *t return offset; } -static int dissect_deleteNamedVariableList_02_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteNamedVariableList_Error(TRUE, tvb, offset, actx, tree, hf_mms_deleteNamedVariableList_02); -} @@ -3577,9 +2740,6 @@ dissect_mms_DeleteNamedType_Error(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_deleteNamedType_02_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteNamedType_Error(TRUE, tvb, offset, actx, tree, hf_mms_deleteNamedType_02); -} @@ -3589,9 +2749,6 @@ dissect_mms_DefineEventEnrollment_Error(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static int dissect_defineEventEnrollment_Error(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DefineEventEnrollment_Error(FALSE, tvb, offset, actx, tree, hf_mms_defineEventEnrollment_Error); -} static const value_string mms_FileRename_Error_vals[] = { @@ -3608,9 +2765,6 @@ dissect_mms_FileRename_Error(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o return offset; } -static int dissect_fileRename_02_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileRename_Error(TRUE, tvb, offset, actx, tree, hf_mms_fileRename_02); -} static const value_string mms_T_serviceSpecificInformation_vals[] = { @@ -3627,75 +2781,60 @@ static const value_string mms_T_serviceSpecificInformation_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_serviceSpecificInformation_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_obtainFile_02_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_start_02_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_stop_02_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_resume_02_impl }, - { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_reset_02_impl }, - { 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_deleteVariableAccess_02_impl }, - { 6, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_deleteNamedVariableList_02_impl }, - { 7, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_deleteNamedType_02_impl }, - { 8, BER_CLASS_CON, 8, 0, dissect_defineEventEnrollment_Error }, - { 9, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_fileRename_02_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_serviceSpecificInformation_choice[] = { + { 0, &hf_mms_obtainFile_02 , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_ObtainFile_Error }, + { 1, &hf_mms_start_02 , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_Start_Error }, + { 2, &hf_mms_stop_02 , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_Stop_Error }, + { 3, &hf_mms_resume_02 , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_mms_Resume_Error }, + { 4, &hf_mms_reset_02 , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mms_Reset_Error }, + { 5, &hf_mms_deleteVariableAccess_02, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_mms_DeleteVariableAccess_Error }, + { 6, &hf_mms_deleteNamedVariableList_02, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_mms_DeleteNamedVariableList_Error }, + { 7, &hf_mms_deleteNamedType_02, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_mms_DeleteNamedType_Error }, + { 8, &hf_mms_defineEventEnrollment_Error, BER_CLASS_CON, 8, 0, dissect_mms_DefineEventEnrollment_Error }, + { 9, &hf_mms_fileRename_02 , BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_mms_FileRename_Error }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_serviceSpecificInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_serviceSpecificInformation_choice, hf_index, ett_mms_T_serviceSpecificInformation, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_serviceSpecificInformation_choice, hf_index, ett_mms_T_serviceSpecificInformation, + NULL); return offset; } -static int dissect_serviceSpecificInformation(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_serviceSpecificInformation(FALSE, tvb, offset, actx, tree, hf_mms_serviceSpecificInformation); -} -static const ber_old_sequence_t ServiceError_sequence[] = { - { BER_CLASS_CON, 0, 0, dissect_errorClass }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_additionalCode_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_additionalDescription_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_serviceSpecificInformation }, - { 0, 0, 0, NULL } +static const ber_sequence_t ServiceError_sequence[] = { + { &hf_mms_errorClass , BER_CLASS_CON, 0, 0, dissect_mms_T_errorClass }, + { &hf_mms_additionalCode , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_INTEGER }, + { &hf_mms_additionalDescription, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_VisibleString }, + { &hf_mms_serviceSpecificInformation, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_mms_T_serviceSpecificInformation }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_ServiceError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - ServiceError_sequence, hf_index, ett_mms_ServiceError); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ServiceError_sequence, hf_index, ett_mms_ServiceError); return offset; } -static int dissect_serviceError_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ServiceError(TRUE, tvb, offset, actx, tree, hf_mms_serviceError); -} -static int dissect_discard_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ServiceError(TRUE, tvb, offset, actx, tree, hf_mms_discard); -} -static int dissect_failure_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ServiceError(TRUE, tvb, offset, actx, tree, hf_mms_failure_01); -} -static const ber_old_sequence_t TerminateDownloadSequence_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_domainName_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_discard_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t TerminateDownloadSequence_Request_sequence[] = { + { &hf_mms_domainName , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { &hf_mms_discard , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_ServiceError }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_TerminateDownloadSequence_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - TerminateDownloadSequence_Request_sequence, hf_index, ett_mms_TerminateDownloadSequence_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + TerminateDownloadSequence_Request_sequence, hf_index, ett_mms_TerminateDownloadSequence_Request); return offset; } -static int dissect_terminateDownloadSequence_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_TerminateDownloadSequence_Request(TRUE, tvb, offset, actx, tree, hf_mms_terminateDownloadSequence); -} @@ -3705,9 +2844,6 @@ dissect_mms_InitiateUploadSequence_Request(gboolean implicit_tag _U_, tvbuff_t * return offset; } -static int dissect_initiateUploadSequence_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_InitiateUploadSequence_Request(TRUE, tvb, offset, actx, tree, hf_mms_initiateUploadSequence); -} @@ -3717,9 +2853,6 @@ dissect_mms_UploadSegment_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_uploadSegment_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_UploadSegment_Request(TRUE, tvb, offset, actx, tree, hf_mms_uploadSegment); -} @@ -3729,25 +2862,19 @@ dissect_mms_TerminateUploadSequence_Request(gboolean implicit_tag _U_, tvbuff_t return offset; } -static int dissect_terminateUploadSequence_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_TerminateUploadSequence_Request(TRUE, tvb, offset, actx, tree, hf_mms_terminateUploadSequence); -} -static const ber_old_sequence_t T_listOfCapabilities_03_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfCapabilities_item }, +static const ber_sequence_t T_listOfCapabilities_03_sequence_of[1] = { + { &hf_mms_listOfCapabilities_item, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_mms_VisibleString }, }; static int dissect_mms_T_listOfCapabilities_03(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - T_listOfCapabilities_03_sequence_of, hf_index, ett_mms_T_listOfCapabilities_03); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + T_listOfCapabilities_03_sequence_of, hf_index, ett_mms_T_listOfCapabilities_03); return offset; } -static int dissect_listOfCapabilities_03_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_listOfCapabilities_03(TRUE, tvb, offset, actx, tree, hf_mms_listOfCapabilities_03); -} @@ -3759,143 +2886,98 @@ dissect_mms_GraphicString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs return offset; } -static int dissect_FileName_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GraphicString(FALSE, tvb, offset, actx, tree, hf_mms_FileName_item); -} -static const ber_old_sequence_t FileName_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_NOOWNTAG, dissect_FileName_item }, +static const ber_sequence_t FileName_sequence_of[1] = { + { &hf_mms_FileName_item , BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_NOOWNTAG, dissect_mms_GraphicString }, }; static int dissect_mms_FileName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - FileName_sequence_of, hf_index, ett_mms_FileName); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + FileName_sequence_of, hf_index, ett_mms_FileName); return offset; } -static int dissect_fileName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileName(TRUE, tvb, offset, actx, tree, hf_mms_fileName); -} -static int dissect_filenName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileName(TRUE, tvb, offset, actx, tree, hf_mms_filenName); -} -static int dissect_sourceFile_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileName(TRUE, tvb, offset, actx, tree, hf_mms_sourceFile); -} -static int dissect_destinationFile_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileName(TRUE, tvb, offset, actx, tree, hf_mms_destinationFile); -} -static int dissect_currentFileName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileName(TRUE, tvb, offset, actx, tree, hf_mms_currentFileName); -} -static int dissect_newFileName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileName(TRUE, tvb, offset, actx, tree, hf_mms_newFileName); -} -static int dissect_fileSpecification_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileName(TRUE, tvb, offset, actx, tree, hf_mms_fileSpecification); -} -static int dissect_continueAfter_03_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileName(TRUE, tvb, offset, actx, tree, hf_mms_continueAfter_03); -} -static int dissect_filename_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileName(TRUE, tvb, offset, actx, tree, hf_mms_filename); -} -static const ber_old_sequence_t RequestDomainDownload_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_domainName_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfCapabilities_03_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_sharable_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_fileName_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t RequestDomainDownload_Request_sequence[] = { + { &hf_mms_domainName , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { &hf_mms_listOfCapabilities_03, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_T_listOfCapabilities_03 }, + { &hf_mms_sharable , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_fileName , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mms_FileName }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_RequestDomainDownload_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - RequestDomainDownload_Request_sequence, hf_index, ett_mms_RequestDomainDownload_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + RequestDomainDownload_Request_sequence, hf_index, ett_mms_RequestDomainDownload_Request); return offset; } -static int dissect_requestDomainDownload_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_RequestDomainDownload_Request(TRUE, tvb, offset, actx, tree, hf_mms_requestDomainDownload); -} -static const ber_old_sequence_t RequestDomainUpload_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_domainName_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_fileName_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t RequestDomainUpload_Request_sequence[] = { + { &hf_mms_domainName , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { &hf_mms_fileName , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_FileName }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_RequestDomainUpload_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - RequestDomainUpload_Request_sequence, hf_index, ett_mms_RequestDomainUpload_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + RequestDomainUpload_Request_sequence, hf_index, ett_mms_RequestDomainUpload_Request); return offset; } -static int dissect_requestDomainUpload_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_RequestDomainUpload_Request(TRUE, tvb, offset, actx, tree, hf_mms_requestDomainUpload); -} -static const ber_old_sequence_t T_listOfCapabilities_04_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfCapabilities_item }, +static const ber_sequence_t T_listOfCapabilities_04_sequence_of[1] = { + { &hf_mms_listOfCapabilities_item, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_mms_VisibleString }, }; static int dissect_mms_T_listOfCapabilities_04(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - T_listOfCapabilities_04_sequence_of, hf_index, ett_mms_T_listOfCapabilities_04); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + T_listOfCapabilities_04_sequence_of, hf_index, ett_mms_T_listOfCapabilities_04); return offset; } -static int dissect_listOfCapabilities_04_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_listOfCapabilities_04(TRUE, tvb, offset, actx, tree, hf_mms_listOfCapabilities_04); -} -static const ber_old_sequence_t LoadDomainContent_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_domainName_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfCapabilities_04_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_sharable_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_fileName_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_thirdParty_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t LoadDomainContent_Request_sequence[] = { + { &hf_mms_domainName , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { &hf_mms_listOfCapabilities_04, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_T_listOfCapabilities_04 }, + { &hf_mms_sharable , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_fileName , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mms_FileName }, + { &hf_mms_thirdParty , BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_ApplicationReference }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_LoadDomainContent_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - LoadDomainContent_Request_sequence, hf_index, ett_mms_LoadDomainContent_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + LoadDomainContent_Request_sequence, hf_index, ett_mms_LoadDomainContent_Request); return offset; } -static int dissect_loadDomainContent_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_LoadDomainContent_Request(TRUE, tvb, offset, actx, tree, hf_mms_loadDomainContent); -} -static const ber_old_sequence_t StoreDomainContent_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_domainName_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_filenName_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_thirdParty_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t StoreDomainContent_Request_sequence[] = { + { &hf_mms_domainName , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { &hf_mms_filenName , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_FileName }, + { &hf_mms_thirdParty , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_ApplicationReference }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_StoreDomainContent_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - StoreDomainContent_Request_sequence, hf_index, ett_mms_StoreDomainContent_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + StoreDomainContent_Request_sequence, hf_index, ett_mms_StoreDomainContent_Request); return offset; } -static int dissect_storeDomainContent_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_StoreDomainContent_Request(TRUE, tvb, offset, actx, tree, hf_mms_storeDomainContent); -} @@ -3905,9 +2987,6 @@ dissect_mms_DeleteDomain_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i return offset; } -static int dissect_deleteDomain_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteDomain_Request(TRUE, tvb, offset, actx, tree, hf_mms_deleteDomain); -} @@ -3917,54 +2996,36 @@ dissect_mms_GetDomainAttributes_Request(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static int dissect_getDomainAttributes_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetDomainAttributes_Request(TRUE, tvb, offset, actx, tree, hf_mms_getDomainAttributes); -} -static const ber_old_sequence_t SEQUENCE_OF_Identifier_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfIdentifier_item }, +static const ber_sequence_t SEQUENCE_OF_Identifier_sequence_of[1] = { + { &hf_mms_listOfIdentifier_item, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_mms_Identifier }, }; static int dissect_mms_SEQUENCE_OF_Identifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_Identifier_sequence_of, hf_index, ett_mms_SEQUENCE_OF_Identifier); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_Identifier_sequence_of, hf_index, ett_mms_SEQUENCE_OF_Identifier); return offset; } -static int dissect_listOfIdentifier_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_Identifier(TRUE, tvb, offset, actx, tree, hf_mms_listOfIdentifier); -} -static int dissect_listOfProgramInvocations_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_Identifier(TRUE, tvb, offset, actx, tree, hf_mms_listOfProgramInvocations); -} -static int dissect_listOfDomainName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_Identifier(TRUE, tvb, offset, actx, tree, hf_mms_listOfDomainName); -} -static int dissect_listOfDomainNames_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_Identifier(TRUE, tvb, offset, actx, tree, hf_mms_listOfDomainNames); -} -static const ber_old_sequence_t CreateProgramInvocation_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_programInvocationName_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfDomainName_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reusable_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_monitorType_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t CreateProgramInvocation_Request_sequence[] = { + { &hf_mms_programInvocationName, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { &hf_mms_listOfDomainName, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_Identifier }, + { &hf_mms_reusable , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_monitorType , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_CreateProgramInvocation_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - CreateProgramInvocation_Request_sequence, hf_index, ett_mms_CreateProgramInvocation_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + CreateProgramInvocation_Request_sequence, hf_index, ett_mms_CreateProgramInvocation_Request); return offset; } -static int dissect_createProgramInvocation_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_CreateProgramInvocation_Request(TRUE, tvb, offset, actx, tree, hf_mms_createProgramInvocation); -} @@ -3974,9 +3035,6 @@ dissect_mms_DeleteProgramInvocation_Request(gboolean implicit_tag _U_, tvbuff_t return offset; } -static int dissect_deleteProgramInvocation_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteProgramInvocation_Request(TRUE, tvb, offset, actx, tree, hf_mms_deleteProgramInvocation); -} static const value_string mms_T_executionArgument_vals[] = { @@ -3985,58 +3043,49 @@ static const value_string mms_T_executionArgument_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_executionArgument_choice[] = { - { 0, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_simpleString_impl }, - { 1, BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_encodedString }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_executionArgument_choice[] = { + { 0, &hf_mms_simpleString , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_VisibleString }, + { 1, &hf_mms_encodedString , BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_acse_EXTERNALt }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_executionArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_executionArgument_choice, hf_index, ett_mms_T_executionArgument, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_executionArgument_choice, hf_index, ett_mms_T_executionArgument, + NULL); return offset; } -static int dissect_executionArgument(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_executionArgument(FALSE, tvb, offset, actx, tree, hf_mms_executionArgument); -} -static const ber_old_sequence_t Start_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_programInvocationName_impl }, - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_executionArgument }, - { 0, 0, 0, NULL } +static const ber_sequence_t Start_Request_sequence[] = { + { &hf_mms_programInvocationName, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { &hf_mms_executionArgument, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_T_executionArgument }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_Start_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Start_Request_sequence, hf_index, ett_mms_Start_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Start_Request_sequence, hf_index, ett_mms_Start_Request); return offset; } -static int dissect_start_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Start_Request(TRUE, tvb, offset, actx, tree, hf_mms_start); -} -static const ber_old_sequence_t Stop_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_programInvocationName_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t Stop_Request_sequence[] = { + { &hf_mms_programInvocationName, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_Stop_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Stop_Request_sequence, hf_index, ett_mms_Stop_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Stop_Request_sequence, hf_index, ett_mms_Stop_Request); return offset; } -static int dissect_stop_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Stop_Request(TRUE, tvb, offset, actx, tree, hf_mms_stop); -} static const value_string mms_T_executionArgument_01_vals[] = { @@ -4045,75 +3094,63 @@ static const value_string mms_T_executionArgument_01_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_executionArgument_01_choice[] = { - { 0, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_simpleString_impl }, - { 1, BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_encodedString }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_executionArgument_01_choice[] = { + { 0, &hf_mms_simpleString , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_VisibleString }, + { 1, &hf_mms_encodedString , BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_acse_EXTERNALt }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_executionArgument_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_executionArgument_01_choice, hf_index, ett_mms_T_executionArgument_01, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_executionArgument_01_choice, hf_index, ett_mms_T_executionArgument_01, + NULL); return offset; } -static int dissect_executionArgument_01(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_executionArgument_01(FALSE, tvb, offset, actx, tree, hf_mms_executionArgument_01); -} -static const ber_old_sequence_t Resume_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_programInvocationName_impl }, - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_executionArgument_01 }, - { 0, 0, 0, NULL } +static const ber_sequence_t Resume_Request_sequence[] = { + { &hf_mms_programInvocationName, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { &hf_mms_executionArgument_01, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_T_executionArgument_01 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_Resume_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Resume_Request_sequence, hf_index, ett_mms_Resume_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Resume_Request_sequence, hf_index, ett_mms_Resume_Request); return offset; } -static int dissect_resume_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Resume_Request(TRUE, tvb, offset, actx, tree, hf_mms_resume); -} -static const ber_old_sequence_t Reset_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_programInvocationName_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t Reset_Request_sequence[] = { + { &hf_mms_programInvocationName, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_Reset_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Reset_Request_sequence, hf_index, ett_mms_Reset_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Reset_Request_sequence, hf_index, ett_mms_Reset_Request); return offset; } -static int dissect_reset_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Reset_Request(TRUE, tvb, offset, actx, tree, hf_mms_reset); -} -static const ber_old_sequence_t Kill_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_programInvocationName_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t Kill_Request_sequence[] = { + { &hf_mms_programInvocationName, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_Kill_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Kill_Request_sequence, hf_index, ett_mms_Kill_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Kill_Request_sequence, hf_index, ett_mms_Kill_Request); return offset; } -static int dissect_kill_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Kill_Request(TRUE, tvb, offset, actx, tree, hf_mms_kill); -} @@ -4123,28 +3160,22 @@ dissect_mms_GetProgramInvocationAttributes_Request(gboolean implicit_tag _U_, tv return offset; } -static int dissect_getProgramInvocationAttributes_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetProgramInvocationAttributes_Request(TRUE, tvb, offset, actx, tree, hf_mms_getProgramInvocationAttributes); -} -static const ber_old_sequence_t ObtainFile_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sourceFileServer_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_sourceFile_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_destinationFile_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t ObtainFile_Request_sequence[] = { + { &hf_mms_sourceFileServer, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_ApplicationReference }, + { &hf_mms_sourceFile , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_FileName }, + { &hf_mms_destinationFile , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_FileName }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_ObtainFile_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - ObtainFile_Request_sequence, hf_index, ett_mms_ObtainFile_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ObtainFile_Request_sequence, hf_index, ett_mms_ObtainFile_Request); return offset; } -static int dissect_obtainFile_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObtainFile_Request(TRUE, tvb, offset, actx, tree, hf_mms_obtainFile); -} static const value_string mms_EC_Class_vals[] = { @@ -4161,32 +3192,26 @@ dissect_mms_EC_Class(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U return offset; } -static int dissect_class_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_EC_Class(TRUE, tvb, offset, actx, tree, hf_mms_class_01); -} -static const ber_old_sequence_t DefineEventCondition_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventConditionName }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_class_01_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_prio_rity_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_severity_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alarmSummaryReports_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_monitoredVariable }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_evaluationInterval_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t DefineEventCondition_Request_sequence[] = { + { &hf_mms_eventConditionName, BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_class_01 , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_EC_Class }, + { &hf_mms_prio_rity , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Priority }, + { &hf_mms_severity , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Unsigned8 }, + { &hf_mms_alarmSummaryReports, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_monitoredVariable, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_mms_VariableSpecification }, + { &hf_mms_evaluationInterval, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_DefineEventCondition_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - DefineEventCondition_Request_sequence, hf_index, ett_mms_DefineEventCondition_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + DefineEventCondition_Request_sequence, hf_index, ett_mms_DefineEventCondition_Request); return offset; } -static int dissect_defineEventCondition_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DefineEventCondition_Request(TRUE, tvb, offset, actx, tree, hf_mms_defineEventCondition); -} static const value_string mms_DeleteEventCondition_Request_vals[] = { @@ -4197,25 +3222,22 @@ static const value_string mms_DeleteEventCondition_Request_vals[] = { { 0, NULL } }; -static const ber_old_choice_t DeleteEventCondition_Request_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_specific_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_aa_specific_01_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_domain_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_vmd_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t DeleteEventCondition_Request_choice[] = { + { 0, &hf_mms_specific , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_ObjectName }, + { 1, &hf_mms_aa_specific_01 , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_NULL }, + { 2, &hf_mms_domain , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { 3, &hf_mms_vmd , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_mms_NULL }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_DeleteEventCondition_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - DeleteEventCondition_Request_choice, hf_index, ett_mms_DeleteEventCondition_Request, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + DeleteEventCondition_Request_choice, hf_index, ett_mms_DeleteEventCondition_Request, + NULL); return offset; } -static int dissect_deleteEventCondition(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteEventCondition_Request(FALSE, tvb, offset, actx, tree, hf_mms_deleteEventCondition); -} @@ -4225,9 +3247,6 @@ dissect_mms_GetEventConditionAttributes_Request(gboolean implicit_tag _U_, tvbuf return offset; } -static int dissect_getEventConditionAttributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetEventConditionAttributes_Request(FALSE, tvb, offset, actx, tree, hf_mms_getEventConditionAttributes); -} @@ -4237,66 +3256,54 @@ dissect_mms_ReportEventConditionStatus_Request(gboolean implicit_tag _U_, tvbuff return offset; } -static int dissect_reportEventConditionStatus(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ReportEventConditionStatus_Request(FALSE, tvb, offset, actx, tree, hf_mms_reportEventConditionStatus); -} -static const ber_old_sequence_t AlterEventConditionMonitoring_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventConditionName }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_enabled_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_priority_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alarmSummaryReports_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_evaluationInterval_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t AlterEventConditionMonitoring_Request_sequence[] = { + { &hf_mms_eventConditionName, BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_enabled , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_priority , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Priority }, + { &hf_mms_alarmSummaryReports, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_evaluationInterval, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_AlterEventConditionMonitoring_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - AlterEventConditionMonitoring_Request_sequence, hf_index, ett_mms_AlterEventConditionMonitoring_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + AlterEventConditionMonitoring_Request_sequence, hf_index, ett_mms_AlterEventConditionMonitoring_Request); return offset; } -static int dissect_alterEventConditionMonitoring_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_AlterEventConditionMonitoring_Request(TRUE, tvb, offset, actx, tree, hf_mms_alterEventConditionMonitoring); -} -static const ber_old_sequence_t TriggerEvent_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventConditionName }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_priority_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t TriggerEvent_Request_sequence[] = { + { &hf_mms_eventConditionName, BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_priority , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Priority }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_TriggerEvent_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - TriggerEvent_Request_sequence, hf_index, ett_mms_TriggerEvent_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + TriggerEvent_Request_sequence, hf_index, ett_mms_TriggerEvent_Request); return offset; } -static int dissect_triggerEvent_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_TriggerEvent_Request(TRUE, tvb, offset, actx, tree, hf_mms_triggerEvent); -} -static const ber_old_sequence_t DefineEventAction_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventActionName }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfModifier_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t DefineEventAction_Request_sequence[] = { + { &hf_mms_eventActionName , BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_listOfModifier , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_Modifier }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_DefineEventAction_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - DefineEventAction_Request_sequence, hf_index, ett_mms_DefineEventAction_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + DefineEventAction_Request_sequence, hf_index, ett_mms_DefineEventAction_Request); return offset; } -static int dissect_defineEventAction_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DefineEventAction_Request(TRUE, tvb, offset, actx, tree, hf_mms_defineEventAction); -} static const value_string mms_DeleteEventAction_Request_vals[] = { @@ -4307,25 +3314,22 @@ static const value_string mms_DeleteEventAction_Request_vals[] = { { 0, NULL } }; -static const ber_old_choice_t DeleteEventAction_Request_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_specific_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_aa_specific_01_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_domain_impl }, - { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_vmd_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t DeleteEventAction_Request_choice[] = { + { 0, &hf_mms_specific , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_ObjectName }, + { 1, &hf_mms_aa_specific_01 , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_NULL }, + { 3, &hf_mms_domain , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { 4, &hf_mms_vmd , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mms_NULL }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_DeleteEventAction_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - DeleteEventAction_Request_choice, hf_index, ett_mms_DeleteEventAction_Request, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + DeleteEventAction_Request_choice, hf_index, ett_mms_DeleteEventAction_Request, + NULL); return offset; } -static int dissect_deleteEventAction(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteEventAction_Request(FALSE, tvb, offset, actx, tree, hf_mms_deleteEventAction); -} @@ -4335,9 +3339,6 @@ dissect_mms_GetEventActionAttributes_Request(gboolean implicit_tag _U_, tvbuff_t return offset; } -static int dissect_getEventActionAttributes(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetEventActionAttributes_Request(FALSE, tvb, offset, actx, tree, hf_mms_getEventActionAttributes); -} @@ -4347,9 +3348,6 @@ dissect_mms_ReportEventActionStatus_Request(gboolean implicit_tag _U_, tvbuff_t return offset; } -static int dissect_reportEventActionStatus(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ReportEventActionStatus_Request(FALSE, tvb, offset, actx, tree, hf_mms_reportEventActionStatus); -} static const value_string mms_AlarmAckRule_vals[] = { @@ -4368,34 +3366,25 @@ dissect_mms_AlarmAckRule(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse return offset; } -static int dissect_alarmAcknowledgementRule_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_AlarmAckRule(TRUE, tvb, offset, actx, tree, hf_mms_alarmAcknowledgementRule); -} -static int dissect_alarmAcknowledgmentRule_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_AlarmAckRule(TRUE, tvb, offset, actx, tree, hf_mms_alarmAcknowledgmentRule); -} -static const ber_old_sequence_t DefineEventEnrollment_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventEnrollmentName }, - { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_eventConditionName }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_eventConditionTransition_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_alarmAcknowledgementRule_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_eventActionName }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_clientApplication }, - { 0, 0, 0, NULL } +static const ber_sequence_t DefineEventEnrollment_Request_sequence[] = { + { &hf_mms_eventEnrollmentName, BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_eventConditionName, BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_eventConditionTransition, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_Transitions }, + { &hf_mms_alarmAcknowledgementRule, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_mms_AlarmAckRule }, + { &hf_mms_eventActionName , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_clientApplication, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_mms_ApplicationReference }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_DefineEventEnrollment_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - DefineEventEnrollment_Request_sequence, hf_index, ett_mms_DefineEventEnrollment_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + DefineEventEnrollment_Request_sequence, hf_index, ett_mms_DefineEventEnrollment_Request); return offset; } -static int dissect_defineEventEnrollment_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DefineEventEnrollment_Request(TRUE, tvb, offset, actx, tree, hf_mms_defineEventEnrollment); -} static const value_string mms_DeleteEventEnrollment_Request_vals[] = { @@ -4405,43 +3394,37 @@ static const value_string mms_DeleteEventEnrollment_Request_vals[] = { { 0, NULL } }; -static const ber_old_choice_t DeleteEventEnrollment_Request_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_specific_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_ec }, - { 2, BER_CLASS_CON, 2, 0, dissect_ea }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t DeleteEventEnrollment_Request_choice[] = { + { 0, &hf_mms_specific , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_ObjectName }, + { 1, &hf_mms_ec , BER_CLASS_CON, 1, 0, dissect_mms_ObjectName }, + { 2, &hf_mms_ea , BER_CLASS_CON, 2, 0, dissect_mms_ObjectName }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_DeleteEventEnrollment_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - DeleteEventEnrollment_Request_choice, hf_index, ett_mms_DeleteEventEnrollment_Request, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + DeleteEventEnrollment_Request_choice, hf_index, ett_mms_DeleteEventEnrollment_Request, + NULL); return offset; } -static int dissect_deleteEventEnrollment(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteEventEnrollment_Request(FALSE, tvb, offset, actx, tree, hf_mms_deleteEventEnrollment); -} -static const ber_old_sequence_t AlterEventEnrollment_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventEnrollmentName }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventConditionTransitions_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alarmAcknowledgmentRule_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t AlterEventEnrollment_Request_sequence[] = { + { &hf_mms_eventEnrollmentName, BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_eventConditionTransitions, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Transitions }, + { &hf_mms_alarmAcknowledgmentRule, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_AlarmAckRule }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_AlterEventEnrollment_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - AlterEventEnrollment_Request_sequence, hf_index, ett_mms_AlterEventEnrollment_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + AlterEventEnrollment_Request_sequence, hf_index, ett_mms_AlterEventEnrollment_Request); return offset; } -static int dissect_alterEventEnrollment_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_AlterEventEnrollment_Request(TRUE, tvb, offset, actx, tree, hf_mms_alterEventEnrollment); -} @@ -4451,9 +3434,6 @@ dissect_mms_ReportEventEnrollmentStatus_Request(gboolean implicit_tag _U_, tvbuf return offset; } -static int dissect_reportEventEnrollmentStatus(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ReportEventEnrollmentStatus_Request(FALSE, tvb, offset, actx, tree, hf_mms_reportEventEnrollmentStatus); -} static const value_string mms_T_scopeOfRequest_vals[] = { @@ -4472,31 +3452,25 @@ dissect_mms_T_scopeOfRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o return offset; } -static int dissect_scopeOfRequest_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_scopeOfRequest(TRUE, tvb, offset, actx, tree, hf_mms_scopeOfRequest); -} -static const ber_old_sequence_t GetEventEnrollmentAttributes_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_scopeOfRequest_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventEnrollmentNames_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_clientApplication }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_eventConditionName }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_eventActionName }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_continueAfter_02 }, - { 0, 0, 0, NULL } +static const ber_sequence_t GetEventEnrollmentAttributes_Request_sequence[] = { + { &hf_mms_scopeOfRequest , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_T_scopeOfRequest }, + { &hf_mms_eventEnrollmentNames, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_ObjectName }, + { &hf_mms_clientApplication, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_mms_ApplicationReference }, + { &hf_mms_eventConditionName, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_eventActionName , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_continueAfter_02, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_GetEventEnrollmentAttributes_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - GetEventEnrollmentAttributes_Request_sequence, hf_index, ett_mms_GetEventEnrollmentAttributes_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + GetEventEnrollmentAttributes_Request_sequence, hf_index, ett_mms_GetEventEnrollmentAttributes_Request); return offset; } -static int dissect_getEventEnrollmentAttributes_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetEventEnrollmentAttributes_Request(TRUE, tvb, offset, actx, tree, hf_mms_getEventEnrollmentAttributes); -} static const value_string mms_EC_State_vals[] = { @@ -4514,12 +3488,6 @@ dissect_mms_EC_State(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U return offset; } -static int dissect_currentState_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_EC_State(TRUE, tvb, offset, actx, tree, hf_mms_currentState); -} -static int dissect_acknowledgedState_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_EC_State(TRUE, tvb, offset, actx, tree, hf_mms_acknowledgedState); -} static const value_string mms_EventTime_vals[] = { @@ -4528,57 +3496,36 @@ static const value_string mms_EventTime_vals[] = { { 0, NULL } }; -static const ber_old_choice_t EventTime_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_timeOfDayT_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_timeSequenceIdentifier_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t EventTime_choice[] = { + { 0, &hf_mms_timeOfDayT , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_TimeOfDay }, + { 1, &hf_mms_timeSequenceIdentifier, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_EventTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - EventTime_choice, hf_index, ett_mms_EventTime, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + EventTime_choice, hf_index, ett_mms_EventTime, + NULL); return offset; } -static int dissect_timeOfLastTransitionToActive(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_EventTime(FALSE, tvb, offset, actx, tree, hf_mms_timeOfLastTransitionToActive); -} -static int dissect_timeOfLastTransitionToIdle(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_EventTime(FALSE, tvb, offset, actx, tree, hf_mms_timeOfLastTransitionToIdle); -} -static int dissect_transitionTime(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_EventTime(FALSE, tvb, offset, actx, tree, hf_mms_transitionTime); -} -static int dissect_timeOfAcknowledgedTransition(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_EventTime(FALSE, tvb, offset, actx, tree, hf_mms_timeOfAcknowledgedTransition); -} -static int dissect_timeActiveAcknowledged(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_EventTime(FALSE, tvb, offset, actx, tree, hf_mms_timeActiveAcknowledged); -} -static int dissect_timeIdleAcknowledged(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_EventTime(FALSE, tvb, offset, actx, tree, hf_mms_timeIdleAcknowledged); -} -static const ber_old_sequence_t AcknowledgeEventNotification_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventEnrollmentName }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_acknowledgedState_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_NOTCHKTAG, dissect_timeOfAcknowledgedTransition }, - { 0, 0, 0, NULL } +static const ber_sequence_t AcknowledgeEventNotification_Request_sequence[] = { + { &hf_mms_eventEnrollmentName, BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_acknowledgedState, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_EC_State }, + { &hf_mms_timeOfAcknowledgedTransition, BER_CLASS_CON, 3, BER_FLAGS_NOTCHKTAG, dissect_mms_EventTime }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_AcknowledgeEventNotification_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - AcknowledgeEventNotification_Request_sequence, hf_index, ett_mms_AcknowledgeEventNotification_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + AcknowledgeEventNotification_Request_sequence, hf_index, ett_mms_AcknowledgeEventNotification_Request); return offset; } -static int dissect_acknowledgeEventNotification_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_AcknowledgeEventNotification_Request(TRUE, tvb, offset, actx, tree, hf_mms_acknowledgeEventNotification); -} static const value_string mms_T_acknowledgmentFilter_vals[] = { @@ -4596,48 +3543,39 @@ dissect_mms_T_acknowledgmentFilter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_acknowledgmentFilter_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_acknowledgmentFilter(TRUE, tvb, offset, actx, tree, hf_mms_acknowledgmentFilter); -} -static const ber_old_sequence_t T_severityFilter_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mostSevere_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_leastSevere_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_severityFilter_sequence[] = { + { &hf_mms_mostSevere , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned8 }, + { &hf_mms_leastSevere , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned8 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_severityFilter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - T_severityFilter_sequence, hf_index, ett_mms_T_severityFilter); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_severityFilter_sequence, hf_index, ett_mms_T_severityFilter); return offset; } -static int dissect_severityFilter_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_severityFilter(TRUE, tvb, offset, actx, tree, hf_mms_severityFilter); -} -static const ber_old_sequence_t GetAlarmSummary_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_enrollmentsOnly_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_activeAlarmsOnly_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_acknowledgmentFilter_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_severityFilter_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_continueAfter_02 }, - { 0, 0, 0, NULL } +static const ber_sequence_t GetAlarmSummary_Request_sequence[] = { + { &hf_mms_enrollmentsOnly , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_activeAlarmsOnly, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_acknowledgmentFilter, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_T_acknowledgmentFilter }, + { &hf_mms_severityFilter , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_T_severityFilter }, + { &hf_mms_continueAfter_02, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_GetAlarmSummary_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - GetAlarmSummary_Request_sequence, hf_index, ett_mms_GetAlarmSummary_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + GetAlarmSummary_Request_sequence, hf_index, ett_mms_GetAlarmSummary_Request); return offset; } -static int dissect_getAlarmSummary_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetAlarmSummary_Request(TRUE, tvb, offset, actx, tree, hf_mms_getAlarmSummary); -} static const value_string mms_T_acknowledgmentFilter_01_vals[] = { @@ -4655,48 +3593,39 @@ dissect_mms_T_acknowledgmentFilter_01(gboolean implicit_tag _U_, tvbuff_t *tvb _ return offset; } -static int dissect_acknowledgmentFilter_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_acknowledgmentFilter_01(TRUE, tvb, offset, actx, tree, hf_mms_acknowledgmentFilter_01); -} -static const ber_old_sequence_t T_severityFilter_01_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mostSevere_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_leastSevere_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_severityFilter_01_sequence[] = { + { &hf_mms_mostSevere , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned8 }, + { &hf_mms_leastSevere , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned8 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_severityFilter_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - T_severityFilter_01_sequence, hf_index, ett_mms_T_severityFilter_01); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_severityFilter_01_sequence, hf_index, ett_mms_T_severityFilter_01); return offset; } -static int dissect_severityFilter_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_severityFilter_01(TRUE, tvb, offset, actx, tree, hf_mms_severityFilter_01); -} -static const ber_old_sequence_t GetAlarmEnrollmentSummary_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_enrollmentsOnly_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_activeAlarmsOnly_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_acknowledgmentFilter_01_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_severityFilter_01_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_continueAfter_02 }, - { 0, 0, 0, NULL } +static const ber_sequence_t GetAlarmEnrollmentSummary_Request_sequence[] = { + { &hf_mms_enrollmentsOnly , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_activeAlarmsOnly, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_acknowledgmentFilter_01, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_T_acknowledgmentFilter_01 }, + { &hf_mms_severityFilter_01, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_T_severityFilter_01 }, + { &hf_mms_continueAfter_02, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_GetAlarmEnrollmentSummary_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - GetAlarmEnrollmentSummary_Request_sequence, hf_index, ett_mms_GetAlarmEnrollmentSummary_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + GetAlarmEnrollmentSummary_Request_sequence, hf_index, ett_mms_GetAlarmEnrollmentSummary_Request); return offset; } -static int dissect_getAlarmEnrollmentSummary_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetAlarmEnrollmentSummary_Request(TRUE, tvb, offset, actx, tree, hf_mms_getAlarmEnrollmentSummary); -} static const value_string mms_T_rangeStartSpecification_vals[] = { @@ -4705,23 +3634,20 @@ static const value_string mms_T_rangeStartSpecification_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_rangeStartSpecification_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_startingTime_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_startingEntry_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_rangeStartSpecification_choice[] = { + { 0, &hf_mms_startingTime , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_TimeOfDay }, + { 1, &hf_mms_startingEntry , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_OCTET_STRING }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_rangeStartSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_rangeStartSpecification_choice, hf_index, ett_mms_T_rangeStartSpecification, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_rangeStartSpecification_choice, hf_index, ett_mms_T_rangeStartSpecification, + NULL); return offset; } -static int dissect_rangeStartSpecification(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_rangeStartSpecification(FALSE, tvb, offset, actx, tree, hf_mms_rangeStartSpecification); -} static const value_string mms_T_rangeStopSpecification_vals[] = { @@ -4730,78 +3656,66 @@ static const value_string mms_T_rangeStopSpecification_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_rangeStopSpecification_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_endingTime_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberOfEntries_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_rangeStopSpecification_choice[] = { + { 0, &hf_mms_endingTime , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_TimeOfDay }, + { 1, &hf_mms_numberOfEntries , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_Integer32 }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_rangeStopSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_rangeStopSpecification_choice, hf_index, ett_mms_T_rangeStopSpecification, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_rangeStopSpecification_choice, hf_index, ett_mms_T_rangeStopSpecification, + NULL); return offset; } -static int dissect_rangeStopSpecification(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_rangeStopSpecification(FALSE, tvb, offset, actx, tree, hf_mms_rangeStopSpecification); -} -static const ber_old_sequence_t T_listOfVariables_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfVariables_item }, +static const ber_sequence_t T_listOfVariables_sequence_of[1] = { + { &hf_mms_listOfVariables_item, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_mms_VisibleString }, }; static int dissect_mms_T_listOfVariables(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - T_listOfVariables_sequence_of, hf_index, ett_mms_T_listOfVariables); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + T_listOfVariables_sequence_of, hf_index, ett_mms_T_listOfVariables); return offset; } -static int dissect_listOfVariables_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_listOfVariables(TRUE, tvb, offset, actx, tree, hf_mms_listOfVariables); -} -static const ber_old_sequence_t T_entryToStartAfter_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_timeSpecification_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_entrySpecification_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_entryToStartAfter_sequence[] = { + { &hf_mms_timeSpecification, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_TimeOfDay }, + { &hf_mms_entrySpecification, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_OCTET_STRING }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_entryToStartAfter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - T_entryToStartAfter_sequence, hf_index, ett_mms_T_entryToStartAfter); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_entryToStartAfter_sequence, hf_index, ett_mms_T_entryToStartAfter); return offset; } -static int dissect_entryToStartAfter_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_entryToStartAfter(TRUE, tvb, offset, actx, tree, hf_mms_entryToStartAfter); -} -static const ber_old_sequence_t ReadJournal_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_journalName }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_rangeStartSpecification }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_rangeStopSpecification }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfVariables_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_entryToStartAfter_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t ReadJournal_Request_sequence[] = { + { &hf_mms_journalName , BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_rangeStartSpecification, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_mms_T_rangeStartSpecification }, + { &hf_mms_rangeStopSpecification, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_mms_T_rangeStopSpecification }, + { &hf_mms_listOfVariables , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_T_listOfVariables }, + { &hf_mms_entryToStartAfter, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_mms_T_entryToStartAfter }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_ReadJournal_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - ReadJournal_Request_sequence, hf_index, ett_mms_ReadJournal_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ReadJournal_Request_sequence, hf_index, ett_mms_ReadJournal_Request); return offset; } -static int dissect_readJournal_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ReadJournal_Request(TRUE, tvb, offset, actx, tree, hf_mms_readJournal); -} @@ -4811,79 +3725,64 @@ dissect_mms_JOU_Additional_Detail(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_additionalDetail(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_JOU_Additional_Detail(FALSE, tvb, offset, actx, tree, hf_mms_additionalDetail); -} -static const ber_old_sequence_t T_event_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventConditionName }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_currentState_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_event_sequence[] = { + { &hf_mms_eventConditionName, BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_currentState , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_EC_State }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_event(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - T_event_sequence, hf_index, ett_mms_T_event); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_event_sequence, hf_index, ett_mms_T_event); return offset; } -static int dissect_event_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_event(TRUE, tvb, offset, actx, tree, hf_mms_event); -} -static const ber_old_sequence_t T_listOfVariables_item_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_variableTag_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_valueSpecification }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_listOfVariables_item_sequence[] = { + { &hf_mms_variableTag , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_VisibleString }, + { &hf_mms_valueSpecification, BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_mms_Data }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_listOfVariables_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - T_listOfVariables_item_sequence, hf_index, ett_mms_T_listOfVariables_item); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_listOfVariables_item_sequence, hf_index, ett_mms_T_listOfVariables_item); return offset; } -static int dissect_listOfVariables_item_01(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_listOfVariables_item(FALSE, tvb, offset, actx, tree, hf_mms_listOfVariables_item_01); -} -static const ber_old_sequence_t T_listOfVariables_01_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfVariables_item_01 }, +static const ber_sequence_t T_listOfVariables_01_sequence_of[1] = { + { &hf_mms_listOfVariables_item_01, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mms_T_listOfVariables_item }, }; static int dissect_mms_T_listOfVariables_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - T_listOfVariables_01_sequence_of, hf_index, ett_mms_T_listOfVariables_01); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + T_listOfVariables_01_sequence_of, hf_index, ett_mms_T_listOfVariables_01); return offset; } -static int dissect_listOfVariables_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_listOfVariables_01(TRUE, tvb, offset, actx, tree, hf_mms_listOfVariables_01); -} -static const ber_old_sequence_t T_data_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_event_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfVariables_01_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_data_sequence[] = { + { &hf_mms_event , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_T_event }, + { &hf_mms_listOfVariables_01, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_T_listOfVariables_01 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - T_data_sequence, hf_index, ett_mms_T_data); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_data_sequence, hf_index, ett_mms_T_data); return offset; } -static int dissect_data_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_data(TRUE, tvb, offset, actx, tree, hf_mms_data); -} static const value_string mms_T_entryForm_vals[] = { @@ -4892,115 +3791,94 @@ static const value_string mms_T_entryForm_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_entryForm_choice[] = { - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_data_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_annotation_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_entryForm_choice[] = { + { 2, &hf_mms_data , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_T_data }, + { 3, &hf_mms_annotation , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_mms_VisibleString }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_entryForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_entryForm_choice, hf_index, ett_mms_T_entryForm, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_entryForm_choice, hf_index, ett_mms_T_entryForm, + NULL); return offset; } -static int dissect_entryForm(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_entryForm(FALSE, tvb, offset, actx, tree, hf_mms_entryForm); -} -static const ber_old_sequence_t EntryContent_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_occurenceTime_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_additionalDetail }, - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_entryForm }, - { 0, 0, 0, NULL } +static const ber_sequence_t EntryContent_sequence[] = { + { &hf_mms_occurenceTime , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_TimeOfDay }, + { &hf_mms_additionalDetail, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_mms_JOU_Additional_Detail }, + { &hf_mms_entryForm , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_T_entryForm }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_EntryContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - EntryContent_sequence, hf_index, ett_mms_EntryContent); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + EntryContent_sequence, hf_index, ett_mms_EntryContent); return offset; } -static int dissect_entryContent_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_EntryContent(TRUE, tvb, offset, actx, tree, hf_mms_entryContent); -} -static int dissect_listOfJournalEntry_item_01(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_EntryContent(FALSE, tvb, offset, actx, tree, hf_mms_listOfJournalEntry_item_01); -} -static const ber_old_sequence_t SEQUENCE_OF_EntryContent_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfJournalEntry_item_01 }, +static const ber_sequence_t SEQUENCE_OF_EntryContent_sequence_of[1] = { + { &hf_mms_listOfJournalEntry_item_01, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mms_EntryContent }, }; static int dissect_mms_SEQUENCE_OF_EntryContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_EntryContent_sequence_of, hf_index, ett_mms_SEQUENCE_OF_EntryContent); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_EntryContent_sequence_of, hf_index, ett_mms_SEQUENCE_OF_EntryContent); return offset; } -static int dissect_listOfJournalEntry_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_EntryContent(TRUE, tvb, offset, actx, tree, hf_mms_listOfJournalEntry_01); -} -static const ber_old_sequence_t WriteJournal_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_journalName }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfJournalEntry_01_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t WriteJournal_Request_sequence[] = { + { &hf_mms_journalName , BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_listOfJournalEntry_01, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_EntryContent }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_WriteJournal_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - WriteJournal_Request_sequence, hf_index, ett_mms_WriteJournal_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + WriteJournal_Request_sequence, hf_index, ett_mms_WriteJournal_Request); return offset; } -static int dissect_writeJournal_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_WriteJournal_Request(TRUE, tvb, offset, actx, tree, hf_mms_writeJournal); -} -static const ber_old_sequence_t T_limitSpecification_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_limitingTime_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_limitingEntry_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_limitSpecification_sequence[] = { + { &hf_mms_limitingTime , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_TimeOfDay }, + { &hf_mms_limitingEntry , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_OCTET_STRING }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_limitSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - T_limitSpecification_sequence, hf_index, ett_mms_T_limitSpecification); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_limitSpecification_sequence, hf_index, ett_mms_T_limitSpecification); return offset; } -static int dissect_limitSpecification_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_limitSpecification(TRUE, tvb, offset, actx, tree, hf_mms_limitSpecification); -} -static const ber_old_sequence_t InitializeJournal_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_journalName }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_limitSpecification_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t InitializeJournal_Request_sequence[] = { + { &hf_mms_journalName , BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_limitSpecification, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_T_limitSpecification }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_InitializeJournal_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - InitializeJournal_Request_sequence, hf_index, ett_mms_InitializeJournal_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + InitializeJournal_Request_sequence, hf_index, ett_mms_InitializeJournal_Request); return offset; } -static int dissect_initializeJournal_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_InitializeJournal_Request(TRUE, tvb, offset, actx, tree, hf_mms_initializeJournal); -} @@ -5010,78 +3888,63 @@ dissect_mms_ReportJournalStatus_Request(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static int dissect_reportJournalStatus_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ReportJournalStatus_Request(TRUE, tvb, offset, actx, tree, hf_mms_reportJournalStatus); -} -static const ber_old_sequence_t CreateJournal_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_journalName }, - { 0, 0, 0, NULL } +static const ber_sequence_t CreateJournal_Request_sequence[] = { + { &hf_mms_journalName , BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_CreateJournal_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - CreateJournal_Request_sequence, hf_index, ett_mms_CreateJournal_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + CreateJournal_Request_sequence, hf_index, ett_mms_CreateJournal_Request); return offset; } -static int dissect_createJournal_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_CreateJournal_Request(TRUE, tvb, offset, actx, tree, hf_mms_createJournal); -} -static const ber_old_sequence_t DeleteJournal_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_journalName }, - { 0, 0, 0, NULL } +static const ber_sequence_t DeleteJournal_Request_sequence[] = { + { &hf_mms_journalName , BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_DeleteJournal_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - DeleteJournal_Request_sequence, hf_index, ett_mms_DeleteJournal_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + DeleteJournal_Request_sequence, hf_index, ett_mms_DeleteJournal_Request); return offset; } -static int dissect_deleteJournal_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteJournal_Request(TRUE, tvb, offset, actx, tree, hf_mms_deleteJournal); -} -static const ber_old_sequence_t GetCapabilityList_Request_sequence[] = { - { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_continueAfter_01 }, - { 0, 0, 0, NULL } +static const ber_sequence_t GetCapabilityList_Request_sequence[] = { + { &hf_mms_continueAfter_01, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_mms_VisibleString }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_GetCapabilityList_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - GetCapabilityList_Request_sequence, hf_index, ett_mms_GetCapabilityList_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + GetCapabilityList_Request_sequence, hf_index, ett_mms_GetCapabilityList_Request); return offset; } -static int dissect_getCapabilityList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetCapabilityList_Request(TRUE, tvb, offset, actx, tree, hf_mms_getCapabilityList); -} -static const ber_old_sequence_t FileOpen_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_fileName_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_initialPosition_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t FileOpen_Request_sequence[] = { + { &hf_mms_fileName , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_FileName }, + { &hf_mms_initialPosition , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_FileOpen_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - FileOpen_Request_sequence, hf_index, ett_mms_FileOpen_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + FileOpen_Request_sequence, hf_index, ett_mms_FileOpen_Request); return offset; } -static int dissect_fileOpen_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileOpen_Request(TRUE, tvb, offset, actx, tree, hf_mms_fileOpen); -} @@ -5091,9 +3954,6 @@ dissect_mms_FileRead_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o return offset; } -static int dissect_fileRead_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileRead_Request(TRUE, tvb, offset, actx, tree, hf_mms_fileRead); -} @@ -5103,27 +3963,21 @@ dissect_mms_FileClose_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_fileClose_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileClose_Request(TRUE, tvb, offset, actx, tree, hf_mms_fileClose); -} -static const ber_old_sequence_t FileRename_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_currentFileName_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_newFileName_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t FileRename_Request_sequence[] = { + { &hf_mms_currentFileName , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_FileName }, + { &hf_mms_newFileName , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_FileName }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_FileRename_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - FileRename_Request_sequence, hf_index, ett_mms_FileRename_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + FileRename_Request_sequence, hf_index, ett_mms_FileRename_Request); return offset; } -static int dissect_fileRename_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileRename_Request(TRUE, tvb, offset, actx, tree, hf_mms_fileRename); -} @@ -5133,27 +3987,21 @@ dissect_mms_FileDelete_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_fileDelete_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileDelete_Request(TRUE, tvb, offset, actx, tree, hf_mms_fileDelete); -} -static const ber_old_sequence_t FileDirectory_Request_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_fileSpecification_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_continueAfter_03_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t FileDirectory_Request_sequence[] = { + { &hf_mms_fileSpecification, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_FileName }, + { &hf_mms_continueAfter_03, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_FileName }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_FileDirectory_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - FileDirectory_Request_sequence, hf_index, ett_mms_FileDirectory_Request); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + FileDirectory_Request_sequence, hf_index, ett_mms_FileDirectory_Request); return offset; } -static int dissect_fileDirectory_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileDirectory_Request(TRUE, tvb, offset, actx, tree, hf_mms_fileDirectory); -} static const value_string mms_ConfirmedServiceRequest_vals[] = { @@ -5238,99 +4086,96 @@ static const value_string mms_ConfirmedServiceRequest_vals[] = { { 0, NULL } }; -static const ber_old_choice_t ConfirmedServiceRequest_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_status_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_getNameList_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_identify_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_rename_impl }, - { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_read_impl }, - { 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_write_impl }, - { 6, BER_CLASS_CON, 6, 0, dissect_getVariableAccessAttributes }, - { 7, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_defineNamedVariable_impl }, - { 8, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_defineScatteredAccess_impl }, - { 9, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_getScatteredAccessAttributes_impl }, - { 10, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_deleteVariableAccess_impl }, - { 11, BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_defineNamedVariableList_impl }, - { 12, BER_CLASS_CON, 12, BER_FLAGS_IMPLTAG, dissect_getNamedVariableListAttributes_impl }, - { 13, BER_CLASS_CON, 13, BER_FLAGS_IMPLTAG, dissect_deleteNamedVariableList_impl }, - { 14, BER_CLASS_CON, 14, BER_FLAGS_IMPLTAG, dissect_defineNamedType_impl }, - { 15, BER_CLASS_CON, 15, BER_FLAGS_IMPLTAG, dissect_getNamedTypeAttributes_impl }, - { 16, BER_CLASS_CON, 16, BER_FLAGS_IMPLTAG, dissect_deleteNamedType_impl }, - { 17, BER_CLASS_CON, 17, BER_FLAGS_IMPLTAG, dissect_input_impl }, - { 18, BER_CLASS_CON, 18, BER_FLAGS_IMPLTAG, dissect_output_impl }, - { 19, BER_CLASS_CON, 19, BER_FLAGS_IMPLTAG, dissect_takeControl_impl }, - { 20, BER_CLASS_CON, 20, BER_FLAGS_IMPLTAG, dissect_relinquishControl_impl }, - { 21, BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_defineSemaphore_impl }, - { 22, BER_CLASS_CON, 22, BER_FLAGS_IMPLTAG, dissect_deleteSemaphore_impl }, - { 23, BER_CLASS_CON, 23, BER_FLAGS_IMPLTAG, dissect_reportSemaphoreStatus_impl }, - { 24, BER_CLASS_CON, 24, BER_FLAGS_IMPLTAG, dissect_reportPoolSemaphoreStatus_impl }, - { 25, BER_CLASS_CON, 25, BER_FLAGS_IMPLTAG, dissect_reportSemaphoreEntryStatus_impl }, - { 26, BER_CLASS_CON, 26, BER_FLAGS_IMPLTAG, dissect_initiateDownloadSequence_impl }, - { 27, BER_CLASS_CON, 27, BER_FLAGS_IMPLTAG, dissect_downloadSegment_impl }, - { 28, BER_CLASS_CON, 28, BER_FLAGS_IMPLTAG, dissect_terminateDownloadSequence_impl }, - { 29, BER_CLASS_CON, 29, BER_FLAGS_IMPLTAG, dissect_initiateUploadSequence_impl }, - { 30, BER_CLASS_CON, 30, BER_FLAGS_IMPLTAG, dissect_uploadSegment_impl }, - { 31, BER_CLASS_CON, 31, BER_FLAGS_IMPLTAG, dissect_terminateUploadSequence_impl }, - { 32, BER_CLASS_CON, 32, BER_FLAGS_IMPLTAG, dissect_requestDomainDownload_impl }, - { 33, BER_CLASS_CON, 33, BER_FLAGS_IMPLTAG, dissect_requestDomainUpload_impl }, - { 34, BER_CLASS_CON, 34, BER_FLAGS_IMPLTAG, dissect_loadDomainContent_impl }, - { 35, BER_CLASS_CON, 35, BER_FLAGS_IMPLTAG, dissect_storeDomainContent_impl }, - { 36, BER_CLASS_CON, 36, BER_FLAGS_IMPLTAG, dissect_deleteDomain_impl }, - { 37, BER_CLASS_CON, 37, BER_FLAGS_IMPLTAG, dissect_getDomainAttributes_impl }, - { 38, BER_CLASS_CON, 38, BER_FLAGS_IMPLTAG, dissect_createProgramInvocation_impl }, - { 39, BER_CLASS_CON, 39, BER_FLAGS_IMPLTAG, dissect_deleteProgramInvocation_impl }, - { 40, BER_CLASS_CON, 40, BER_FLAGS_IMPLTAG, dissect_start_impl }, - { 41, BER_CLASS_CON, 41, BER_FLAGS_IMPLTAG, dissect_stop_impl }, - { 42, BER_CLASS_CON, 42, BER_FLAGS_IMPLTAG, dissect_resume_impl }, - { 43, BER_CLASS_CON, 43, BER_FLAGS_IMPLTAG, dissect_reset_impl }, - { 44, BER_CLASS_CON, 44, BER_FLAGS_IMPLTAG, dissect_kill_impl }, - { 45, BER_CLASS_CON, 45, BER_FLAGS_IMPLTAG, dissect_getProgramInvocationAttributes_impl }, - { 46, BER_CLASS_CON, 46, BER_FLAGS_IMPLTAG, dissect_obtainFile_impl }, - { 47, BER_CLASS_CON, 47, BER_FLAGS_IMPLTAG, dissect_defineEventCondition_impl }, - { 48, BER_CLASS_CON, 48, 0, dissect_deleteEventCondition }, - { 49, BER_CLASS_CON, 49, 0, dissect_getEventConditionAttributes }, - { 50, BER_CLASS_CON, 50, 0, dissect_reportEventConditionStatus }, - { 51, BER_CLASS_CON, 51, BER_FLAGS_IMPLTAG, dissect_alterEventConditionMonitoring_impl }, - { 52, BER_CLASS_CON, 52, BER_FLAGS_IMPLTAG, dissect_triggerEvent_impl }, - { 53, BER_CLASS_CON, 53, BER_FLAGS_IMPLTAG, dissect_defineEventAction_impl }, - { 54, BER_CLASS_CON, 54, 0, dissect_deleteEventAction }, - { 55, BER_CLASS_CON, 55, 0, dissect_getEventActionAttributes }, - { 56, BER_CLASS_CON, 56, 0, dissect_reportEventActionStatus }, - { 57, BER_CLASS_CON, 57, BER_FLAGS_IMPLTAG, dissect_defineEventEnrollment_impl }, - { 58, BER_CLASS_CON, 58, 0, dissect_deleteEventEnrollment }, - { 59, BER_CLASS_CON, 59, BER_FLAGS_IMPLTAG, dissect_alterEventEnrollment_impl }, - { 60, BER_CLASS_CON, 60, 0, dissect_reportEventEnrollmentStatus }, - { 61, BER_CLASS_CON, 61, BER_FLAGS_IMPLTAG, dissect_getEventEnrollmentAttributes_impl }, - { 62, BER_CLASS_CON, 62, BER_FLAGS_IMPLTAG, dissect_acknowledgeEventNotification_impl }, - { 63, BER_CLASS_CON, 63, BER_FLAGS_IMPLTAG, dissect_getAlarmSummary_impl }, - { 64, BER_CLASS_CON, 64, BER_FLAGS_IMPLTAG, dissect_getAlarmEnrollmentSummary_impl }, - { 65, BER_CLASS_CON, 65, BER_FLAGS_IMPLTAG, dissect_readJournal_impl }, - { 66, BER_CLASS_CON, 66, BER_FLAGS_IMPLTAG, dissect_writeJournal_impl }, - { 67, BER_CLASS_CON, 67, BER_FLAGS_IMPLTAG, dissect_initializeJournal_impl }, - { 68, BER_CLASS_CON, 68, BER_FLAGS_IMPLTAG, dissect_reportJournalStatus_impl }, - { 69, BER_CLASS_CON, 69, BER_FLAGS_IMPLTAG, dissect_createJournal_impl }, - { 70, BER_CLASS_CON, 70, BER_FLAGS_IMPLTAG, dissect_deleteJournal_impl }, - { 71, BER_CLASS_CON, 71, BER_FLAGS_IMPLTAG, dissect_getCapabilityList_impl }, - { 72, BER_CLASS_CON, 72, BER_FLAGS_IMPLTAG, dissect_fileOpen_impl }, - { 73, BER_CLASS_CON, 73, BER_FLAGS_IMPLTAG, dissect_fileRead_impl }, - { 74, BER_CLASS_CON, 74, BER_FLAGS_IMPLTAG, dissect_fileClose_impl }, - { 75, BER_CLASS_CON, 75, BER_FLAGS_IMPLTAG, dissect_fileRename_impl }, - { 76, BER_CLASS_CON, 76, BER_FLAGS_IMPLTAG, dissect_fileDelete_impl }, - { 77, BER_CLASS_CON, 77, BER_FLAGS_IMPLTAG, dissect_fileDirectory_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t ConfirmedServiceRequest_choice[] = { + { 0, &hf_mms_status , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Status_Request }, + { 1, &hf_mms_getNameList , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_GetNameList_Request }, + { 2, &hf_mms_identify , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_Identify_Request }, + { 3, &hf_mms_rename , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_mms_Rename_Request }, + { 4, &hf_mms_read , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mms_Read_Request }, + { 5, &hf_mms_write , BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_mms_Write_Request }, + { 6, &hf_mms_getVariableAccessAttributes, BER_CLASS_CON, 6, 0, dissect_mms_GetVariableAccessAttributes_Request }, + { 7, &hf_mms_defineNamedVariable, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_mms_DefineNamedVariable_Request }, + { 8, &hf_mms_defineScatteredAccess, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mms_DefineScatteredAccess_Request }, + { 9, &hf_mms_getScatteredAccessAttributes, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_mms_GetScatteredAccessAttributes_Request }, + { 10, &hf_mms_deleteVariableAccess, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_mms_DeleteVariableAccess_Request }, + { 11, &hf_mms_defineNamedVariableList, BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_mms_DefineNamedVariableList_Request }, + { 12, &hf_mms_getNamedVariableListAttributes, BER_CLASS_CON, 12, BER_FLAGS_IMPLTAG, dissect_mms_GetNamedVariableListAttributes_Request }, + { 13, &hf_mms_deleteNamedVariableList, BER_CLASS_CON, 13, BER_FLAGS_IMPLTAG, dissect_mms_DeleteNamedVariableList_Request }, + { 14, &hf_mms_defineNamedType , BER_CLASS_CON, 14, BER_FLAGS_IMPLTAG, dissect_mms_DefineNamedType_Request }, + { 15, &hf_mms_getNamedTypeAttributes, BER_CLASS_CON, 15, BER_FLAGS_IMPLTAG, dissect_mms_GetNamedTypeAttributes_Request }, + { 16, &hf_mms_deleteNamedType , BER_CLASS_CON, 16, BER_FLAGS_IMPLTAG, dissect_mms_DeleteNamedType_Request }, + { 17, &hf_mms_input , BER_CLASS_CON, 17, BER_FLAGS_IMPLTAG, dissect_mms_Input_Request }, + { 18, &hf_mms_output , BER_CLASS_CON, 18, BER_FLAGS_IMPLTAG, dissect_mms_Output_Request }, + { 19, &hf_mms_takeControl , BER_CLASS_CON, 19, BER_FLAGS_IMPLTAG, dissect_mms_TakeControl_Request }, + { 20, &hf_mms_relinquishControl, BER_CLASS_CON, 20, BER_FLAGS_IMPLTAG, dissect_mms_RelinquishControl_Request }, + { 21, &hf_mms_defineSemaphore , BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mms_DefineSemaphore_Request }, + { 22, &hf_mms_deleteSemaphore , BER_CLASS_CON, 22, BER_FLAGS_IMPLTAG, dissect_mms_DeleteSemaphore_Request }, + { 23, &hf_mms_reportSemaphoreStatus, BER_CLASS_CON, 23, BER_FLAGS_IMPLTAG, dissect_mms_ReportSemaphoreStatus_Request }, + { 24, &hf_mms_reportPoolSemaphoreStatus, BER_CLASS_CON, 24, BER_FLAGS_IMPLTAG, dissect_mms_ReportPoolSemaphoreStatus_Request }, + { 25, &hf_mms_reportSemaphoreEntryStatus, BER_CLASS_CON, 25, BER_FLAGS_IMPLTAG, dissect_mms_ReportSemaphoreEntryStatus_Request }, + { 26, &hf_mms_initiateDownloadSequence, BER_CLASS_CON, 26, BER_FLAGS_IMPLTAG, dissect_mms_InitiateDownloadSequence_Request }, + { 27, &hf_mms_downloadSegment , BER_CLASS_CON, 27, BER_FLAGS_IMPLTAG, dissect_mms_DownloadSegment_Request }, + { 28, &hf_mms_terminateDownloadSequence, BER_CLASS_CON, 28, BER_FLAGS_IMPLTAG, dissect_mms_TerminateDownloadSequence_Request }, + { 29, &hf_mms_initiateUploadSequence, BER_CLASS_CON, 29, BER_FLAGS_IMPLTAG, dissect_mms_InitiateUploadSequence_Request }, + { 30, &hf_mms_uploadSegment , BER_CLASS_CON, 30, BER_FLAGS_IMPLTAG, dissect_mms_UploadSegment_Request }, + { 31, &hf_mms_terminateUploadSequence, BER_CLASS_CON, 31, BER_FLAGS_IMPLTAG, dissect_mms_TerminateUploadSequence_Request }, + { 32, &hf_mms_requestDomainDownload, BER_CLASS_CON, 32, BER_FLAGS_IMPLTAG, dissect_mms_RequestDomainDownload_Request }, + { 33, &hf_mms_requestDomainUpload, BER_CLASS_CON, 33, BER_FLAGS_IMPLTAG, dissect_mms_RequestDomainUpload_Request }, + { 34, &hf_mms_loadDomainContent, BER_CLASS_CON, 34, BER_FLAGS_IMPLTAG, dissect_mms_LoadDomainContent_Request }, + { 35, &hf_mms_storeDomainContent, BER_CLASS_CON, 35, BER_FLAGS_IMPLTAG, dissect_mms_StoreDomainContent_Request }, + { 36, &hf_mms_deleteDomain , BER_CLASS_CON, 36, BER_FLAGS_IMPLTAG, dissect_mms_DeleteDomain_Request }, + { 37, &hf_mms_getDomainAttributes, BER_CLASS_CON, 37, BER_FLAGS_IMPLTAG, dissect_mms_GetDomainAttributes_Request }, + { 38, &hf_mms_createProgramInvocation, BER_CLASS_CON, 38, BER_FLAGS_IMPLTAG, dissect_mms_CreateProgramInvocation_Request }, + { 39, &hf_mms_deleteProgramInvocation, BER_CLASS_CON, 39, BER_FLAGS_IMPLTAG, dissect_mms_DeleteProgramInvocation_Request }, + { 40, &hf_mms_start , BER_CLASS_CON, 40, BER_FLAGS_IMPLTAG, dissect_mms_Start_Request }, + { 41, &hf_mms_stop , BER_CLASS_CON, 41, BER_FLAGS_IMPLTAG, dissect_mms_Stop_Request }, + { 42, &hf_mms_resume , BER_CLASS_CON, 42, BER_FLAGS_IMPLTAG, dissect_mms_Resume_Request }, + { 43, &hf_mms_reset , BER_CLASS_CON, 43, BER_FLAGS_IMPLTAG, dissect_mms_Reset_Request }, + { 44, &hf_mms_kill , BER_CLASS_CON, 44, BER_FLAGS_IMPLTAG, dissect_mms_Kill_Request }, + { 45, &hf_mms_getProgramInvocationAttributes, BER_CLASS_CON, 45, BER_FLAGS_IMPLTAG, dissect_mms_GetProgramInvocationAttributes_Request }, + { 46, &hf_mms_obtainFile , BER_CLASS_CON, 46, BER_FLAGS_IMPLTAG, dissect_mms_ObtainFile_Request }, + { 47, &hf_mms_defineEventCondition, BER_CLASS_CON, 47, BER_FLAGS_IMPLTAG, dissect_mms_DefineEventCondition_Request }, + { 48, &hf_mms_deleteEventCondition, BER_CLASS_CON, 48, 0, dissect_mms_DeleteEventCondition_Request }, + { 49, &hf_mms_getEventConditionAttributes, BER_CLASS_CON, 49, 0, dissect_mms_GetEventConditionAttributes_Request }, + { 50, &hf_mms_reportEventConditionStatus, BER_CLASS_CON, 50, 0, dissect_mms_ReportEventConditionStatus_Request }, + { 51, &hf_mms_alterEventConditionMonitoring, BER_CLASS_CON, 51, BER_FLAGS_IMPLTAG, dissect_mms_AlterEventConditionMonitoring_Request }, + { 52, &hf_mms_triggerEvent , BER_CLASS_CON, 52, BER_FLAGS_IMPLTAG, dissect_mms_TriggerEvent_Request }, + { 53, &hf_mms_defineEventAction, BER_CLASS_CON, 53, BER_FLAGS_IMPLTAG, dissect_mms_DefineEventAction_Request }, + { 54, &hf_mms_deleteEventAction, BER_CLASS_CON, 54, 0, dissect_mms_DeleteEventAction_Request }, + { 55, &hf_mms_getEventActionAttributes, BER_CLASS_CON, 55, 0, dissect_mms_GetEventActionAttributes_Request }, + { 56, &hf_mms_reportEventActionStatus, BER_CLASS_CON, 56, 0, dissect_mms_ReportEventActionStatus_Request }, + { 57, &hf_mms_defineEventEnrollment, BER_CLASS_CON, 57, BER_FLAGS_IMPLTAG, dissect_mms_DefineEventEnrollment_Request }, + { 58, &hf_mms_deleteEventEnrollment, BER_CLASS_CON, 58, 0, dissect_mms_DeleteEventEnrollment_Request }, + { 59, &hf_mms_alterEventEnrollment, BER_CLASS_CON, 59, BER_FLAGS_IMPLTAG, dissect_mms_AlterEventEnrollment_Request }, + { 60, &hf_mms_reportEventEnrollmentStatus, BER_CLASS_CON, 60, 0, dissect_mms_ReportEventEnrollmentStatus_Request }, + { 61, &hf_mms_getEventEnrollmentAttributes, BER_CLASS_CON, 61, BER_FLAGS_IMPLTAG, dissect_mms_GetEventEnrollmentAttributes_Request }, + { 62, &hf_mms_acknowledgeEventNotification, BER_CLASS_CON, 62, BER_FLAGS_IMPLTAG, dissect_mms_AcknowledgeEventNotification_Request }, + { 63, &hf_mms_getAlarmSummary , BER_CLASS_CON, 63, BER_FLAGS_IMPLTAG, dissect_mms_GetAlarmSummary_Request }, + { 64, &hf_mms_getAlarmEnrollmentSummary, BER_CLASS_CON, 64, BER_FLAGS_IMPLTAG, dissect_mms_GetAlarmEnrollmentSummary_Request }, + { 65, &hf_mms_readJournal , BER_CLASS_CON, 65, BER_FLAGS_IMPLTAG, dissect_mms_ReadJournal_Request }, + { 66, &hf_mms_writeJournal , BER_CLASS_CON, 66, BER_FLAGS_IMPLTAG, dissect_mms_WriteJournal_Request }, + { 67, &hf_mms_initializeJournal, BER_CLASS_CON, 67, BER_FLAGS_IMPLTAG, dissect_mms_InitializeJournal_Request }, + { 68, &hf_mms_reportJournalStatus, BER_CLASS_CON, 68, BER_FLAGS_IMPLTAG, dissect_mms_ReportJournalStatus_Request }, + { 69, &hf_mms_createJournal , BER_CLASS_CON, 69, BER_FLAGS_IMPLTAG, dissect_mms_CreateJournal_Request }, + { 70, &hf_mms_deleteJournal , BER_CLASS_CON, 70, BER_FLAGS_IMPLTAG, dissect_mms_DeleteJournal_Request }, + { 71, &hf_mms_getCapabilityList, BER_CLASS_CON, 71, BER_FLAGS_IMPLTAG, dissect_mms_GetCapabilityList_Request }, + { 72, &hf_mms_fileOpen , BER_CLASS_CON, 72, BER_FLAGS_IMPLTAG, dissect_mms_FileOpen_Request }, + { 73, &hf_mms_fileRead , BER_CLASS_CON, 73, BER_FLAGS_IMPLTAG, dissect_mms_FileRead_Request }, + { 74, &hf_mms_fileClose , BER_CLASS_CON, 74, BER_FLAGS_IMPLTAG, dissect_mms_FileClose_Request }, + { 75, &hf_mms_fileRename , BER_CLASS_CON, 75, BER_FLAGS_IMPLTAG, dissect_mms_FileRename_Request }, + { 76, &hf_mms_fileDelete , BER_CLASS_CON, 76, BER_FLAGS_IMPLTAG, dissect_mms_FileDelete_Request }, + { 77, &hf_mms_fileDirectory , BER_CLASS_CON, 77, BER_FLAGS_IMPLTAG, dissect_mms_FileDirectory_Request }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_ConfirmedServiceRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - ConfirmedServiceRequest_choice, hf_index, ett_mms_ConfirmedServiceRequest, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + ConfirmedServiceRequest_choice, hf_index, ett_mms_ConfirmedServiceRequest, + NULL); return offset; } -static int dissect_confirmedServiceRequest(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ConfirmedServiceRequest(FALSE, tvb, offset, actx, tree, hf_mms_confirmedServiceRequest); -} static const value_string mms_CS_Request_Detail_vals[] = { @@ -5338,42 +4183,36 @@ static const value_string mms_CS_Request_Detail_vals[] = { { 0, NULL } }; -static const ber_old_choice_t CS_Request_Detail_choice[] = { - { 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_foo }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t CS_Request_Detail_choice[] = { + { 0, &hf_mms_foo , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_mms_INTEGER }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_CS_Request_Detail(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - CS_Request_Detail_choice, hf_index, ett_mms_CS_Request_Detail, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + CS_Request_Detail_choice, hf_index, ett_mms_CS_Request_Detail, + NULL); return offset; } -static int dissect_cs_request_detail(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_CS_Request_Detail(FALSE, tvb, offset, actx, tree, hf_mms_cs_request_detail); -} -static const ber_old_sequence_t Confirmed_RequestPDU_sequence[] = { - { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID }, - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_listOfModifier }, - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_confirmedServiceRequest }, - { BER_CLASS_CON, 79, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_cs_request_detail }, - { 0, 0, 0, NULL } +static const ber_sequence_t Confirmed_RequestPDU_sequence[] = { + { &hf_mms_invokeID , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_mms_Unsigned32 }, + { &hf_mms_listOfModifier , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_mms_SEQUENCE_OF_Modifier }, + { &hf_mms_confirmedServiceRequest, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_ConfirmedServiceRequest }, + { &hf_mms_cs_request_detail, BER_CLASS_CON, 79, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_mms_CS_Request_Detail }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_Confirmed_RequestPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Confirmed_RequestPDU_sequence, hf_index, ett_mms_Confirmed_RequestPDU); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Confirmed_RequestPDU_sequence, hf_index, ett_mms_Confirmed_RequestPDU); return offset; } -static int dissect_confirmed_RequestPDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Confirmed_RequestPDU(TRUE, tvb, offset, actx, tree, hf_mms_confirmed_RequestPDU); -} static const value_string mms_T_vmdLogicalStatus_vals[] = { @@ -5392,9 +4231,6 @@ dissect_mms_T_vmdLogicalStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_vmdLogicalStatus_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_vmdLogicalStatus(TRUE, tvb, offset, actx, tree, hf_mms_vmdLogicalStatus); -} static const value_string mms_T_vmdPhysicalStatus_vals[] = { @@ -5413,9 +4249,6 @@ dissect_mms_T_vmdPhysicalStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in return offset; } -static int dissect_vmdPhysicalStatus_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_vmdPhysicalStatus(TRUE, tvb, offset, actx, tree, hf_mms_vmdPhysicalStatus); -} @@ -5427,46 +4260,37 @@ dissect_mms_BIT_STRING_SIZE_0_128(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_localDetail_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_BIT_STRING_SIZE_0_128(TRUE, tvb, offset, actx, tree, hf_mms_localDetail); -} -static const ber_old_sequence_t Status_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_vmdLogicalStatus_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_vmdPhysicalStatus_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localDetail_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t Status_Response_sequence[] = { + { &hf_mms_vmdLogicalStatus, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_T_vmdLogicalStatus }, + { &hf_mms_vmdPhysicalStatus, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_T_vmdPhysicalStatus }, + { &hf_mms_localDetail , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BIT_STRING_SIZE_0_128 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_Status_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Status_Response_sequence, hf_index, ett_mms_Status_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Status_Response_sequence, hf_index, ett_mms_Status_Response); return offset; } -static int dissect_status_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Status_Response(TRUE, tvb, offset, actx, tree, hf_mms_status_01); -} -static const ber_old_sequence_t GetNameList_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfIdentifier_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t GetNameList_Response_sequence[] = { + { &hf_mms_listOfIdentifier, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_Identifier }, + { &hf_mms_moreFollows , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_GetNameList_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - GetNameList_Response_sequence, hf_index, ett_mms_GetNameList_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + GetNameList_Response_sequence, hf_index, ett_mms_GetNameList_Response); return offset; } -static int dissect_getNameList_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetNameList_Response(TRUE, tvb, offset, actx, tree, hf_mms_getNameList_01); -} @@ -5476,45 +4300,36 @@ dissect_mms_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_listOfAbstractSyntaxes_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_OBJECT_IDENTIFIER(FALSE, tvb, offset, actx, tree, hf_mms_listOfAbstractSyntaxes_item); -} -static const ber_old_sequence_t T_listOfAbstractSyntaxes_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_listOfAbstractSyntaxes_item }, +static const ber_sequence_t T_listOfAbstractSyntaxes_sequence_of[1] = { + { &hf_mms_listOfAbstractSyntaxes_item, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_mms_OBJECT_IDENTIFIER }, }; static int dissect_mms_T_listOfAbstractSyntaxes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - T_listOfAbstractSyntaxes_sequence_of, hf_index, ett_mms_T_listOfAbstractSyntaxes); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + T_listOfAbstractSyntaxes_sequence_of, hf_index, ett_mms_T_listOfAbstractSyntaxes); return offset; } -static int dissect_listOfAbstractSyntaxes_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_listOfAbstractSyntaxes(TRUE, tvb, offset, actx, tree, hf_mms_listOfAbstractSyntaxes); -} -static const ber_old_sequence_t Identify_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_vendorName_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_modelName_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_revision_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfAbstractSyntaxes_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t Identify_Response_sequence[] = { + { &hf_mms_vendorName , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_VisibleString }, + { &hf_mms_modelName , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_VisibleString }, + { &hf_mms_revision , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_VisibleString }, + { &hf_mms_listOfAbstractSyntaxes, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_T_listOfAbstractSyntaxes }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_Identify_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Identify_Response_sequence, hf_index, ett_mms_Identify_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Identify_Response_sequence, hf_index, ett_mms_Identify_Response); return offset; } -static int dissect_identify_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Identify_Response(TRUE, tvb, offset, actx, tree, hf_mms_identify_01); -} @@ -5524,9 +4339,6 @@ dissect_mms_Rename_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of return offset; } -static int dissect_rename_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Rename_Response(TRUE, tvb, offset, actx, tree, hf_mms_rename_01); -} static const value_string mms_DataAccessError_vals[] = { @@ -5552,9 +4364,6 @@ dissect_mms_DataAccessError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of return offset; } -static int dissect_failure_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DataAccessError(TRUE, tvb, offset, actx, tree, hf_mms_failure); -} static const value_string mms_AccessResult_vals[] = { @@ -5574,68 +4383,59 @@ static const value_string mms_AccessResult_vals[] = { { 0, NULL } }; -static const ber_old_choice_t AccessResult_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_failure_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_array_01_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_structure_01_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_boolean_01_impl }, - { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_bit_string_01_impl }, - { 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_integer_01_impl }, - { 6, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_unsigned_01_impl }, - { 7, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_floating_point_impl }, - { 9, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_octet_string_01_impl }, - { 10, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_visible_string_01_impl }, - { 12, BER_CLASS_CON, 12, BER_FLAGS_IMPLTAG, dissect_binary_time_01_impl }, - { 13, BER_CLASS_CON, 13, BER_FLAGS_IMPLTAG, dissect_bcd_01_impl }, - { 14, BER_CLASS_CON, 14, BER_FLAGS_IMPLTAG, dissect_booleanArray_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t AccessResult_choice[] = { + { 0, &hf_mms_failure , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_DataAccessError }, + { 1, &hf_mms_array_01 , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_Data }, + { 2, &hf_mms_structure_01 , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_Data }, + { 3, &hf_mms_boolean_01 , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { 4, &hf_mms_bit_string_01 , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mms_BIT_STRING }, + { 5, &hf_mms_integer_01 , BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_mms_INTEGER }, + { 6, &hf_mms_unsigned_01 , BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_mms_INTEGER }, + { 7, &hf_mms_floating_point , BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_mms_FloatingPoint }, + { 9, &hf_mms_octet_string_01 , BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_mms_OCTET_STRING }, + { 10, &hf_mms_visible_string_01, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_mms_VisibleString }, + { 12, &hf_mms_binary_time_01 , BER_CLASS_CON, 12, BER_FLAGS_IMPLTAG, dissect_mms_TimeOfDay }, + { 13, &hf_mms_bcd_01 , BER_CLASS_CON, 13, BER_FLAGS_IMPLTAG, dissect_mms_INTEGER }, + { 14, &hf_mms_booleanArray , BER_CLASS_CON, 14, BER_FLAGS_IMPLTAG, dissect_mms_BIT_STRING }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_AccessResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - AccessResult_choice, hf_index, ett_mms_AccessResult, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + AccessResult_choice, hf_index, ett_mms_AccessResult, + NULL); return offset; } -static int dissect_listOfAccessResult_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_AccessResult(FALSE, tvb, offset, actx, tree, hf_mms_listOfAccessResult_item); -} -static const ber_old_sequence_t SEQUENCE_OF_AccessResult_sequence_of[1] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listOfAccessResult_item }, +static const ber_sequence_t SEQUENCE_OF_AccessResult_sequence_of[1] = { + { &hf_mms_listOfAccessResult_item, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_AccessResult }, }; static int dissect_mms_SEQUENCE_OF_AccessResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_AccessResult_sequence_of, hf_index, ett_mms_SEQUENCE_OF_AccessResult); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_AccessResult_sequence_of, hf_index, ett_mms_SEQUENCE_OF_AccessResult); return offset; } -static int dissect_listOfAccessResult_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_AccessResult(TRUE, tvb, offset, actx, tree, hf_mms_listOfAccessResult); -} -static const ber_old_sequence_t Read_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_variableAccessSpecificatn }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfAccessResult_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t Read_Response_sequence[] = { + { &hf_mms_variableAccessSpecificatn, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_mms_VariableAccessSpecification }, + { &hf_mms_listOfAccessResult, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_AccessResult }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_Read_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Read_Response_sequence, hf_index, ett_mms_Read_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Read_Response_sequence, hf_index, ett_mms_Read_Response); return offset; } -static int dissect_read_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Read_Response(TRUE, tvb, offset, actx, tree, hf_mms_read_01); -} static const value_string mms_Write_Response_item_vals[] = { @@ -5644,58 +4444,49 @@ static const value_string mms_Write_Response_item_vals[] = { { 0, NULL } }; -static const ber_old_choice_t Write_Response_item_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_failure_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_success_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t Write_Response_item_choice[] = { + { 0, &hf_mms_failure , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_DataAccessError }, + { 1, &hf_mms_success , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_NULL }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_Write_Response_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - Write_Response_item_choice, hf_index, ett_mms_Write_Response_item, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + Write_Response_item_choice, hf_index, ett_mms_Write_Response_item, + NULL); return offset; } -static int dissect_Write_Response_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Write_Response_item(FALSE, tvb, offset, actx, tree, hf_mms_Write_Response_item); -} -static const ber_old_sequence_t Write_Response_sequence_of[1] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_Write_Response_item }, +static const ber_sequence_t Write_Response_sequence_of[1] = { + { &hf_mms_Write_Response_item, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_Write_Response_item }, }; static int dissect_mms_Write_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - Write_Response_sequence_of, hf_index, ett_mms_Write_Response); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + Write_Response_sequence_of, hf_index, ett_mms_Write_Response); return offset; } -static int dissect_write_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Write_Response(TRUE, tvb, offset, actx, tree, hf_mms_write_01); -} -static const ber_old_sequence_t GetVariableAccessAttributes_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_address }, - { BER_CLASS_CON, 2, BER_FLAGS_NOTCHKTAG, dissect_typeSpecification }, - { 0, 0, 0, NULL } +static const ber_sequence_t GetVariableAccessAttributes_Response_sequence[] = { + { &hf_mms_mmsDeletable , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_address , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_mms_Address }, + { &hf_mms_typeSpecification, BER_CLASS_CON, 2, BER_FLAGS_NOTCHKTAG, dissect_mms_TypeSpecification }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_GetVariableAccessAttributes_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - GetVariableAccessAttributes_Response_sequence, hf_index, ett_mms_GetVariableAccessAttributes_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + GetVariableAccessAttributes_Response_sequence, hf_index, ett_mms_GetVariableAccessAttributes_Response); return offset; } -static int dissect_getVariableAccessAttributes_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetVariableAccessAttributes_Response(TRUE, tvb, offset, actx, tree, hf_mms_getVariableAccessAttributes_01); -} @@ -5705,9 +4496,6 @@ dissect_mms_DefineNamedVariable_Response(gboolean implicit_tag _U_, tvbuff_t *tv return offset; } -static int dissect_defineNamedVariable_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DefineNamedVariable_Response(TRUE, tvb, offset, actx, tree, hf_mms_defineNamedVariable_01); -} @@ -5717,45 +4505,36 @@ dissect_mms_DefineScatteredAccess_Response(gboolean implicit_tag _U_, tvbuff_t * return offset; } -static int dissect_defineScatteredAccess_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DefineScatteredAccess_Response(TRUE, tvb, offset, actx, tree, hf_mms_defineScatteredAccess_01); -} -static const ber_old_sequence_t GetScatteredAccessAttributes_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_scatteredAccessDescription_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t GetScatteredAccessAttributes_Response_sequence[] = { + { &hf_mms_mmsDeletable , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_scatteredAccessDescription, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_ScatteredAccessDescription }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_GetScatteredAccessAttributes_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - GetScatteredAccessAttributes_Response_sequence, hf_index, ett_mms_GetScatteredAccessAttributes_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + GetScatteredAccessAttributes_Response_sequence, hf_index, ett_mms_GetScatteredAccessAttributes_Response); return offset; } -static int dissect_getScatteredAccessAttributes_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetScatteredAccessAttributes_Response(TRUE, tvb, offset, actx, tree, hf_mms_getScatteredAccessAttributes_01); -} -static const ber_old_sequence_t DeleteVariableAccess_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_numberMatched_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberDeleted_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t DeleteVariableAccess_Response_sequence[] = { + { &hf_mms_numberMatched , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { &hf_mms_numberDeleted , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_DeleteVariableAccess_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - DeleteVariableAccess_Response_sequence, hf_index, ett_mms_DeleteVariableAccess_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + DeleteVariableAccess_Response_sequence, hf_index, ett_mms_DeleteVariableAccess_Response); return offset; } -static int dissect_deleteVariableAccess_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteVariableAccess_Response(TRUE, tvb, offset, actx, tree, hf_mms_deleteVariableAccess_01); -} @@ -5765,79 +4544,64 @@ dissect_mms_DefineNamedVariableList_Response(gboolean implicit_tag _U_, tvbuff_t return offset; } -static int dissect_defineNamedVariableList_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DefineNamedVariableList_Response(TRUE, tvb, offset, actx, tree, hf_mms_defineNamedVariableList_01); -} -static const ber_old_sequence_t T_listOfVariable_item_01_sequence[] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableSpecification }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alternateAccess_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_listOfVariable_item_01_sequence[] = { + { &hf_mms_variableSpecification, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_VariableSpecification }, + { &hf_mms_alternateAccess , BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_AlternateAccess }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_listOfVariable_item_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - T_listOfVariable_item_01_sequence, hf_index, ett_mms_T_listOfVariable_item_01); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_listOfVariable_item_01_sequence, hf_index, ett_mms_T_listOfVariable_item_01); return offset; } -static int dissect_listOfVariable_item_01(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_listOfVariable_item_01(FALSE, tvb, offset, actx, tree, hf_mms_listOfVariable_item_01); -} -static const ber_old_sequence_t T_listOfVariable_01_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfVariable_item_01 }, +static const ber_sequence_t T_listOfVariable_01_sequence_of[1] = { + { &hf_mms_listOfVariable_item_01, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mms_T_listOfVariable_item_01 }, }; static int dissect_mms_T_listOfVariable_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - T_listOfVariable_01_sequence_of, hf_index, ett_mms_T_listOfVariable_01); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + T_listOfVariable_01_sequence_of, hf_index, ett_mms_T_listOfVariable_01); return offset; } -static int dissect_listOfVariable_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_listOfVariable_01(TRUE, tvb, offset, actx, tree, hf_mms_listOfVariable_01); -} -static const ber_old_sequence_t GetNamedVariableListAttributes_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfVariable_01_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t GetNamedVariableListAttributes_Response_sequence[] = { + { &hf_mms_mmsDeletable , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_listOfVariable_01, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_T_listOfVariable_01 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_GetNamedVariableListAttributes_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - GetNamedVariableListAttributes_Response_sequence, hf_index, ett_mms_GetNamedVariableListAttributes_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + GetNamedVariableListAttributes_Response_sequence, hf_index, ett_mms_GetNamedVariableListAttributes_Response); return offset; } -static int dissect_getNamedVariableListAttributes_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetNamedVariableListAttributes_Response(TRUE, tvb, offset, actx, tree, hf_mms_getNamedVariableListAttributes_01); -} -static const ber_old_sequence_t DeleteNamedVariableList_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_numberMatched_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberDeleted_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t DeleteNamedVariableList_Response_sequence[] = { + { &hf_mms_numberMatched , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { &hf_mms_numberDeleted , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_DeleteNamedVariableList_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - DeleteNamedVariableList_Response_sequence, hf_index, ett_mms_DeleteNamedVariableList_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + DeleteNamedVariableList_Response_sequence, hf_index, ett_mms_DeleteNamedVariableList_Response); return offset; } -static int dissect_deleteNamedVariableList_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteNamedVariableList_Response(TRUE, tvb, offset, actx, tree, hf_mms_deleteNamedVariableList_01); -} @@ -5847,45 +4611,36 @@ dissect_mms_DefineNamedType_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U return offset; } -static int dissect_defineNamedType_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DefineNamedType_Response(TRUE, tvb, offset, actx, tree, hf_mms_defineNamedType_01); -} -static const ber_old_sequence_t GetNamedTypeAttributes_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl }, - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeSpecification }, - { 0, 0, 0, NULL } +static const ber_sequence_t GetNamedTypeAttributes_Response_sequence[] = { + { &hf_mms_mmsDeletable , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_typeSpecification, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_TypeSpecification }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_GetNamedTypeAttributes_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - GetNamedTypeAttributes_Response_sequence, hf_index, ett_mms_GetNamedTypeAttributes_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + GetNamedTypeAttributes_Response_sequence, hf_index, ett_mms_GetNamedTypeAttributes_Response); return offset; } -static int dissect_getNamedTypeAttributes_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetNamedTypeAttributes_Response(TRUE, tvb, offset, actx, tree, hf_mms_getNamedTypeAttributes_01); -} -static const ber_old_sequence_t DeleteNamedType_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_numberMatched_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberDeleted_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t DeleteNamedType_Response_sequence[] = { + { &hf_mms_numberMatched , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { &hf_mms_numberDeleted , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_DeleteNamedType_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - DeleteNamedType_Response_sequence, hf_index, ett_mms_DeleteNamedType_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + DeleteNamedType_Response_sequence, hf_index, ett_mms_DeleteNamedType_Response); return offset; } -static int dissect_deleteNamedType_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteNamedType_Response(TRUE, tvb, offset, actx, tree, hf_mms_deleteNamedType_01); -} @@ -5897,9 +4652,6 @@ dissect_mms_Input_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off return offset; } -static int dissect_input_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Input_Response(TRUE, tvb, offset, actx, tree, hf_mms_input_01); -} @@ -5909,9 +4661,6 @@ dissect_mms_Output_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of return offset; } -static int dissect_output_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Output_Response(TRUE, tvb, offset, actx, tree, hf_mms_output_01); -} static const value_string mms_TakeControl_Response_vals[] = { @@ -5920,23 +4669,20 @@ static const value_string mms_TakeControl_Response_vals[] = { { 0, NULL } }; -static const ber_old_choice_t TakeControl_Response_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_noResult_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_namedToken_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t TakeControl_Response_choice[] = { + { 0, &hf_mms_noResult , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_NULL }, + { 1, &hf_mms_namedToken , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_TakeControl_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - TakeControl_Response_choice, hf_index, ett_mms_TakeControl_Response, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + TakeControl_Response_choice, hf_index, ett_mms_TakeControl_Response, + NULL); return offset; } -static int dissect_takeControl_01(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_TakeControl_Response(FALSE, tvb, offset, actx, tree, hf_mms_takeControl_01); -} @@ -5946,9 +4692,6 @@ dissect_mms_RelinquishControl_Response(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static int dissect_relinquishControl_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_RelinquishControl_Response(TRUE, tvb, offset, actx, tree, hf_mms_relinquishControl_01); -} @@ -5958,9 +4701,6 @@ dissect_mms_DefineSemaphore_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U return offset; } -static int dissect_defineSemaphore_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DefineSemaphore_Response(TRUE, tvb, offset, actx, tree, hf_mms_defineSemaphore_01); -} @@ -5970,9 +4710,6 @@ dissect_mms_DeleteSemaphore_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U return offset; } -static int dissect_deleteSemaphore_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteSemaphore_Response(TRUE, tvb, offset, actx, tree, hf_mms_deleteSemaphore_01); -} static const value_string mms_T_class_vals[] = { @@ -5989,30 +4726,24 @@ dissect_mms_T_class(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ return offset; } -static int dissect_class_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_class(TRUE, tvb, offset, actx, tree, hf_mms_class); -} -static const ber_old_sequence_t ReportSemaphoreStatus_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_class_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_numberOfTokens_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_numberOfOwnedTokens_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_numberOfHungTokens_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t ReportSemaphoreStatus_Response_sequence[] = { + { &hf_mms_mmsDeletable , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_class , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_T_class }, + { &hf_mms_numberOfTokens , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned16 }, + { &hf_mms_numberOfOwnedTokens, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned16 }, + { &hf_mms_numberOfHungTokens, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned16 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_ReportSemaphoreStatus_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - ReportSemaphoreStatus_Response_sequence, hf_index, ett_mms_ReportSemaphoreStatus_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ReportSemaphoreStatus_Response_sequence, hf_index, ett_mms_ReportSemaphoreStatus_Response); return offset; } -static int dissect_reportSemaphoreStatus_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ReportSemaphoreStatus_Response(TRUE, tvb, offset, actx, tree, hf_mms_reportSemaphoreStatus_01); -} static const value_string mms_T_listOfNamedTokens_item_vals[] = { @@ -6022,58 +4753,49 @@ static const value_string mms_T_listOfNamedTokens_item_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_listOfNamedTokens_item_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_freeNamedToken_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ownedNamedToken_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_hungNamedToken_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_listOfNamedTokens_item_choice[] = { + { 0, &hf_mms_freeNamedToken , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { 1, &hf_mms_ownedNamedToken , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { 2, &hf_mms_hungNamedToken , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_listOfNamedTokens_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_listOfNamedTokens_item_choice, hf_index, ett_mms_T_listOfNamedTokens_item, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_listOfNamedTokens_item_choice, hf_index, ett_mms_T_listOfNamedTokens_item, + NULL); return offset; } -static int dissect_listOfNamedTokens_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_listOfNamedTokens_item(FALSE, tvb, offset, actx, tree, hf_mms_listOfNamedTokens_item); -} -static const ber_old_sequence_t T_listOfNamedTokens_sequence_of[1] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listOfNamedTokens_item }, +static const ber_sequence_t T_listOfNamedTokens_sequence_of[1] = { + { &hf_mms_listOfNamedTokens_item, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_T_listOfNamedTokens_item }, }; static int dissect_mms_T_listOfNamedTokens(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - T_listOfNamedTokens_sequence_of, hf_index, ett_mms_T_listOfNamedTokens); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + T_listOfNamedTokens_sequence_of, hf_index, ett_mms_T_listOfNamedTokens); return offset; } -static int dissect_listOfNamedTokens_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_listOfNamedTokens(TRUE, tvb, offset, actx, tree, hf_mms_listOfNamedTokens); -} -static const ber_old_sequence_t ReportPoolSemaphoreStatus_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfNamedTokens_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t ReportPoolSemaphoreStatus_Response_sequence[] = { + { &hf_mms_listOfNamedTokens, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_T_listOfNamedTokens }, + { &hf_mms_moreFollows , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_ReportPoolSemaphoreStatus_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - ReportPoolSemaphoreStatus_Response_sequence, hf_index, ett_mms_ReportPoolSemaphoreStatus_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ReportPoolSemaphoreStatus_Response_sequence, hf_index, ett_mms_ReportPoolSemaphoreStatus_Response); return offset; } -static int dissect_reportPoolSemaphoreStatus_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ReportPoolSemaphoreStatus_Response(TRUE, tvb, offset, actx, tree, hf_mms_reportPoolSemaphoreStatus_01); -} static const value_string mms_T_entryClass_vals[] = { @@ -6090,67 +4812,55 @@ dissect_mms_T_entryClass(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse return offset; } -static int dissect_entryClass_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_entryClass(TRUE, tvb, offset, actx, tree, hf_mms_entryClass); -} -static const ber_old_sequence_t SemaphoreEntry_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_entryId_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_entryClass_impl }, - { BER_CLASS_CON, 2, 0, dissect_applicationReference }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_namedToken_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_priority_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_remainingTimeOut_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_abortOnTimeOut_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_relinquishIfConnectionLost_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t SemaphoreEntry_sequence[] = { + { &hf_mms_entryId , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_OCTET_STRING }, + { &hf_mms_entryClass , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_T_entryClass }, + { &hf_mms_applicationReference, BER_CLASS_CON, 2, 0, dissect_mms_ApplicationReference }, + { &hf_mms_namedToken , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Identifier }, + { &hf_mms_priority , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Priority }, + { &hf_mms_remainingTimeOut, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { &hf_mms_abortOnTimeOut , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_relinquishIfConnectionLost, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_SemaphoreEntry(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - SemaphoreEntry_sequence, hf_index, ett_mms_SemaphoreEntry); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + SemaphoreEntry_sequence, hf_index, ett_mms_SemaphoreEntry); return offset; } -static int dissect_listOfSemaphoreEntry_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SemaphoreEntry(FALSE, tvb, offset, actx, tree, hf_mms_listOfSemaphoreEntry_item); -} -static const ber_old_sequence_t SEQUENCE_OF_SemaphoreEntry_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfSemaphoreEntry_item }, +static const ber_sequence_t SEQUENCE_OF_SemaphoreEntry_sequence_of[1] = { + { &hf_mms_listOfSemaphoreEntry_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mms_SemaphoreEntry }, }; static int dissect_mms_SEQUENCE_OF_SemaphoreEntry(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_SemaphoreEntry_sequence_of, hf_index, ett_mms_SEQUENCE_OF_SemaphoreEntry); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_SemaphoreEntry_sequence_of, hf_index, ett_mms_SEQUENCE_OF_SemaphoreEntry); return offset; } -static int dissect_listOfSemaphoreEntry_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_SemaphoreEntry(TRUE, tvb, offset, actx, tree, hf_mms_listOfSemaphoreEntry); -} -static const ber_old_sequence_t ReportSemaphoreEntryStatus_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfSemaphoreEntry_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t ReportSemaphoreEntryStatus_Response_sequence[] = { + { &hf_mms_listOfSemaphoreEntry, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_SemaphoreEntry }, + { &hf_mms_moreFollows , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_ReportSemaphoreEntryStatus_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - ReportSemaphoreEntryStatus_Response_sequence, hf_index, ett_mms_ReportSemaphoreEntryStatus_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ReportSemaphoreEntryStatus_Response_sequence, hf_index, ett_mms_ReportSemaphoreEntryStatus_Response); return offset; } -static int dissect_reportSemaphoreEntryStatus_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ReportSemaphoreEntryStatus_Response(TRUE, tvb, offset, actx, tree, hf_mms_reportSemaphoreEntryStatus_01); -} @@ -6160,9 +4870,6 @@ dissect_mms_InitiateDownloadSequence_Response(gboolean implicit_tag _U_, tvbuff_ return offset; } -static int dissect_initiateDownloadSequence_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_InitiateDownloadSequence_Response(TRUE, tvb, offset, actx, tree, hf_mms_initiateDownloadSequence_01); -} static const value_string mms_T_loadData_vals[] = { @@ -6171,41 +4878,35 @@ static const value_string mms_T_loadData_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_loadData_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_non_coded_impl }, - { 1, BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_coded }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_loadData_choice[] = { + { 0, &hf_mms_non_coded , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_OCTET_STRING }, + { 1, &hf_mms_coded , BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_acse_EXTERNALt }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_loadData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_loadData_choice, hf_index, ett_mms_T_loadData, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_loadData_choice, hf_index, ett_mms_T_loadData, + NULL); return offset; } -static int dissect_loadData(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_loadData(FALSE, tvb, offset, actx, tree, hf_mms_loadData); -} -static const ber_old_sequence_t DownloadSegment_Response_sequence[] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_loadData }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t DownloadSegment_Response_sequence[] = { + { &hf_mms_loadData , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_T_loadData }, + { &hf_mms_moreFollows , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_DownloadSegment_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - DownloadSegment_Response_sequence, hf_index, ett_mms_DownloadSegment_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + DownloadSegment_Response_sequence, hf_index, ett_mms_DownloadSegment_Response); return offset; } -static int dissect_downloadSegment_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DownloadSegment_Response(TRUE, tvb, offset, actx, tree, hf_mms_downloadSegment_01); -} @@ -6215,43 +4916,34 @@ dissect_mms_TerminateDownloadSequence_Response(gboolean implicit_tag _U_, tvbuff return offset; } -static int dissect_terminateDownloadSequence_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_TerminateDownloadSequence_Response(TRUE, tvb, offset, actx, tree, hf_mms_terminateDownloadSequence_01); -} -static const ber_old_sequence_t T_listOfCapabilities_02_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfCapabilities_item }, +static const ber_sequence_t T_listOfCapabilities_02_sequence_of[1] = { + { &hf_mms_listOfCapabilities_item, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_mms_VisibleString }, }; static int dissect_mms_T_listOfCapabilities_02(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - T_listOfCapabilities_02_sequence_of, hf_index, ett_mms_T_listOfCapabilities_02); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + T_listOfCapabilities_02_sequence_of, hf_index, ett_mms_T_listOfCapabilities_02); return offset; } -static int dissect_listOfCapabilities_02_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_listOfCapabilities_02(TRUE, tvb, offset, actx, tree, hf_mms_listOfCapabilities_02); -} -static const ber_old_sequence_t InitiateUploadSequence_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ulsmID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfCapabilities_02_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t InitiateUploadSequence_Response_sequence[] = { + { &hf_mms_ulsmID , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Integer32 }, + { &hf_mms_listOfCapabilities_02, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_T_listOfCapabilities_02 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_InitiateUploadSequence_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - InitiateUploadSequence_Response_sequence, hf_index, ett_mms_InitiateUploadSequence_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + InitiateUploadSequence_Response_sequence, hf_index, ett_mms_InitiateUploadSequence_Response); return offset; } -static int dissect_initiateUploadSequence_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_InitiateUploadSequence_Response(TRUE, tvb, offset, actx, tree, hf_mms_initiateUploadSequence_01); -} static const value_string mms_T_loadData_01_vals[] = { @@ -6260,41 +4952,35 @@ static const value_string mms_T_loadData_01_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_loadData_01_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_non_coded_impl }, - { 1, BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_coded }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_loadData_01_choice[] = { + { 0, &hf_mms_non_coded , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_OCTET_STRING }, + { 1, &hf_mms_coded , BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_acse_EXTERNALt }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_loadData_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_loadData_01_choice, hf_index, ett_mms_T_loadData_01, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_loadData_01_choice, hf_index, ett_mms_T_loadData_01, + NULL); return offset; } -static int dissect_loadData_01(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_loadData_01(FALSE, tvb, offset, actx, tree, hf_mms_loadData_01); -} -static const ber_old_sequence_t UploadSegment_Response_sequence[] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_loadData_01 }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t UploadSegment_Response_sequence[] = { + { &hf_mms_loadData_01 , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_T_loadData_01 }, + { &hf_mms_moreFollows , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_UploadSegment_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - UploadSegment_Response_sequence, hf_index, ett_mms_UploadSegment_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + UploadSegment_Response_sequence, hf_index, ett_mms_UploadSegment_Response); return offset; } -static int dissect_uploadSegment_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_UploadSegment_Response(TRUE, tvb, offset, actx, tree, hf_mms_uploadSegment_01); -} @@ -6304,9 +4990,6 @@ dissect_mms_TerminateUploadSequence_Response(gboolean implicit_tag _U_, tvbuff_t return offset; } -static int dissect_terminateUploadSequence_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_TerminateUploadSequence_Response(TRUE, tvb, offset, actx, tree, hf_mms_terminateUploadSequence_01); -} @@ -6316,9 +4999,6 @@ dissect_mms_RequestDomainDownload_Response(gboolean implicit_tag _U_, tvbuff_t * return offset; } -static int dissect_requestDomainDownLoad_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_RequestDomainDownload_Response(TRUE, tvb, offset, actx, tree, hf_mms_requestDomainDownLoad); -} @@ -6328,9 +5008,6 @@ dissect_mms_RequestDomainUpload_Response(gboolean implicit_tag _U_, tvbuff_t *tv return offset; } -static int dissect_requestDomainUpload_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_RequestDomainUpload_Response(TRUE, tvb, offset, actx, tree, hf_mms_requestDomainUpload_01); -} @@ -6340,9 +5017,6 @@ dissect_mms_LoadDomainContent_Response(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static int dissect_loadDomainContent_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_LoadDomainContent_Response(TRUE, tvb, offset, actx, tree, hf_mms_loadDomainContent_01); -} @@ -6352,9 +5026,6 @@ dissect_mms_StoreDomainContent_Response(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static int dissect_storeDomainContent_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_StoreDomainContent_Response(TRUE, tvb, offset, actx, tree, hf_mms_storeDomainContent_01); -} @@ -6364,25 +5035,19 @@ dissect_mms_DeleteDomain_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_deleteDomain_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteDomain_Response(TRUE, tvb, offset, actx, tree, hf_mms_deleteDomain_01); -} -static const ber_old_sequence_t T_listOfCapabilities_05_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfCapabilities_item }, +static const ber_sequence_t T_listOfCapabilities_05_sequence_of[1] = { + { &hf_mms_listOfCapabilities_item, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_mms_VisibleString }, }; static int dissect_mms_T_listOfCapabilities_05(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - T_listOfCapabilities_05_sequence_of, hf_index, ett_mms_T_listOfCapabilities_05); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + T_listOfCapabilities_05_sequence_of, hf_index, ett_mms_T_listOfCapabilities_05); return offset; } -static int dissect_listOfCapabilities_05_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_listOfCapabilities_05(TRUE, tvb, offset, actx, tree, hf_mms_listOfCapabilities_05); -} static const value_string mms_DomainState_vals[] = { @@ -6412,9 +5077,6 @@ dissect_mms_DomainState(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_state_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DomainState(TRUE, tvb, offset, actx, tree, hf_mms_state); -} @@ -6425,37 +5087,25 @@ dissect_mms_Integer8(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U return offset; } -static int dissect_proposedDataStructureNestingLevel_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Integer8(TRUE, tvb, offset, actx, tree, hf_mms_proposedDataStructureNestingLevel); -} -static int dissect_negociatedDataStructureNestingLevel_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Integer8(TRUE, tvb, offset, actx, tree, hf_mms_negociatedDataStructureNestingLevel); -} -static int dissect_uploadInProgress_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Integer8(TRUE, tvb, offset, actx, tree, hf_mms_uploadInProgress); -} -static const ber_old_sequence_t GetDomainAttributes_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfCapabilities_05_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_state_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_sharable_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_listOfProgramInvocations_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_uploadInProgress_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t GetDomainAttributes_Response_sequence[] = { + { &hf_mms_listOfCapabilities_05, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_T_listOfCapabilities_05 }, + { &hf_mms_state , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_DomainState }, + { &hf_mms_mmsDeletable , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_sharable , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_listOfProgramInvocations, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_Identifier }, + { &hf_mms_uploadInProgress, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_mms_Integer8 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_GetDomainAttributes_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - GetDomainAttributes_Response_sequence, hf_index, ett_mms_GetDomainAttributes_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + GetDomainAttributes_Response_sequence, hf_index, ett_mms_GetDomainAttributes_Response); return offset; } -static int dissect_getDomainAttributes_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetDomainAttributes_Response(TRUE, tvb, offset, actx, tree, hf_mms_getDomainAttributes_01); -} @@ -6465,9 +5115,6 @@ dissect_mms_CreateProgramInvocation_Response(gboolean implicit_tag _U_, tvbuff_t return offset; } -static int dissect_createProgramInvocation_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_CreateProgramInvocation_Response(TRUE, tvb, offset, actx, tree, hf_mms_createProgramInvocation_01); -} @@ -6477,9 +5124,6 @@ dissect_mms_DeleteProgramInvocation_Response(gboolean implicit_tag _U_, tvbuff_t return offset; } -static int dissect_deleteProgramInvocation_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteProgramInvocation_Response(TRUE, tvb, offset, actx, tree, hf_mms_deleteProgramInvocation_01); -} @@ -6489,9 +5133,6 @@ dissect_mms_Start_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off return offset; } -static int dissect_start_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Start_Response(TRUE, tvb, offset, actx, tree, hf_mms_start_01); -} @@ -6501,9 +5142,6 @@ dissect_mms_Stop_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs return offset; } -static int dissect_stop_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Stop_Response(TRUE, tvb, offset, actx, tree, hf_mms_stop_01); -} @@ -6513,9 +5151,6 @@ dissect_mms_Resume_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of return offset; } -static int dissect_resume_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Resume_Response(TRUE, tvb, offset, actx, tree, hf_mms_resume_01); -} @@ -6525,9 +5160,6 @@ dissect_mms_Reset_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off return offset; } -static int dissect_reset_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Reset_Response(TRUE, tvb, offset, actx, tree, hf_mms_reset_01); -} @@ -6537,9 +5169,6 @@ dissect_mms_Kill_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs return offset; } -static int dissect_kill_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Kill_Response(TRUE, tvb, offset, actx, tree, hf_mms_kill_01); -} static const value_string mms_T_executionArgument_02_vals[] = { @@ -6548,46 +5177,40 @@ static const value_string mms_T_executionArgument_02_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_executionArgument_02_choice[] = { - { 0, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_simpleString_impl }, - { 1, BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_encodedString }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_executionArgument_02_choice[] = { + { 0, &hf_mms_simpleString , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_VisibleString }, + { 1, &hf_mms_encodedString , BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_acse_EXTERNALt }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_executionArgument_02(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_executionArgument_02_choice, hf_index, ett_mms_T_executionArgument_02, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_executionArgument_02_choice, hf_index, ett_mms_T_executionArgument_02, + NULL); return offset; } -static int dissect_executionArgument_02(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_executionArgument_02(FALSE, tvb, offset, actx, tree, hf_mms_executionArgument_02); -} -static const ber_old_sequence_t GetProgramInvocationAttributes_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_state_01_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfDomainNames_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_reusable_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_monitor_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_startArgument_impl }, - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_executionArgument_02 }, - { 0, 0, 0, NULL } +static const ber_sequence_t GetProgramInvocationAttributes_Response_sequence[] = { + { &hf_mms_state_01 , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_ProgramInvocationState }, + { &hf_mms_listOfDomainNames, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_Identifier }, + { &hf_mms_mmsDeletable , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_reusable , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_monitor , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_startArgument , BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_mms_VisibleString }, + { &hf_mms_executionArgument_02, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_T_executionArgument_02 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_GetProgramInvocationAttributes_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - GetProgramInvocationAttributes_Response_sequence, hf_index, ett_mms_GetProgramInvocationAttributes_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + GetProgramInvocationAttributes_Response_sequence, hf_index, ett_mms_GetProgramInvocationAttributes_Response); return offset; } -static int dissect_getProgramInvocationAttributes_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetProgramInvocationAttributes_Response(TRUE, tvb, offset, actx, tree, hf_mms_getProgramInvocationAttributes_01); -} @@ -6597,9 +5220,6 @@ dissect_mms_ObtainFile_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in return offset; } -static int dissect_obtainFile_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ObtainFile_Response(TRUE, tvb, offset, actx, tree, hf_mms_obtainFile_01); -} @@ -6609,45 +5229,36 @@ dissect_mms_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of return offset; } -static int dissect_lastModified_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GeneralizedTime(TRUE, tvb, offset, actx, tree, hf_mms_lastModified); -} -static const ber_old_sequence_t FileAttributes_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sizeOfFile_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lastModified_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t FileAttributes_sequence[] = { + { &hf_mms_sizeOfFile , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { &hf_mms_lastModified , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_GeneralizedTime }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_FileAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - FileAttributes_sequence, hf_index, ett_mms_FileAttributes); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + FileAttributes_sequence, hf_index, ett_mms_FileAttributes); return offset; } -static int dissect_fileAttributes_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileAttributes(TRUE, tvb, offset, actx, tree, hf_mms_fileAttributes); -} -static const ber_old_sequence_t FileOpen_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_frsmID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_fileAttributes_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t FileOpen_Response_sequence[] = { + { &hf_mms_frsmID , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Integer32 }, + { &hf_mms_fileAttributes , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_FileAttributes }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_FileOpen_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - FileOpen_Response_sequence, hf_index, ett_mms_FileOpen_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + FileOpen_Response_sequence, hf_index, ett_mms_FileOpen_Response); return offset; } -static int dissect_fileOpen_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileOpen_Response(TRUE, tvb, offset, actx, tree, hf_mms_fileOpen_01); -} @@ -6657,9 +5268,6 @@ dissect_mms_DefineEventCondition_Response(gboolean implicit_tag _U_, tvbuff_t *t return offset; } -static int dissect_defineEventCondition_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DefineEventCondition_Response(TRUE, tvb, offset, actx, tree, hf_mms_defineEventCondition_01); -} @@ -6669,9 +5277,6 @@ dissect_mms_DeleteEventCondition_Response(gboolean implicit_tag _U_, tvbuff_t *t return offset; } -static int dissect_deleteEventCondition_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteEventCondition_Response(TRUE, tvb, offset, actx, tree, hf_mms_deleteEventCondition_01); -} static const value_string mms_T_monitoredVariable_vals[] = { @@ -6680,67 +5285,58 @@ static const value_string mms_T_monitoredVariable_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_monitoredVariable_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_variableReference }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_undefined_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_monitoredVariable_choice[] = { + { 0, &hf_mms_variableReference, BER_CLASS_CON, 0, 0, dissect_mms_VariableSpecification }, + { 1, &hf_mms_undefined , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_NULL }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_monitoredVariable(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_monitoredVariable_choice, hf_index, ett_mms_T_monitoredVariable, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_monitoredVariable_choice, hf_index, ett_mms_T_monitoredVariable, + NULL); return offset; } -static int dissect_monitoredVariable_01(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_monitoredVariable(FALSE, tvb, offset, actx, tree, hf_mms_monitoredVariable_01); -} -static const ber_old_sequence_t GetEventConditionAttributes_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_class_01_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_prio_rity_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_severity_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alarmSummaryReports_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_monitoredVariable_01 }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_evaluationInterval_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t GetEventConditionAttributes_Response_sequence[] = { + { &hf_mms_mmsDeletable , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_class_01 , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_EC_Class }, + { &hf_mms_prio_rity , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Priority }, + { &hf_mms_severity , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Unsigned8 }, + { &hf_mms_alarmSummaryReports, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_monitoredVariable_01, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_mms_T_monitoredVariable }, + { &hf_mms_evaluationInterval, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_GetEventConditionAttributes_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - GetEventConditionAttributes_Response_sequence, hf_index, ett_mms_GetEventConditionAttributes_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + GetEventConditionAttributes_Response_sequence, hf_index, ett_mms_GetEventConditionAttributes_Response); return offset; } -static int dissect_getEventConditionAttributes_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetEventConditionAttributes_Response(TRUE, tvb, offset, actx, tree, hf_mms_getEventConditionAttributes_01); -} -static const ber_old_sequence_t ReportEventConditionStatus_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_currentState_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberOfEventEnrollments_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_enabled_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_timeOfLastTransitionToActive }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_timeOfLastTransitionToIdle }, - { 0, 0, 0, NULL } +static const ber_sequence_t ReportEventConditionStatus_Response_sequence[] = { + { &hf_mms_currentState , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_EC_State }, + { &hf_mms_numberOfEventEnrollments, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { &hf_mms_enabled , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_timeOfLastTransitionToActive, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_mms_EventTime }, + { &hf_mms_timeOfLastTransitionToIdle, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_mms_EventTime }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_ReportEventConditionStatus_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - ReportEventConditionStatus_Response_sequence, hf_index, ett_mms_ReportEventConditionStatus_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ReportEventConditionStatus_Response_sequence, hf_index, ett_mms_ReportEventConditionStatus_Response); return offset; } -static int dissect_reportEventConditionStatus_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ReportEventConditionStatus_Response(TRUE, tvb, offset, actx, tree, hf_mms_reportEventConditionStatus_01); -} @@ -6750,9 +5346,6 @@ dissect_mms_AlterEventConditionMonitoring_Response(gboolean implicit_tag _U_, tv return offset; } -static int dissect_alterEventConditionMonitoring_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_AlterEventConditionMonitoring_Response(TRUE, tvb, offset, actx, tree, hf_mms_alterEventConditionMonitoring_01); -} @@ -6762,9 +5355,6 @@ dissect_mms_TriggerEvent_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_triggerEvent_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_TriggerEvent_Response(TRUE, tvb, offset, actx, tree, hf_mms_triggerEvent_01); -} @@ -6774,9 +5364,6 @@ dissect_mms_DefineEventAction_Response(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static int dissect_defineEventAction_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DefineEventAction_Response(TRUE, tvb, offset, actx, tree, hf_mms_defineEventAction_01); -} @@ -6786,27 +5373,21 @@ dissect_mms_DeleteEventAction_Response(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static int dissect_deleteEventAction_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteEventAction_Response(TRUE, tvb, offset, actx, tree, hf_mms_deleteEventAction_01); -} -static const ber_old_sequence_t GetEventActionAttributes_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfModifier_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t GetEventActionAttributes_Response_sequence[] = { + { &hf_mms_mmsDeletable , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_listOfModifier , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_Modifier }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_GetEventActionAttributes_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - GetEventActionAttributes_Response_sequence, hf_index, ett_mms_GetEventActionAttributes_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + GetEventActionAttributes_Response_sequence, hf_index, ett_mms_GetEventActionAttributes_Response); return offset; } -static int dissect_getEventActionAttributes_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetEventActionAttributes_Response(TRUE, tvb, offset, actx, tree, hf_mms_getEventActionAttributes_01); -} @@ -6816,9 +5397,6 @@ dissect_mms_ReportEventActionStatus_Response(gboolean implicit_tag _U_, tvbuff_t return offset; } -static int dissect_reportActionStatus_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ReportEventActionStatus_Response(TRUE, tvb, offset, actx, tree, hf_mms_reportActionStatus); -} @@ -6828,9 +5406,6 @@ dissect_mms_DefineEventEnrollment_Response(gboolean implicit_tag _U_, tvbuff_t * return offset; } -static int dissect_defineEventEnrollment_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DefineEventEnrollment_Response(TRUE, tvb, offset, actx, tree, hf_mms_defineEventEnrollment_01); -} @@ -6840,9 +5415,6 @@ dissect_mms_DeleteEventEnrollment_Response(gboolean implicit_tag _U_, tvbuff_t * return offset; } -static int dissect_deleteEventEnrollment_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteEventEnrollment_Response(TRUE, tvb, offset, actx, tree, hf_mms_deleteEventEnrollment_01); -} static const value_string mms_EE_State_vals[] = { @@ -6865,15 +5437,6 @@ dissect_mms_EE_State(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U return offset; } -static int dissect_currentState_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_EE_State(TRUE, tvb, offset, actx, tree, hf_mms_currentState_01); -} -static int dissect_state_03_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_EE_State(TRUE, tvb, offset, actx, tree, hf_mms_state_03); -} -static int dissect_enrollementState_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_EE_State(TRUE, tvb, offset, actx, tree, hf_mms_enrollementState); -} static const value_string mms_T_currentState_vals[] = { @@ -6882,41 +5445,35 @@ static const value_string mms_T_currentState_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_currentState_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_state_03_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_undefined_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_currentState_choice[] = { + { 0, &hf_mms_state_03 , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_EE_State }, + { 1, &hf_mms_undefined , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_NULL }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_currentState(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_currentState_choice, hf_index, ett_mms_T_currentState, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_currentState_choice, hf_index, ett_mms_T_currentState, + NULL); return offset; } -static int dissect_currentState_02(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_currentState(FALSE, tvb, offset, actx, tree, hf_mms_currentState_02); -} -static const ber_old_sequence_t AlterEventEnrollment_Response_sequence[] = { - { BER_CLASS_CON, 0, 0, dissect_currentState_02 }, - { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_transitionTime }, - { 0, 0, 0, NULL } +static const ber_sequence_t AlterEventEnrollment_Response_sequence[] = { + { &hf_mms_currentState_02 , BER_CLASS_CON, 0, 0, dissect_mms_T_currentState }, + { &hf_mms_transitionTime , BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_mms_EventTime }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_AlterEventEnrollment_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - AlterEventEnrollment_Response_sequence, hf_index, ett_mms_AlterEventEnrollment_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + AlterEventEnrollment_Response_sequence, hf_index, ett_mms_AlterEventEnrollment_Response); return offset; } -static int dissect_alterEventEnrollment_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_AlterEventEnrollment_Response(TRUE, tvb, offset, actx, tree, hf_mms_alterEventEnrollment_01); -} static const value_string mms_EE_Duration_vals[] = { @@ -6933,30 +5490,24 @@ dissect_mms_EE_Duration(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_duration_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_EE_Duration(TRUE, tvb, offset, actx, tree, hf_mms_duration); -} -static const ber_old_sequence_t ReportEventEnrollmentStatus_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventConditionTransitions_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notificationLost_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_duration_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alarmAcknowledgmentRule_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_currentState_01_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t ReportEventEnrollmentStatus_Response_sequence[] = { + { &hf_mms_eventConditionTransitions, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Transitions }, + { &hf_mms_notificationLost, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_duration , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_EE_Duration }, + { &hf_mms_alarmAcknowledgmentRule, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_AlarmAckRule }, + { &hf_mms_currentState_01 , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mms_EE_State }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_ReportEventEnrollmentStatus_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - ReportEventEnrollmentStatus_Response_sequence, hf_index, ett_mms_ReportEventEnrollmentStatus_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ReportEventEnrollmentStatus_Response_sequence, hf_index, ett_mms_ReportEventEnrollmentStatus_Response); return offset; } -static int dissect_reportEventEnrollmentStatus_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ReportEventEnrollmentStatus_Response(TRUE, tvb, offset, actx, tree, hf_mms_reportEventEnrollmentStatus_01); -} static const value_string mms_T_eventConditionName_vals[] = { @@ -6965,23 +5516,20 @@ static const value_string mms_T_eventConditionName_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_eventConditionName_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_eventCondition }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_undefined_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_eventConditionName_choice[] = { + { 0, &hf_mms_eventCondition , BER_CLASS_CON, 0, 0, dissect_mms_ObjectName }, + { 1, &hf_mms_undefined , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_NULL }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_eventConditionName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_eventConditionName_choice, hf_index, ett_mms_T_eventConditionName, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_eventConditionName_choice, hf_index, ett_mms_T_eventConditionName, + NULL); return offset; } -static int dissect_eventConditionName_01(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_eventConditionName(FALSE, tvb, offset, actx, tree, hf_mms_eventConditionName_01); -} static const value_string mms_T_eventActionName_vals[] = { @@ -6990,23 +5538,20 @@ static const value_string mms_T_eventActionName_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_eventActionName_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_eventAction }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_undefined_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_eventActionName_choice[] = { + { 0, &hf_mms_eventAction , BER_CLASS_CON, 0, 0, dissect_mms_ObjectName }, + { 1, &hf_mms_undefined , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_NULL }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_eventActionName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_eventActionName_choice, hf_index, ett_mms_T_eventActionName, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_eventActionName_choice, hf_index, ett_mms_T_eventActionName, + NULL); return offset; } -static int dissect_eventActionName_01(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_eventActionName(FALSE, tvb, offset, actx, tree, hf_mms_eventActionName_01); -} static const value_string mms_EE_Class_vals[] = { @@ -7023,68 +5568,56 @@ dissect_mms_EE_Class(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U return offset; } -static int dissect_enrollmentClass_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_EE_Class(TRUE, tvb, offset, actx, tree, hf_mms_enrollmentClass); -} -static const ber_old_sequence_t EventEnrollment_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventEnrollmentName }, - { BER_CLASS_CON, 1, 0, dissect_eventConditionName_01 }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_eventActionName_01 }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_clientApplication }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_enrollmentClass_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_duration_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_invokeID_impl }, - { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_remainingAcceptableDelay_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t EventEnrollment_sequence[] = { + { &hf_mms_eventEnrollmentName, BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_eventConditionName_01, BER_CLASS_CON, 1, 0, dissect_mms_T_eventConditionName }, + { &hf_mms_eventActionName_01, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_mms_T_eventActionName }, + { &hf_mms_clientApplication, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_mms_ApplicationReference }, + { &hf_mms_mmsDeletable , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_enrollmentClass , BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_mms_EE_Class }, + { &hf_mms_duration , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_EE_Duration }, + { &hf_mms_invokeID , BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { &hf_mms_remainingAcceptableDelay, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_EventEnrollment(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - EventEnrollment_sequence, hf_index, ett_mms_EventEnrollment); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + EventEnrollment_sequence, hf_index, ett_mms_EventEnrollment); return offset; } -static int dissect_listOfEventEnrollment_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_EventEnrollment(FALSE, tvb, offset, actx, tree, hf_mms_listOfEventEnrollment_item); -} -static const ber_old_sequence_t SEQUENCE_OF_EventEnrollment_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfEventEnrollment_item }, +static const ber_sequence_t SEQUENCE_OF_EventEnrollment_sequence_of[1] = { + { &hf_mms_listOfEventEnrollment_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mms_EventEnrollment }, }; static int dissect_mms_SEQUENCE_OF_EventEnrollment(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_EventEnrollment_sequence_of, hf_index, ett_mms_SEQUENCE_OF_EventEnrollment); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_EventEnrollment_sequence_of, hf_index, ett_mms_SEQUENCE_OF_EventEnrollment); return offset; } -static int dissect_listOfEventEnrollment_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_EventEnrollment(TRUE, tvb, offset, actx, tree, hf_mms_listOfEventEnrollment); -} -static const ber_old_sequence_t GetEventEnrollmentAttributes_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfEventEnrollment_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t GetEventEnrollmentAttributes_Response_sequence[] = { + { &hf_mms_listOfEventEnrollment, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_EventEnrollment }, + { &hf_mms_moreFollows , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_GetEventEnrollmentAttributes_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - GetEventEnrollmentAttributes_Response_sequence, hf_index, ett_mms_GetEventEnrollmentAttributes_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + GetEventEnrollmentAttributes_Response_sequence, hf_index, ett_mms_GetEventEnrollmentAttributes_Response); return offset; } -static int dissect_getEventEnrollmentAttributes_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetEventEnrollmentAttributes_Response(TRUE, tvb, offset, actx, tree, hf_mms_getEventEnrollmentAttributes_01); -} @@ -7094,9 +5627,6 @@ dissect_mms_AcknowledgeEventNotification_Response(gboolean implicit_tag _U_, tvb return offset; } -static int dissect_acknowledgeEventNotification_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_AcknowledgeEventNotification_Response(TRUE, tvb, offset, actx, tree, hf_mms_acknowledgeEventNotification_01); -} static const value_string mms_T_unacknowledgedState_vals[] = { @@ -7115,179 +5645,149 @@ dissect_mms_T_unacknowledgedState(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_unacknowledgedState_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_unacknowledgedState(TRUE, tvb, offset, actx, tree, hf_mms_unacknowledgedState); -} -static const ber_old_sequence_t AlarmSummary_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventConditionName }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_severity_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_currentState_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_unacknowledgedState_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_timeOfLastTransitionToActive }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_timeOfLastTransitionToIdle }, - { 0, 0, 0, NULL } +static const ber_sequence_t AlarmSummary_sequence[] = { + { &hf_mms_eventConditionName, BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_severity , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned8 }, + { &hf_mms_currentState , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_EC_State }, + { &hf_mms_unacknowledgedState, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_mms_T_unacknowledgedState }, + { &hf_mms_timeOfLastTransitionToActive, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_mms_EventTime }, + { &hf_mms_timeOfLastTransitionToIdle, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_mms_EventTime }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_AlarmSummary(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - AlarmSummary_sequence, hf_index, ett_mms_AlarmSummary); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + AlarmSummary_sequence, hf_index, ett_mms_AlarmSummary); return offset; } -static int dissect_listOfAlarmSummary_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_AlarmSummary(FALSE, tvb, offset, actx, tree, hf_mms_listOfAlarmSummary_item); -} -static const ber_old_sequence_t SEQUENCE_OF_AlarmSummary_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfAlarmSummary_item }, +static const ber_sequence_t SEQUENCE_OF_AlarmSummary_sequence_of[1] = { + { &hf_mms_listOfAlarmSummary_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mms_AlarmSummary }, }; static int dissect_mms_SEQUENCE_OF_AlarmSummary(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_AlarmSummary_sequence_of, hf_index, ett_mms_SEQUENCE_OF_AlarmSummary); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_AlarmSummary_sequence_of, hf_index, ett_mms_SEQUENCE_OF_AlarmSummary); return offset; } -static int dissect_listOfAlarmSummary_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_AlarmSummary(TRUE, tvb, offset, actx, tree, hf_mms_listOfAlarmSummary); -} -static const ber_old_sequence_t GetAlarmSummary_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfAlarmSummary_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t GetAlarmSummary_Response_sequence[] = { + { &hf_mms_listOfAlarmSummary, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_AlarmSummary }, + { &hf_mms_moreFollows , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_GetAlarmSummary_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - GetAlarmSummary_Response_sequence, hf_index, ett_mms_GetAlarmSummary_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + GetAlarmSummary_Response_sequence, hf_index, ett_mms_GetAlarmSummary_Response); return offset; } -static int dissect_getAlarmSummary_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetAlarmSummary_Response(TRUE, tvb, offset, actx, tree, hf_mms_getAlarmSummary_01); -} -static const ber_old_sequence_t AlarmEnrollmentSummary_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventEnrollmentName }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_clientApplication }, - { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_severity_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_currentState_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notificationLost_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alarmAcknowledgmentRule_impl }, - { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_enrollementState_impl }, - { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_timeOfLastTransitionToActive }, - { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_timeActiveAcknowledged }, - { BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_timeOfLastTransitionToIdle }, - { BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_timeIdleAcknowledged }, - { 0, 0, 0, NULL } +static const ber_sequence_t AlarmEnrollmentSummary_sequence[] = { + { &hf_mms_eventEnrollmentName, BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_clientApplication, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_mms_ApplicationReference }, + { &hf_mms_severity , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned8 }, + { &hf_mms_currentState , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mms_EC_State }, + { &hf_mms_notificationLost, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_alarmAcknowledgmentRule, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_AlarmAckRule }, + { &hf_mms_enrollementState, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_EE_State }, + { &hf_mms_timeOfLastTransitionToActive, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_mms_EventTime }, + { &hf_mms_timeActiveAcknowledged, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_mms_EventTime }, + { &hf_mms_timeOfLastTransitionToIdle, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_mms_EventTime }, + { &hf_mms_timeIdleAcknowledged, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_mms_EventTime }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_AlarmEnrollmentSummary(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - AlarmEnrollmentSummary_sequence, hf_index, ett_mms_AlarmEnrollmentSummary); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + AlarmEnrollmentSummary_sequence, hf_index, ett_mms_AlarmEnrollmentSummary); return offset; } -static int dissect_listOfAlarmEnrollmentSummary_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_AlarmEnrollmentSummary(FALSE, tvb, offset, actx, tree, hf_mms_listOfAlarmEnrollmentSummary_item); -} -static const ber_old_sequence_t SEQUENCE_OF_AlarmEnrollmentSummary_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfAlarmEnrollmentSummary_item }, +static const ber_sequence_t SEQUENCE_OF_AlarmEnrollmentSummary_sequence_of[1] = { + { &hf_mms_listOfAlarmEnrollmentSummary_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mms_AlarmEnrollmentSummary }, }; static int dissect_mms_SEQUENCE_OF_AlarmEnrollmentSummary(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_AlarmEnrollmentSummary_sequence_of, hf_index, ett_mms_SEQUENCE_OF_AlarmEnrollmentSummary); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_AlarmEnrollmentSummary_sequence_of, hf_index, ett_mms_SEQUENCE_OF_AlarmEnrollmentSummary); return offset; } -static int dissect_listOfAlarmEnrollmentSummary_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_AlarmEnrollmentSummary(TRUE, tvb, offset, actx, tree, hf_mms_listOfAlarmEnrollmentSummary); -} -static const ber_old_sequence_t GetAlarmEnrollmentSummary_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfAlarmEnrollmentSummary_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t GetAlarmEnrollmentSummary_Response_sequence[] = { + { &hf_mms_listOfAlarmEnrollmentSummary, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_AlarmEnrollmentSummary }, + { &hf_mms_moreFollows , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_GetAlarmEnrollmentSummary_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - GetAlarmEnrollmentSummary_Response_sequence, hf_index, ett_mms_GetAlarmEnrollmentSummary_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + GetAlarmEnrollmentSummary_Response_sequence, hf_index, ett_mms_GetAlarmEnrollmentSummary_Response); return offset; } -static int dissect_getAlarmEnrollmentSummary_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetAlarmEnrollmentSummary_Response(TRUE, tvb, offset, actx, tree, hf_mms_getAlarmEnrollmentSummary_01); -} -static const ber_old_sequence_t JournalEntry_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_entryIdentifier_impl }, - { BER_CLASS_CON, 1, 0, dissect_originatingApplication }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_entryContent_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t JournalEntry_sequence[] = { + { &hf_mms_entryIdentifier , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_OCTET_STRING }, + { &hf_mms_originatingApplication, BER_CLASS_CON, 1, 0, dissect_mms_ApplicationReference }, + { &hf_mms_entryContent , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_EntryContent }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_JournalEntry(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - JournalEntry_sequence, hf_index, ett_mms_JournalEntry); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + JournalEntry_sequence, hf_index, ett_mms_JournalEntry); return offset; } -static int dissect_listOfJournalEntry_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_JournalEntry(FALSE, tvb, offset, actx, tree, hf_mms_listOfJournalEntry_item); -} -static const ber_old_sequence_t SEQUENCE_OF_JournalEntry_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfJournalEntry_item }, +static const ber_sequence_t SEQUENCE_OF_JournalEntry_sequence_of[1] = { + { &hf_mms_listOfJournalEntry_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mms_JournalEntry }, }; static int dissect_mms_SEQUENCE_OF_JournalEntry(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_JournalEntry_sequence_of, hf_index, ett_mms_SEQUENCE_OF_JournalEntry); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_JournalEntry_sequence_of, hf_index, ett_mms_SEQUENCE_OF_JournalEntry); return offset; } -static int dissect_listOfJournalEntry_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_JournalEntry(TRUE, tvb, offset, actx, tree, hf_mms_listOfJournalEntry); -} -static const ber_old_sequence_t ReadJournal_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfJournalEntry_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t ReadJournal_Response_sequence[] = { + { &hf_mms_listOfJournalEntry, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_JournalEntry }, + { &hf_mms_moreFollows , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_ReadJournal_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - ReadJournal_Response_sequence, hf_index, ett_mms_ReadJournal_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ReadJournal_Response_sequence, hf_index, ett_mms_ReadJournal_Response); return offset; } -static int dissect_readJournal_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ReadJournal_Response(TRUE, tvb, offset, actx, tree, hf_mms_readJournal_01); -} @@ -7297,9 +5797,6 @@ dissect_mms_WriteJournal_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_writeJournal_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_WriteJournal_Response(TRUE, tvb, offset, actx, tree, hf_mms_writeJournal_01); -} @@ -7309,27 +5806,21 @@ dissect_mms_InitializeJournal_Response(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static int dissect_initializeJournal_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_InitializeJournal_Response(TRUE, tvb, offset, actx, tree, hf_mms_initializeJournal_01); -} -static const ber_old_sequence_t ReportJournalStatus_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_currentEntries_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t ReportJournalStatus_Response_sequence[] = { + { &hf_mms_currentEntries , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { &hf_mms_mmsDeletable , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_ReportJournalStatus_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - ReportJournalStatus_Response_sequence, hf_index, ett_mms_ReportJournalStatus_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ReportJournalStatus_Response_sequence, hf_index, ett_mms_ReportJournalStatus_Response); return offset; } -static int dissect_reportJournalStatus_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ReportJournalStatus_Response(TRUE, tvb, offset, actx, tree, hf_mms_reportJournalStatus_01); -} @@ -7339,9 +5830,6 @@ dissect_mms_CreateJournal_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_createJournal_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_CreateJournal_Response(TRUE, tvb, offset, actx, tree, hf_mms_createJournal_01); -} @@ -7351,61 +5839,49 @@ dissect_mms_DeleteJournal_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_deleteJournal_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DeleteJournal_Response(TRUE, tvb, offset, actx, tree, hf_mms_deleteJournal_01); -} -static const ber_old_sequence_t T_listOfCapabilities_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfCapabilities_item }, +static const ber_sequence_t T_listOfCapabilities_sequence_of[1] = { + { &hf_mms_listOfCapabilities_item, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_mms_VisibleString }, }; static int dissect_mms_T_listOfCapabilities(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - T_listOfCapabilities_sequence_of, hf_index, ett_mms_T_listOfCapabilities); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + T_listOfCapabilities_sequence_of, hf_index, ett_mms_T_listOfCapabilities); return offset; } -static int dissect_listOfCapabilities_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_listOfCapabilities(TRUE, tvb, offset, actx, tree, hf_mms_listOfCapabilities); -} -static const ber_old_sequence_t GetCapabilityList_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfCapabilities_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t GetCapabilityList_Response_sequence[] = { + { &hf_mms_listOfCapabilities, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_T_listOfCapabilities }, + { &hf_mms_moreFollows , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_GetCapabilityList_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - GetCapabilityList_Response_sequence, hf_index, ett_mms_GetCapabilityList_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + GetCapabilityList_Response_sequence, hf_index, ett_mms_GetCapabilityList_Response); return offset; } -static int dissect_getCapabilityList_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_GetCapabilityList_Response(TRUE, tvb, offset, actx, tree, hf_mms_getCapabilityList_01); -} -static const ber_old_sequence_t FileRead_Response_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_fileData_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t FileRead_Response_sequence[] = { + { &hf_mms_fileData , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_OCTET_STRING }, + { &hf_mms_moreFollows , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_FileRead_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - FileRead_Response_sequence, hf_index, ett_mms_FileRead_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + FileRead_Response_sequence, hf_index, ett_mms_FileRead_Response); return offset; } -static int dissect_fileRead_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileRead_Response(TRUE, tvb, offset, actx, tree, hf_mms_fileRead_01); -} @@ -7415,9 +5891,6 @@ dissect_mms_FileClose_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_fileClose_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileClose_Response(TRUE, tvb, offset, actx, tree, hf_mms_fileClose_01); -} @@ -7427,9 +5900,6 @@ dissect_mms_FileRename_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in return offset; } -static int dissect_fileRename_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileRename_Response(TRUE, tvb, offset, actx, tree, hf_mms_fileRename_01); -} @@ -7439,61 +5909,49 @@ dissect_mms_FileDelete_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in return offset; } -static int dissect_fileDelete_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileDelete_Response(TRUE, tvb, offset, actx, tree, hf_mms_fileDelete_01); -} -static const ber_old_sequence_t DirectoryEntry_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_filename_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_fileAttributes_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t DirectoryEntry_sequence[] = { + { &hf_mms_filename , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_FileName }, + { &hf_mms_fileAttributes , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_FileAttributes }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_DirectoryEntry(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - DirectoryEntry_sequence, hf_index, ett_mms_DirectoryEntry); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + DirectoryEntry_sequence, hf_index, ett_mms_DirectoryEntry); return offset; } -static int dissect_listOfDirectoryEntry_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_DirectoryEntry(FALSE, tvb, offset, actx, tree, hf_mms_listOfDirectoryEntry_item); -} -static const ber_old_sequence_t SEQUENCE_OF_DirectoryEntry_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfDirectoryEntry_item }, +static const ber_sequence_t SEQUENCE_OF_DirectoryEntry_sequence_of[1] = { + { &hf_mms_listOfDirectoryEntry_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mms_DirectoryEntry }, }; static int dissect_mms_SEQUENCE_OF_DirectoryEntry(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_DirectoryEntry_sequence_of, hf_index, ett_mms_SEQUENCE_OF_DirectoryEntry); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_DirectoryEntry_sequence_of, hf_index, ett_mms_SEQUENCE_OF_DirectoryEntry); return offset; } -static int dissect_listOfDirectoryEntry(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_SEQUENCE_OF_DirectoryEntry(FALSE, tvb, offset, actx, tree, hf_mms_listOfDirectoryEntry); -} -static const ber_old_sequence_t FileDirectory_Response_sequence[] = { - { BER_CLASS_CON, 0, 0, dissect_listOfDirectoryEntry }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t FileDirectory_Response_sequence[] = { + { &hf_mms_listOfDirectoryEntry, BER_CLASS_CON, 0, 0, dissect_mms_SEQUENCE_OF_DirectoryEntry }, + { &hf_mms_moreFollows , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_FileDirectory_Response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - FileDirectory_Response_sequence, hf_index, ett_mms_FileDirectory_Response); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + FileDirectory_Response_sequence, hf_index, ett_mms_FileDirectory_Response); return offset; } -static int dissect_fileDirectory_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_FileDirectory_Response(TRUE, tvb, offset, actx, tree, hf_mms_fileDirectory_01); -} static const value_string mms_ConfirmedServiceResponse_vals[] = { @@ -7578,158 +6036,143 @@ static const value_string mms_ConfirmedServiceResponse_vals[] = { { 0, NULL } }; -static const ber_old_choice_t ConfirmedServiceResponse_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_status_01_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_getNameList_01_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_identify_01_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_rename_01_impl }, - { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_read_01_impl }, - { 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_write_01_impl }, - { 6, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_getVariableAccessAttributes_01_impl }, - { 7, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_defineNamedVariable_01_impl }, - { 8, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_defineScatteredAccess_01_impl }, - { 9, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_getScatteredAccessAttributes_01_impl }, - { 10, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_deleteVariableAccess_01_impl }, - { 11, BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_defineNamedVariableList_01_impl }, - { 12, BER_CLASS_CON, 12, BER_FLAGS_IMPLTAG, dissect_getNamedVariableListAttributes_01_impl }, - { 13, BER_CLASS_CON, 13, BER_FLAGS_IMPLTAG, dissect_deleteNamedVariableList_01_impl }, - { 14, BER_CLASS_CON, 14, BER_FLAGS_IMPLTAG, dissect_defineNamedType_01_impl }, - { 15, BER_CLASS_CON, 15, BER_FLAGS_IMPLTAG, dissect_getNamedTypeAttributes_01_impl }, - { 16, BER_CLASS_CON, 16, BER_FLAGS_IMPLTAG, dissect_deleteNamedType_01_impl }, - { 17, BER_CLASS_CON, 17, BER_FLAGS_IMPLTAG, dissect_input_01_impl }, - { 18, BER_CLASS_CON, 18, BER_FLAGS_IMPLTAG, dissect_output_01_impl }, - { 19, BER_CLASS_CON, 19, 0, dissect_takeControl_01 }, - { 20, BER_CLASS_CON, 20, BER_FLAGS_IMPLTAG, dissect_relinquishControl_01_impl }, - { 21, BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_defineSemaphore_01_impl }, - { 22, BER_CLASS_CON, 22, BER_FLAGS_IMPLTAG, dissect_deleteSemaphore_01_impl }, - { 23, BER_CLASS_CON, 23, BER_FLAGS_IMPLTAG, dissect_reportSemaphoreStatus_01_impl }, - { 24, BER_CLASS_CON, 24, BER_FLAGS_IMPLTAG, dissect_reportPoolSemaphoreStatus_01_impl }, - { 25, BER_CLASS_CON, 25, BER_FLAGS_IMPLTAG, dissect_reportSemaphoreEntryStatus_01_impl }, - { 26, BER_CLASS_CON, 26, BER_FLAGS_IMPLTAG, dissect_initiateDownloadSequence_01_impl }, - { 27, BER_CLASS_CON, 27, BER_FLAGS_IMPLTAG, dissect_downloadSegment_01_impl }, - { 28, BER_CLASS_CON, 28, BER_FLAGS_IMPLTAG, dissect_terminateDownloadSequence_01_impl }, - { 29, BER_CLASS_CON, 29, BER_FLAGS_IMPLTAG, dissect_initiateUploadSequence_01_impl }, - { 30, BER_CLASS_CON, 30, BER_FLAGS_IMPLTAG, dissect_uploadSegment_01_impl }, - { 31, BER_CLASS_CON, 31, BER_FLAGS_IMPLTAG, dissect_terminateUploadSequence_01_impl }, - { 32, BER_CLASS_CON, 32, BER_FLAGS_IMPLTAG, dissect_requestDomainDownLoad_impl }, - { 33, BER_CLASS_CON, 33, BER_FLAGS_IMPLTAG, dissect_requestDomainUpload_01_impl }, - { 34, BER_CLASS_CON, 34, BER_FLAGS_IMPLTAG, dissect_loadDomainContent_01_impl }, - { 35, BER_CLASS_CON, 35, BER_FLAGS_IMPLTAG, dissect_storeDomainContent_01_impl }, - { 36, BER_CLASS_CON, 36, BER_FLAGS_IMPLTAG, dissect_deleteDomain_01_impl }, - { 37, BER_CLASS_CON, 37, BER_FLAGS_IMPLTAG, dissect_getDomainAttributes_01_impl }, - { 38, BER_CLASS_CON, 38, BER_FLAGS_IMPLTAG, dissect_createProgramInvocation_01_impl }, - { 39, BER_CLASS_CON, 39, BER_FLAGS_IMPLTAG, dissect_deleteProgramInvocation_01_impl }, - { 40, BER_CLASS_CON, 40, BER_FLAGS_IMPLTAG, dissect_start_01_impl }, - { 41, BER_CLASS_CON, 41, BER_FLAGS_IMPLTAG, dissect_stop_01_impl }, - { 42, BER_CLASS_CON, 42, BER_FLAGS_IMPLTAG, dissect_resume_01_impl }, - { 43, BER_CLASS_CON, 43, BER_FLAGS_IMPLTAG, dissect_reset_01_impl }, - { 44, BER_CLASS_CON, 44, BER_FLAGS_IMPLTAG, dissect_kill_01_impl }, - { 45, BER_CLASS_CON, 45, BER_FLAGS_IMPLTAG, dissect_getProgramInvocationAttributes_01_impl }, - { 46, BER_CLASS_CON, 46, BER_FLAGS_IMPLTAG, dissect_obtainFile_01_impl }, - { 72, BER_CLASS_CON, 72, BER_FLAGS_IMPLTAG, dissect_fileOpen_01_impl }, - { 47, BER_CLASS_CON, 47, BER_FLAGS_IMPLTAG, dissect_defineEventCondition_01_impl }, - { 48, BER_CLASS_CON, 48, BER_FLAGS_IMPLTAG, dissect_deleteEventCondition_01_impl }, - { 49, BER_CLASS_CON, 49, BER_FLAGS_IMPLTAG, dissect_getEventConditionAttributes_01_impl }, - { 50, BER_CLASS_CON, 50, BER_FLAGS_IMPLTAG, dissect_reportEventConditionStatus_01_impl }, - { 51, BER_CLASS_CON, 51, BER_FLAGS_IMPLTAG, dissect_alterEventConditionMonitoring_01_impl }, - { 52, BER_CLASS_CON, 52, BER_FLAGS_IMPLTAG, dissect_triggerEvent_01_impl }, - { 53, BER_CLASS_CON, 53, BER_FLAGS_IMPLTAG, dissect_defineEventAction_01_impl }, - { 54, BER_CLASS_CON, 54, BER_FLAGS_IMPLTAG, dissect_deleteEventAction_01_impl }, - { 55, BER_CLASS_CON, 55, BER_FLAGS_IMPLTAG, dissect_getEventActionAttributes_01_impl }, - { 56, BER_CLASS_CON, 56, BER_FLAGS_IMPLTAG, dissect_reportActionStatus_impl }, - { 57, BER_CLASS_CON, 57, BER_FLAGS_IMPLTAG, dissect_defineEventEnrollment_01_impl }, - { 58, BER_CLASS_CON, 58, BER_FLAGS_IMPLTAG, dissect_deleteEventEnrollment_01_impl }, - { 59, BER_CLASS_CON, 59, BER_FLAGS_IMPLTAG, dissect_alterEventEnrollment_01_impl }, - { 60, BER_CLASS_CON, 60, BER_FLAGS_IMPLTAG, dissect_reportEventEnrollmentStatus_01_impl }, - { 61, BER_CLASS_CON, 61, BER_FLAGS_IMPLTAG, dissect_getEventEnrollmentAttributes_01_impl }, - { 62, BER_CLASS_CON, 62, BER_FLAGS_IMPLTAG, dissect_acknowledgeEventNotification_01_impl }, - { 63, BER_CLASS_CON, 63, BER_FLAGS_IMPLTAG, dissect_getAlarmSummary_01_impl }, - { 64, BER_CLASS_CON, 64, BER_FLAGS_IMPLTAG, dissect_getAlarmEnrollmentSummary_01_impl }, - { 65, BER_CLASS_CON, 65, BER_FLAGS_IMPLTAG, dissect_readJournal_01_impl }, - { 66, BER_CLASS_CON, 66, BER_FLAGS_IMPLTAG, dissect_writeJournal_01_impl }, - { 67, BER_CLASS_CON, 67, BER_FLAGS_IMPLTAG, dissect_initializeJournal_01_impl }, - { 68, BER_CLASS_CON, 68, BER_FLAGS_IMPLTAG, dissect_reportJournalStatus_01_impl }, - { 69, BER_CLASS_CON, 69, BER_FLAGS_IMPLTAG, dissect_createJournal_01_impl }, - { 70, BER_CLASS_CON, 70, BER_FLAGS_IMPLTAG, dissect_deleteJournal_01_impl }, - { 71, BER_CLASS_CON, 71, BER_FLAGS_IMPLTAG, dissect_getCapabilityList_01_impl }, - { 73, BER_CLASS_CON, 73, BER_FLAGS_IMPLTAG, dissect_fileRead_01_impl }, - { 74, BER_CLASS_CON, 74, BER_FLAGS_IMPLTAG, dissect_fileClose_01_impl }, - { 75, BER_CLASS_CON, 75, BER_FLAGS_IMPLTAG, dissect_fileRename_01_impl }, - { 76, BER_CLASS_CON, 76, BER_FLAGS_IMPLTAG, dissect_fileDelete_01_impl }, - { 77, BER_CLASS_CON, 77, BER_FLAGS_IMPLTAG, dissect_fileDirectory_01_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t ConfirmedServiceResponse_choice[] = { + { 0, &hf_mms_status_01 , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Status_Response }, + { 1, &hf_mms_getNameList_01 , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_GetNameList_Response }, + { 2, &hf_mms_identify_01 , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_Identify_Response }, + { 3, &hf_mms_rename_01 , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_mms_Rename_Response }, + { 4, &hf_mms_read_01 , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mms_Read_Response }, + { 5, &hf_mms_write_01 , BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_mms_Write_Response }, + { 6, &hf_mms_getVariableAccessAttributes_01, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_mms_GetVariableAccessAttributes_Response }, + { 7, &hf_mms_defineNamedVariable_01, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_mms_DefineNamedVariable_Response }, + { 8, &hf_mms_defineScatteredAccess_01, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mms_DefineScatteredAccess_Response }, + { 9, &hf_mms_getScatteredAccessAttributes_01, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_mms_GetScatteredAccessAttributes_Response }, + { 10, &hf_mms_deleteVariableAccess_01, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_mms_DeleteVariableAccess_Response }, + { 11, &hf_mms_defineNamedVariableList_01, BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_mms_DefineNamedVariableList_Response }, + { 12, &hf_mms_getNamedVariableListAttributes_01, BER_CLASS_CON, 12, BER_FLAGS_IMPLTAG, dissect_mms_GetNamedVariableListAttributes_Response }, + { 13, &hf_mms_deleteNamedVariableList_01, BER_CLASS_CON, 13, BER_FLAGS_IMPLTAG, dissect_mms_DeleteNamedVariableList_Response }, + { 14, &hf_mms_defineNamedType_01, BER_CLASS_CON, 14, BER_FLAGS_IMPLTAG, dissect_mms_DefineNamedType_Response }, + { 15, &hf_mms_getNamedTypeAttributes_01, BER_CLASS_CON, 15, BER_FLAGS_IMPLTAG, dissect_mms_GetNamedTypeAttributes_Response }, + { 16, &hf_mms_deleteNamedType_01, BER_CLASS_CON, 16, BER_FLAGS_IMPLTAG, dissect_mms_DeleteNamedType_Response }, + { 17, &hf_mms_input_01 , BER_CLASS_CON, 17, BER_FLAGS_IMPLTAG, dissect_mms_Input_Response }, + { 18, &hf_mms_output_01 , BER_CLASS_CON, 18, BER_FLAGS_IMPLTAG, dissect_mms_Output_Response }, + { 19, &hf_mms_takeControl_01 , BER_CLASS_CON, 19, 0, dissect_mms_TakeControl_Response }, + { 20, &hf_mms_relinquishControl_01, BER_CLASS_CON, 20, BER_FLAGS_IMPLTAG, dissect_mms_RelinquishControl_Response }, + { 21, &hf_mms_defineSemaphore_01, BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_mms_DefineSemaphore_Response }, + { 22, &hf_mms_deleteSemaphore_01, BER_CLASS_CON, 22, BER_FLAGS_IMPLTAG, dissect_mms_DeleteSemaphore_Response }, + { 23, &hf_mms_reportSemaphoreStatus_01, BER_CLASS_CON, 23, BER_FLAGS_IMPLTAG, dissect_mms_ReportSemaphoreStatus_Response }, + { 24, &hf_mms_reportPoolSemaphoreStatus_01, BER_CLASS_CON, 24, BER_FLAGS_IMPLTAG, dissect_mms_ReportPoolSemaphoreStatus_Response }, + { 25, &hf_mms_reportSemaphoreEntryStatus_01, BER_CLASS_CON, 25, BER_FLAGS_IMPLTAG, dissect_mms_ReportSemaphoreEntryStatus_Response }, + { 26, &hf_mms_initiateDownloadSequence_01, BER_CLASS_CON, 26, BER_FLAGS_IMPLTAG, dissect_mms_InitiateDownloadSequence_Response }, + { 27, &hf_mms_downloadSegment_01, BER_CLASS_CON, 27, BER_FLAGS_IMPLTAG, dissect_mms_DownloadSegment_Response }, + { 28, &hf_mms_terminateDownloadSequence_01, BER_CLASS_CON, 28, BER_FLAGS_IMPLTAG, dissect_mms_TerminateDownloadSequence_Response }, + { 29, &hf_mms_initiateUploadSequence_01, BER_CLASS_CON, 29, BER_FLAGS_IMPLTAG, dissect_mms_InitiateUploadSequence_Response }, + { 30, &hf_mms_uploadSegment_01, BER_CLASS_CON, 30, BER_FLAGS_IMPLTAG, dissect_mms_UploadSegment_Response }, + { 31, &hf_mms_terminateUploadSequence_01, BER_CLASS_CON, 31, BER_FLAGS_IMPLTAG, dissect_mms_TerminateUploadSequence_Response }, + { 32, &hf_mms_requestDomainDownLoad, BER_CLASS_CON, 32, BER_FLAGS_IMPLTAG, dissect_mms_RequestDomainDownload_Response }, + { 33, &hf_mms_requestDomainUpload_01, BER_CLASS_CON, 33, BER_FLAGS_IMPLTAG, dissect_mms_RequestDomainUpload_Response }, + { 34, &hf_mms_loadDomainContent_01, BER_CLASS_CON, 34, BER_FLAGS_IMPLTAG, dissect_mms_LoadDomainContent_Response }, + { 35, &hf_mms_storeDomainContent_01, BER_CLASS_CON, 35, BER_FLAGS_IMPLTAG, dissect_mms_StoreDomainContent_Response }, + { 36, &hf_mms_deleteDomain_01 , BER_CLASS_CON, 36, BER_FLAGS_IMPLTAG, dissect_mms_DeleteDomain_Response }, + { 37, &hf_mms_getDomainAttributes_01, BER_CLASS_CON, 37, BER_FLAGS_IMPLTAG, dissect_mms_GetDomainAttributes_Response }, + { 38, &hf_mms_createProgramInvocation_01, BER_CLASS_CON, 38, BER_FLAGS_IMPLTAG, dissect_mms_CreateProgramInvocation_Response }, + { 39, &hf_mms_deleteProgramInvocation_01, BER_CLASS_CON, 39, BER_FLAGS_IMPLTAG, dissect_mms_DeleteProgramInvocation_Response }, + { 40, &hf_mms_start_01 , BER_CLASS_CON, 40, BER_FLAGS_IMPLTAG, dissect_mms_Start_Response }, + { 41, &hf_mms_stop_01 , BER_CLASS_CON, 41, BER_FLAGS_IMPLTAG, dissect_mms_Stop_Response }, + { 42, &hf_mms_resume_01 , BER_CLASS_CON, 42, BER_FLAGS_IMPLTAG, dissect_mms_Resume_Response }, + { 43, &hf_mms_reset_01 , BER_CLASS_CON, 43, BER_FLAGS_IMPLTAG, dissect_mms_Reset_Response }, + { 44, &hf_mms_kill_01 , BER_CLASS_CON, 44, BER_FLAGS_IMPLTAG, dissect_mms_Kill_Response }, + { 45, &hf_mms_getProgramInvocationAttributes_01, BER_CLASS_CON, 45, BER_FLAGS_IMPLTAG, dissect_mms_GetProgramInvocationAttributes_Response }, + { 46, &hf_mms_obtainFile_01 , BER_CLASS_CON, 46, BER_FLAGS_IMPLTAG, dissect_mms_ObtainFile_Response }, + { 72, &hf_mms_fileOpen_01 , BER_CLASS_CON, 72, BER_FLAGS_IMPLTAG, dissect_mms_FileOpen_Response }, + { 47, &hf_mms_defineEventCondition_01, BER_CLASS_CON, 47, BER_FLAGS_IMPLTAG, dissect_mms_DefineEventCondition_Response }, + { 48, &hf_mms_deleteEventCondition_01, BER_CLASS_CON, 48, BER_FLAGS_IMPLTAG, dissect_mms_DeleteEventCondition_Response }, + { 49, &hf_mms_getEventConditionAttributes_01, BER_CLASS_CON, 49, BER_FLAGS_IMPLTAG, dissect_mms_GetEventConditionAttributes_Response }, + { 50, &hf_mms_reportEventConditionStatus_01, BER_CLASS_CON, 50, BER_FLAGS_IMPLTAG, dissect_mms_ReportEventConditionStatus_Response }, + { 51, &hf_mms_alterEventConditionMonitoring_01, BER_CLASS_CON, 51, BER_FLAGS_IMPLTAG, dissect_mms_AlterEventConditionMonitoring_Response }, + { 52, &hf_mms_triggerEvent_01 , BER_CLASS_CON, 52, BER_FLAGS_IMPLTAG, dissect_mms_TriggerEvent_Response }, + { 53, &hf_mms_defineEventAction_01, BER_CLASS_CON, 53, BER_FLAGS_IMPLTAG, dissect_mms_DefineEventAction_Response }, + { 54, &hf_mms_deleteEventAction_01, BER_CLASS_CON, 54, BER_FLAGS_IMPLTAG, dissect_mms_DeleteEventAction_Response }, + { 55, &hf_mms_getEventActionAttributes_01, BER_CLASS_CON, 55, BER_FLAGS_IMPLTAG, dissect_mms_GetEventActionAttributes_Response }, + { 56, &hf_mms_reportActionStatus, BER_CLASS_CON, 56, BER_FLAGS_IMPLTAG, dissect_mms_ReportEventActionStatus_Response }, + { 57, &hf_mms_defineEventEnrollment_01, BER_CLASS_CON, 57, BER_FLAGS_IMPLTAG, dissect_mms_DefineEventEnrollment_Response }, + { 58, &hf_mms_deleteEventEnrollment_01, BER_CLASS_CON, 58, BER_FLAGS_IMPLTAG, dissect_mms_DeleteEventEnrollment_Response }, + { 59, &hf_mms_alterEventEnrollment_01, BER_CLASS_CON, 59, BER_FLAGS_IMPLTAG, dissect_mms_AlterEventEnrollment_Response }, + { 60, &hf_mms_reportEventEnrollmentStatus_01, BER_CLASS_CON, 60, BER_FLAGS_IMPLTAG, dissect_mms_ReportEventEnrollmentStatus_Response }, + { 61, &hf_mms_getEventEnrollmentAttributes_01, BER_CLASS_CON, 61, BER_FLAGS_IMPLTAG, dissect_mms_GetEventEnrollmentAttributes_Response }, + { 62, &hf_mms_acknowledgeEventNotification_01, BER_CLASS_CON, 62, BER_FLAGS_IMPLTAG, dissect_mms_AcknowledgeEventNotification_Response }, + { 63, &hf_mms_getAlarmSummary_01, BER_CLASS_CON, 63, BER_FLAGS_IMPLTAG, dissect_mms_GetAlarmSummary_Response }, + { 64, &hf_mms_getAlarmEnrollmentSummary_01, BER_CLASS_CON, 64, BER_FLAGS_IMPLTAG, dissect_mms_GetAlarmEnrollmentSummary_Response }, + { 65, &hf_mms_readJournal_01 , BER_CLASS_CON, 65, BER_FLAGS_IMPLTAG, dissect_mms_ReadJournal_Response }, + { 66, &hf_mms_writeJournal_01 , BER_CLASS_CON, 66, BER_FLAGS_IMPLTAG, dissect_mms_WriteJournal_Response }, + { 67, &hf_mms_initializeJournal_01, BER_CLASS_CON, 67, BER_FLAGS_IMPLTAG, dissect_mms_InitializeJournal_Response }, + { 68, &hf_mms_reportJournalStatus_01, BER_CLASS_CON, 68, BER_FLAGS_IMPLTAG, dissect_mms_ReportJournalStatus_Response }, + { 69, &hf_mms_createJournal_01, BER_CLASS_CON, 69, BER_FLAGS_IMPLTAG, dissect_mms_CreateJournal_Response }, + { 70, &hf_mms_deleteJournal_01, BER_CLASS_CON, 70, BER_FLAGS_IMPLTAG, dissect_mms_DeleteJournal_Response }, + { 71, &hf_mms_getCapabilityList_01, BER_CLASS_CON, 71, BER_FLAGS_IMPLTAG, dissect_mms_GetCapabilityList_Response }, + { 73, &hf_mms_fileRead_01 , BER_CLASS_CON, 73, BER_FLAGS_IMPLTAG, dissect_mms_FileRead_Response }, + { 74, &hf_mms_fileClose_01 , BER_CLASS_CON, 74, BER_FLAGS_IMPLTAG, dissect_mms_FileClose_Response }, + { 75, &hf_mms_fileRename_01 , BER_CLASS_CON, 75, BER_FLAGS_IMPLTAG, dissect_mms_FileRename_Response }, + { 76, &hf_mms_fileDelete_01 , BER_CLASS_CON, 76, BER_FLAGS_IMPLTAG, dissect_mms_FileDelete_Response }, + { 77, &hf_mms_fileDirectory_01, BER_CLASS_CON, 77, BER_FLAGS_IMPLTAG, dissect_mms_FileDirectory_Response }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_ConfirmedServiceResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - ConfirmedServiceResponse_choice, hf_index, ett_mms_ConfirmedServiceResponse, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + ConfirmedServiceResponse_choice, hf_index, ett_mms_ConfirmedServiceResponse, + NULL); return offset; } -static int dissect_confirmedServiceResponse(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ConfirmedServiceResponse(FALSE, tvb, offset, actx, tree, hf_mms_confirmedServiceResponse); -} -static int dissect_success_01(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ConfirmedServiceResponse(FALSE, tvb, offset, actx, tree, hf_mms_success_01); -} -static const ber_old_sequence_t Confirmed_ResponsePDU_sequence[] = { - { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID }, - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_confirmedServiceResponse }, - { BER_CLASS_CON, 79, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_cs_request_detail }, - { 0, 0, 0, NULL } +static const ber_sequence_t Confirmed_ResponsePDU_sequence[] = { + { &hf_mms_invokeID , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_mms_Unsigned32 }, + { &hf_mms_confirmedServiceResponse, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_ConfirmedServiceResponse }, + { &hf_mms_cs_request_detail, BER_CLASS_CON, 79, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_mms_CS_Request_Detail }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_Confirmed_ResponsePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Confirmed_ResponsePDU_sequence, hf_index, ett_mms_Confirmed_ResponsePDU); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Confirmed_ResponsePDU_sequence, hf_index, ett_mms_Confirmed_ResponsePDU); return offset; } -static int dissect_confirmed_ResponsePDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Confirmed_ResponsePDU(TRUE, tvb, offset, actx, tree, hf_mms_confirmed_ResponsePDU); -} -static const ber_old_sequence_t Confirmed_ErrorPDU_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_invokeID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_modifierPosition_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_serviceError_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t Confirmed_ErrorPDU_sequence[] = { + { &hf_mms_invokeID , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { &hf_mms_modifierPosition, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { &hf_mms_serviceError , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_ServiceError }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_Confirmed_ErrorPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Confirmed_ErrorPDU_sequence, hf_index, ett_mms_Confirmed_ErrorPDU); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Confirmed_ErrorPDU_sequence, hf_index, ett_mms_Confirmed_ErrorPDU); return offset; } -static int dissect_confirmed_ErrorPDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Confirmed_ErrorPDU(TRUE, tvb, offset, actx, tree, hf_mms_confirmed_ErrorPDU); -} -static const ber_old_sequence_t InformationReport_sequence[] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableAccessSpecification }, - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfAccessResult_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t InformationReport_sequence[] = { + { &hf_mms_variableAccessSpecification, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_VariableAccessSpecification }, + { &hf_mms_listOfAccessResult, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_SEQUENCE_OF_AccessResult }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_InformationReport(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - InformationReport_sequence, hf_index, ett_mms_InformationReport); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + InformationReport_sequence, hf_index, ett_mms_InformationReport); return offset; } -static int dissect_informationReport_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_InformationReport(TRUE, tvb, offset, actx, tree, hf_mms_informationReport); -} @@ -7739,9 +6182,6 @@ dissect_mms_UnsolicitedStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_unsolicitedStatus_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_UnsolicitedStatus(TRUE, tvb, offset, actx, tree, hf_mms_unsolicitedStatus); -} static const value_string mms_T_eventConditionName_01_vals[] = { @@ -7750,23 +6190,20 @@ static const value_string mms_T_eventConditionName_01_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_eventConditionName_01_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_eventCondition }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_undefined_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_eventConditionName_01_choice[] = { + { 0, &hf_mms_eventCondition , BER_CLASS_CON, 0, 0, dissect_mms_ObjectName }, + { 1, &hf_mms_undefined , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_NULL }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_eventConditionName_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_eventConditionName_01_choice, hf_index, ett_mms_T_eventConditionName_01, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_eventConditionName_01_choice, hf_index, ett_mms_T_eventConditionName_01, + NULL); return offset; } -static int dissect_eventConditionName_02(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_eventConditionName_01(FALSE, tvb, offset, actx, tree, hf_mms_eventConditionName_02); -} static const value_string mms_T_eventActionResult_vals[] = { @@ -7775,65 +6212,56 @@ static const value_string mms_T_eventActionResult_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_eventActionResult_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_success_01 }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_failure_01_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_eventActionResult_choice[] = { + { 0, &hf_mms_success_01 , BER_CLASS_CON, 0, 0, dissect_mms_ConfirmedServiceResponse }, + { 1, &hf_mms_failure_01 , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_ServiceError }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_eventActionResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_eventActionResult_choice, hf_index, ett_mms_T_eventActionResult, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_eventActionResult_choice, hf_index, ett_mms_T_eventActionResult, + NULL); return offset; } -static int dissect_eventActionResult(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_eventActionResult(FALSE, tvb, offset, actx, tree, hf_mms_eventActionResult); -} -static const ber_old_sequence_t T_actionResult_sequence[] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_eventActioName }, - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_eventActionResult }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_actionResult_sequence[] = { + { &hf_mms_eventActioName , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_eventActionResult, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_T_eventActionResult }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_actionResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - T_actionResult_sequence, hf_index, ett_mms_T_actionResult); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_actionResult_sequence, hf_index, ett_mms_T_actionResult); return offset; } -static int dissect_actionResult_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_actionResult(TRUE, tvb, offset, actx, tree, hf_mms_actionResult); -} -static const ber_old_sequence_t EventNotification_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventEnrollmentName }, - { BER_CLASS_CON, 1, 0, dissect_eventConditionName_02 }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_severity_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentState_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_NOTCHKTAG, dissect_transitionTime }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notificationLost_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alarmAcknowledgmentRule_impl }, - { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_actionResult_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t EventNotification_sequence[] = { + { &hf_mms_eventEnrollmentName, BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_mms_ObjectName }, + { &hf_mms_eventConditionName_02, BER_CLASS_CON, 1, 0, dissect_mms_T_eventConditionName_01 }, + { &hf_mms_severity , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned8 }, + { &hf_mms_currentState , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_EC_State }, + { &hf_mms_transitionTime , BER_CLASS_CON, 4, BER_FLAGS_NOTCHKTAG, dissect_mms_EventTime }, + { &hf_mms_notificationLost, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_BOOLEAN }, + { &hf_mms_alarmAcknowledgmentRule, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_AlarmAckRule }, + { &hf_mms_actionResult , BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_T_actionResult }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_EventNotification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - EventNotification_sequence, hf_index, ett_mms_EventNotification); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + EventNotification_sequence, hf_index, ett_mms_EventNotification); return offset; } -static int dissect_eventNotification_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_EventNotification(TRUE, tvb, offset, actx, tree, hf_mms_eventNotification); -} static const value_string mms_UnconfirmedService_vals[] = { @@ -7843,42 +6271,36 @@ static const value_string mms_UnconfirmedService_vals[] = { { 0, NULL } }; -static const ber_old_choice_t UnconfirmedService_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_informationReport_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_unsolicitedStatus_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_eventNotification_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t UnconfirmedService_choice[] = { + { 0, &hf_mms_informationReport, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_InformationReport }, + { 1, &hf_mms_unsolicitedStatus, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_UnsolicitedStatus }, + { 2, &hf_mms_eventNotification, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_EventNotification }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_UnconfirmedService(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - UnconfirmedService_choice, hf_index, ett_mms_UnconfirmedService, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + UnconfirmedService_choice, hf_index, ett_mms_UnconfirmedService, + NULL); return offset; } -static int dissect_unconfirmedService(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_UnconfirmedService(FALSE, tvb, offset, actx, tree, hf_mms_unconfirmedService); -} -static const ber_old_sequence_t Unconfirmed_PDU_sequence[] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_unconfirmedService }, - { BER_CLASS_CON, 79, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_cs_request_detail }, - { 0, 0, 0, NULL } +static const ber_sequence_t Unconfirmed_PDU_sequence[] = { + { &hf_mms_unconfirmedService, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_UnconfirmedService }, + { &hf_mms_cs_request_detail, BER_CLASS_CON, 79, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_mms_CS_Request_Detail }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_Unconfirmed_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Unconfirmed_PDU_sequence, hf_index, ett_mms_Unconfirmed_PDU); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Unconfirmed_PDU_sequence, hf_index, ett_mms_Unconfirmed_PDU); return offset; } -static int dissect_unconfirmed_PDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Unconfirmed_PDU(TRUE, tvb, offset, actx, tree, hf_mms_unconfirmed_PDU); -} static const value_string mms_T_confirmed_requestPDU_vals[] = { @@ -7902,9 +6324,6 @@ dissect_mms_T_confirmed_requestPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_confirmed_requestPDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_confirmed_requestPDU(TRUE, tvb, offset, actx, tree, hf_mms_confirmed_requestPDU); -} static const value_string mms_T_confirmed_responsePDU_vals[] = { @@ -7925,9 +6344,6 @@ dissect_mms_T_confirmed_responsePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ return offset; } -static int dissect_confirmed_responsePDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_confirmed_responsePDU(TRUE, tvb, offset, actx, tree, hf_mms_confirmed_responsePDU); -} static const value_string mms_T_confirmed_errorPDU_vals[] = { @@ -7947,9 +6363,6 @@ dissect_mms_T_confirmed_errorPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i return offset; } -static int dissect_confirmed_errorPDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_confirmed_errorPDU(TRUE, tvb, offset, actx, tree, hf_mms_confirmed_errorPDU); -} static const value_string mms_T_unconfirmedPDU_vals[] = { @@ -7969,9 +6382,6 @@ dissect_mms_T_unconfirmedPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o return offset; } -static int dissect_unconfirmedPDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_unconfirmedPDU(TRUE, tvb, offset, actx, tree, hf_mms_unconfirmedPDU); -} static const value_string mms_T_pdu_error_vals[] = { @@ -7989,9 +6399,6 @@ dissect_mms_T_pdu_error(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_pdu_error_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_pdu_error(TRUE, tvb, offset, actx, tree, hf_mms_pdu_error); -} static const value_string mms_T_cancel_requestPDU_vals[] = { @@ -8008,9 +6415,6 @@ dissect_mms_T_cancel_requestPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in return offset; } -static int dissect_cancel_requestPDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_cancel_requestPDU(TRUE, tvb, offset, actx, tree, hf_mms_cancel_requestPDU); -} static const value_string mms_T_cancel_responsePDU_vals[] = { @@ -8027,9 +6431,6 @@ dissect_mms_T_cancel_responsePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i return offset; } -static int dissect_cancel_responsePDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_cancel_responsePDU(TRUE, tvb, offset, actx, tree, hf_mms_cancel_responsePDU); -} static const value_string mms_T_cancel_errorPDU_vals[] = { @@ -8048,9 +6449,6 @@ dissect_mms_T_cancel_errorPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_cancel_errorPDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_cancel_errorPDU(TRUE, tvb, offset, actx, tree, hf_mms_cancel_errorPDU); -} static const value_string mms_T_conclude_requestPDU_vals[] = { @@ -8067,9 +6465,6 @@ dissect_mms_T_conclude_requestPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_conclude_requestPDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_conclude_requestPDU(TRUE, tvb, offset, actx, tree, hf_mms_conclude_requestPDU); -} static const value_string mms_T_conclude_responsePDU_vals[] = { @@ -8086,9 +6481,6 @@ dissect_mms_T_conclude_responsePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_conclude_responsePDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_conclude_responsePDU(TRUE, tvb, offset, actx, tree, hf_mms_conclude_responsePDU); -} static const value_string mms_T_conclude_errorPDU_vals[] = { @@ -8106,9 +6498,6 @@ dissect_mms_T_conclude_errorPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in return offset; } -static int dissect_conclude_errorPDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_conclude_errorPDU(TRUE, tvb, offset, actx, tree, hf_mms_conclude_errorPDU); -} static const value_string mms_T_rejectReason_vals[] = { @@ -8126,50 +6515,44 @@ static const value_string mms_T_rejectReason_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_rejectReason_choice[] = { - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_confirmed_requestPDU_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_confirmed_responsePDU_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_confirmed_errorPDU_impl }, - { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_unconfirmedPDU_impl }, - { 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_pdu_error_impl }, - { 6, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_cancel_requestPDU_impl }, - { 7, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_cancel_responsePDU_impl }, - { 8, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_cancel_errorPDU_impl }, - { 9, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_conclude_requestPDU_impl }, - { 10, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_conclude_responsePDU_impl }, - { 11, BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_conclude_errorPDU_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_rejectReason_choice[] = { + { 1, &hf_mms_confirmed_requestPDU, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_T_confirmed_requestPDU }, + { 2, &hf_mms_confirmed_responsePDU, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_T_confirmed_responsePDU }, + { 3, &hf_mms_confirmed_errorPDU, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_mms_T_confirmed_errorPDU }, + { 4, &hf_mms_unconfirmedPDU , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mms_T_unconfirmedPDU }, + { 5, &hf_mms_pdu_error , BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_mms_T_pdu_error }, + { 6, &hf_mms_cancel_requestPDU, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_mms_T_cancel_requestPDU }, + { 7, &hf_mms_cancel_responsePDU, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_mms_T_cancel_responsePDU }, + { 8, &hf_mms_cancel_errorPDU , BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mms_T_cancel_errorPDU }, + { 9, &hf_mms_conclude_requestPDU, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_mms_T_conclude_requestPDU }, + { 10, &hf_mms_conclude_responsePDU, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_mms_T_conclude_responsePDU }, + { 11, &hf_mms_conclude_errorPDU, BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_mms_T_conclude_errorPDU }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_mms_T_rejectReason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_rejectReason_choice, hf_index, ett_mms_T_rejectReason, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_rejectReason_choice, hf_index, ett_mms_T_rejectReason, + NULL); return offset; } -static int dissect_rejectReason(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_T_rejectReason(FALSE, tvb, offset, actx, tree, hf_mms_rejectReason); -} -static const ber_old_sequence_t RejectPDU_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalInvokeID_impl }, - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rejectReason }, - { 0, 0, 0, NULL } +static const ber_sequence_t RejectPDU_sequence[] = { + { &hf_mms_originalInvokeID, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { &hf_mms_rejectReason , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mms_T_rejectReason }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_RejectPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - RejectPDU_sequence, hf_index, ett_mms_RejectPDU); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + RejectPDU_sequence, hf_index, ett_mms_RejectPDU); return offset; } -static int dissect_rejectPDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_RejectPDU(TRUE, tvb, offset, actx, tree, hf_mms_rejectPDU); -} @@ -8179,9 +6562,6 @@ dissect_mms_Cancel_RequestPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_cancel_RequestPDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Cancel_RequestPDU(TRUE, tvb, offset, actx, tree, hf_mms_cancel_RequestPDU); -} @@ -8191,27 +6571,21 @@ dissect_mms_Cancel_ResponsePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_cancel_ResponsePDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Cancel_ResponsePDU(TRUE, tvb, offset, actx, tree, hf_mms_cancel_ResponsePDU); -} -static const ber_old_sequence_t Cancel_ErrorPDU_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_originalInvokeID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceError_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t Cancel_ErrorPDU_sequence[] = { + { &hf_mms_originalInvokeID, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Unsigned32 }, + { &hf_mms_serviceError , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_ServiceError }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_Cancel_ErrorPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Cancel_ErrorPDU_sequence, hf_index, ett_mms_Cancel_ErrorPDU); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Cancel_ErrorPDU_sequence, hf_index, ett_mms_Cancel_ErrorPDU); return offset; } -static int dissect_cancel_ErrorPDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Cancel_ErrorPDU(TRUE, tvb, offset, actx, tree, hf_mms_cancel_ErrorPDU); -} @@ -8222,24 +6596,6 @@ dissect_mms_Integer16(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ return offset; } -static int dissect_proposedMaxServOutstandingCalling_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Integer16(TRUE, tvb, offset, actx, tree, hf_mms_proposedMaxServOutstandingCalling); -} -static int dissect_proposedMaxServOutstandingCalled_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Integer16(TRUE, tvb, offset, actx, tree, hf_mms_proposedMaxServOutstandingCalled); -} -static int dissect_proposedVersionNumber_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Integer16(TRUE, tvb, offset, actx, tree, hf_mms_proposedVersionNumber); -} -static int dissect_negociatedMaxServOutstandingCalling_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Integer16(TRUE, tvb, offset, actx, tree, hf_mms_negociatedMaxServOutstandingCalling); -} -static int dissect_negociatedMaxServOutstandingCalled_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Integer16(TRUE, tvb, offset, actx, tree, hf_mms_negociatedMaxServOutstandingCalled); -} -static int dissect_negociatedVersionNumber_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Integer16(TRUE, tvb, offset, actx, tree, hf_mms_negociatedVersionNumber); -} static const asn_namedbit ParameterSupportOptions_bits[] = { @@ -8264,12 +6620,6 @@ dissect_mms_ParameterSupportOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ return offset; } -static int dissect_proposedParameterCBB_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ParameterSupportOptions(TRUE, tvb, offset, actx, tree, hf_mms_proposedParameterCBB); -} -static int dissect_negociatedParameterCBB_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ParameterSupportOptions(TRUE, tvb, offset, actx, tree, hf_mms_negociatedParameterCBB); -} static const asn_namedbit ServiceSupportOptions_bits[] = { @@ -8369,92 +6719,74 @@ dissect_mms_ServiceSupportOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_servicesSupportedCalling_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ServiceSupportOptions(TRUE, tvb, offset, actx, tree, hf_mms_servicesSupportedCalling); -} -static int dissect_servicesSupportedCalled_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_ServiceSupportOptions(TRUE, tvb, offset, actx, tree, hf_mms_servicesSupportedCalled); -} -static const ber_old_sequence_t InitRequestDetail_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_proposedVersionNumber_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_proposedParameterCBB_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_servicesSupportedCalling_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t InitRequestDetail_sequence[] = { + { &hf_mms_proposedVersionNumber, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Integer16 }, + { &hf_mms_proposedParameterCBB, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_ParameterSupportOptions }, + { &hf_mms_servicesSupportedCalling, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_ServiceSupportOptions }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_InitRequestDetail(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - InitRequestDetail_sequence, hf_index, ett_mms_InitRequestDetail); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + InitRequestDetail_sequence, hf_index, ett_mms_InitRequestDetail); return offset; } -static int dissect_mmsInitRequestDetail_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_InitRequestDetail(TRUE, tvb, offset, actx, tree, hf_mms_mmsInitRequestDetail); -} -static const ber_old_sequence_t Initiate_RequestPDU_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localDetailCalling_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_proposedMaxServOutstandingCalling_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_proposedMaxServOutstandingCalled_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_proposedDataStructureNestingLevel_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mmsInitRequestDetail_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t Initiate_RequestPDU_sequence[] = { + { &hf_mms_localDetailCalling, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Integer32 }, + { &hf_mms_proposedMaxServOutstandingCalling, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_Integer16 }, + { &hf_mms_proposedMaxServOutstandingCalled, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_Integer16 }, + { &hf_mms_proposedDataStructureNestingLevel, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Integer8 }, + { &hf_mms_mmsInitRequestDetail, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mms_InitRequestDetail }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_Initiate_RequestPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Initiate_RequestPDU_sequence, hf_index, ett_mms_Initiate_RequestPDU); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Initiate_RequestPDU_sequence, hf_index, ett_mms_Initiate_RequestPDU); return offset; } -static int dissect_initiate_RequestPDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Initiate_RequestPDU(TRUE, tvb, offset, actx, tree, hf_mms_initiate_RequestPDU); -} -static const ber_old_sequence_t InitResponseDetail_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_negociatedVersionNumber_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_negociatedParameterCBB_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_servicesSupportedCalled_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t InitResponseDetail_sequence[] = { + { &hf_mms_negociatedVersionNumber, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Integer16 }, + { &hf_mms_negociatedParameterCBB, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_ParameterSupportOptions }, + { &hf_mms_servicesSupportedCalled, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_ServiceSupportOptions }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_InitResponseDetail(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - InitResponseDetail_sequence, hf_index, ett_mms_InitResponseDetail); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + InitResponseDetail_sequence, hf_index, ett_mms_InitResponseDetail); return offset; } -static int dissect_mmsInitResponseDetail_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_InitResponseDetail(TRUE, tvb, offset, actx, tree, hf_mms_mmsInitResponseDetail); -} -static const ber_old_sequence_t Initiate_ResponsePDU_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localDetailCalled_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_negociatedMaxServOutstandingCalling_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_negociatedMaxServOutstandingCalled_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_negociatedDataStructureNestingLevel_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mmsInitResponseDetail_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t Initiate_ResponsePDU_sequence[] = { + { &hf_mms_localDetailCalled, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Integer32 }, + { &hf_mms_negociatedMaxServOutstandingCalling, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_Integer16 }, + { &hf_mms_negociatedMaxServOutstandingCalled, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_Integer16 }, + { &hf_mms_negociatedDataStructureNestingLevel, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mms_Integer8 }, + { &hf_mms_mmsInitResponseDetail, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mms_InitResponseDetail }, + { NULL, 0, 0, 0, NULL } }; static int dissect_mms_Initiate_ResponsePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Initiate_ResponsePDU_sequence, hf_index, ett_mms_Initiate_ResponsePDU); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Initiate_ResponsePDU_sequence, hf_index, ett_mms_Initiate_ResponsePDU); return offset; } -static int dissect_initiate_ResponsePDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Initiate_ResponsePDU(TRUE, tvb, offset, actx, tree, hf_mms_initiate_ResponsePDU); -} @@ -8464,9 +6796,6 @@ dissect_mms_Initiate_ErrorPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_initiate_ErrorPDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Initiate_ErrorPDU(TRUE, tvb, offset, actx, tree, hf_mms_initiate_ErrorPDU); -} @@ -8476,9 +6805,6 @@ dissect_mms_Conclude_RequestPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in return offset; } -static int dissect_conclude_RequestPDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Conclude_RequestPDU(TRUE, tvb, offset, actx, tree, hf_mms_conclude_RequestPDU); -} @@ -8488,9 +6814,6 @@ dissect_mms_Conclude_ResponsePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i return offset; } -static int dissect_conclude_ResponsePDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Conclude_ResponsePDU(TRUE, tvb, offset, actx, tree, hf_mms_conclude_ResponsePDU); -} @@ -8500,9 +6823,6 @@ dissect_mms_Conclude_ErrorPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_conclude_ErrorPDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_mms_Conclude_ErrorPDU(TRUE, tvb, offset, actx, tree, hf_mms_conclude_ErrorPDU); -} const value_string mms_MMSpdu_vals[] = { @@ -8523,22 +6843,22 @@ const value_string mms_MMSpdu_vals[] = { { 0, NULL } }; -static const ber_old_choice_t MMSpdu_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_confirmed_RequestPDU_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_confirmed_ResponsePDU_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_confirmed_ErrorPDU_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_unconfirmed_PDU_impl }, - { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_rejectPDU_impl }, - { 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_cancel_RequestPDU_impl }, - { 6, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_cancel_ResponsePDU_impl }, - { 7, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_cancel_ErrorPDU_impl }, - { 8, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_initiate_RequestPDU_impl }, - { 9, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_initiate_ResponsePDU_impl }, - { 10, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_initiate_ErrorPDU_impl }, - { 11, BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_conclude_RequestPDU_impl }, - { 12, BER_CLASS_CON, 12, BER_FLAGS_IMPLTAG, dissect_conclude_ResponsePDU_impl }, - { 13, BER_CLASS_CON, 13, BER_FLAGS_IMPLTAG, dissect_conclude_ErrorPDU_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t MMSpdu_choice[] = { + { 0, &hf_mms_confirmed_RequestPDU, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mms_Confirmed_RequestPDU }, + { 1, &hf_mms_confirmed_ResponsePDU, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mms_Confirmed_ResponsePDU }, + { 2, &hf_mms_confirmed_ErrorPDU, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_mms_Confirmed_ErrorPDU }, + { 3, &hf_mms_unconfirmed_PDU , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_mms_Unconfirmed_PDU }, + { 4, &hf_mms_rejectPDU , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_mms_RejectPDU }, + { 5, &hf_mms_cancel_RequestPDU, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_mms_Cancel_RequestPDU }, + { 6, &hf_mms_cancel_ResponsePDU, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_mms_Cancel_ResponsePDU }, + { 7, &hf_mms_cancel_ErrorPDU , BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_mms_Cancel_ErrorPDU }, + { 8, &hf_mms_initiate_RequestPDU, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_mms_Initiate_RequestPDU }, + { 9, &hf_mms_initiate_ResponsePDU, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_mms_Initiate_ResponsePDU }, + { 10, &hf_mms_initiate_ErrorPDU, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_mms_Initiate_ErrorPDU }, + { 11, &hf_mms_conclude_RequestPDU, BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_mms_Conclude_RequestPDU }, + { 12, &hf_mms_conclude_ResponsePDU, BER_CLASS_CON, 12, BER_FLAGS_IMPLTAG, dissect_mms_Conclude_ResponsePDU }, + { 13, &hf_mms_conclude_ErrorPDU, BER_CLASS_CON, 13, BER_FLAGS_IMPLTAG, dissect_mms_Conclude_ErrorPDU }, + { 0, NULL, 0, 0, 0, NULL } }; int @@ -8546,9 +6866,9 @@ dissect_mms_MMSpdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, #line 35 "mms.cnf" gint branch_taken; - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - MMSpdu_choice, hf_index, ett_mms_MMSpdu, - &branch_taken); + offset = dissect_ber_choice(actx, tree, tvb, offset, + MMSpdu_choice, hf_index, ett_mms_MMSpdu, + &branch_taken); if(check_col(actx->pinfo->cinfo, COL_INFO)) diff --git a/epan/dissectors/packet-mms.h b/epan/dissectors/packet-mms.h index d46f7c8f71..03bba35f22 100644 --- a/epan/dissectors/packet-mms.h +++ b/epan/dissectors/packet-mms.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-mms.h */ -/* ../../tools/asn2wrs.py -b -e -p mms -c mms.cnf -s packet-mms-template mms.asn */ +/* ../../tools/asn2wrs.py -b -X -T -e -p mms -c mms.cnf -s packet-mms-template mms.asn */ /* Input file: packet-mms-template.h */ |