diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-06-01 19:52:26 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-06-01 19:52:26 +0000 |
| commit | 9f4a2da38dec835213b3d44f58dc8331034a1b26 (patch) | |
| tree | 0429a9e1ae242c21e54402156565d53fa9d66a70 /epan/dissectors/packet-inap.c | |
| parent | 35e68735c16f9aa977c1c6f98e9ef6385bae44be (diff) | |
Regenerate the INAP dissector with the -X option using the original asn1 files
(with small modifications).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22021 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-inap.c')
| -rw-r--r-- | epan/dissectors/packet-inap.c | 3759 |
1 files changed, 1510 insertions, 2249 deletions
diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c index 1cfc6f9aad..33220e58e0 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-inap.c */ -/* ../../tools/asn2wrs.py -b -e -p inap -c inap.cnf -s packet-inap-template inap.asn */ +/* ../../tools/asn2wrs.py -b -X -e -p inap -c inap.cnf -s packet-inap-template inap.asn IN-CS-1-Datatypes.asn IN-CS-1-Datatypes-appendix.asn */ /* Input file: packet-inap-template.c */ @@ -84,13 +84,13 @@ static int hf_inap_EventNotificationChargingArg_PDU = -1; /* EventNotificationC static int hf_inap_EventReportBCSMArg_PDU = -1; /* EventReportBCSMArg */ static int hf_inap_FurnishChargingInformationArg_PDU = -1; /* FurnishChargingInformationArg */ static int hf_inap_HoldCallInNetworkArg_PDU = -1; /* HoldCallInNetworkArg */ -static int hf_inap_InitialDP_PDU = -1; /* InitialDP */ +static int hf_inap_InitialDPArg_PDU = -1; /* InitialDPArg */ static int hf_inap_InitiateCallAttemptArg_PDU = -1; /* InitiateCallAttemptArg */ static int hf_inap_MidCallArg_PDU = -1; /* MidCallArg */ static int hf_inap_OAnswerArg_PDU = -1; /* OAnswerArg */ static int hf_inap_OCalledPartyBusyArg_PDU = -1; /* OCalledPartyBusyArg */ static int hf_inap_ODisconnectArg_PDU = -1; /* ODisconnectArg */ -static int hf_inap_ONoAnswer_PDU = -1; /* ONoAnswer */ +static int hf_inap_ONoAnswerArg_PDU = -1; /* ONoAnswerArg */ static int hf_inap_OriginationAttemptAuthorizedArg_PDU = -1; /* OriginationAttemptAuthorizedArg */ static int hf_inap_PlayAnnouncementArg_PDU = -1; /* PlayAnnouncementArg */ static int hf_inap_PromptAndCollectUserInformationArg_PDU = -1; /* PromptAndCollectUserInformationArg */ @@ -100,7 +100,7 @@ static int hf_inap_RequestCurrentStatusReportArg_PDU = -1; /* RequestCurrentSta static int hf_inap_RequestCurrentStatusReportResultArg_PDU = -1; /* RequestCurrentStatusReportResultArg */ static int hf_inap_RequestEveryStatusChangeReportArg_PDU = -1; /* RequestEveryStatusChangeReportArg */ static int hf_inap_RequestFirstStatusMatchReportArg_PDU = -1; /* RequestFirstStatusMatchReportArg */ -static int hf_inap_RequestNotificationChargingEvent_PDU = -1; /* RequestNotificationChargingEvent */ +static int hf_inap_RequestNotificationChargingEventArg_PDU = -1; /* RequestNotificationChargingEventArg */ static int hf_inap_RequestReportBCSMEventArg_PDU = -1; /* RequestReportBCSMEventArg */ static int hf_inap_ResetTimerArg_PDU = -1; /* ResetTimerArg */ static int hf_inap_RouteSelectFailureArg_PDU = -1; /* RouteSelectFailureArg */ @@ -138,30 +138,15 @@ static int hf_inap_returnErrorProblem = -1; /* ReturnErrorProblem */ static int hf_inap_localValue = -1; /* OperationLocalvalue */ static int hf_inap_globalValue = -1; /* OBJECT_IDENTIFIER */ static int hf_inap_localValue_01 = -1; /* LocalErrorcode */ -static int hf_inap_originalCallID = -1; /* CallID */ -static int hf_inap_destinationCallID = -1; /* CallID */ -static int hf_inap_newLegID = -1; /* OCTET_STRING */ -static int hf_inap_correlationidentifier = -1; /* OCTET_STRING */ -static int hf_inap_CallPartyHandlingResultsArg_item = -1; /* LegInformation */ -static int hf_inap_callID = -1; /* CallID */ -static int hf_inap_targetCallID = -1; /* CallID */ -static int hf_inap_legToBeConnectedID = -1; /* OCTET_STRING */ -static int hf_inap_legToBeDetached = -1; /* OCTET_STRING */ -static int hf_inap_legID = -1; /* LegID */ -static int hf_inap_heldLegID = -1; /* LegID */ -static int hf_inap_legToBeReleased = -1; /* LegID */ -static int hf_inap_releaseCause = -1; /* Cause */ -static int hf_inap_legStatus = -1; /* LegStatus */ -static int hf_inap_Extensions_item = -1; /* Extensions_item */ -static int hf_inap_type = -1; /* INTEGER */ -static int hf_inap_criticality = -1; /* T_criticality */ -static int hf_inap_value = -1; /* OCTET_STRING */ +static int hf_inap_problem_01 = -1; /* T_problem_01 */ +static int hf_inap_operation = -1; /* INTEGER_M128_127 */ static int hf_inap_filteredCallTreatment = -1; /* FilteredCallTreatment */ static int hf_inap_filteringCharacteristics = -1; /* FilteringCharacteristics */ static int hf_inap_filteringTimeOut = -1; /* FilteringTimeOut */ static int hf_inap_filteringCriteria = -1; /* FilteringCriteria */ static int hf_inap_startTime = -1; /* DateAndTime */ -static int hf_inap_extensions = -1; /* Extensions */ +static int hf_inap_extensions = -1; /* SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField */ +static int hf_inap_extensions_item = -1; /* ExtensionField */ static int hf_inap_dpSpecificCommonParameters = -1; /* DpSpecificCommonParameters */ static int hf_inap_dialledDigits = -1; /* CalledPartyNumber */ static int hf_inap_callingPartyBusinessGroupID = -1; /* CallingPartyBusinessGroupID */ @@ -193,6 +178,7 @@ static int hf_inap_gapCriteria = -1; /* GapCriteria */ static int hf_inap_gapIndicators = -1; /* GapIndicators */ static int hf_inap_controlType = -1; /* ControlType */ static int hf_inap_gapTreatment = -1; /* GapTreatment */ +static int hf_inap_requestedInformationList = -1; /* RequestedInformationList */ static int hf_inap_requestedInformationTypeList = -1; /* RequestedInformationTypeList */ static int hf_inap_invokeID_01 = -1; /* InvokeID */ static int hf_inap_allRequests = -1; /* NULL */ @@ -204,7 +190,8 @@ static int hf_inap_scfID = -1; /* ScfID */ static int hf_inap_serviceInteractionIndicators = -1; /* ServiceInteractionIndicators */ static int hf_inap_resourceAddress = -1; /* T_resourceAddress */ static int hf_inap_ipRoutingAddress = -1; /* IPRoutingAddress */ -static int hf_inap_both2 = -1; /* T_both2 */ +static int hf_inap_legID = -1; /* LegID */ +static int hf_inap_both = -1; /* T_both */ static int hf_inap_none = -1; /* NULL */ static int hf_inap_serviceAddressInformation = -1; /* ServiceAddressInformation */ static int hf_inap_bearerCapability = -1; /* BearerCapability */ @@ -232,6 +219,7 @@ static int hf_inap_calledPartyBusinessGroupID = -1; /* CalledPartyBusinessGroup static int hf_inap_calledPartySubaddress = -1; /* CalledPartySubaddress */ static int hf_inap_featureRequestIndicator = -1; /* FeatureRequestIndicator */ static int hf_inap_busyCause = -1; /* Cause */ +static int hf_inap_releaseCause = -1; /* Cause */ static int hf_inap_connectTime = -1; /* Integer4 */ static int hf_inap_informationToSend = -1; /* InformationToSend */ static int hf_inap_disconnectFromIPForbidden = -1; /* BOOLEAN */ @@ -239,12 +227,9 @@ static int hf_inap_requestAnnouncementComplete = -1; /* BOOLEAN */ static int hf_inap_collectedInfo = -1; /* CollectedInfo */ static int hf_inap_digitsResponse = -1; /* Digits */ static int hf_inap_iA5Response = -1; /* IA5String */ -static int hf_inap_initialCallSegment = -1; /* Cause */ -static int hf_inap_allCallSegments = -1; /* T_allCallSegments */ static int hf_inap_resourceStatus = -1; /* ResourceStatus */ static int hf_inap_monitorDuration = -1; /* Duration */ -static int hf_inap_RequestNotificationChargingEvent_item = -1; /* RequestNotificationChargingEvent_item */ -static int hf_inap_eventTypeCharging2 = -1; /* OCTET_STRING */ +static int hf_inap_RequestNotificationChargingEventArg_item = -1; /* ChargingEvent */ static int hf_inap_bcsmEvents = -1; /* SEQUENCE_SIZE_1_numOfBCSMEvents_OF_BCSMEvent */ static int hf_inap_bcsmEvents_item = -1; /* BCSMEvent */ static int hf_inap_timerID = -1; /* TimerID */ @@ -258,7 +243,7 @@ static int hf_inap_countersValue = -1; /* CountersValue */ static int hf_inap_responseCondition = -1; /* ResponseCondition */ static int hf_inap_reportCondition = -1; /* ReportCondition */ static int hf_inap_dpSpecificCriteria = -1; /* DpSpecificCriteria */ -static int hf_inap_bearerCap = -1; /* BearerCap */ +static int hf_inap_bearerCap = -1; /* T_bearerCap */ static int hf_inap_tmr = -1; /* OCTET_STRING_SIZE_1 */ static int hf_inap_minimumNbOfDigits = -1; /* INTEGER_1_127 */ static int hf_inap_maximumNbOfDigits = -1; /* INTEGER_1_127 */ @@ -293,13 +278,16 @@ static int hf_inap_tNoAnswerSpecificInfo = -1; /* T_tNoAnswerSpecificInfo */ static int hf_inap_tAnswerSpecificInfo = -1; /* T_tAnswerSpecificInfo */ static int hf_inap_tMidCallSpecificInfo = -1; /* T_tMidCallSpecificInfo */ static int hf_inap_tDisconnectSpecificInfo = -1; /* T_tDisconnectSpecificInfo */ +static int hf_inap_type = -1; /* ExtensionType */ +static int hf_inap_criticality = -1; /* Criticality */ +static int hf_inap_value = -1; /* T_value */ static int hf_inap_trunkGroupID = -1; /* INTEGER */ static int hf_inap_privateFacilityID = -1; /* INTEGER */ static int hf_inap_huntGroup = -1; /* OCTET_STRING */ static int hf_inap_routeIndex = -1; /* OCTET_STRING */ static int hf_inap_sFBillingChargingCharacteristics = -1; /* SFBillingChargingCharacteristics */ static int hf_inap_maximumNumberOfCounters = -1; /* MaximumNumberOfCounters */ -static int hf_inap_interval1 = -1; /* INTEGER_M1_32000 */ +static int hf_inap_interval = -1; /* INTEGER_M1_32000 */ static int hf_inap_numberOfCalls = -1; /* Integer4 */ static int hf_inap_dialledNumber = -1; /* Digits */ static int hf_inap_callingLineID = -1; /* Digits */ @@ -313,11 +301,11 @@ static int hf_inap_calledAddressAndService = -1; /* T_calledAddressAndService * static int hf_inap_callingAddressAndService = -1; /* T_callingAddressAndService */ static int hf_inap_dpCriteria = -1; /* EventTypeBCSM */ static int hf_inap_gapInterval = -1; /* Interval */ -static int hf_inap_both = -1; /* T_both */ +static int hf_inap_both_01 = -1; /* T_both_01 */ static int hf_inap_messageID = -1; /* MessageID */ static int hf_inap_numberOfRepetitions = -1; /* INTEGER_1_127 */ -static int hf_inap_duration3 = -1; /* INTEGER_0_32767 */ -static int hf_inap_interval = -1; /* INTEGER_0_32767 */ +static int hf_inap_duration_01 = -1; /* INTEGER_0_32767 */ +static int hf_inap_interval_01 = -1; /* INTEGER_0_32767 */ static int hf_inap_inbandInfo = -1; /* InbandInfo */ static int hf_inap_tone = -1; /* Tone */ static int hf_inap_displayInformation = -1; /* DisplayInformation */ @@ -345,16 +333,27 @@ static int hf_inap_releaseCauseValue = -1; /* Cause */ static int hf_inap_lineID = -1; /* Digits */ static int hf_inap_facilityGroupID = -1; /* FacilityGroup */ static int hf_inap_facilityGroupMemberID = -1; /* INTEGER */ -static int hf_inap_RouteList_item = -1; /* OCTET_STRING */ +static int hf_inap_RouteList_item = -1; /* OCTET_STRING_SIZE_minRouteListLength_maxRouteListLength */ static int hf_inap_toneID = -1; /* Integer4 */ -static int hf_inap_tone_duration = -1; /* Integer4 */ +static int hf_inap_duration_02 = -1; /* Integer4 */ static int hf_inap_integer = -1; /* Integer4 */ static int hf_inap_number = -1; /* Digits */ static int hf_inap_time = -1; /* OCTET_STRING_SIZE_2 */ -static int hf_inap_date2 = -1; /* OCTET_STRING_SIZE_3 */ +static int hf_inap_date = -1; /* OCTET_STRING_SIZE_3 */ static int hf_inap_price = -1; /* OCTET_STRING_SIZE_4 */ -static int hf_inap_problem_01 = -1; /* T_problem_01 */ -static int hf_inap_operation = -1; /* INTEGER_M128_127 */ +static int hf_inap_originalCallID = -1; /* CallID */ +static int hf_inap_destinationCallID = -1; /* CallID */ +static int hf_inap_newLegID = -1; /* LegID */ +static int hf_inap_correlationidentifier = -1; /* CorrelationID */ +static int hf_inap_CallPartyHandlingResultsArg_item = -1; /* LegInformation */ +static int hf_inap_callID = -1; /* CallID */ +static int hf_inap_targetCallID = -1; /* CallID */ +static int hf_inap_legToBeConnectedID = -1; /* LegID */ +static int hf_inap_legToBeDetached = -1; /* LegID */ +static int hf_inap_heldLegID = -1; /* LegID */ +static int hf_inap_legToBeReleased = -1; /* LegID */ +static int hf_inap_releaseCause_01 = -1; /* CauseQ763 */ +static int hf_inap_legStatus = -1; /* LegStatus */ /*--- End of included file: packet-inap-hf.c ---*/ #line 57 "packet-inap-template.c" @@ -385,18 +384,9 @@ static gint ett_inap_T_invokeIDRej = -1; static gint ett_inap_T_problem = -1; static gint ett_inap_OPERATION = -1; static gint ett_inap_ERROR = -1; -static gint ett_inap_AddPartyArg = -1; -static gint ett_inap_AttachArg = -1; -static gint ett_inap_CallPartyHandlingResultsArg = -1; -static gint ett_inap_ChangePartiesArg = -1; -static gint ett_inap_DetachArg = -1; -static gint ett_inap_HoldCallPartyConnectionArg = -1; -static gint ett_inap_ReconnectArg = -1; -static gint ett_inap_ReleaseCallPartyConnectionArg = -1; -static gint ett_inap_LegInformation = -1; -static gint ett_inap_Extensions = -1; -static gint ett_inap_Extensions_item = -1; +static gint ett_inap_CancelFailed = -1; static gint ett_inap_ActivateServiceFilteringArg = -1; +static gint ett_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField = -1; static gint ett_inap_AnalysedInformationArg = -1; static gint ett_inap_AnalyseInformationArg = -1; static gint ett_inap_ApplyChargingArg = -1; @@ -411,30 +401,27 @@ static gint ett_inap_CollectInformationArg = -1; static gint ett_inap_ConnectArg = -1; static gint ett_inap_ConnectToResourceArg = -1; static gint ett_inap_T_resourceAddress = -1; -static gint ett_inap_T_both2 = -1; +static gint ett_inap_T_both = -1; static gint ett_inap_DpSpecificCommonParameters = -1; static gint ett_inap_EstablishTemporaryConnectionArg = -1; static gint ett_inap_EventNotificationChargingArg = -1; static gint ett_inap_EventReportBCSMArg = -1; static gint ett_inap_HoldCallInNetworkArg = -1; -static gint ett_inap_InitialDP = -1; +static gint ett_inap_InitialDPArg = -1; static gint ett_inap_InitiateCallAttemptArg = -1; static gint ett_inap_MidCallArg = -1; static gint ett_inap_OAnswerArg = -1; static gint ett_inap_OCalledPartyBusyArg = -1; static gint ett_inap_ODisconnectArg = -1; -static gint ett_inap_ONoAnswer = -1; +static gint ett_inap_ONoAnswerArg = -1; static gint ett_inap_OriginationAttemptAuthorizedArg = -1; static gint ett_inap_PlayAnnouncementArg = -1; static gint ett_inap_PromptAndCollectUserInformationArg = -1; static gint ett_inap_ReceivedInformationArg = -1; -static gint ett_inap_ReleaseCallArg = -1; -static gint ett_inap_T_allCallSegments = -1; static gint ett_inap_RequestCurrentStatusReportResultArg = -1; static gint ett_inap_RequestEveryStatusChangeReportArg = -1; static gint ett_inap_RequestFirstStatusMatchReportArg = -1; -static gint ett_inap_RequestNotificationChargingEvent = -1; -static gint ett_inap_RequestNotificationChargingEvent_item = -1; +static gint ett_inap_RequestNotificationChargingEventArg = -1; static gint ett_inap_RequestReportBCSMEventArg = -1; static gint ett_inap_SEQUENCE_SIZE_1_numOfBCSMEvents_OF_BCSMEvent = -1; static gint ett_inap_ResetTimerArg = -1; @@ -472,6 +459,7 @@ static gint ett_inap_T_tNoAnswerSpecificInfo = -1; static gint ett_inap_T_tAnswerSpecificInfo = -1; static gint ett_inap_T_tMidCallSpecificInfo = -1; static gint ett_inap_T_tDisconnectSpecificInfo = -1; +static gint ett_inap_ExtensionField = -1; static gint ett_inap_FacilityGroup = -1; static gint ett_inap_FilteredCallTreatment = -1; static gint ett_inap_FilteringCharacteristics = -1; @@ -484,7 +472,7 @@ static gint ett_inap_T_callingAddressAndService = -1; static gint ett_inap_GapOnService = -1; static gint ett_inap_GapIndicators = -1; static gint ett_inap_GapTreatment = -1; -static gint ett_inap_T_both = -1; +static gint ett_inap_T_both_01 = -1; static gint ett_inap_InbandInfo = -1; static gint ett_inap_InformationToSend = -1; static gint ett_inap_LegID = -1; @@ -503,7 +491,15 @@ static gint ett_inap_RouteList = -1; static gint ett_inap_ServiceAddressInformation = -1; static gint ett_inap_Tone = -1; static gint ett_inap_VariablePart = -1; -static gint ett_inap_CancelFailed = -1; +static gint ett_inap_AddPartyArg = -1; +static gint ett_inap_AttachArg = -1; +static gint ett_inap_CallPartyHandlingResultsArg = -1; +static gint ett_inap_ChangePartiesArg = -1; +static gint ett_inap_DetachArg = -1; +static gint ett_inap_HoldCallPartyConnectionArg = -1; +static gint ett_inap_ReconnectArg = -1; +static gint ett_inap_ReleaseCallPartyConnectionArg = -1; +static gint ett_inap_LegInformation = -1; /*--- End of included file: packet-inap-ett.c ---*/ #line 72 "packet-inap-template.c" @@ -603,9 +599,6 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset, /*--- Included file: packet-inap-fn.c ---*/ #line 1 "packet-inap-fn.c" -/*--- Fields for imported types ---*/ - - static int @@ -615,21 +608,12 @@ dissect_inap_InvokeIdType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs return offset; } -static int dissect_invokeID(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_InvokeIdType(FALSE, tvb, offset, actx, tree, hf_inap_invokeID); -} -static int dissect_linkedID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_InvokeIdType(TRUE, tvb, offset, actx, tree, hf_inap_linkedID); -} -static int dissect_derivable(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_InvokeIdType(FALSE, tvb, offset, actx, tree, hf_inap_derivable); -} static int dissect_inap_INAPOperationLocalvalue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 89 "inap.cnf" +#line 98 "inap.cnf" offset = dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_index, &opcode); if (check_col(actx->pinfo->cinfo, COL_INFO)){ @@ -649,9 +633,6 @@ dissect_inap_OperationLocalvalue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i return offset; } -static int dissect_localValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_OperationLocalvalue(FALSE, tvb, offset, actx, tree, hf_inap_localValue); -} @@ -661,9 +642,6 @@ dissect_inap_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_globalValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_OBJECT_IDENTIFIER(FALSE, tvb, offset, actx, tree, hf_inap_globalValue); -} static const value_string inap_OPERATION_vals[] = { @@ -672,118 +650,97 @@ static const value_string inap_OPERATION_vals[] = { { 0, NULL } }; -static const ber_old_choice_t OPERATION_choice[] = { - { 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_localValue }, - { 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_globalValue }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t OPERATION_choice[] = { + { 0, &hf_inap_localValue , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_inap_OperationLocalvalue }, + { 1, &hf_inap_globalValue , BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_inap_OBJECT_IDENTIFIER }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_OPERATION(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, - OPERATION_choice, hf_index, ett_inap_OPERATION, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + OPERATION_choice, hf_index, ett_inap_OPERATION, + NULL); return offset; } -static int dissect_opCode(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_OPERATION(FALSE, tvb, offset, actx, tree, hf_inap_opCode); -} static int dissect_inap_InvokeParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 73 "inap.cnf" +#line 82 "inap.cnf" offset = dissect_invokeData(tree, tvb, offset, actx); return offset; } -static int dissect_invokeparameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_InvokeParameter(FALSE, tvb, offset, actx, tree, hf_inap_invokeparameter); -} -static const ber_old_sequence_t Invoke_sequence[] = { - { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID }, - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_linkedID_impl }, - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opCode }, - { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_invokeparameter }, - { 0, 0, 0, NULL } +static const ber_sequence_t Invoke_sequence[] = { + { &hf_inap_invokeID , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_inap_InvokeIdType }, + { &hf_inap_linkedID , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_InvokeIdType }, + { &hf_inap_opCode , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_OPERATION }, + { &hf_inap_invokeparameter, BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_inap_InvokeParameter }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_Invoke(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, - Invoke_sequence, hf_index, ett_inap_Invoke); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Invoke_sequence, hf_index, ett_inap_Invoke); return offset; } -static int dissect_invoke_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Invoke(TRUE, tvb, offset, actx, tree, hf_inap_invoke); -} static int dissect_inap_ReturnResultParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 76 "inap.cnf" +#line 85 "inap.cnf" offset = dissect_returnResultData(tree, tvb, offset, actx); return offset; } -static int dissect_returnparameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ReturnResultParameter(FALSE, tvb, offset, actx, tree, hf_inap_returnparameter); -} -static const ber_old_sequence_t T_resultretres_sequence[] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opCode }, - { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_returnparameter }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_resultretres_sequence[] = { + { &hf_inap_opCode , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_OPERATION }, + { &hf_inap_returnparameter, BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_inap_ReturnResultParameter }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_resultretres(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_resultretres_sequence, hf_index, ett_inap_T_resultretres); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_resultretres_sequence, hf_index, ett_inap_T_resultretres); return offset; } -static int dissect_resultretres(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_resultretres(FALSE, tvb, offset, actx, tree, hf_inap_resultretres); -} -static const ber_old_sequence_t ReturnResult_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_resultretres }, - { 0, 0, 0, NULL } +static const ber_sequence_t ReturnResult_sequence[] = { + { &hf_inap_invokeID , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_inap_InvokeIdType }, + { &hf_inap_resultretres , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_inap_T_resultretres }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_ReturnResult(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, - ReturnResult_sequence, hf_index, ett_inap_ReturnResult); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ReturnResult_sequence, hf_index, ett_inap_ReturnResult); return offset; } -static int dissect_returnResultLast_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ReturnResult(TRUE, tvb, offset, actx, tree, hf_inap_returnResultLast); -} -static int dissect_returnResultNotLast_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ReturnResult(TRUE, tvb, offset, actx, tree, hf_inap_returnResultNotLast); -} static int dissect_inap_INAPLocalErrorcode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 82 "inap.cnf" +#line 91 "inap.cnf" offset = dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_index, &errorCode); if (check_col(actx->pinfo->cinfo, COL_INFO)){ @@ -803,9 +760,6 @@ dissect_inap_LocalErrorcode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of return offset; } -static int dissect_localValue_01(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_LocalErrorcode(FALSE, tvb, offset, actx, tree, hf_inap_localValue_01); -} static const value_string inap_ERROR_vals[] = { @@ -814,57 +768,48 @@ static const value_string inap_ERROR_vals[] = { { 0, NULL } }; -static const ber_old_choice_t ERROR_choice[] = { - { 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_localValue_01 }, - { 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_globalValue }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t ERROR_choice[] = { + { 0, &hf_inap_localValue_01 , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_inap_LocalErrorcode }, + { 1, &hf_inap_globalValue , BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_inap_OBJECT_IDENTIFIER }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_ERROR(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, - ERROR_choice, hf_index, ett_inap_ERROR, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + ERROR_choice, hf_index, ett_inap_ERROR, + NULL); return offset; } -static int dissect_errorCode(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ERROR(FALSE, tvb, offset, actx, tree, hf_inap_errorCode); -} static int dissect_inap_ReturnErrorParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 79 "inap.cnf" +#line 88 "inap.cnf" offset = dissect_returnErrorData(tree, tvb, offset, actx); return offset; } -static int dissect_parameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ReturnErrorParameter(FALSE, tvb, offset, actx, tree, hf_inap_parameter); -} -static const ber_old_sequence_t ReturnError_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_errorCode }, - { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameter }, - { 0, 0, 0, NULL } +static const ber_sequence_t ReturnError_sequence[] = { + { &hf_inap_invokeID , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_inap_InvokeIdType }, + { &hf_inap_errorCode , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_ERROR }, + { &hf_inap_parameter , BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_inap_ReturnErrorParameter }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_ReturnError(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, - ReturnError_sequence, hf_index, ett_inap_ReturnError); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ReturnError_sequence, hf_index, ett_inap_ReturnError); return offset; } -static int dissect_returnError_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ReturnError(TRUE, tvb, offset, actx, tree, hf_inap_returnError); -} @@ -874,18 +819,6 @@ dissect_inap_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, return offset; } -static int dissect_not_derivable(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_NULL(FALSE, tvb, offset, actx, tree, hf_inap_not_derivable); -} -static int dissect_allRequests_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_NULL(TRUE, tvb, offset, actx, tree, hf_inap_allRequests); -} -static int dissect_none_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_NULL(TRUE, tvb, offset, actx, tree, hf_inap_none); -} -static int dissect_empty_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_NULL(TRUE, tvb, offset, actx, tree, hf_inap_empty); -} static const value_string inap_T_invokeIDRej_vals[] = { @@ -894,23 +827,20 @@ static const value_string inap_T_invokeIDRej_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_invokeIDRej_choice[] = { - { 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_derivable }, - { 1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_not_derivable }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_invokeIDRej_choice[] = { + { 0, &hf_inap_derivable , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_inap_InvokeIdType }, + { 1, &hf_inap_not_derivable , BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_inap_NULL }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_invokeIDRej(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_invokeIDRej_choice, hf_index, ett_inap_T_invokeIDRej, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_invokeIDRej_choice, hf_index, ett_inap_T_invokeIDRej, + NULL); return offset; } -static int dissect_invokeIDRej(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_invokeIDRej(FALSE, tvb, offset, actx, tree, hf_inap_invokeIDRej); -} static const value_string inap_GeneralProblem_vals[] = { @@ -928,9 +858,6 @@ dissect_inap_GeneralProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of return offset; } -static int dissect_generalProblem_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_GeneralProblem(TRUE, tvb, offset, actx, tree, hf_inap_generalProblem); -} static const value_string inap_InvokeProblem_vals[] = { @@ -953,9 +880,6 @@ dissect_inap_InvokeProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off return offset; } -static int dissect_invokeProblem_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_InvokeProblem(TRUE, tvb, offset, actx, tree, hf_inap_invokeProblem); -} static const value_string inap_ReturnResultProblem_vals[] = { @@ -973,9 +897,6 @@ dissect_inap_ReturnResultProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i return offset; } -static int dissect_returnResultProblem_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ReturnResultProblem(TRUE, tvb, offset, actx, tree, hf_inap_returnResultProblem); -} static const value_string inap_ReturnErrorProblem_vals[] = { @@ -995,9 +916,6 @@ dissect_inap_ReturnErrorProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in return offset; } -static int dissect_returnErrorProblem_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ReturnErrorProblem(TRUE, tvb, offset, actx, tree, hf_inap_returnErrorProblem); -} static const value_string inap_T_problem_vals[] = { @@ -1008,43 +926,37 @@ static const value_string inap_T_problem_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_problem_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_generalProblem_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invokeProblem_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResultProblem_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_returnErrorProblem_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_problem_choice[] = { + { 0, &hf_inap_generalProblem , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_GeneralProblem }, + { 1, &hf_inap_invokeProblem , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_InvokeProblem }, + { 2, &hf_inap_returnResultProblem, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_inap_ReturnResultProblem }, + { 3, &hf_inap_returnErrorProblem, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_inap_ReturnErrorProblem }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_problem(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_problem_choice, hf_index, ett_inap_T_problem, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_problem_choice, hf_index, ett_inap_T_problem, + NULL); return offset; } -static int dissect_problem(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_problem(FALSE, tvb, offset, actx, tree, hf_inap_problem); -} -static const ber_old_sequence_t Reject_sequence[] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeIDRej }, - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_problem }, - { 0, 0, 0, NULL } +static const ber_sequence_t Reject_sequence[] = { + { &hf_inap_invokeIDRej , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_T_invokeIDRej }, + { &hf_inap_problem , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_T_problem }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_Reject(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, - Reject_sequence, hf_index, ett_inap_Reject); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Reject_sequence, hf_index, ett_inap_Reject); return offset; } -static int dissect_reject_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Reject(TRUE, tvb, offset, actx, tree, hf_inap_reject); -} static const value_string inap_Component_vals[] = { @@ -1056,392 +968,117 @@ static const value_string inap_Component_vals[] = { { 0, NULL } }; -static const ber_old_choice_t Component_choice[] = { - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invoke_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResultLast_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_returnError_impl }, - { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_reject_impl }, - { 7, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_returnResultNotLast_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t Component_choice[] = { + { 1, &hf_inap_invoke , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_Invoke }, + { 2, &hf_inap_returnResultLast, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_inap_ReturnResult }, + { 3, &hf_inap_returnError , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_inap_ReturnError }, + { 4, &hf_inap_reject , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_inap_Reject }, + { 7, &hf_inap_returnResultNotLast, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_inap_ReturnResult }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_Component(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, - Component_choice, hf_index, ett_inap_Component, - NULL); - - return offset; -} - - - -static int -dissect_inap_CallID(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_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); - - return offset; -} -static int dissect_originalCallID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CallID(TRUE, tvb, offset, actx, tree, hf_inap_originalCallID); -} -static int dissect_destinationCallID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CallID(TRUE, tvb, offset, actx, tree, hf_inap_destinationCallID); -} -static int dissect_callID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CallID(TRUE, tvb, offset, actx, tree, hf_inap_callID); -} -static int dissect_targetCallID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CallID(TRUE, tvb, offset, actx, tree, hf_inap_targetCallID); -} - - -static const ber_old_sequence_t AddPartyArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalCallID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_destinationCallID_impl }, - { 0, 0, 0, NULL } -}; - -static int -dissect_inap_AddPartyArg(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, - AddPartyArg_sequence, hf_index, ett_inap_AddPartyArg); - - return offset; -} - - - -static int -dissect_inap_OCTET_STRING(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_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); - - return offset; -} -static int dissect_newLegID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_OCTET_STRING(TRUE, tvb, offset, actx, tree, hf_inap_newLegID); -} -static int dissect_correlationidentifier_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_OCTET_STRING(TRUE, tvb, offset, actx, tree, hf_inap_correlationidentifier); -} -static int dissect_legToBeConnectedID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_OCTET_STRING(TRUE, tvb, offset, actx, tree, hf_inap_legToBeConnectedID); -} -static int dissect_legToBeDetached_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_OCTET_STRING(TRUE, tvb, offset, actx, tree, hf_inap_legToBeDetached); -} -static int dissect_value_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_OCTET_STRING(TRUE, tvb, offset, actx, tree, hf_inap_value); -} -static int dissect_eventTypeCharging2_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_OCTET_STRING(TRUE, tvb, offset, actx, tree, hf_inap_eventTypeCharging2); -} -static int dissect_huntGroup_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_OCTET_STRING(TRUE, tvb, offset, actx, tree, hf_inap_huntGroup); -} -static int dissect_routeIndex_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_OCTET_STRING(TRUE, tvb, offset, actx, tree, hf_inap_routeIndex); -} -static int dissect_RouteList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_OCTET_STRING(FALSE, tvb, offset, actx, tree, hf_inap_RouteList_item); -} - - -static const ber_old_sequence_t AttachArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_newLegID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_correlationidentifier_impl }, - { 0, 0, 0, NULL } -}; - -static int -dissect_inap_AttachArg(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, - AttachArg_sequence, hf_index, ett_inap_AttachArg); - - return offset; -} - - - -static int -dissect_inap_LegType(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_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + Component_choice, hf_index, ett_inap_Component, + NULL); return offset; } -static int dissect_sendingSideID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_LegType(TRUE, tvb, offset, actx, tree, hf_inap_sendingSideID); -} -static int dissect_receivingSideID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_LegType(TRUE, tvb, offset, actx, tree, hf_inap_receivingSideID); -} -static const value_string inap_LegID_vals[] = { - { 0, "sendingSideID" }, - { 1, "receivingSideID" }, - { 0, NULL } -}; - -static const ber_old_choice_t LegID_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sendingSideID_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_receivingSideID_impl }, - { 0, 0, 0, 0, NULL } -}; - -static int -dissect_inap_LegID(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, - LegID_choice, hf_index, ett_inap_LegID, - NULL); - - return offset; -} -static int dissect_legID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_LegID(TRUE, tvb, offset, actx, tree, hf_inap_legID); -} -static int dissect_heldLegID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_LegID(TRUE, tvb, offset, actx, tree, hf_inap_heldLegID); -} -static int dissect_legToBeReleased_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_LegID(TRUE, tvb, offset, actx, tree, hf_inap_legToBeReleased); -} -static int dissect_partyToCharge_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_LegID(TRUE, tvb, offset, actx, tree, hf_inap_partyToCharge); -} - - -static const value_string inap_LegStatus_vals[] = { - { 0, "connected" }, - { 1, "unconnected" }, - { 2, "pending" }, - { 3, "interacting" }, +static const value_string inap_T_problem_01_vals[] = { + { 0, "unknownOperation" }, + { 1, "tooLate" }, + { 2, "operationNotCancellable" }, { 0, NULL } }; static int -dissect_inap_LegStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_inap_T_problem_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_integer(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); return offset; } -static int dissect_legStatus_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_LegStatus(TRUE, tvb, offset, actx, tree, hf_inap_legStatus); -} -static const ber_old_sequence_t LegInformation_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_legStatus_impl }, - { 0, 0, 0, NULL } -}; static int -dissect_inap_LegInformation(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, - LegInformation_sequence, hf_index, ett_inap_LegInformation); - - return offset; -} -static int dissect_CallPartyHandlingResultsArg_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_LegInformation(FALSE, tvb, offset, actx, tree, hf_inap_CallPartyHandlingResultsArg_item); -} - - -static const ber_old_sequence_t CallPartyHandlingResultsArg_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CallPartyHandlingResultsArg_item }, -}; - -static int -dissect_inap_CallPartyHandlingResultsArg(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, - CallPartyHandlingResultsArg_sequence_of, hf_index, ett_inap_CallPartyHandlingResultsArg); - - return offset; -} - - -static const ber_old_sequence_t ChangePartiesArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_targetCallID_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_legToBeConnectedID_impl }, - { 0, 0, 0, NULL } -}; - -static int -dissect_inap_ChangePartiesArg(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, - ChangePartiesArg_sequence, hf_index, ett_inap_ChangePartiesArg); - - return offset; -} - - -static const ber_old_sequence_t DetachArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_legToBeDetached_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_correlationidentifier_impl }, - { 0, 0, 0, NULL } -}; - -static int -dissect_inap_DetachArg(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, - DetachArg_sequence, hf_index, ett_inap_DetachArg); - - return offset; -} - - -static const ber_old_sequence_t HoldCallPartyConnectionArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID_impl }, - { 0, 0, 0, NULL } -}; - -static int -dissect_inap_HoldCallPartyConnectionArg(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, - HoldCallPartyConnectionArg_sequence, hf_index, ett_inap_HoldCallPartyConnectionArg); +dissect_inap_INTEGER_M128_127(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_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); return offset; } -static const ber_old_sequence_t ReconnectArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_heldLegID_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t CancelFailed_sequence[] = { + { &hf_inap_problem_01 , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_T_problem_01 }, + { &hf_inap_operation , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_INTEGER_M128_127 }, + { NULL, 0, 0, 0, NULL } }; static int -dissect_inap_ReconnectArg(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, - ReconnectArg_sequence, hf_index, ett_inap_ReconnectArg); +dissect_inap_CancelFailed(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_sequence(implicit_tag, actx, tree, tvb, offset, + CancelFailed_sequence, hf_index, ett_inap_CancelFailed); return offset; } - -static int -dissect_inap_Cause(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_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); - - return offset; -} -static int dissect_releaseCause_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Cause(TRUE, tvb, offset, actx, tree, hf_inap_releaseCause); -} -static int dissect_busyCause_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Cause(TRUE, tvb, offset, actx, tree, hf_inap_busyCause); -} -static int dissect_initialCallSegment(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Cause(FALSE, tvb, offset, actx, tree, hf_inap_initialCallSegment); -} -static int dissect_failureCause_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Cause(TRUE, tvb, offset, actx, tree, hf_inap_failureCause); -} -static int dissect_releaseCauseValue_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Cause(TRUE, tvb, offset, actx, tree, hf_inap_releaseCauseValue); -} - - -static const ber_old_sequence_t ReleaseCallPartyConnectionArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legToBeReleased_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callID_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_releaseCause_impl }, - { 0, 0, 0, NULL } +static const value_string inap_RequestedInfoError_vals[] = { + { 1, "unknownRequestedInfo" }, + { 2, "requestedInfoNotAvailable" }, + { 0, NULL } }; -static int -dissect_inap_ReleaseCallPartyConnectionArg(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, - ReleaseCallPartyConnectionArg_sequence, hf_index, ett_inap_ReleaseCallPartyConnectionArg); - - return offset; -} - - static int -dissect_inap_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_inap_RequestedInfoError(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_integer(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); return offset; } -static int dissect_type(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_INTEGER(FALSE, tvb, offset, actx, tree, hf_inap_type); -} -static int dissect_trunkGroupID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_INTEGER(TRUE, tvb, offset, actx, tree, hf_inap_trunkGroupID); -} -static int dissect_privateFacilityID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_INTEGER(TRUE, tvb, offset, actx, tree, hf_inap_privateFacilityID); -} -static int dissect_facilityGroupMemberID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_INTEGER(TRUE, tvb, offset, actx, tree, hf_inap_facilityGroupMemberID); -} -static const value_string inap_T_criticality_vals[] = { - { 0, "ignore" }, - { 1, "abort" }, +static const value_string inap_SystemFailure_vals[] = { + { 0, "unavailableResources" }, + { 1, "componentFailure" }, + { 2, "basicCallProcessingException" }, + { 3, "resourceStatusFailure" }, + { 4, "endUserFailure" }, { 0, NULL } }; static int -dissect_inap_T_criticality(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_inap_SystemFailure(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_integer(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); return offset; } -static int dissect_criticality(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_criticality(FALSE, tvb, offset, actx, tree, hf_inap_criticality); -} -static const ber_old_sequence_t Extensions_item_sequence[] = { - { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_type }, - { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_criticality }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_value_impl }, - { 0, 0, 0, NULL } +static const value_string inap_TaskRefused_vals[] = { + { 0, "generic" }, + { 1, "unobtainable" }, + { 2, "congestion" }, + { 0, NULL } }; -static int -dissect_inap_Extensions_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, - Extensions_item_sequence, hf_index, ett_inap_Extensions_item); - - return offset; -} -static int dissect_Extensions_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Extensions_item(FALSE, tvb, offset, actx, tree, hf_inap_Extensions_item); -} - - -static const ber_old_sequence_t Extensions_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Extensions_item }, -}; static int -dissect_inap_Extensions(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, - Extensions_sequence_of, hf_index, ett_inap_Extensions); +dissect_inap_TaskRefused(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_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); return offset; } -static int dissect_extensions_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Extensions(TRUE, tvb, offset, actx, tree, hf_inap_extensions); -} @@ -1452,9 +1089,6 @@ dissect_inap_SFBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_ return offset; } -static int dissect_sFBillingChargingCharacteristics_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_SFBillingChargingCharacteristics(TRUE, tvb, offset, actx, tree, hf_inap_sFBillingChargingCharacteristics); -} @@ -1465,33 +1099,6 @@ dissect_inap_Integer4(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ return offset; } -static int dissect_connectTime_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Integer4(TRUE, tvb, offset, actx, tree, hf_inap_connectTime); -} -static int dissect_counterValue_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Integer4(TRUE, tvb, offset, actx, tree, hf_inap_counterValue); -} -static int dissect_numberOfCalls_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Integer4(TRUE, tvb, offset, actx, tree, hf_inap_numberOfCalls); -} -static int dissect_elementaryMessageID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Integer4(TRUE, tvb, offset, actx, tree, hf_inap_elementaryMessageID); -} -static int dissect_elementaryMessageIDs_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Integer4(FALSE, tvb, offset, actx, tree, hf_inap_elementaryMessageIDs_item); -} -static int dissect_callConnectedElapsedTimeValue_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Integer4(TRUE, tvb, offset, actx, tree, hf_inap_callConnectedElapsedTimeValue); -} -static int dissect_toneID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Integer4(TRUE, tvb, offset, actx, tree, hf_inap_toneID); -} -static int dissect_tone_duration_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Integer4(TRUE, tvb, offset, actx, tree, hf_inap_tone_duration); -} -static int dissect_integer_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Integer4(TRUE, tvb, offset, actx, tree, hf_inap_integer); -} @@ -1503,9 +1110,6 @@ dissect_inap_IA5String_SIZE_minMessageContentLength_maxMessageContentLength(gboo return offset; } -static int dissect_messageContent_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_IA5String_SIZE_minMessageContentLength_maxMessageContentLength(TRUE, tvb, offset, actx, tree, hf_inap_messageContent); -} @@ -1516,43 +1120,34 @@ dissect_inap_OCTET_STRING_SIZE_minAttributesLength_maxAttributesLength(gboolean return offset; } -static int dissect_attributes_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_OCTET_STRING_SIZE_minAttributesLength_maxAttributesLength(TRUE, tvb, offset, actx, tree, hf_inap_attributes); -} -static const ber_old_sequence_t T_text_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_messageContent_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_attributes_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_text_sequence[] = { + { &hf_inap_messageContent , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_IA5String_SIZE_minMessageContentLength_maxMessageContentLength }, + { &hf_inap_attributes , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_OCTET_STRING_SIZE_minAttributesLength_maxAttributesLength }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_text(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_text_sequence, hf_index, ett_inap_T_text); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_text_sequence, hf_index, ett_inap_T_text); return offset; } -static int dissect_text_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_text(TRUE, tvb, offset, actx, tree, hf_inap_text); -} -static const ber_old_sequence_t SEQUENCE_SIZE_1_numOfMessageIDs_OF_Integer4_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_elementaryMessageIDs_item }, +static const ber_sequence_t SEQUENCE_SIZE_1_numOfMessageIDs_OF_Integer4_sequence_of[1] = { + { &hf_inap_elementaryMessageIDs_item, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_inap_Integer4 }, }; static int dissect_inap_SEQUENCE_SIZE_1_numOfMessageIDs_OF_Integer4(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_SIZE_1_numOfMessageIDs_OF_Integer4_sequence_of, hf_index, ett_inap_SEQUENCE_SIZE_1_numOfMessageIDs_OF_Integer4); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_SIZE_1_numOfMessageIDs_OF_Integer4_sequence_of, hf_index, ett_inap_SEQUENCE_SIZE_1_numOfMessageIDs_OF_Integer4); return offset; } -static int dissect_elementaryMessageIDs_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_SEQUENCE_SIZE_1_numOfMessageIDs_OF_Integer4(TRUE, tvb, offset, actx, tree, hf_inap_elementaryMessageIDs); -} @@ -1563,30 +1158,6 @@ dissect_inap_Digits(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ return offset; } -static int dissect_prefix_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Digits(TRUE, tvb, offset, actx, tree, hf_inap_prefix); -} -static int dissect_digitsResponse_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Digits(TRUE, tvb, offset, actx, tree, hf_inap_digitsResponse); -} -static int dissect_dialledNumber_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Digits(TRUE, tvb, offset, actx, tree, hf_inap_dialledNumber); -} -static int dissect_callingLineID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Digits(TRUE, tvb, offset, actx, tree, hf_inap_callingLineID); -} -static int dissect_calledAddressValue_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Digits(TRUE, tvb, offset, actx, tree, hf_inap_calledAddressValue); -} -static int dissect_callingAddressValue_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Digits(TRUE, tvb, offset, actx, tree, hf_inap_callingAddressValue); -} -static int dissect_lineID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Digits(TRUE, tvb, offset, actx, tree, hf_inap_lineID); -} -static int dissect_number_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Digits(TRUE, tvb, offset, actx, tree, hf_inap_number); -} @@ -1597,9 +1168,6 @@ dissect_inap_OCTET_STRING_SIZE_2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i return offset; } -static int dissect_time_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_OCTET_STRING_SIZE_2(TRUE, tvb, offset, actx, tree, hf_inap_time); -} @@ -1610,9 +1178,6 @@ dissect_inap_OCTET_STRING_SIZE_3(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i return offset; } -static int dissect_date2_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_OCTET_STRING_SIZE_3(TRUE, tvb, offset, actx, tree, hf_inap_date2); -} @@ -1623,74 +1188,62 @@ dissect_inap_OCTET_STRING_SIZE_4(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i return offset; } -static int dissect_price_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_OCTET_STRING_SIZE_4(TRUE, tvb, offset, actx, tree, hf_inap_price); -} static const value_string inap_VariablePart_vals[] = { { 0, "integer" }, { 1, "number" }, { 2, "time" }, - { 3, "date2" }, + { 3, "date" }, { 4, "price" }, { 0, NULL } }; -static const ber_old_choice_t VariablePart_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_integer_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_number_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_time_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_date2_impl }, - { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_price_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t VariablePart_choice[] = { + { 0, &hf_inap_integer , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_Integer4 }, + { 1, &hf_inap_number , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_Digits }, + { 2, &hf_inap_time , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_inap_OCTET_STRING_SIZE_2 }, + { 3, &hf_inap_date , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_inap_OCTET_STRING_SIZE_3 }, + { 4, &hf_inap_price , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_inap_OCTET_STRING_SIZE_4 }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_VariablePart(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, - VariablePart_choice, hf_index, ett_inap_VariablePart, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + VariablePart_choice, hf_index, ett_inap_VariablePart, + NULL); return offset; } -static int dissect_variableParts_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_VariablePart(FALSE, tvb, offset, actx, tree, hf_inap_variableParts_item); -} -static const ber_old_sequence_t SEQUENCE_SIZE_1_5_OF_VariablePart_sequence_of[1] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableParts_item }, +static const ber_sequence_t SEQUENCE_SIZE_1_5_OF_VariablePart_sequence_of[1] = { + { &hf_inap_variableParts_item, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_VariablePart }, }; static int dissect_inap_SEQUENCE_SIZE_1_5_OF_VariablePart(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_SIZE_1_5_OF_VariablePart_sequence_of, hf_index, ett_inap_SEQUENCE_SIZE_1_5_OF_VariablePart); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_SIZE_1_5_OF_VariablePart_sequence_of, hf_index, ett_inap_SEQUENCE_SIZE_1_5_OF_VariablePart); return offset; } -static int dissect_variableParts_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_SEQUENCE_SIZE_1_5_OF_VariablePart(TRUE, tvb, offset, actx, tree, hf_inap_variableParts); -} -static const ber_old_sequence_t T_variableMessage_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_elementaryMessageID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_variableParts_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_variableMessage_sequence[] = { + { &hf_inap_elementaryMessageID, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_Integer4 }, + { &hf_inap_variableParts , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_5_OF_VariablePart }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_variableMessage(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_variableMessage_sequence, hf_index, ett_inap_T_variableMessage); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_variableMessage_sequence, hf_index, ett_inap_T_variableMessage); return offset; } -static int dissect_variableMessage_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_variableMessage(TRUE, tvb, offset, actx, tree, hf_inap_variableMessage); -} static const value_string inap_MessageID_vals[] = { @@ -1701,25 +1254,22 @@ static const value_string inap_MessageID_vals[] = { { 0, NULL } }; -static const ber_old_choice_t MessageID_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_elementaryMessageID_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_text_impl }, - { 29, BER_CLASS_CON, 29, BER_FLAGS_IMPLTAG, dissect_elementaryMessageIDs_impl }, - { 30, BER_CLASS_CON, 30, BER_FLAGS_IMPLTAG, dissect_variableMessage_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t MessageID_choice[] = { + { 0, &hf_inap_elementaryMessageID, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_Integer4 }, + { 1, &hf_inap_text , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_T_text }, + { 29, &hf_inap_elementaryMessageIDs, BER_CLASS_CON, 29, BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfMessageIDs_OF_Integer4 }, + { 30, &hf_inap_variableMessage, BER_CLASS_CON, 30, BER_FLAGS_IMPLTAG, dissect_inap_T_variableMessage }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_MessageID(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, - MessageID_choice, hf_index, ett_inap_MessageID, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + MessageID_choice, hf_index, ett_inap_MessageID, + NULL); return offset; } -static int dissect_messageID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_MessageID(TRUE, tvb, offset, actx, tree, hf_inap_messageID); -} @@ -1730,21 +1280,6 @@ dissect_inap_INTEGER_1_127(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off return offset; } -static int dissect_minimumNbOfDigits_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_INTEGER_1_127(TRUE, tvb, offset, actx, tree, hf_inap_minimumNbOfDigits); -} -static int dissect_maximumNbOfDigits_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_INTEGER_1_127(TRUE, tvb, offset, actx, tree, hf_inap_maximumNbOfDigits); -} -static int dissect_firstDigitTimeOut_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_INTEGER_1_127(TRUE, tvb, offset, actx, tree, hf_inap_firstDigitTimeOut); -} -static int dissect_interDigitTimeOut_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_INTEGER_1_127(TRUE, tvb, offset, actx, tree, hf_inap_interDigitTimeOut); -} -static int dissect_numberOfRepetitions_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_INTEGER_1_127(TRUE, tvb, offset, actx, tree, hf_inap_numberOfRepetitions); -} @@ -1755,50 +1290,38 @@ dissect_inap_INTEGER_0_32767(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o return offset; } -static int dissect_duration3_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_INTEGER_0_32767(TRUE, tvb, offset, actx, tree, hf_inap_duration3); -} -static int dissect_interval_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_INTEGER_0_32767(TRUE, tvb, offset, actx, tree, hf_inap_interval); -} -static const ber_old_sequence_t InbandInfo_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_messageID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_numberOfRepetitions_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_duration3_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_interval_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t InbandInfo_sequence[] = { + { &hf_inap_messageID , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_MessageID }, + { &hf_inap_numberOfRepetitions, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_INTEGER_1_127 }, + { &hf_inap_duration_01 , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_INTEGER_0_32767 }, + { &hf_inap_interval_01 , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_INTEGER_0_32767 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_InbandInfo(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, - InbandInfo_sequence, hf_index, ett_inap_InbandInfo); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + InbandInfo_sequence, hf_index, ett_inap_InbandInfo); return offset; } -static int dissect_inbandInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_InbandInfo(TRUE, tvb, offset, actx, tree, hf_inap_inbandInfo); -} -static const ber_old_sequence_t Tone_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_toneID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_tone_duration_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t Tone_sequence[] = { + { &hf_inap_toneID , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_Integer4 }, + { &hf_inap_duration_02 , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Integer4 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_Tone(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, - Tone_sequence, hf_index, ett_inap_Tone); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Tone_sequence, hf_index, ett_inap_Tone); return offset; } -static int dissect_tone_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Tone(TRUE, tvb, offset, actx, tree, hf_inap_tone); -} @@ -1810,9 +1333,6 @@ dissect_inap_DisplayInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in return offset; } -static int dissect_displayInformation_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_DisplayInformation(TRUE, tvb, offset, actx, tree, hf_inap_displayInformation); -} static const value_string inap_InformationToSend_vals[] = { @@ -1822,24 +1342,21 @@ static const value_string inap_InformationToSend_vals[] = { { 0, NULL } }; -static const ber_old_choice_t InformationToSend_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inbandInfo_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_tone_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_displayInformation_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t InformationToSend_choice[] = { + { 0, &hf_inap_inbandInfo , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_InbandInfo }, + { 1, &hf_inap_tone , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_Tone }, + { 2, &hf_inap_displayInformation, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_inap_DisplayInformation }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_InformationToSend(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, - InformationToSend_choice, hf_index, ett_inap_InformationToSend, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + InformationToSend_choice, hf_index, ett_inap_InformationToSend, + NULL); return offset; } -static int dissect_informationToSend_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_InformationToSend(TRUE, tvb, offset, actx, tree, hf_inap_informationToSend); -} @@ -1850,29 +1367,33 @@ dissect_inap_MaximumNumberOfCounters(gboolean implicit_tag _U_, tvbuff_t *tvb _U return offset; } -static int dissect_maximumNumberOfCounters_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_MaximumNumberOfCounters(TRUE, tvb, offset, actx, tree, hf_inap_maximumNumberOfCounters); + + + +static int +dissect_inap_Cause(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_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; } -static const ber_old_sequence_t FilteredCallTreatment_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sFBillingChargingCharacteristics_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_informationToSend_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_maximumNumberOfCounters_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_releaseCause_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t FilteredCallTreatment_sequence[] = { + { &hf_inap_sFBillingChargingCharacteristics, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_SFBillingChargingCharacteristics }, + { &hf_inap_informationToSend, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_InformationToSend }, + { &hf_inap_maximumNumberOfCounters, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_MaximumNumberOfCounters }, + { &hf_inap_releaseCause , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Cause }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_FilteredCallTreatment(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, - FilteredCallTreatment_sequence, hf_index, ett_inap_FilteredCallTreatment); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + FilteredCallTreatment_sequence, hf_index, ett_inap_FilteredCallTreatment); return offset; } -static int dissect_filteredCallTreatment_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_FilteredCallTreatment(TRUE, tvb, offset, actx, tree, hf_inap_filteredCallTreatment); -} @@ -1883,34 +1404,28 @@ dissect_inap_INTEGER_M1_32000(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_interval1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_INTEGER_M1_32000(TRUE, tvb, offset, actx, tree, hf_inap_interval1); -} static const value_string inap_FilteringCharacteristics_vals[] = { - { 0, "interval1" }, + { 0, "interval" }, { 1, "numberOfCalls" }, { 0, NULL } }; -static const ber_old_choice_t FilteringCharacteristics_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_interval1_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberOfCalls_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t FilteringCharacteristics_choice[] = { + { 0, &hf_inap_interval , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_INTEGER_M1_32000 }, + { 1, &hf_inap_numberOfCalls , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_Integer4 }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_FilteringCharacteristics(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, - FilteringCharacteristics_choice, hf_index, ett_inap_FilteringCharacteristics, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + FilteringCharacteristics_choice, hf_index, ett_inap_FilteringCharacteristics, + NULL); return offset; } -static int dissect_filteringCharacteristics_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_FilteringCharacteristics(TRUE, tvb, offset, actx, tree, hf_inap_filteringCharacteristics); -} @@ -1921,12 +1436,6 @@ dissect_inap_Duration(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ return offset; } -static int dissect_monitorDuration_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Duration(TRUE, tvb, offset, actx, tree, hf_inap_monitorDuration); -} -static int dissect_duration_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Duration(TRUE, tvb, offset, actx, tree, hf_inap_duration); -} @@ -1937,15 +1446,6 @@ dissect_inap_DateAndTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse return offset; } -static int dissect_startTime_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_DateAndTime(TRUE, tvb, offset, actx, tree, hf_inap_startTime); -} -static int dissect_stopTime_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_DateAndTime(TRUE, tvb, offset, actx, tree, hf_inap_stopTime); -} -static int dissect_callStopTimeValue_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_DateAndTime(TRUE, tvb, offset, actx, tree, hf_inap_callStopTimeValue); -} static const value_string inap_FilteringTimeOut_vals[] = { @@ -1954,23 +1454,20 @@ static const value_string inap_FilteringTimeOut_vals[] = { { 0, NULL } }; -static const ber_old_choice_t FilteringTimeOut_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_duration_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_stopTime_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t FilteringTimeOut_choice[] = { + { 0, &hf_inap_duration , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_Duration }, + { 1, &hf_inap_stopTime , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_DateAndTime }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_FilteringTimeOut(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, - FilteringTimeOut_choice, hf_index, ett_inap_FilteringTimeOut, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + FilteringTimeOut_choice, hf_index, ett_inap_FilteringTimeOut, + NULL); return offset; } -static int dissect_filteringTimeOut_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_FilteringTimeOut(TRUE, tvb, offset, actx, tree, hf_inap_filteringTimeOut); -} @@ -1980,9 +1477,6 @@ dissect_inap_ServiceKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_serviceKey_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ServiceKey(TRUE, tvb, offset, actx, tree, hf_inap_serviceKey); -} @@ -1993,29 +1487,23 @@ dissect_inap_LocationNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of return offset; } -static int dissect_locationNumber_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_LocationNumber(TRUE, tvb, offset, actx, tree, hf_inap_locationNumber); -} -static const ber_old_sequence_t T_addressAndService_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_calledAddressValue_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceKey_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingAddressValue_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_locationNumber_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_addressAndService_sequence[] = { + { &hf_inap_calledAddressValue, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_Digits }, + { &hf_inap_serviceKey , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_ServiceKey }, + { &hf_inap_callingAddressValue, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Digits }, + { &hf_inap_locationNumber , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_LocationNumber }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_addressAndService(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_addressAndService_sequence, hf_index, ett_inap_T_addressAndService); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_addressAndService_sequence, hf_index, ett_inap_T_addressAndService); return offset; } -static int dissect_addressAndService_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_addressAndService(TRUE, tvb, offset, actx, tree, hf_inap_addressAndService); -} static const value_string inap_FilteringCriteria_vals[] = { @@ -2026,41 +1514,106 @@ static const value_string inap_FilteringCriteria_vals[] = { { 0, NULL } }; -static const ber_old_choice_t FilteringCriteria_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dialledNumber_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_callingLineID_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_serviceKey_impl }, - { 30, BER_CLASS_CON, 30, BER_FLAGS_IMPLTAG, dissect_addressAndService_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t FilteringCriteria_choice[] = { + { 0, &hf_inap_dialledNumber , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_Digits }, + { 1, &hf_inap_callingLineID , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_Digits }, + { 2, &hf_inap_serviceKey , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_inap_ServiceKey }, + { 30, &hf_inap_addressAndService, BER_CLASS_CON, 30, BER_FLAGS_IMPLTAG, dissect_inap_T_addressAndService }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_FilteringCriteria(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, - FilteringCriteria_choice, hf_index, ett_inap_FilteringCriteria, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + FilteringCriteria_choice, hf_index, ett_inap_FilteringCriteria, + NULL); return offset; } -static int dissect_filteringCriteria_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_FilteringCriteria(TRUE, tvb, offset, actx, tree, hf_inap_filteringCriteria); + + + +static int +dissect_inap_ExtensionType(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_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; } -static const ber_old_sequence_t ActivateServiceFilteringArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_filteredCallTreatment_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_filteringCharacteristics_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_filteringTimeOut_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_filteringCriteria_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_startTime_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { 0, 0, 0, NULL } +static const value_string inap_Criticality_vals[] = { + { 0, "ignored" }, + { 1, "abort" }, + { 0, NULL } +}; + + +static int +dissect_inap_Criticality(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_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + + +static int +dissect_inap_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 78 "inap.cnf" + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + + + return offset; +} + + +static const ber_sequence_t ExtensionField_sequence[] = { + { &hf_inap_type , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_inap_ExtensionType }, + { &hf_inap_criticality , BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_inap_Criticality }, + { &hf_inap_value , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_T_value }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_inap_ExtensionField(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_sequence(implicit_tag, actx, tree, tvb, offset, + ExtensionField_sequence, hf_index, ett_inap_ExtensionField); + + return offset; +} + + +static const ber_sequence_t SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField_sequence_of[1] = { + { &hf_inap_extensions_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_inap_ExtensionField }, +}; + +static int +dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField(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_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField_sequence_of, hf_index, ett_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField); + + return offset; +} + + +static const ber_sequence_t ActivateServiceFilteringArg_sequence[] = { + { &hf_inap_filteredCallTreatment, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_FilteredCallTreatment }, + { &hf_inap_filteringCharacteristics, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_FilteringCharacteristics }, + { &hf_inap_filteringTimeOut, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_FilteringTimeOut }, + { &hf_inap_filteringCriteria, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_FilteringCriteria }, + { &hf_inap_startTime , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_DateAndTime }, + { &hf_inap_extensions , BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_ActivateServiceFilteringArg(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, - ActivateServiceFilteringArg_sequence, hf_index, ett_inap_ActivateServiceFilteringArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ActivateServiceFilteringArg_sequence, hf_index, ett_inap_ActivateServiceFilteringArg); return offset; } @@ -2080,9 +1633,6 @@ dissect_inap_T_messageType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off return offset; } -static int dissect_messageType_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_messageType(TRUE, tvb, offset, actx, tree, hf_inap_messageType); -} static const value_string inap_T_dpAssignment_vals[] = { @@ -2100,27 +1650,21 @@ dissect_inap_T_dpAssignment(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of return offset; } -static int dissect_dpAssignment_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_dpAssignment(TRUE, tvb, offset, actx, tree, hf_inap_dpAssignment); -} -static const ber_old_sequence_t MiscCallInfo_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_messageType_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dpAssignment_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t MiscCallInfo_sequence[] = { + { &hf_inap_messageType , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_T_messageType }, + { &hf_inap_dpAssignment , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_T_dpAssignment }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_MiscCallInfo(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, - MiscCallInfo_sequence, hf_index, ett_inap_MiscCallInfo); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + MiscCallInfo_sequence, hf_index, ett_inap_MiscCallInfo); return offset; } -static int dissect_miscCallInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_MiscCallInfo(TRUE, tvb, offset, actx, tree, hf_inap_miscCallInfo); -} static const value_string inap_TriggerType_vals[] = { @@ -2154,34 +1698,28 @@ dissect_inap_TriggerType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse return offset; } -static int dissect_triggerType_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_TriggerType(TRUE, tvb, offset, actx, tree, hf_inap_triggerType); -} -static const ber_old_sequence_t ServiceAddressInformation_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceKey_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_miscCallInfo_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_triggerType_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t ServiceAddressInformation_sequence[] = { + { &hf_inap_serviceKey , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ServiceKey }, + { &hf_inap_miscCallInfo , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_MiscCallInfo }, + { &hf_inap_triggerType , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_TriggerType }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_ServiceAddressInformation(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, - ServiceAddressInformation_sequence, hf_index, ett_inap_ServiceAddressInformation); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ServiceAddressInformation_sequence, hf_index, ett_inap_ServiceAddressInformation); return offset; } -static int dissect_serviceAddressInformation_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ServiceAddressInformation(TRUE, tvb, offset, actx, tree, hf_inap_serviceAddressInformation); -} static int -dissect_inap_BearerCap(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 128 "inap.cnf" +dissect_inap_T_bearerCap(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 137 "inap.cnf" tvbuff_t *parameter_tvb; @@ -2198,9 +1736,6 @@ dissect_inap_BearerCap(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_bearerCap_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_BearerCap(TRUE, tvb, offset, actx, tree, hf_inap_bearerCap); -} @@ -2211,9 +1746,6 @@ dissect_inap_OCTET_STRING_SIZE_1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i return offset; } -static int dissect_tmr_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_OCTET_STRING_SIZE_1(TRUE, tvb, offset, actx, tree, hf_inap_tmr); -} static const value_string inap_BearerCapability_vals[] = { @@ -2222,29 +1754,26 @@ static const value_string inap_BearerCapability_vals[] = { { 0, NULL } }; -static const ber_old_choice_t BearerCapability_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_bearerCap_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_tmr_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t BearerCapability_choice[] = { + { 0, &hf_inap_bearerCap , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_T_bearerCap }, + { 1, &hf_inap_tmr , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_OCTET_STRING_SIZE_1 }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_BearerCapability(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, - BearerCapability_choice, hf_index, ett_inap_BearerCapability, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + BearerCapability_choice, hf_index, ett_inap_BearerCapability, + NULL); return offset; } -static int dissect_bearerCapability_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_BearerCapability(TRUE, tvb, offset, actx, tree, hf_inap_bearerCapability); -} static int dissect_inap_CalledPartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 99 "inap.cnf" +#line 108 "inap.cnf" tvbuff_t *parameter_tvb; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -2260,27 +1789,12 @@ dissect_isup_called_party_number_parameter(parameter_tvb, tree, NULL); return offset; } -static int dissect_dialledDigits_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CalledPartyNumber(TRUE, tvb, offset, actx, tree, hf_inap_dialledDigits); -} -static int dissect_calledPartyNumber_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CalledPartyNumber(TRUE, tvb, offset, actx, tree, hf_inap_calledPartyNumber); -} -static int dissect_destinationNumberRoutingAddress_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CalledPartyNumber(TRUE, tvb, offset, actx, tree, hf_inap_destinationNumberRoutingAddress); -} -static int dissect_DestinationRoutingAddress_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CalledPartyNumber(FALSE, tvb, offset, actx, tree, hf_inap_DestinationRoutingAddress_item); -} -static int dissect_calledPartynumber_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CalledPartyNumber(TRUE, tvb, offset, actx, tree, hf_inap_calledPartynumber); -} static int dissect_inap_CallingPartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 113 "inap.cnf" +#line 122 "inap.cnf" tvbuff_t *parameter_tvb; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -2297,9 +1811,6 @@ dissect_inap_CallingPartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in return offset; } -static int dissect_callingPartyNumber_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CallingPartyNumber(TRUE, tvb, offset, actx, tree, hf_inap_callingPartyNumber); -} @@ -2310,9 +1821,6 @@ dissect_inap_CallingPartysCategory(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_callingPartysCategory_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CallingPartysCategory(TRUE, tvb, offset, actx, tree, hf_inap_callingPartysCategory); -} @@ -2323,9 +1831,6 @@ dissect_inap_IPSSPCapabilities(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_iPSSPCapabilities_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_IPSSPCapabilities(TRUE, tvb, offset, actx, tree, hf_inap_iPSSPCapabilities); -} @@ -2336,9 +1841,6 @@ dissect_inap_IPAvailable(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse return offset; } -static int dissect_iPAvailable_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_IPAvailable(TRUE, tvb, offset, actx, tree, hf_inap_iPAvailable); -} @@ -2349,9 +1851,6 @@ dissect_inap_ISDNAccessRelatedInformation(gboolean implicit_tag _U_, tvbuff_t *t return offset; } -static int dissect_iSDNAccessRelatedInformation_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ISDNAccessRelatedInformation(TRUE, tvb, offset, actx, tree, hf_inap_iSDNAccessRelatedInformation); -} static const value_string inap_CGEncountered_vals[] = { @@ -2369,9 +1868,6 @@ dissect_inap_CGEncountered(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off return offset; } -static int dissect_cGEncountered_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CGEncountered(TRUE, tvb, offset, actx, tree, hf_inap_cGEncountered); -} @@ -2382,9 +1878,6 @@ dissect_inap_ServiceProfileIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _ return offset; } -static int dissect_serviceProfileIdentifier_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ServiceProfileIdentifier(TRUE, tvb, offset, actx, tree, hf_inap_serviceProfileIdentifier); -} static const value_string inap_TerminalType_vals[] = { @@ -2405,9 +1898,6 @@ dissect_inap_TerminalType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs return offset; } -static int dissect_terminalType_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_TerminalType(TRUE, tvb, offset, actx, tree, hf_inap_terminalType); -} @@ -2417,9 +1907,6 @@ dissect_inap_ChargeNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs return offset; } -static int dissect_chargeNumber_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ChargeNumber(TRUE, tvb, offset, actx, tree, hf_inap_chargeNumber); -} @@ -2429,40 +1916,34 @@ dissect_inap_ServingAreaID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off return offset; } -static int dissect_servingAreaID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ServingAreaID(TRUE, tvb, offset, actx, tree, hf_inap_servingAreaID); -} -static const ber_old_sequence_t DpSpecificCommonParameters_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_serviceAddressInformation_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_bearerCapability_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartyNumber_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyNumber_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartysCategory_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iPSSPCapabilities_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iPAvailable_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iSDNAccessRelatedInformation_impl }, - { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cGEncountered_impl }, - { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_locationNumber_impl }, - { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceProfileIdentifier_impl }, - { BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_terminalType_impl }, - { BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_chargeNumber_impl }, - { BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_servingAreaID_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t DpSpecificCommonParameters_sequence[] = { + { &hf_inap_serviceAddressInformation, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_ServiceAddressInformation }, + { &hf_inap_bearerCapability, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_BearerCapability }, + { &hf_inap_calledPartyNumber, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartyNumber }, + { &hf_inap_callingPartyNumber, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartyNumber }, + { &hf_inap_callingPartysCategory, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartysCategory }, + { &hf_inap_iPSSPCapabilities, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_IPSSPCapabilities }, + { &hf_inap_iPAvailable , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_IPAvailable }, + { &hf_inap_iSDNAccessRelatedInformation, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ISDNAccessRelatedInformation }, + { &hf_inap_cGEncountered , BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CGEncountered }, + { &hf_inap_locationNumber , BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_LocationNumber }, + { &hf_inap_serviceProfileIdentifier, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ServiceProfileIdentifier }, + { &hf_inap_terminalType , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_TerminalType }, + { &hf_inap_extensions , BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_chargeNumber , BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ChargeNumber }, + { &hf_inap_servingAreaID , BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ServingAreaID }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_DpSpecificCommonParameters(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, - DpSpecificCommonParameters_sequence, hf_index, ett_inap_DpSpecificCommonParameters); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + DpSpecificCommonParameters_sequence, hf_index, ett_inap_DpSpecificCommonParameters); return offset; } -static int dissect_dpSpecificCommonParameters_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_DpSpecificCommonParameters(TRUE, tvb, offset, actx, tree, hf_inap_dpSpecificCommonParameters); -} @@ -2473,9 +1954,6 @@ dissect_inap_CallingPartyBusinessGroupID(gboolean implicit_tag _U_, tvbuff_t *tv return offset; } -static int dissect_callingPartyBusinessGroupID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CallingPartyBusinessGroupID(TRUE, tvb, offset, actx, tree, hf_inap_callingPartyBusinessGroupID); -} @@ -2486,8 +1964,25 @@ dissect_inap_CallingPartySubaddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ return offset; } -static int dissect_callingPartySubaddress_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CallingPartySubaddress(TRUE, tvb, offset, actx, tree, hf_inap_callingPartySubaddress); + + + +static int +dissect_inap_INTEGER(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_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + + +static int +dissect_inap_OCTET_STRING(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_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; } @@ -2499,31 +1994,22 @@ static const value_string inap_FacilityGroup_vals[] = { { 0, NULL } }; -static const ber_old_choice_t FacilityGroup_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_trunkGroupID_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_privateFacilityID_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_huntGroup_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_routeIndex_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t FacilityGroup_choice[] = { + { 0, &hf_inap_trunkGroupID , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_INTEGER }, + { 1, &hf_inap_privateFacilityID, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_INTEGER }, + { 2, &hf_inap_huntGroup , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_inap_OCTET_STRING }, + { 3, &hf_inap_routeIndex , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_inap_OCTET_STRING }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_FacilityGroup(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, - FacilityGroup_choice, hf_index, ett_inap_FacilityGroup, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + FacilityGroup_choice, hf_index, ett_inap_FacilityGroup, + NULL); return offset; } -static int dissect_callingFacilityGroup_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_FacilityGroup(TRUE, tvb, offset, actx, tree, hf_inap_callingFacilityGroup); -} -static int dissect_calledFacilityGroup_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_FacilityGroup(TRUE, tvb, offset, actx, tree, hf_inap_calledFacilityGroup); -} -static int dissect_facilityGroupID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_FacilityGroup(TRUE, tvb, offset, actx, tree, hf_inap_facilityGroupID); -} @@ -2534,18 +2020,12 @@ dissect_inap_FacilityGroupMember(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i return offset; } -static int dissect_callingFacilityGroupMember_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_FacilityGroupMember(TRUE, tvb, offset, actx, tree, hf_inap_callingFacilityGroupMember); -} -static int dissect_calledFacilityGroupMember_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_FacilityGroupMember(TRUE, tvb, offset, actx, tree, hf_inap_calledFacilityGroupMember); -} static int dissect_inap_OriginalCalledPartyID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 158 "inap.cnf" +#line 167 "inap.cnf" tvbuff_t *parameter_tvb; @@ -2561,15 +2041,12 @@ dissect_inap_OriginalCalledPartyID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_originalCalledPartyID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_OriginalCalledPartyID(TRUE, tvb, offset, actx, tree, hf_inap_originalCalledPartyID); -} static int dissect_inap_RedirectingPartyID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 172 "inap.cnf" +#line 181 "inap.cnf" tvbuff_t *parameter_tvb; @@ -2586,15 +2063,12 @@ dissect_inap_RedirectingPartyID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in return offset; } -static int dissect_redirectingPartyID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_RedirectingPartyID(TRUE, tvb, offset, actx, tree, hf_inap_redirectingPartyID); -} static int dissect_inap_RedirectionInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 143 "inap.cnf" +#line 152 "inap.cnf" tvbuff_t *parameter_tvb; @@ -2611,25 +2085,29 @@ dissect_inap_RedirectionInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ return offset; } -static int dissect_redirectionInformation_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_RedirectionInformation(TRUE, tvb, offset, actx, tree, hf_inap_redirectionInformation); + + + +static int +dissect_inap_OCTET_STRING_SIZE_minRouteListLength_maxRouteListLength(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_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; } -static const ber_old_sequence_t RouteList_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_RouteList_item }, +static const ber_sequence_t RouteList_sequence_of[1] = { + { &hf_inap_RouteList_item , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_inap_OCTET_STRING_SIZE_minRouteListLength_maxRouteListLength }, }; static int dissect_inap_RouteList(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, - RouteList_sequence_of, hf_index, ett_inap_RouteList); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + RouteList_sequence_of, hf_index, ett_inap_RouteList); return offset; } -static int dissect_routeList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_RouteList(TRUE, tvb, offset, actx, tree, hf_inap_routeList); -} @@ -2639,9 +2117,6 @@ dissect_inap_TravellingClassMark(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i return offset; } -static int dissect_travellingClassMark_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_TravellingClassMark(TRUE, tvb, offset, actx, tree, hf_inap_travellingClassMark); -} @@ -2651,9 +2126,6 @@ dissect_inap_FeatureCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse return offset; } -static int dissect_featureCode_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_FeatureCode(TRUE, tvb, offset, actx, tree, hf_inap_featureCode); -} @@ -2663,9 +2135,6 @@ dissect_inap_AccessCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_accessCode_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_AccessCode(TRUE, tvb, offset, actx, tree, hf_inap_accessCode); -} @@ -2676,54 +2145,48 @@ dissect_inap_Carrier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U return offset; } -static int dissect_carrier_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Carrier(TRUE, tvb, offset, actx, tree, hf_inap_carrier); -} -static const ber_old_sequence_t AnalysedInformationArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dialledDigits_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyBusinessGroupID_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartySubaddress_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_callingFacilityGroup_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingFacilityGroupMember_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalCalledPartyID_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_prefix_impl }, - { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectingPartyID_impl }, - { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectionInformation_impl }, - { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_routeList_impl }, - { BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_travellingClassMark_impl }, - { BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_featureCode_impl }, - { BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_accessCode_impl }, - { BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_carrier_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t AnalysedInformationArg_sequence[] = { + { &hf_inap_dpSpecificCommonParameters, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_DpSpecificCommonParameters }, + { &hf_inap_dialledDigits , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartyNumber }, + { &hf_inap_callingPartyBusinessGroupID, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartyBusinessGroupID }, + { &hf_inap_callingPartySubaddress, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartySubaddress }, + { &hf_inap_callingFacilityGroup, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_FacilityGroup }, + { &hf_inap_callingFacilityGroupMember, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_FacilityGroupMember }, + { &hf_inap_originalCalledPartyID, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_OriginalCalledPartyID }, + { &hf_inap_prefix , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Digits }, + { &hf_inap_redirectingPartyID, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectingPartyID }, + { &hf_inap_redirectionInformation, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectionInformation }, + { &hf_inap_routeList , BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RouteList }, + { &hf_inap_travellingClassMark, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_TravellingClassMark }, + { &hf_inap_extensions , BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_featureCode , BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_FeatureCode }, + { &hf_inap_accessCode , BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_AccessCode }, + { &hf_inap_carrier , BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Carrier }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_AnalysedInformationArg(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, - AnalysedInformationArg_sequence, hf_index, ett_inap_AnalysedInformationArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + AnalysedInformationArg_sequence, hf_index, ett_inap_AnalysedInformationArg); return offset; } -static const ber_old_sequence_t DestinationRoutingAddress_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_DestinationRoutingAddress_item }, +static const ber_sequence_t DestinationRoutingAddress_sequence_of[1] = { + { &hf_inap_DestinationRoutingAddress_item, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_inap_CalledPartyNumber }, }; static int dissect_inap_DestinationRoutingAddress(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, - DestinationRoutingAddress_sequence_of, hf_index, ett_inap_DestinationRoutingAddress); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + DestinationRoutingAddress_sequence_of, hf_index, ett_inap_DestinationRoutingAddress); return offset; } -static int dissect_destinationRoutingAddress_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_DestinationRoutingAddress(TRUE, tvb, offset, actx, tree, hf_inap_destinationRoutingAddress); -} @@ -2734,30 +2197,27 @@ dissect_inap_AlertingPattern(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o return offset; } -static int dissect_alertingPattern_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_AlertingPattern(TRUE, tvb, offset, actx, tree, hf_inap_alertingPattern); -} -static const ber_old_sequence_t AnalyseInformationArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_destinationRoutingAddress_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertingPattern_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iSDNAccessRelatedInformation_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalCalledPartyID_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyNumber_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartysCategory_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartyNumber_impl }, - { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_chargeNumber_impl }, - { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_travellingClassMark_impl }, - { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_carrier_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t AnalyseInformationArg_sequence[] = { + { &hf_inap_destinationRoutingAddress, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_DestinationRoutingAddress }, + { &hf_inap_alertingPattern, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_AlertingPattern }, + { &hf_inap_iSDNAccessRelatedInformation, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ISDNAccessRelatedInformation }, + { &hf_inap_originalCalledPartyID, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_OriginalCalledPartyID }, + { &hf_inap_extensions , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_callingPartyNumber, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartyNumber }, + { &hf_inap_callingPartysCategory, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartysCategory }, + { &hf_inap_calledPartyNumber, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartyNumber }, + { &hf_inap_chargeNumber , BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ChargeNumber }, + { &hf_inap_travellingClassMark, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_TravellingClassMark }, + { &hf_inap_carrier , BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Carrier }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_AnalyseInformationArg(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, - AnalyseInformationArg_sequence, hf_index, ett_inap_AnalyseInformationArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + AnalyseInformationArg_sequence, hf_index, ett_inap_AnalyseInformationArg); return offset; } @@ -2771,22 +2231,51 @@ dissect_inap_AChBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff return offset; } -static int dissect_aChBillingChargingCharacteristics_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_AChBillingChargingCharacteristics(TRUE, tvb, offset, actx, tree, hf_inap_aChBillingChargingCharacteristics); + + + +static int +dissect_inap_LegType(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_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + +static const value_string inap_LegID_vals[] = { + { 0, "sendingSideID" }, + { 1, "receivingSideID" }, + { 0, NULL } +}; + +static const ber_choice_t LegID_choice[] = { + { 0, &hf_inap_sendingSideID , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_LegType }, + { 1, &hf_inap_receivingSideID, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_LegType }, + { 0, NULL, 0, 0, 0, NULL } +}; + +static int +dissect_inap_LegID(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_choice(actx, tree, tvb, offset, + LegID_choice, hf_index, ett_inap_LegID, + NULL); + + return offset; } -static const ber_old_sequence_t ApplyChargingArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_aChBillingChargingCharacteristics_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_partyToCharge_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t ApplyChargingArg_sequence[] = { + { &hf_inap_aChBillingChargingCharacteristics, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_AChBillingChargingCharacteristics }, + { &hf_inap_partyToCharge , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_LegID }, + { &hf_inap_extensions , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_ApplyChargingArg(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, - ApplyChargingArg_sequence, hf_index, ett_inap_ApplyChargingArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ApplyChargingArg_sequence, hf_index, ett_inap_ApplyChargingArg); return offset; } @@ -2818,26 +2307,20 @@ dissect_inap_CorrelationID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off return offset; } -static int dissect_correlationID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CorrelationID(TRUE, tvb, offset, actx, tree, hf_inap_correlationID); -} -static int dissect_bcsmEventCorrelationID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CorrelationID(TRUE, tvb, offset, actx, tree, hf_inap_bcsmEventCorrelationID); -} -static const ber_old_sequence_t AssistRequestInstructionsArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_correlationID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iPAvailable_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iPSSPCapabilities_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t AssistRequestInstructionsArg_sequence[] = { + { &hf_inap_correlationID , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_CorrelationID }, + { &hf_inap_iPAvailable , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_IPAvailable }, + { &hf_inap_iPSSPCapabilities, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_IPSSPCapabilities }, + { &hf_inap_extensions , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_AssistRequestInstructionsArg(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, - AssistRequestInstructionsArg_sequence, hf_index, ett_inap_AssistRequestInstructionsArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + AssistRequestInstructionsArg_sequence, hf_index, ett_inap_AssistRequestInstructionsArg); return offset; } @@ -2872,67 +2355,52 @@ dissect_inap_EventTypeBCSM(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off return offset; } -static int dissect_eventTypeBCSM_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_EventTypeBCSM(TRUE, tvb, offset, actx, tree, hf_inap_eventTypeBCSM); -} -static int dissect_dpCriteria_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_EventTypeBCSM(TRUE, tvb, offset, actx, tree, hf_inap_dpCriteria); -} -static const ber_old_sequence_t GapOnService_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_serviceKey_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dpCriteria_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t GapOnService_sequence[] = { + { &hf_inap_serviceKey , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_ServiceKey }, + { &hf_inap_dpCriteria , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_EventTypeBCSM }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_GapOnService(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, - GapOnService_sequence, hf_index, ett_inap_GapOnService); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + GapOnService_sequence, hf_index, ett_inap_GapOnService); return offset; } -static int dissect_gapOnService_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_GapOnService(TRUE, tvb, offset, actx, tree, hf_inap_gapOnService); -} -static const ber_old_sequence_t T_calledAddressAndService_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_calledAddressValue_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceKey_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_calledAddressAndService_sequence[] = { + { &hf_inap_calledAddressValue, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_Digits }, + { &hf_inap_serviceKey , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_ServiceKey }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_calledAddressAndService(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_calledAddressAndService_sequence, hf_index, ett_inap_T_calledAddressAndService); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_calledAddressAndService_sequence, hf_index, ett_inap_T_calledAddressAndService); return offset; } -static int dissect_calledAddressAndService_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_calledAddressAndService(TRUE, tvb, offset, actx, tree, hf_inap_calledAddressAndService); -} -static const ber_old_sequence_t T_callingAddressAndService_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_callingAddressValue_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceKey_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_locationNumber_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_callingAddressAndService_sequence[] = { + { &hf_inap_callingAddressValue, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_Digits }, + { &hf_inap_serviceKey , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_ServiceKey }, + { &hf_inap_locationNumber , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_LocationNumber }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_callingAddressAndService(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_callingAddressAndService_sequence, hf_index, ett_inap_T_callingAddressAndService); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_callingAddressAndService_sequence, hf_index, ett_inap_T_callingAddressAndService); return offset; } -static int dissect_callingAddressAndService_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_callingAddressAndService(TRUE, tvb, offset, actx, tree, hf_inap_callingAddressAndService); -} static const value_string inap_GapCriteria_vals[] = { @@ -2943,25 +2411,22 @@ static const value_string inap_GapCriteria_vals[] = { { 0, NULL } }; -static const ber_old_choice_t GapCriteria_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_calledAddressValue_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_gapOnService_impl }, - { 29, BER_CLASS_CON, 29, BER_FLAGS_IMPLTAG, dissect_calledAddressAndService_impl }, - { 30, BER_CLASS_CON, 30, BER_FLAGS_IMPLTAG, dissect_callingAddressAndService_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t GapCriteria_choice[] = { + { 0, &hf_inap_calledAddressValue, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_Digits }, + { 2, &hf_inap_gapOnService , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_inap_GapOnService }, + { 29, &hf_inap_calledAddressAndService, BER_CLASS_CON, 29, BER_FLAGS_IMPLTAG, dissect_inap_T_calledAddressAndService }, + { 30, &hf_inap_callingAddressAndService, BER_CLASS_CON, 30, BER_FLAGS_IMPLTAG, dissect_inap_T_callingAddressAndService }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_GapCriteria(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, - GapCriteria_choice, hf_index, ett_inap_GapCriteria, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + GapCriteria_choice, hf_index, ett_inap_GapCriteria, + NULL); return offset; } -static int dissect_gapCriteria_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_GapCriteria(TRUE, tvb, offset, actx, tree, hf_inap_gapCriteria); -} @@ -2972,27 +2437,21 @@ dissect_inap_Interval(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ return offset; } -static int dissect_gapInterval_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_Interval(TRUE, tvb, offset, actx, tree, hf_inap_gapInterval); -} -static const ber_old_sequence_t GapIndicators_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_duration_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gapInterval_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t GapIndicators_sequence[] = { + { &hf_inap_duration , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_Duration }, + { &hf_inap_gapInterval , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_Interval }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_GapIndicators(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, - GapIndicators_sequence, hf_index, ett_inap_GapIndicators); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + GapIndicators_sequence, hf_index, ett_inap_GapIndicators); return offset; } -static int dissect_gapIndicators_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_GapIndicators(TRUE, tvb, offset, actx, tree, hf_inap_gapIndicators); -} static const value_string inap_ControlType_vals[] = { @@ -3010,27 +2469,21 @@ dissect_inap_ControlType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse return offset; } -static int dissect_controlType_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ControlType(TRUE, tvb, offset, actx, tree, hf_inap_controlType); -} -static const ber_old_sequence_t T_both_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_informationToSend_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_releaseCause_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_both_01_sequence[] = { + { &hf_inap_informationToSend, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_InformationToSend }, + { &hf_inap_releaseCause , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_Cause }, + { NULL, 0, 0, 0, NULL } }; static int -dissect_inap_T_both(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_both_sequence, hf_index, ett_inap_T_both); +dissect_inap_T_both_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_sequence(implicit_tag, actx, tree, tvb, offset, + T_both_01_sequence, hf_index, ett_inap_T_both_01); return offset; } -static int dissect_both_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_both(TRUE, tvb, offset, actx, tree, hf_inap_both); -} static const value_string inap_GapTreatment_vals[] = { @@ -3040,39 +2493,36 @@ static const value_string inap_GapTreatment_vals[] = { { 0, NULL } }; -static const ber_old_choice_t GapTreatment_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_informationToSend_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_releaseCause_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_both_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t GapTreatment_choice[] = { + { 0, &hf_inap_informationToSend, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_InformationToSend }, + { 1, &hf_inap_releaseCause , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_Cause }, + { 2, &hf_inap_both_01 , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_inap_T_both_01 }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_GapTreatment(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, - GapTreatment_choice, hf_index, ett_inap_GapTreatment, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + GapTreatment_choice, hf_index, ett_inap_GapTreatment, + NULL); return offset; } -static int dissect_gapTreatment_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_GapTreatment(TRUE, tvb, offset, actx, tree, hf_inap_gapTreatment); -} -static const ber_old_sequence_t CallGapArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_gapCriteria_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gapIndicators_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_controlType_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_gapTreatment_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t CallGapArg_sequence[] = { + { &hf_inap_gapCriteria , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_GapCriteria }, + { &hf_inap_gapIndicators , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_GapIndicators }, + { &hf_inap_controlType , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ControlType }, + { &hf_inap_gapTreatment , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_GapTreatment }, + { &hf_inap_extensions , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_CallGapArg(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, - CallGapArg_sequence, hf_index, ett_inap_CallGapArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + CallGapArg_sequence, hf_index, ett_inap_CallGapArg); return offset; } @@ -3095,58 +2545,114 @@ dissect_inap_RequestedInformationType(gboolean implicit_tag _U_, tvbuff_t *tvb _ return offset; } -static int dissect_RequestedInformationTypeList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_RequestedInformationType(FALSE, tvb, offset, actx, tree, hf_inap_RequestedInformationTypeList_item); + + + +static int +dissect_inap_INTEGER_0_255(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_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; } -static int dissect_requestedInformationType_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_RequestedInformationType(TRUE, tvb, offset, actx, tree, hf_inap_requestedInformationType); + + +static const value_string inap_RequestedInformationValue_vals[] = { + { 0, "callAttemptElapsedTimeValue" }, + { 1, "callStopTimeValue" }, + { 2, "callConnectedElapsedTimeValue" }, + { 3, "calledAddressValue" }, + { 30, "releaseCauseValue" }, + { 0, NULL } +}; + +static const ber_choice_t RequestedInformationValue_choice[] = { + { 0, &hf_inap_callAttemptElapsedTimeValue, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_INTEGER_0_255 }, + { 1, &hf_inap_callStopTimeValue, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_DateAndTime }, + { 2, &hf_inap_callConnectedElapsedTimeValue, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_inap_Integer4 }, + { 3, &hf_inap_calledAddressValue, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_inap_Digits }, + { 30, &hf_inap_releaseCauseValue, BER_CLASS_CON, 30, BER_FLAGS_IMPLTAG, dissect_inap_Cause }, + { 0, NULL, 0, 0, 0, NULL } +}; + +static int +dissect_inap_RequestedInformationValue(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_choice(actx, tree, tvb, offset, + RequestedInformationValue_choice, hf_index, ett_inap_RequestedInformationValue, + NULL); + + return offset; } -static const ber_old_sequence_t RequestedInformationTypeList_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_RequestedInformationTypeList_item }, +static const ber_sequence_t RequestedInformation_sequence[] = { + { &hf_inap_requestedInformationType, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_RequestedInformationType }, + { &hf_inap_requestedInformationValue, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_RequestedInformationValue }, + { NULL, 0, 0, 0, NULL } }; static int -dissect_inap_RequestedInformationTypeList(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, - RequestedInformationTypeList_sequence_of, hf_index, ett_inap_RequestedInformationTypeList); +dissect_inap_RequestedInformation(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_sequence(implicit_tag, actx, tree, tvb, offset, + RequestedInformation_sequence, hf_index, ett_inap_RequestedInformation); return offset; } -static int dissect_requestedInformationTypeList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_RequestedInformationTypeList(TRUE, tvb, offset, actx, tree, hf_inap_requestedInformationTypeList); + + +static const ber_sequence_t RequestedInformationList_sequence_of[1] = { + { &hf_inap_RequestedInformationList_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_inap_RequestedInformation }, +}; + +static int +dissect_inap_RequestedInformationList(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_sequence_of(implicit_tag, actx, tree, tvb, offset, + RequestedInformationList_sequence_of, hf_index, ett_inap_RequestedInformationList); + + return offset; } -static const ber_old_sequence_t CallInformationReportArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_requestedInformationTypeList_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_correlationID_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t CallInformationReportArg_sequence[] = { + { &hf_inap_requestedInformationList, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_RequestedInformationList }, + { &hf_inap_correlationID , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CorrelationID }, + { &hf_inap_extensions , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_CallInformationReportArg(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, - CallInformationReportArg_sequence, hf_index, ett_inap_CallInformationReportArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + CallInformationReportArg_sequence, hf_index, ett_inap_CallInformationReportArg); return offset; } -static const ber_old_sequence_t CallInformationRequestArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_requestedInformationTypeList_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_correlationID_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t RequestedInformationTypeList_sequence_of[1] = { + { &hf_inap_RequestedInformationTypeList_item, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_inap_RequestedInformationType }, +}; + +static int +dissect_inap_RequestedInformationTypeList(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_sequence_of(implicit_tag, actx, tree, tvb, offset, + RequestedInformationTypeList_sequence_of, hf_index, ett_inap_RequestedInformationTypeList); + + return offset; +} + + +static const ber_sequence_t CallInformationRequestArg_sequence[] = { + { &hf_inap_requestedInformationTypeList, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_RequestedInformationTypeList }, + { &hf_inap_correlationID , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CorrelationID }, + { &hf_inap_extensions , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_CallInformationRequestArg(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, - CallInformationRequestArg_sequence, hf_index, ett_inap_CallInformationRequestArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + CallInformationRequestArg_sequence, hf_index, ett_inap_CallInformationRequestArg); return offset; } @@ -3155,14 +2661,10 @@ dissect_inap_CallInformationRequestArg(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_inap_InvokeID(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_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + offset = dissect_inap_InvokeIdType(implicit_tag, tvb, offset, actx, tree, hf_index); return offset; } -static int dissect_invokeID_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_InvokeID(TRUE, tvb, offset, actx, tree, hf_inap_invokeID_01); -} static const value_string inap_CancelArg_vals[] = { @@ -3171,17 +2673,17 @@ static const value_string inap_CancelArg_vals[] = { { 0, NULL } }; -static const ber_old_choice_t CancelArg_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_invokeID_01_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_allRequests_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t CancelArg_choice[] = { + { 0, &hf_inap_invokeID_01 , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_InvokeID }, + { 1, &hf_inap_allRequests , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_NULL }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_CancelArg(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, - CancelArg_choice, hf_index, ett_inap_CancelArg, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + CancelArg_choice, hf_index, ett_inap_CancelArg, + NULL); return offset; } @@ -3195,65 +2697,62 @@ static const value_string inap_ResourceID_vals[] = { { 0, NULL } }; -static const ber_old_choice_t ResourceID_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_lineID_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_facilityGroupID_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_facilityGroupMemberID_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_trunkGroupID_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t ResourceID_choice[] = { + { 0, &hf_inap_lineID , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_Digits }, + { 1, &hf_inap_facilityGroupID, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_FacilityGroup }, + { 2, &hf_inap_facilityGroupMemberID, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_inap_INTEGER }, + { 3, &hf_inap_trunkGroupID , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_inap_INTEGER }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_ResourceID(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, - ResourceID_choice, hf_index, ett_inap_ResourceID, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + ResourceID_choice, hf_index, ett_inap_ResourceID, + NULL); return offset; } -static int dissect_resourceID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ResourceID(TRUE, tvb, offset, actx, tree, hf_inap_resourceID); -} -static const ber_old_sequence_t CancelStatusReportRequestArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_resourceID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t CancelStatusReportRequestArg_sequence[] = { + { &hf_inap_resourceID , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_ResourceID }, + { &hf_inap_extensions , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_CancelStatusReportRequestArg(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, - CancelStatusReportRequestArg_sequence, hf_index, ett_inap_CancelStatusReportRequestArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + CancelStatusReportRequestArg_sequence, hf_index, ett_inap_CancelStatusReportRequestArg); return offset; } -static const ber_old_sequence_t CollectedInformationArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dialledDigits_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyBusinessGroupID_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartySubaddress_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_callingFacilityGroup_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingFacilityGroupMember_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalCalledPartyID_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_prefix_impl }, - { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectingPartyID_impl }, - { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectionInformation_impl }, - { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_travellingClassMark_impl }, - { BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_featureCode_impl }, - { BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_accessCode_impl }, - { BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_carrier_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t CollectedInformationArg_sequence[] = { + { &hf_inap_dpSpecificCommonParameters, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_DpSpecificCommonParameters }, + { &hf_inap_dialledDigits , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartyNumber }, + { &hf_inap_callingPartyBusinessGroupID, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartyBusinessGroupID }, + { &hf_inap_callingPartySubaddress, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartySubaddress }, + { &hf_inap_callingFacilityGroup, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_FacilityGroup }, + { &hf_inap_callingFacilityGroupMember, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_FacilityGroupMember }, + { &hf_inap_originalCalledPartyID, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_OriginalCalledPartyID }, + { &hf_inap_prefix , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Digits }, + { &hf_inap_redirectingPartyID, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectingPartyID }, + { &hf_inap_redirectionInformation, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectionInformation }, + { &hf_inap_travellingClassMark, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_TravellingClassMark }, + { &hf_inap_extensions , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_featureCode , BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_FeatureCode }, + { &hf_inap_accessCode , BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_AccessCode }, + { &hf_inap_carrier , BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Carrier }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_CollectedInformationArg(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, - CollectedInformationArg_sequence, hf_index, ett_inap_CollectedInformationArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + CollectedInformationArg_sequence, hf_index, ett_inap_CollectedInformationArg); return offset; } @@ -3267,26 +2766,23 @@ dissect_inap_NumberingPlan(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off return offset; } -static int dissect_numberingPlan_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_NumberingPlan(TRUE, tvb, offset, actx, tree, hf_inap_numberingPlan); -} -static const ber_old_sequence_t CollectInformationArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertingPattern_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_numberingPlan_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalCalledPartyID_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_travellingClassMark_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyNumber_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dialledDigits_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t CollectInformationArg_sequence[] = { + { &hf_inap_alertingPattern, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_AlertingPattern }, + { &hf_inap_numberingPlan , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_NumberingPlan }, + { &hf_inap_originalCalledPartyID, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_OriginalCalledPartyID }, + { &hf_inap_travellingClassMark, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_TravellingClassMark }, + { &hf_inap_extensions , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_callingPartyNumber, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartyNumber }, + { &hf_inap_dialledDigits , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartyNumber }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_CollectInformationArg(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, - CollectInformationArg_sequence, hf_index, ett_inap_CollectInformationArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + CollectInformationArg_sequence, hf_index, ett_inap_CollectInformationArg); return offset; } @@ -3300,9 +2796,6 @@ dissect_inap_CutAndPaste(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse return offset; } -static int dissect_cutAndPaste_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CutAndPaste(TRUE, tvb, offset, actx, tree, hf_inap_cutAndPaste); -} static const value_string inap_ForwardingCondition_vals[] = { @@ -3320,9 +2813,6 @@ dissect_inap_ForwardingCondition(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i return offset; } -static int dissect_forwardingCondition_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ForwardingCondition(TRUE, tvb, offset, actx, tree, hf_inap_forwardingCondition); -} @@ -3333,9 +2823,6 @@ dissect_inap_ScfID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, return offset; } -static int dissect_scfID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ScfID(TRUE, tvb, offset, actx, tree, hf_inap_scfID); -} @@ -3346,36 +2833,33 @@ dissect_inap_ServiceInteractionIndicators(gboolean implicit_tag _U_, tvbuff_t *t return offset; } -static int dissect_serviceInteractionIndicators_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ServiceInteractionIndicators(TRUE, tvb, offset, actx, tree, hf_inap_serviceInteractionIndicators); -} -static const ber_old_sequence_t ConnectArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_destinationRoutingAddress_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertingPattern_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_correlationID_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cutAndPaste_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_forwardingCondition_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iSDNAccessRelatedInformation_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalCalledPartyID_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_routeList_impl }, - { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_scfID_impl }, - { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_travellingClassMark_impl }, - { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_carrier_impl }, - { BER_CLASS_CON, 26, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceInteractionIndicators_impl }, - { BER_CLASS_CON, 27, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyNumber_impl }, - { BER_CLASS_CON, 28, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartysCategory_impl }, - { BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectingPartyID_impl }, - { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectionInformation_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t ConnectArg_sequence[] = { + { &hf_inap_destinationRoutingAddress, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_DestinationRoutingAddress }, + { &hf_inap_alertingPattern, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_AlertingPattern }, + { &hf_inap_correlationID , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CorrelationID }, + { &hf_inap_cutAndPaste , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CutAndPaste }, + { &hf_inap_forwardingCondition, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ForwardingCondition }, + { &hf_inap_iSDNAccessRelatedInformation, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ISDNAccessRelatedInformation }, + { &hf_inap_originalCalledPartyID, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_OriginalCalledPartyID }, + { &hf_inap_routeList , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RouteList }, + { &hf_inap_scfID , BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ScfID }, + { &hf_inap_travellingClassMark, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_TravellingClassMark }, + { &hf_inap_extensions , BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_carrier , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Carrier }, + { &hf_inap_serviceInteractionIndicators, BER_CLASS_CON, 26, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ServiceInteractionIndicators }, + { &hf_inap_callingPartyNumber, BER_CLASS_CON, 27, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartyNumber }, + { &hf_inap_callingPartysCategory, BER_CLASS_CON, 28, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartysCategory }, + { &hf_inap_redirectingPartyID, BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectingPartyID }, + { &hf_inap_redirectionInformation, BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectionInformation }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_ConnectArg(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, - ConnectArg_sequence, hf_index, ett_inap_ConnectArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ConnectArg_sequence, hf_index, ett_inap_ConnectArg); return offset; } @@ -3388,69 +2872,60 @@ dissect_inap_IPRoutingAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_ipRoutingAddress_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_IPRoutingAddress(TRUE, tvb, offset, actx, tree, hf_inap_ipRoutingAddress); -} -static const ber_old_sequence_t T_both2_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ipRoutingAddress_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_both_sequence[] = { + { &hf_inap_ipRoutingAddress, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_IPRoutingAddress }, + { &hf_inap_legID , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_LegID }, + { NULL, 0, 0, 0, NULL } }; static int -dissect_inap_T_both2(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_both2_sequence, hf_index, ett_inap_T_both2); +dissect_inap_T_both(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_sequence(implicit_tag, actx, tree, tvb, offset, + T_both_sequence, hf_index, ett_inap_T_both); return offset; } -static int dissect_both2_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_both2(TRUE, tvb, offset, actx, tree, hf_inap_both2); -} static const value_string inap_T_resourceAddress_vals[] = { { 0, "ipRoutingAddress" }, { 1, "legID" }, - { 2, "both2" }, + { 2, "both" }, { 3, "none" }, { 0, NULL } }; -static const ber_old_choice_t T_resourceAddress_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ipRoutingAddress_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_legID_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_both2_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_none_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_resourceAddress_choice[] = { + { 0, &hf_inap_ipRoutingAddress, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_IPRoutingAddress }, + { 1, &hf_inap_legID , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_LegID }, + { 2, &hf_inap_both , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_inap_T_both }, + { 3, &hf_inap_none , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_inap_NULL }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_resourceAddress(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_resourceAddress_choice, hf_index, ett_inap_T_resourceAddress, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_resourceAddress_choice, hf_index, ett_inap_T_resourceAddress, + NULL); return offset; } -static int dissect_resourceAddress(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_resourceAddress(FALSE, tvb, offset, actx, tree, hf_inap_resourceAddress); -} -static const ber_old_sequence_t ConnectToResourceArg_sequence[] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_resourceAddress }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceInteractionIndicators_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t ConnectToResourceArg_sequence[] = { + { &hf_inap_resourceAddress, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_T_resourceAddress }, + { &hf_inap_extensions , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_serviceInteractionIndicators, BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ServiceInteractionIndicators }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_ConnectToResourceArg(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, - ConnectToResourceArg_sequence, hf_index, ett_inap_ConnectToResourceArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ConnectToResourceArg_sequence, hf_index, ett_inap_ConnectToResourceArg); return offset; } @@ -3463,26 +2938,23 @@ dissect_inap_AssistingSSPIPRoutingAddress(gboolean implicit_tag _U_, tvbuff_t *t return offset; } -static int dissect_assistingSSPIPRoutingAddress_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_AssistingSSPIPRoutingAddress(TRUE, tvb, offset, actx, tree, hf_inap_assistingSSPIPRoutingAddress); -} -static const ber_old_sequence_t EstablishTemporaryConnectionArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_assistingSSPIPRoutingAddress_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_correlationID_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_scfID_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_carrier_impl }, - { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceInteractionIndicators_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t EstablishTemporaryConnectionArg_sequence[] = { + { &hf_inap_assistingSSPIPRoutingAddress, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_AssistingSSPIPRoutingAddress }, + { &hf_inap_correlationID , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CorrelationID }, + { &hf_inap_legID , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_LegID }, + { &hf_inap_scfID , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ScfID }, + { &hf_inap_extensions , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_carrier , BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Carrier }, + { &hf_inap_serviceInteractionIndicators, BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ServiceInteractionIndicators }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_EstablishTemporaryConnectionArg(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, - EstablishTemporaryConnectionArg_sequence, hf_index, ett_inap_EstablishTemporaryConnectionArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + EstablishTemporaryConnectionArg_sequence, hf_index, ett_inap_EstablishTemporaryConnectionArg); return offset; } @@ -3496,9 +2968,6 @@ dissect_inap_EventTypeCharging(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_eventTypeCharging_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_EventTypeCharging(TRUE, tvb, offset, actx, tree, hf_inap_eventTypeCharging); -} @@ -3509,9 +2978,6 @@ dissect_inap_EventSpecificInformationCharging(gboolean implicit_tag _U_, tvbuff_ return offset; } -static int dissect_eventSpecificInformationCharging_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_EventSpecificInformationCharging(TRUE, tvb, offset, actx, tree, hf_inap_eventSpecificInformationCharging); -} static const value_string inap_MonitorMode_vals[] = { @@ -3529,246 +2995,204 @@ dissect_inap_MonitorMode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse return offset; } -static int dissect_monitorMode_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_MonitorMode(TRUE, tvb, offset, actx, tree, hf_inap_monitorMode); -} -static const ber_old_sequence_t EventNotificationChargingArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventTypeCharging_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventSpecificInformationCharging_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_monitorMode_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t EventNotificationChargingArg_sequence[] = { + { &hf_inap_eventTypeCharging, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_EventTypeCharging }, + { &hf_inap_eventSpecificInformationCharging, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_EventSpecificInformationCharging }, + { &hf_inap_legID , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_LegID }, + { &hf_inap_extensions , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_monitorMode , BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_MonitorMode }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_EventNotificationChargingArg(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, - EventNotificationChargingArg_sequence, hf_index, ett_inap_EventNotificationChargingArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + EventNotificationChargingArg_sequence, hf_index, ett_inap_EventNotificationChargingArg); return offset; } -static const ber_old_sequence_t T_collectedInfoSpecificInfo_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_calledPartynumber_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_collectedInfoSpecificInfo_sequence[] = { + { &hf_inap_calledPartynumber, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_CalledPartyNumber }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_collectedInfoSpecificInfo(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_collectedInfoSpecificInfo_sequence, hf_index, ett_inap_T_collectedInfoSpecificInfo); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_collectedInfoSpecificInfo_sequence, hf_index, ett_inap_T_collectedInfoSpecificInfo); return offset; } -static int dissect_collectedInfoSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_collectedInfoSpecificInfo(TRUE, tvb, offset, actx, tree, hf_inap_collectedInfoSpecificInfo); -} -static const ber_old_sequence_t T_analyzedInfoSpecificInfo_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_calledPartynumber_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_analyzedInfoSpecificInfo_sequence[] = { + { &hf_inap_calledPartynumber, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_CalledPartyNumber }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_analyzedInfoSpecificInfo(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_analyzedInfoSpecificInfo_sequence, hf_index, ett_inap_T_analyzedInfoSpecificInfo); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_analyzedInfoSpecificInfo_sequence, hf_index, ett_inap_T_analyzedInfoSpecificInfo); return offset; } -static int dissect_analyzedInfoSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_analyzedInfoSpecificInfo(TRUE, tvb, offset, actx, tree, hf_inap_analyzedInfoSpecificInfo); -} -static const ber_old_sequence_t T_routeSelectFailureSpecificInfo_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_failureCause_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_routeSelectFailureSpecificInfo_sequence[] = { + { &hf_inap_failureCause , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Cause }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_routeSelectFailureSpecificInfo(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_routeSelectFailureSpecificInfo_sequence, hf_index, ett_inap_T_routeSelectFailureSpecificInfo); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_routeSelectFailureSpecificInfo_sequence, hf_index, ett_inap_T_routeSelectFailureSpecificInfo); return offset; } -static int dissect_routeSelectFailureSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_routeSelectFailureSpecificInfo(TRUE, tvb, offset, actx, tree, hf_inap_routeSelectFailureSpecificInfo); -} -static const ber_old_sequence_t T_oCalledPartyBusySpecificInfo_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_busyCause_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_oCalledPartyBusySpecificInfo_sequence[] = { + { &hf_inap_busyCause , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Cause }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_oCalledPartyBusySpecificInfo(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_oCalledPartyBusySpecificInfo_sequence, hf_index, ett_inap_T_oCalledPartyBusySpecificInfo); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_oCalledPartyBusySpecificInfo_sequence, hf_index, ett_inap_T_oCalledPartyBusySpecificInfo); return offset; } -static int dissect_oCalledPartyBusySpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_oCalledPartyBusySpecificInfo(TRUE, tvb, offset, actx, tree, hf_inap_oCalledPartyBusySpecificInfo); -} -static const ber_old_sequence_t T_oNoAnswerSpecificInfo_sequence[] = { - { 0, 0, 0, NULL } +static const ber_sequence_t T_oNoAnswerSpecificInfo_sequence[] = { + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_oNoAnswerSpecificInfo(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_oNoAnswerSpecificInfo_sequence, hf_index, ett_inap_T_oNoAnswerSpecificInfo); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_oNoAnswerSpecificInfo_sequence, hf_index, ett_inap_T_oNoAnswerSpecificInfo); return offset; } -static int dissect_oNoAnswerSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_oNoAnswerSpecificInfo(TRUE, tvb, offset, actx, tree, hf_inap_oNoAnswerSpecificInfo); -} -static const ber_old_sequence_t T_oAnswerSpecificInfo_sequence[] = { - { 0, 0, 0, NULL } +static const ber_sequence_t T_oAnswerSpecificInfo_sequence[] = { + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_oAnswerSpecificInfo(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_oAnswerSpecificInfo_sequence, hf_index, ett_inap_T_oAnswerSpecificInfo); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_oAnswerSpecificInfo_sequence, hf_index, ett_inap_T_oAnswerSpecificInfo); return offset; } -static int dissect_oAnswerSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_oAnswerSpecificInfo(TRUE, tvb, offset, actx, tree, hf_inap_oAnswerSpecificInfo); -} -static const ber_old_sequence_t T_oMidCallSpecificInfo_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_connectTime_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_oMidCallSpecificInfo_sequence[] = { + { &hf_inap_connectTime , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Integer4 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_oMidCallSpecificInfo(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_oMidCallSpecificInfo_sequence, hf_index, ett_inap_T_oMidCallSpecificInfo); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_oMidCallSpecificInfo_sequence, hf_index, ett_inap_T_oMidCallSpecificInfo); return offset; } -static int dissect_oMidCallSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_oMidCallSpecificInfo(TRUE, tvb, offset, actx, tree, hf_inap_oMidCallSpecificInfo); -} -static const ber_old_sequence_t T_oDisconnectSpecificInfo_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_releaseCause_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_connectTime_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_oDisconnectSpecificInfo_sequence[] = { + { &hf_inap_releaseCause , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Cause }, + { &hf_inap_connectTime , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Integer4 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_oDisconnectSpecificInfo(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_oDisconnectSpecificInfo_sequence, hf_index, ett_inap_T_oDisconnectSpecificInfo); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_oDisconnectSpecificInfo_sequence, hf_index, ett_inap_T_oDisconnectSpecificInfo); return offset; } -static int dissect_oDisconnectSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_oDisconnectSpecificInfo(TRUE, tvb, offset, actx, tree, hf_inap_oDisconnectSpecificInfo); -} -static const ber_old_sequence_t T_tBusySpecificInfo_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_busyCause_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_tBusySpecificInfo_sequence[] = { + { &hf_inap_busyCause , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Cause }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_tBusySpecificInfo(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_tBusySpecificInfo_sequence, hf_index, ett_inap_T_tBusySpecificInfo); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_tBusySpecificInfo_sequence, hf_index, ett_inap_T_tBusySpecificInfo); return offset; } -static int dissect_tBusySpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_tBusySpecificInfo(TRUE, tvb, offset, actx, tree, hf_inap_tBusySpecificInfo); -} -static const ber_old_sequence_t T_tNoAnswerSpecificInfo_sequence[] = { - { 0, 0, 0, NULL } +static const ber_sequence_t T_tNoAnswerSpecificInfo_sequence[] = { + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_tNoAnswerSpecificInfo(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_tNoAnswerSpecificInfo_sequence, hf_index, ett_inap_T_tNoAnswerSpecificInfo); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_tNoAnswerSpecificInfo_sequence, hf_index, ett_inap_T_tNoAnswerSpecificInfo); return offset; } -static int dissect_tNoAnswerSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_tNoAnswerSpecificInfo(TRUE, tvb, offset, actx, tree, hf_inap_tNoAnswerSpecificInfo); -} -static const ber_old_sequence_t T_tAnswerSpecificInfo_sequence[] = { - { 0, 0, 0, NULL } +static const ber_sequence_t T_tAnswerSpecificInfo_sequence[] = { + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_tAnswerSpecificInfo(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_tAnswerSpecificInfo_sequence, hf_index, ett_inap_T_tAnswerSpecificInfo); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_tAnswerSpecificInfo_sequence, hf_index, ett_inap_T_tAnswerSpecificInfo); return offset; } -static int dissect_tAnswerSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_tAnswerSpecificInfo(TRUE, tvb, offset, actx, tree, hf_inap_tAnswerSpecificInfo); -} -static const ber_old_sequence_t T_tMidCallSpecificInfo_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_connectTime_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_tMidCallSpecificInfo_sequence[] = { + { &hf_inap_connectTime , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Integer4 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_tMidCallSpecificInfo(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_tMidCallSpecificInfo_sequence, hf_index, ett_inap_T_tMidCallSpecificInfo); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_tMidCallSpecificInfo_sequence, hf_index, ett_inap_T_tMidCallSpecificInfo); return offset; } -static int dissect_tMidCallSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_tMidCallSpecificInfo(TRUE, tvb, offset, actx, tree, hf_inap_tMidCallSpecificInfo); -} -static const ber_old_sequence_t T_tDisconnectSpecificInfo_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_releaseCause_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_connectTime_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t T_tDisconnectSpecificInfo_sequence[] = { + { &hf_inap_releaseCause , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Cause }, + { &hf_inap_connectTime , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Integer4 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_T_tDisconnectSpecificInfo(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_tDisconnectSpecificInfo_sequence, hf_index, ett_inap_T_tDisconnectSpecificInfo); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_tDisconnectSpecificInfo_sequence, hf_index, ett_inap_T_tDisconnectSpecificInfo); return offset; } -static int dissect_tDisconnectSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_tDisconnectSpecificInfo(TRUE, tvb, offset, actx, tree, hf_inap_tDisconnectSpecificInfo); -} static const value_string inap_EventSpecificInformationBCSM_vals[] = { @@ -3788,50 +3212,47 @@ static const value_string inap_EventSpecificInformationBCSM_vals[] = { { 0, NULL } }; -static const ber_old_choice_t EventSpecificInformationBCSM_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_collectedInfoSpecificInfo_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_analyzedInfoSpecificInfo_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_routeSelectFailureSpecificInfo_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_oCalledPartyBusySpecificInfo_impl }, - { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_oNoAnswerSpecificInfo_impl }, - { 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_oAnswerSpecificInfo_impl }, - { 6, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_oMidCallSpecificInfo_impl }, - { 7, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_oDisconnectSpecificInfo_impl }, - { 8, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_tBusySpecificInfo_impl }, - { 9, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_tNoAnswerSpecificInfo_impl }, - { 10, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_tAnswerSpecificInfo_impl }, - { 11, BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_tMidCallSpecificInfo_impl }, - { 12, BER_CLASS_CON, 12, BER_FLAGS_IMPLTAG, dissect_tDisconnectSpecificInfo_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t EventSpecificInformationBCSM_choice[] = { + { 0, &hf_inap_collectedInfoSpecificInfo, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_T_collectedInfoSpecificInfo }, + { 1, &hf_inap_analyzedInfoSpecificInfo, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_T_analyzedInfoSpecificInfo }, + { 2, &hf_inap_routeSelectFailureSpecificInfo, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_inap_T_routeSelectFailureSpecificInfo }, + { 3, &hf_inap_oCalledPartyBusySpecificInfo, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_inap_T_oCalledPartyBusySpecificInfo }, + { 4, &hf_inap_oNoAnswerSpecificInfo, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_inap_T_oNoAnswerSpecificInfo }, + { 5, &hf_inap_oAnswerSpecificInfo, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_inap_T_oAnswerSpecificInfo }, + { 6, &hf_inap_oMidCallSpecificInfo, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_inap_T_oMidCallSpecificInfo }, + { 7, &hf_inap_oDisconnectSpecificInfo, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_inap_T_oDisconnectSpecificInfo }, + { 8, &hf_inap_tBusySpecificInfo, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_inap_T_tBusySpecificInfo }, + { 9, &hf_inap_tNoAnswerSpecificInfo, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_inap_T_tNoAnswerSpecificInfo }, + { 10, &hf_inap_tAnswerSpecificInfo, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_inap_T_tAnswerSpecificInfo }, + { 11, &hf_inap_tMidCallSpecificInfo, BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_inap_T_tMidCallSpecificInfo }, + { 12, &hf_inap_tDisconnectSpecificInfo, BER_CLASS_CON, 12, BER_FLAGS_IMPLTAG, dissect_inap_T_tDisconnectSpecificInfo }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_EventSpecificInformationBCSM(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, - EventSpecificInformationBCSM_choice, hf_index, ett_inap_EventSpecificInformationBCSM, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + EventSpecificInformationBCSM_choice, hf_index, ett_inap_EventSpecificInformationBCSM, + NULL); return offset; } -static int dissect_eventSpecificInformationBCSM_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_EventSpecificInformationBCSM(TRUE, tvb, offset, actx, tree, hf_inap_eventSpecificInformationBCSM); -} -static const ber_old_sequence_t EventReportBCSMArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventTypeBCSM_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_bcsmEventCorrelationID_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_eventSpecificInformationBCSM_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_miscCallInfo_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t EventReportBCSMArg_sequence[] = { + { &hf_inap_eventTypeBCSM , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_EventTypeBCSM }, + { &hf_inap_bcsmEventCorrelationID, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CorrelationID }, + { &hf_inap_eventSpecificInformationBCSM, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_EventSpecificInformationBCSM }, + { &hf_inap_legID , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_LegID }, + { &hf_inap_miscCallInfo , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_MiscCallInfo }, + { &hf_inap_extensions , BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_EventReportBCSMArg(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, - EventReportBCSMArg_sequence, hf_index, ett_inap_EventReportBCSMArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + EventReportBCSMArg_sequence, hf_index, ett_inap_EventReportBCSMArg); return offset; } @@ -3864,9 +3285,6 @@ dissect_inap_HoldCause(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_holdcause_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_HoldCause(TRUE, tvb, offset, actx, tree, hf_inap_holdcause); -} static const value_string inap_HoldCallInNetworkArg_vals[] = { @@ -3875,17 +3293,17 @@ static const value_string inap_HoldCallInNetworkArg_vals[] = { { 0, NULL } }; -static const ber_old_choice_t HoldCallInNetworkArg_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_holdcause_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_empty_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t HoldCallInNetworkArg_choice[] = { + { 0, &hf_inap_holdcause , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_HoldCause }, + { 1, &hf_inap_empty , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_NULL }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_HoldCallInNetworkArg(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, - HoldCallInNetworkArg_choice, hf_index, ett_inap_HoldCallInNetworkArg, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + HoldCallInNetworkArg_choice, hf_index, ett_inap_HoldCallInNetworkArg, + NULL); return offset; } @@ -3899,9 +3317,6 @@ dissect_inap_HighLayerCompatibility(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ return offset; } -static int dissect_highLayerCompatibility_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_HighLayerCompatibility(TRUE, tvb, offset, actx, tree, hf_inap_highLayerCompatibility); -} @@ -3911,9 +3326,6 @@ dissect_inap_AdditionalCallingPartyNumber(gboolean implicit_tag _U_, tvbuff_t *t return offset; } -static int dissect_additionalCallingPartyNumber_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_AdditionalCallingPartyNumber(TRUE, tvb, offset, actx, tree, hf_inap_additionalCallingPartyNumber); -} @@ -3924,64 +3336,61 @@ dissect_inap_ForwardCallIndicators(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_forwardCallIndicators_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ForwardCallIndicators(TRUE, tvb, offset, actx, tree, hf_inap_forwardCallIndicators); -} -static const ber_old_sequence_t InitialDP_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceKey_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dialledDigits_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartyNumber_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyNumber_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyBusinessGroupID_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartysCategory_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartySubaddress_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cGEncountered_impl }, - { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iPSSPCapabilities_impl }, - { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iPAvailable_impl }, - { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_locationNumber_impl }, - { BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_miscCallInfo_impl }, - { BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalCalledPartyID_impl }, - { BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceProfileIdentifier_impl }, - { BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_terminalType_impl }, - { BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_triggerType_impl }, - { BER_CLASS_CON, 23, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_highLayerCompatibility_impl }, - { BER_CLASS_CON, 24, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceInteractionIndicators_impl }, - { BER_CLASS_CON, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_additionalCallingPartyNumber_impl }, - { BER_CLASS_CON, 26, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_forwardCallIndicators_impl }, - { BER_CLASS_CON, 27, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_bearerCapability_impl }, - { BER_CLASS_CON, 28, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventTypeBCSM_impl }, - { BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectingPartyID_impl }, - { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectionInformation_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t InitialDPArg_sequence[] = { + { &hf_inap_serviceKey , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ServiceKey }, + { &hf_inap_dialledDigits , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartyNumber }, + { &hf_inap_calledPartyNumber, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartyNumber }, + { &hf_inap_callingPartyNumber, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartyNumber }, + { &hf_inap_callingPartyBusinessGroupID, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartyBusinessGroupID }, + { &hf_inap_callingPartysCategory, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartysCategory }, + { &hf_inap_callingPartySubaddress, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartySubaddress }, + { &hf_inap_cGEncountered , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CGEncountered }, + { &hf_inap_iPSSPCapabilities, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_IPSSPCapabilities }, + { &hf_inap_iPAvailable , BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_IPAvailable }, + { &hf_inap_locationNumber , BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_LocationNumber }, + { &hf_inap_miscCallInfo , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_MiscCallInfo }, + { &hf_inap_originalCalledPartyID, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_OriginalCalledPartyID }, + { &hf_inap_serviceProfileIdentifier, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ServiceProfileIdentifier }, + { &hf_inap_terminalType , BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_TerminalType }, + { &hf_inap_extensions , BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_triggerType , BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_TriggerType }, + { &hf_inap_highLayerCompatibility, BER_CLASS_CON, 23, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_HighLayerCompatibility }, + { &hf_inap_serviceInteractionIndicators, BER_CLASS_CON, 24, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ServiceInteractionIndicators }, + { &hf_inap_additionalCallingPartyNumber, BER_CLASS_CON, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_AdditionalCallingPartyNumber }, + { &hf_inap_forwardCallIndicators, BER_CLASS_CON, 26, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ForwardCallIndicators }, + { &hf_inap_bearerCapability, BER_CLASS_CON, 27, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_BearerCapability }, + { &hf_inap_eventTypeBCSM , BER_CLASS_CON, 28, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_EventTypeBCSM }, + { &hf_inap_redirectingPartyID, BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectingPartyID }, + { &hf_inap_redirectionInformation, BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectionInformation }, + { NULL, 0, 0, 0, NULL } }; static int -dissect_inap_InitialDP(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, - InitialDP_sequence, hf_index, ett_inap_InitialDP); +dissect_inap_InitialDPArg(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_sequence(implicit_tag, actx, tree, tvb, offset, + InitialDPArg_sequence, hf_index, ett_inap_InitialDPArg); return offset; } -static const ber_old_sequence_t InitiateCallAttemptArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_destinationRoutingAddress_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertingPattern_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iSDNAccessRelatedInformation_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_travellingClassMark_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceInteractionIndicators_impl }, - { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyNumber_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t InitiateCallAttemptArg_sequence[] = { + { &hf_inap_destinationRoutingAddress, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_DestinationRoutingAddress }, + { &hf_inap_alertingPattern, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_AlertingPattern }, + { &hf_inap_iSDNAccessRelatedInformation, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ISDNAccessRelatedInformation }, + { &hf_inap_travellingClassMark, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_TravellingClassMark }, + { &hf_inap_extensions , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_serviceInteractionIndicators, BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ServiceInteractionIndicators }, + { &hf_inap_callingPartyNumber, BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartyNumber }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_InitiateCallAttemptArg(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, - InitiateCallAttemptArg_sequence, hf_index, ett_inap_InitiateCallAttemptArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + InitiateCallAttemptArg_sequence, hf_index, ett_inap_InitiateCallAttemptArg); return offset; } @@ -3995,9 +3404,6 @@ dissect_inap_CalledPartyBusinessGroupID(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static int dissect_calledPartyBusinessGroupID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CalledPartyBusinessGroupID(TRUE, tvb, offset, actx, tree, hf_inap_calledPartyBusinessGroupID); -} @@ -4008,9 +3414,6 @@ dissect_inap_CalledPartySubaddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_calledPartySubaddress_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CalledPartySubaddress(TRUE, tvb, offset, actx, tree, hf_inap_calledPartySubaddress); -} static const value_string inap_FeatureRequestIndicator_vals[] = { @@ -4030,149 +3433,146 @@ dissect_inap_FeatureRequestIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U return offset; } -static int dissect_featureRequestIndicator_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_FeatureRequestIndicator(TRUE, tvb, offset, actx, tree, hf_inap_featureRequestIndicator); -} -static const ber_old_sequence_t MidCallArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartyBusinessGroupID_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartySubaddress_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyBusinessGroupID_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartySubaddress_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_featureRequestIndicator_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_carrier_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t MidCallArg_sequence[] = { + { &hf_inap_dpSpecificCommonParameters, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_DpSpecificCommonParameters }, + { &hf_inap_calledPartyBusinessGroupID, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartyBusinessGroupID }, + { &hf_inap_calledPartySubaddress, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartySubaddress }, + { &hf_inap_callingPartyBusinessGroupID, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartyBusinessGroupID }, + { &hf_inap_callingPartySubaddress, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartySubaddress }, + { &hf_inap_featureRequestIndicator, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_FeatureRequestIndicator }, + { &hf_inap_extensions , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_carrier , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Carrier }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_MidCallArg(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, - MidCallArg_sequence, hf_index, ett_inap_MidCallArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + MidCallArg_sequence, hf_index, ett_inap_MidCallArg); return offset; } -static const ber_old_sequence_t OAnswerArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyBusinessGroupID_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartySubaddress_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_callingFacilityGroup_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingFacilityGroupMember_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalCalledPartyID_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectingPartyID_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectionInformation_impl }, - { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_routeList_impl }, - { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_travellingClassMark_impl }, - { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t OAnswerArg_sequence[] = { + { &hf_inap_dpSpecificCommonParameters, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_DpSpecificCommonParameters }, + { &hf_inap_callingPartyBusinessGroupID, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartyBusinessGroupID }, + { &hf_inap_callingPartySubaddress, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartySubaddress }, + { &hf_inap_callingFacilityGroup, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_FacilityGroup }, + { &hf_inap_callingFacilityGroupMember, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_FacilityGroupMember }, + { &hf_inap_originalCalledPartyID, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_OriginalCalledPartyID }, + { &hf_inap_redirectingPartyID, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectingPartyID }, + { &hf_inap_redirectionInformation, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectionInformation }, + { &hf_inap_routeList , BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RouteList }, + { &hf_inap_travellingClassMark, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_TravellingClassMark }, + { &hf_inap_extensions , BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_OAnswerArg(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, - OAnswerArg_sequence, hf_index, ett_inap_OAnswerArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + OAnswerArg_sequence, hf_index, ett_inap_OAnswerArg); return offset; } -static const ber_old_sequence_t OCalledPartyBusyArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_busyCause_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyBusinessGroupID_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartySubaddress_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_callingFacilityGroup_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingFacilityGroupMember_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalCalledPartyID_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_prefix_impl }, - { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectingPartyID_impl }, - { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectionInformation_impl }, - { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_routeList_impl }, - { BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_travellingClassMark_impl }, - { BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_carrier_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t OCalledPartyBusyArg_sequence[] = { + { &hf_inap_dpSpecificCommonParameters, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_DpSpecificCommonParameters }, + { &hf_inap_busyCause , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Cause }, + { &hf_inap_callingPartyBusinessGroupID, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartyBusinessGroupID }, + { &hf_inap_callingPartySubaddress, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartySubaddress }, + { &hf_inap_callingFacilityGroup, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_FacilityGroup }, + { &hf_inap_callingFacilityGroupMember, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_FacilityGroupMember }, + { &hf_inap_originalCalledPartyID, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_OriginalCalledPartyID }, + { &hf_inap_prefix , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Digits }, + { &hf_inap_redirectingPartyID, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectingPartyID }, + { &hf_inap_redirectionInformation, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectionInformation }, + { &hf_inap_routeList , BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RouteList }, + { &hf_inap_travellingClassMark, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_TravellingClassMark }, + { &hf_inap_extensions , BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_carrier , BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Carrier }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_OCalledPartyBusyArg(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, - OCalledPartyBusyArg_sequence, hf_index, ett_inap_OCalledPartyBusyArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + OCalledPartyBusyArg_sequence, hf_index, ett_inap_OCalledPartyBusyArg); return offset; } -static const ber_old_sequence_t ODisconnectArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyBusinessGroupID_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartySubaddress_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_callingFacilityGroup_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingFacilityGroupMember_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_releaseCause_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_routeList_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_carrier_impl }, - { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_connectTime_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t ODisconnectArg_sequence[] = { + { &hf_inap_dpSpecificCommonParameters, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_DpSpecificCommonParameters }, + { &hf_inap_callingPartyBusinessGroupID, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartyBusinessGroupID }, + { &hf_inap_callingPartySubaddress, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartySubaddress }, + { &hf_inap_callingFacilityGroup, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_FacilityGroup }, + { &hf_inap_callingFacilityGroupMember, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_FacilityGroupMember }, + { &hf_inap_releaseCause , BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Cause }, + { &hf_inap_routeList , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RouteList }, + { &hf_inap_extensions , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_carrier , BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Carrier }, + { &hf_inap_connectTime , BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Integer4 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_ODisconnectArg(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, - ODisconnectArg_sequence, hf_index, ett_inap_ODisconnectArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ODisconnectArg_sequence, hf_index, ett_inap_ODisconnectArg); return offset; } -static const ber_old_sequence_t ONoAnswer_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyBusinessGroupID_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartySubaddress_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_callingFacilityGroup_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingFacilityGroupMember_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalCalledPartyID_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_prefix_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectingPartyID_impl }, - { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectionInformation_impl }, - { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_routeList_impl }, - { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_travellingClassMark_impl }, - { BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_carrier_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t ONoAnswerArg_sequence[] = { + { &hf_inap_dpSpecificCommonParameters, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_DpSpecificCommonParameters }, + { &hf_inap_callingPartyBusinessGroupID, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartyBusinessGroupID }, + { &hf_inap_callingPartySubaddress, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartySubaddress }, + { &hf_inap_callingFacilityGroup, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_FacilityGroup }, + { &hf_inap_callingFacilityGroupMember, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_FacilityGroupMember }, + { &hf_inap_originalCalledPartyID, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_OriginalCalledPartyID }, + { &hf_inap_prefix , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Digits }, + { &hf_inap_redirectingPartyID, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectingPartyID }, + { &hf_inap_redirectionInformation, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectionInformation }, + { &hf_inap_routeList , BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RouteList }, + { &hf_inap_travellingClassMark, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_TravellingClassMark }, + { &hf_inap_extensions , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_carrier , BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Carrier }, + { NULL, 0, 0, 0, NULL } }; static int -dissect_inap_ONoAnswer(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, - ONoAnswer_sequence, hf_index, ett_inap_ONoAnswer); +dissect_inap_ONoAnswerArg(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_sequence(implicit_tag, actx, tree, tvb, offset, + ONoAnswerArg_sequence, hf_index, ett_inap_ONoAnswerArg); return offset; } -static const ber_old_sequence_t OriginationAttemptAuthorizedArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dialledDigits_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyBusinessGroupID_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartySubaddress_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_callingFacilityGroup_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingFacilityGroupMember_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_travellingClassMark_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_carrier_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t OriginationAttemptAuthorizedArg_sequence[] = { + { &hf_inap_dpSpecificCommonParameters, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_DpSpecificCommonParameters }, + { &hf_inap_dialledDigits , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartyNumber }, + { &hf_inap_callingPartyBusinessGroupID, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartyBusinessGroupID }, + { &hf_inap_callingPartySubaddress, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartySubaddress }, + { &hf_inap_callingFacilityGroup, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_FacilityGroup }, + { &hf_inap_callingFacilityGroupMember, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_FacilityGroupMember }, + { &hf_inap_travellingClassMark, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_TravellingClassMark }, + { &hf_inap_extensions , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_carrier , BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Carrier }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_OriginationAttemptAuthorizedArg(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, - OriginationAttemptAuthorizedArg_sequence, hf_index, ett_inap_OriginationAttemptAuthorizedArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + OriginationAttemptAuthorizedArg_sequence, hf_index, ett_inap_OriginationAttemptAuthorizedArg); return offset; } @@ -4185,38 +3585,20 @@ dissect_inap_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U return offset; } -static int dissect_disconnectFromIPForbidden_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_inap_disconnectFromIPForbidden); -} -static int dissect_requestAnnouncementComplete_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_inap_requestAnnouncementComplete); -} -static int dissect_interruptableAnnInd_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_inap_interruptableAnnInd); -} -static int dissect_voiceInformation_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_inap_voiceInformation); -} -static int dissect_voiceBack_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_inap_voiceBack); -} -static int dissect_iA5Information_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_BOOLEAN(TRUE, tvb, offset, actx, tree, hf_inap_iA5Information); -} -static const ber_old_sequence_t PlayAnnouncementArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_informationToSend_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_disconnectFromIPForbidden_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requestAnnouncementComplete_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t PlayAnnouncementArg_sequence[] = { + { &hf_inap_informationToSend, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_InformationToSend }, + { &hf_inap_disconnectFromIPForbidden, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_BOOLEAN }, + { &hf_inap_requestAnnouncementComplete, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_BOOLEAN }, + { &hf_inap_extensions , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_PlayAnnouncementArg(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, - PlayAnnouncementArg_sequence, hf_index, ett_inap_PlayAnnouncementArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + PlayAnnouncementArg_sequence, hf_index, ett_inap_PlayAnnouncementArg); return offset; } @@ -4230,15 +3612,6 @@ dissect_inap_OCTET_STRING_SIZE_1_2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_endOfReplyDigit_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_OCTET_STRING_SIZE_1_2(TRUE, tvb, offset, actx, tree, hf_inap_endOfReplyDigit); -} -static int dissect_cancelDigit_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_OCTET_STRING_SIZE_1_2(TRUE, tvb, offset, actx, tree, hf_inap_cancelDigit); -} -static int dissect_startDigit_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_OCTET_STRING_SIZE_1_2(TRUE, tvb, offset, actx, tree, hf_inap_startDigit); -} static const value_string inap_ErrorTreatment_vals[] = { @@ -4256,36 +3629,30 @@ dissect_inap_ErrorTreatment(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of return offset; } -static int dissect_errorTreatment_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ErrorTreatment(TRUE, tvb, offset, actx, tree, hf_inap_errorTreatment); -} -static const ber_old_sequence_t CollectedDigits_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_minimumNbOfDigits_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_maximumNbOfDigits_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_endOfReplyDigit_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cancelDigit_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_startDigit_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_firstDigitTimeOut_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_interDigitTimeOut_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_errorTreatment_impl }, - { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_interruptableAnnInd_impl }, - { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_voiceInformation_impl }, - { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_voiceBack_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t CollectedDigits_sequence[] = { + { &hf_inap_minimumNbOfDigits, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_INTEGER_1_127 }, + { &hf_inap_maximumNbOfDigits, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_INTEGER_1_127 }, + { &hf_inap_endOfReplyDigit, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_OCTET_STRING_SIZE_1_2 }, + { &hf_inap_cancelDigit , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_OCTET_STRING_SIZE_1_2 }, + { &hf_inap_startDigit , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_OCTET_STRING_SIZE_1_2 }, + { &hf_inap_firstDigitTimeOut, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_INTEGER_1_127 }, + { &hf_inap_interDigitTimeOut, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_INTEGER_1_127 }, + { &hf_inap_errorTreatment , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ErrorTreatment }, + { &hf_inap_interruptableAnnInd, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_BOOLEAN }, + { &hf_inap_voiceInformation, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_BOOLEAN }, + { &hf_inap_voiceBack , BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_BOOLEAN }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_CollectedDigits(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, - CollectedDigits_sequence, hf_index, ett_inap_CollectedDigits); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + CollectedDigits_sequence, hf_index, ett_inap_CollectedDigits); return offset; } -static int dissect_collectedDigits_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CollectedDigits(TRUE, tvb, offset, actx, tree, hf_inap_collectedDigits); -} static const value_string inap_CollectedInfo_vals[] = { @@ -4294,37 +3661,34 @@ static const value_string inap_CollectedInfo_vals[] = { { 0, NULL } }; -static const ber_old_choice_t CollectedInfo_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_collectedDigits_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_iA5Information_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t CollectedInfo_choice[] = { + { 0, &hf_inap_collectedDigits, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_CollectedDigits }, + { 1, &hf_inap_iA5Information , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_BOOLEAN }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_CollectedInfo(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, - CollectedInfo_choice, hf_index, ett_inap_CollectedInfo, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + CollectedInfo_choice, hf_index, ett_inap_CollectedInfo, + NULL); return offset; } -static int dissect_collectedInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CollectedInfo(TRUE, tvb, offset, actx, tree, hf_inap_collectedInfo); -} -static const ber_old_sequence_t PromptAndCollectUserInformationArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_collectedInfo_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_disconnectFromIPForbidden_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_informationToSend_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t PromptAndCollectUserInformationArg_sequence[] = { + { &hf_inap_collectedInfo , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_CollectedInfo }, + { &hf_inap_disconnectFromIPForbidden, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_BOOLEAN }, + { &hf_inap_informationToSend, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_InformationToSend }, + { &hf_inap_extensions , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_PromptAndCollectUserInformationArg(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, - PromptAndCollectUserInformationArg_sequence, hf_index, ett_inap_PromptAndCollectUserInformationArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + PromptAndCollectUserInformationArg_sequence, hf_index, ett_inap_PromptAndCollectUserInformationArg); return offset; } @@ -4339,9 +3703,6 @@ dissect_inap_IA5String(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_iA5Response_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_IA5String(TRUE, tvb, offset, actx, tree, hf_inap_iA5Response); -} static const value_string inap_ReceivedInformationArg_vals[] = { @@ -4350,56 +3711,26 @@ static const value_string inap_ReceivedInformationArg_vals[] = { { 0, NULL } }; -static const ber_old_choice_t ReceivedInformationArg_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_digitsResponse_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_iA5Response_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t ReceivedInformationArg_choice[] = { + { 0, &hf_inap_digitsResponse , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_Digits }, + { 1, &hf_inap_iA5Response , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_IA5String }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_ReceivedInformationArg(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, - ReceivedInformationArg_choice, hf_index, ett_inap_ReceivedInformationArg, - NULL); - - return offset; -} - - -static const ber_old_sequence_t T_allCallSegments_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_releaseCause_impl }, - { 0, 0, 0, NULL } -}; - -static int -dissect_inap_T_allCallSegments(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_allCallSegments_sequence, hf_index, ett_inap_T_allCallSegments); + offset = dissect_ber_choice(actx, tree, tvb, offset, + ReceivedInformationArg_choice, hf_index, ett_inap_ReceivedInformationArg, + NULL); return offset; } -static int dissect_allCallSegments_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_allCallSegments(TRUE, tvb, offset, actx, tree, hf_inap_allCallSegments); -} -static const value_string inap_ReleaseCallArg_vals[] = { - { 0, "initialCallSegment" }, - { 1, "allCallSegments" }, - { 0, NULL } -}; - -static const ber_old_choice_t ReleaseCallArg_choice[] = { - { 0, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_initialCallSegment }, - { 1, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_allCallSegments_impl }, - { 0, 0, 0, 0, NULL } -}; static int dissect_inap_ReleaseCallArg(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, - ReleaseCallArg_choice, hf_index, ett_inap_ReleaseCallArg, - NULL); + offset = dissect_inap_Cause(implicit_tag, tvb, offset, actx, tree, hf_index); return offset; } @@ -4428,90 +3759,84 @@ dissect_inap_ResourceStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of return offset; } -static int dissect_resourceStatus_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ResourceStatus(TRUE, tvb, offset, actx, tree, hf_inap_resourceStatus); -} -static const ber_old_sequence_t RequestCurrentStatusReportResultArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_resourceStatus_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_resourceID_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t RequestCurrentStatusReportResultArg_sequence[] = { + { &hf_inap_resourceStatus , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_ResourceStatus }, + { &hf_inap_resourceID , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_ResourceID }, + { &hf_inap_extensions , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_RequestCurrentStatusReportResultArg(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, - RequestCurrentStatusReportResultArg_sequence, hf_index, ett_inap_RequestCurrentStatusReportResultArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + RequestCurrentStatusReportResultArg_sequence, hf_index, ett_inap_RequestCurrentStatusReportResultArg); return offset; } -static const ber_old_sequence_t RequestEveryStatusChangeReportArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_resourceID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_correlationID_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_monitorDuration_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t RequestEveryStatusChangeReportArg_sequence[] = { + { &hf_inap_resourceID , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_ResourceID }, + { &hf_inap_correlationID , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CorrelationID }, + { &hf_inap_monitorDuration, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Duration }, + { &hf_inap_extensions , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_RequestEveryStatusChangeReportArg(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, - RequestEveryStatusChangeReportArg_sequence, hf_index, ett_inap_RequestEveryStatusChangeReportArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + RequestEveryStatusChangeReportArg_sequence, hf_index, ett_inap_RequestEveryStatusChangeReportArg); return offset; } -static const ber_old_sequence_t RequestFirstStatusMatchReportArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_resourceID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_resourceStatus_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_correlationID_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_monitorDuration_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_bearerCapability_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t RequestFirstStatusMatchReportArg_sequence[] = { + { &hf_inap_resourceID , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_ResourceID }, + { &hf_inap_resourceStatus , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ResourceStatus }, + { &hf_inap_correlationID , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CorrelationID }, + { &hf_inap_monitorDuration, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Duration }, + { &hf_inap_extensions , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_bearerCapability, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_BearerCapability }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_RequestFirstStatusMatchReportArg(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, - RequestFirstStatusMatchReportArg_sequence, hf_index, ett_inap_RequestFirstStatusMatchReportArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + RequestFirstStatusMatchReportArg_sequence, hf_index, ett_inap_RequestFirstStatusMatchReportArg); return offset; } -static const ber_old_sequence_t RequestNotificationChargingEvent_item_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventTypeCharging2_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_monitorMode_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t ChargingEvent_sequence[] = { + { &hf_inap_eventTypeCharging, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_EventTypeCharging }, + { &hf_inap_monitorMode , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_MonitorMode }, + { &hf_inap_legID , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_LegID }, + { NULL, 0, 0, 0, NULL } }; static int -dissect_inap_RequestNotificationChargingEvent_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, - RequestNotificationChargingEvent_item_sequence, hf_index, ett_inap_RequestNotificationChargingEvent_item); +dissect_inap_ChargingEvent(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_sequence(implicit_tag, actx, tree, tvb, offset, + ChargingEvent_sequence, hf_index, ett_inap_ChargingEvent); return offset; } -static int dissect_RequestNotificationChargingEvent_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_RequestNotificationChargingEvent_item(FALSE, tvb, offset, actx, tree, hf_inap_RequestNotificationChargingEvent_item); -} -static const ber_old_sequence_t RequestNotificationChargingEvent_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RequestNotificationChargingEvent_item }, +static const ber_sequence_t RequestNotificationChargingEventArg_sequence_of[1] = { + { &hf_inap_RequestNotificationChargingEventArg_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_inap_ChargingEvent }, }; static int -dissect_inap_RequestNotificationChargingEvent(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, - RequestNotificationChargingEvent_sequence_of, hf_index, ett_inap_RequestNotificationChargingEvent); +dissect_inap_RequestNotificationChargingEventArg(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_sequence_of(implicit_tag, actx, tree, tvb, offset, + RequestNotificationChargingEventArg_sequence_of, hf_index, ett_inap_RequestNotificationChargingEventArg); return offset; } @@ -4525,9 +3850,6 @@ dissect_inap_NumberOfDigits(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of return offset; } -static int dissect_numberOfDigits_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_NumberOfDigits(TRUE, tvb, offset, actx, tree, hf_inap_numberOfDigits); -} @@ -4538,9 +3860,6 @@ dissect_inap_ApplicationTimer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_applicationTimer_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ApplicationTimer(TRUE, tvb, offset, actx, tree, hf_inap_applicationTimer); -} static const value_string inap_DpSpecificCriteria_vals[] = { @@ -4549,72 +3868,63 @@ static const value_string inap_DpSpecificCriteria_vals[] = { { 0, NULL } }; -static const ber_old_choice_t DpSpecificCriteria_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_numberOfDigits_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_applicationTimer_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t DpSpecificCriteria_choice[] = { + { 0, &hf_inap_numberOfDigits , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_NumberOfDigits }, + { 1, &hf_inap_applicationTimer, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_ApplicationTimer }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_inap_DpSpecificCriteria(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, - DpSpecificCriteria_choice, hf_index, ett_inap_DpSpecificCriteria, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + DpSpecificCriteria_choice, hf_index, ett_inap_DpSpecificCriteria, + NULL); return offset; } -static int dissect_dpSpecificCriteria_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_DpSpecificCriteria(TRUE, tvb, offset, actx, tree, hf_inap_dpSpecificCriteria); -} -static const ber_old_sequence_t BCSMEvent_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventTypeBCSM_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_monitorMode_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID_impl }, - { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_dpSpecificCriteria_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t BCSMEvent_sequence[] = { + { &hf_inap_eventTypeBCSM , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_EventTypeBCSM }, + { &hf_inap_monitorMode , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_MonitorMode }, + { &hf_inap_legID , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_LegID }, + { &hf_inap_dpSpecificCriteria, BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_DpSpecificCriteria }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_BCSMEvent(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, - BCSMEvent_sequence, hf_index, ett_inap_BCSMEvent); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + BCSMEvent_sequence, hf_index, ett_inap_BCSMEvent); return offset; } -static int dissect_bcsmEvents_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_BCSMEvent(FALSE, tvb, offset, actx, tree, hf_inap_bcsmEvents_item); -} -static const ber_old_sequence_t SEQUENCE_SIZE_1_numOfBCSMEvents_OF_BCSMEvent_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_bcsmEvents_item }, +static const ber_sequence_t SEQUENCE_SIZE_1_numOfBCSMEvents_OF_BCSMEvent_sequence_of[1] = { + { &hf_inap_bcsmEvents_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_inap_BCSMEvent }, }; static int dissect_inap_SEQUENCE_SIZE_1_numOfBCSMEvents_OF_BCSMEvent(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_SIZE_1_numOfBCSMEvents_OF_BCSMEvent_sequence_of, hf_index, ett_inap_SEQUENCE_SIZE_1_numOfBCSMEvents_OF_BCSMEvent); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_SIZE_1_numOfBCSMEvents_OF_BCSMEvent_sequence_of, hf_index, ett_inap_SEQUENCE_SIZE_1_numOfBCSMEvents_OF_BCSMEvent); return offset; } -static int dissect_bcsmEvents_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_SEQUENCE_SIZE_1_numOfBCSMEvents_OF_BCSMEvent(TRUE, tvb, offset, actx, tree, hf_inap_bcsmEvents); -} -static const ber_old_sequence_t RequestReportBCSMEventArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_bcsmEvents_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_bcsmEventCorrelationID_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t RequestReportBCSMEventArg_sequence[] = { + { &hf_inap_bcsmEvents , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfBCSMEvents_OF_BCSMEvent }, + { &hf_inap_bcsmEventCorrelationID, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CorrelationID }, + { &hf_inap_extensions , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_RequestReportBCSMEventArg(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, - RequestReportBCSMEventArg_sequence, hf_index, ett_inap_RequestReportBCSMEventArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + RequestReportBCSMEventArg_sequence, hf_index, ett_inap_RequestReportBCSMEventArg); return offset; } @@ -4633,9 +3943,6 @@ dissect_inap_TimerID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U return offset; } -static int dissect_timerID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_TimerID(TRUE, tvb, offset, actx, tree, hf_inap_timerID); -} @@ -4645,93 +3952,90 @@ dissect_inap_TimerValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_timervalue_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_TimerValue(TRUE, tvb, offset, actx, tree, hf_inap_timervalue); -} -static const ber_old_sequence_t ResetTimerArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_timerID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_timervalue_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t ResetTimerArg_sequence[] = { + { &hf_inap_timerID , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_TimerID }, + { &hf_inap_timervalue , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_TimerValue }, + { &hf_inap_extensions , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_ResetTimerArg(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, - ResetTimerArg_sequence, hf_index, ett_inap_ResetTimerArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ResetTimerArg_sequence, hf_index, ett_inap_ResetTimerArg); return offset; } -static const ber_old_sequence_t RouteSelectFailureArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dialledDigits_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyBusinessGroupID_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartySubaddress_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_callingFacilityGroup_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingFacilityGroupMember_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_failureCause_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalCalledPartyID_impl }, - { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_prefix_impl }, - { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectingPartyID_impl }, - { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectionInformation_impl }, - { BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_routeList_impl }, - { BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_travellingClassMark_impl }, - { BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_carrier_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t RouteSelectFailureArg_sequence[] = { + { &hf_inap_dpSpecificCommonParameters, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_DpSpecificCommonParameters }, + { &hf_inap_dialledDigits , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartyNumber }, + { &hf_inap_callingPartyBusinessGroupID, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartyBusinessGroupID }, + { &hf_inap_callingPartySubaddress, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartySubaddress }, + { &hf_inap_callingFacilityGroup, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_FacilityGroup }, + { &hf_inap_callingFacilityGroupMember, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_FacilityGroupMember }, + { &hf_inap_failureCause , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Cause }, + { &hf_inap_originalCalledPartyID, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_OriginalCalledPartyID }, + { &hf_inap_prefix , BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Digits }, + { &hf_inap_redirectingPartyID, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectingPartyID }, + { &hf_inap_redirectionInformation, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectionInformation }, + { &hf_inap_routeList , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RouteList }, + { &hf_inap_travellingClassMark, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_TravellingClassMark }, + { &hf_inap_extensions , BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_carrier , BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Carrier }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_RouteSelectFailureArg(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, - RouteSelectFailureArg_sequence, hf_index, ett_inap_RouteSelectFailureArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + RouteSelectFailureArg_sequence, hf_index, ett_inap_RouteSelectFailureArg); return offset; } -static const ber_old_sequence_t SelectFacilityArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertingPattern_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_destinationNumberRoutingAddress_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iSDNAccessRelatedInformation_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_calledFacilityGroup_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledFacilityGroupMember_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalCalledPartyID_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t SelectFacilityArg_sequence[] = { + { &hf_inap_alertingPattern, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_AlertingPattern }, + { &hf_inap_destinationNumberRoutingAddress, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartyNumber }, + { &hf_inap_iSDNAccessRelatedInformation, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ISDNAccessRelatedInformation }, + { &hf_inap_calledFacilityGroup, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_FacilityGroup }, + { &hf_inap_calledFacilityGroupMember, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_FacilityGroupMember }, + { &hf_inap_originalCalledPartyID, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_OriginalCalledPartyID }, + { &hf_inap_extensions , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_SelectFacilityArg(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, - SelectFacilityArg_sequence, hf_index, ett_inap_SelectFacilityArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + SelectFacilityArg_sequence, hf_index, ett_inap_SelectFacilityArg); return offset; } -static const ber_old_sequence_t SelectRouteArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_destinationRoutingAddress_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alertingPattern_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_correlationID_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iSDNAccessRelatedInformation_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalCalledPartyID_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_routeList_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_scfID_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_travellingClassMark_impl }, - { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_carrier_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t SelectRouteArg_sequence[] = { + { &hf_inap_destinationRoutingAddress, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_DestinationRoutingAddress }, + { &hf_inap_alertingPattern, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_AlertingPattern }, + { &hf_inap_correlationID , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CorrelationID }, + { &hf_inap_iSDNAccessRelatedInformation, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ISDNAccessRelatedInformation }, + { &hf_inap_originalCalledPartyID, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_OriginalCalledPartyID }, + { &hf_inap_routeList , BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RouteList }, + { &hf_inap_scfID , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ScfID }, + { &hf_inap_travellingClassMark, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_TravellingClassMark }, + { &hf_inap_extensions , BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_carrier , BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Carrier }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_SelectRouteArg(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, - SelectRouteArg_sequence, hf_index, ett_inap_SelectRouteArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + SelectRouteArg_sequence, hf_index, ett_inap_SelectRouteArg); return offset; } @@ -4745,22 +4049,19 @@ dissect_inap_SCIBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff return offset; } -static int dissect_sCIBillingChargingCharacteristics_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_SCIBillingChargingCharacteristics(TRUE, tvb, offset, actx, tree, hf_inap_sCIBillingChargingCharacteristics); -} -static const ber_old_sequence_t SendChargingInformationArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sCIBillingChargingCharacteristics_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_partyToCharge_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t SendChargingInformationArg_sequence[] = { + { &hf_inap_sCIBillingChargingCharacteristics, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_SCIBillingChargingCharacteristics }, + { &hf_inap_partyToCharge , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_LegID }, + { &hf_inap_extensions , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_SendChargingInformationArg(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, - SendChargingInformationArg_sequence, hf_index, ett_inap_SendChargingInformationArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + SendChargingInformationArg_sequence, hf_index, ett_inap_SendChargingInformationArg); return offset; } @@ -4774,43 +4075,34 @@ dissect_inap_CounterID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } -static int dissect_counterID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CounterID(TRUE, tvb, offset, actx, tree, hf_inap_counterID); -} -static const ber_old_sequence_t CounterAndValue_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_counterID_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_counterValue_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t CounterAndValue_sequence[] = { + { &hf_inap_counterID , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_CounterID }, + { &hf_inap_counterValue , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_Integer4 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_CounterAndValue(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, - CounterAndValue_sequence, hf_index, ett_inap_CounterAndValue); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + CounterAndValue_sequence, hf_index, ett_inap_CounterAndValue); return offset; } -static int dissect_CountersValue_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CounterAndValue(FALSE, tvb, offset, actx, tree, hf_inap_CountersValue_item); -} -static const ber_old_sequence_t CountersValue_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CountersValue_item }, +static const ber_sequence_t CountersValue_sequence_of[1] = { + { &hf_inap_CountersValue_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_inap_CounterAndValue }, }; static int dissect_inap_CountersValue(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, - CountersValue_sequence_of, hf_index, ett_inap_CountersValue); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + CountersValue_sequence_of, hf_index, ett_inap_CountersValue); return offset; } -static int dissect_countersValue_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_CountersValue(TRUE, tvb, offset, actx, tree, hf_inap_countersValue); -} static const value_string inap_ResponseCondition_vals[] = { @@ -4827,23 +4119,20 @@ dissect_inap_ResponseCondition(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int return offset; } -static int dissect_responseCondition_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ResponseCondition(TRUE, tvb, offset, actx, tree, hf_inap_responseCondition); -} -static const ber_old_sequence_t ServiceFilteringResponseArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_countersValue_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_filteringCriteria_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_responseCondition_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t ServiceFilteringResponseArg_sequence[] = { + { &hf_inap_countersValue , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_CountersValue }, + { &hf_inap_filteringCriteria, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_FilteringCriteria }, + { &hf_inap_extensions , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_responseCondition, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ResponseCondition }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_ServiceFilteringResponseArg(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, - ServiceFilteringResponseArg_sequence, hf_index, ett_inap_ServiceFilteringResponseArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ServiceFilteringResponseArg_sequence, hf_index, ett_inap_ServiceFilteringResponseArg); return offset; } @@ -4873,149 +4162,149 @@ dissect_inap_ReportCondition(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o return offset; } -static int dissect_reportCondition_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_ReportCondition(TRUE, tvb, offset, actx, tree, hf_inap_reportCondition); -} -static const ber_old_sequence_t StatusReportArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_resourceStatus_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_correlationID_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_resourceID_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reportCondition_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t StatusReportArg_sequence[] = { + { &hf_inap_resourceStatus , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ResourceStatus }, + { &hf_inap_correlationID , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CorrelationID }, + { &hf_inap_resourceID , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_ResourceID }, + { &hf_inap_extensions , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_reportCondition, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_ReportCondition }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_StatusReportArg(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, - StatusReportArg_sequence, hf_index, ett_inap_StatusReportArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + StatusReportArg_sequence, hf_index, ett_inap_StatusReportArg); return offset; } -static const ber_old_sequence_t TAnswerArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartyBusinessGroupID_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartySubaddress_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_calledFacilityGroup_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledFacilityGroupMember_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t TAnswerArg_sequence[] = { + { &hf_inap_dpSpecificCommonParameters, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_DpSpecificCommonParameters }, + { &hf_inap_calledPartyBusinessGroupID, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartyBusinessGroupID }, + { &hf_inap_calledPartySubaddress, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartySubaddress }, + { &hf_inap_calledFacilityGroup, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_FacilityGroup }, + { &hf_inap_calledFacilityGroupMember, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_FacilityGroupMember }, + { &hf_inap_extensions , BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_TAnswerArg(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, - TAnswerArg_sequence, hf_index, ett_inap_TAnswerArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + TAnswerArg_sequence, hf_index, ett_inap_TAnswerArg); return offset; } -static const ber_old_sequence_t TBusyArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_busyCause_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartyBusinessGroupID_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartySubaddress_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalCalledPartyID_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectingPartyID_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectionInformation_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_routeList_impl }, - { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_travellingClassMark_impl }, - { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t TBusyArg_sequence[] = { + { &hf_inap_dpSpecificCommonParameters, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_DpSpecificCommonParameters }, + { &hf_inap_busyCause , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Cause }, + { &hf_inap_calledPartyBusinessGroupID, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartyBusinessGroupID }, + { &hf_inap_calledPartySubaddress, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartySubaddress }, + { &hf_inap_originalCalledPartyID, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_OriginalCalledPartyID }, + { &hf_inap_redirectingPartyID, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectingPartyID }, + { &hf_inap_redirectionInformation, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectionInformation }, + { &hf_inap_routeList , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RouteList }, + { &hf_inap_travellingClassMark, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_TravellingClassMark }, + { &hf_inap_extensions , BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_TBusyArg(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, - TBusyArg_sequence, hf_index, ett_inap_TBusyArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + TBusyArg_sequence, hf_index, ett_inap_TBusyArg); return offset; } -static const ber_old_sequence_t TDisconnectArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartyBusinessGroupID_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartySubaddress_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_calledFacilityGroup_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledFacilityGroupMember_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_releaseCause_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_connectTime_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t TDisconnectArg_sequence[] = { + { &hf_inap_dpSpecificCommonParameters, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_DpSpecificCommonParameters }, + { &hf_inap_calledPartyBusinessGroupID, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartyBusinessGroupID }, + { &hf_inap_calledPartySubaddress, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartySubaddress }, + { &hf_inap_calledFacilityGroup, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_FacilityGroup }, + { &hf_inap_calledFacilityGroupMember, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_FacilityGroupMember }, + { &hf_inap_releaseCause , BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Cause }, + { &hf_inap_extensions , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { &hf_inap_connectTime , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_Integer4 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_TDisconnectArg(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, - TDisconnectArg_sequence, hf_index, ett_inap_TDisconnectArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + TDisconnectArg_sequence, hf_index, ett_inap_TDisconnectArg); return offset; } -static const ber_old_sequence_t TermAttemptAuthorizedArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartyBusinessGroupID_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartySubaddress_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callingPartyBusinessGroupID_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalCalledPartyID_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectingPartyID_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectionInformation_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_routeList_impl }, - { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_travellingClassMark_impl }, - { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t TermAttemptAuthorizedArg_sequence[] = { + { &hf_inap_dpSpecificCommonParameters, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_DpSpecificCommonParameters }, + { &hf_inap_calledPartyBusinessGroupID, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartyBusinessGroupID }, + { &hf_inap_calledPartySubaddress, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartySubaddress }, + { &hf_inap_callingPartyBusinessGroupID, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallingPartyBusinessGroupID }, + { &hf_inap_originalCalledPartyID, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_OriginalCalledPartyID }, + { &hf_inap_redirectingPartyID, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectingPartyID }, + { &hf_inap_redirectionInformation, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectionInformation }, + { &hf_inap_routeList , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RouteList }, + { &hf_inap_travellingClassMark, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_TravellingClassMark }, + { &hf_inap_extensions , BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_TermAttemptAuthorizedArg(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, - TermAttemptAuthorizedArg_sequence, hf_index, ett_inap_TermAttemptAuthorizedArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + TermAttemptAuthorizedArg_sequence, hf_index, ett_inap_TermAttemptAuthorizedArg); return offset; } -static const ber_old_sequence_t TNoAnswerArg_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dpSpecificCommonParameters_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartyBusinessGroupID_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartySubaddress_impl }, - { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_calledFacilityGroup_impl }, - { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledFacilityGroupMember_impl }, - { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalCalledPartyID_impl }, - { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectingPartyID_impl }, - { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_redirectionInformation_impl }, - { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_travellingClassMark_impl }, - { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t TNoAnswerArg_sequence[] = { + { &hf_inap_dpSpecificCommonParameters, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_DpSpecificCommonParameters }, + { &hf_inap_calledPartyBusinessGroupID, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartyBusinessGroupID }, + { &hf_inap_calledPartySubaddress, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CalledPartySubaddress }, + { &hf_inap_calledFacilityGroup, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_FacilityGroup }, + { &hf_inap_calledFacilityGroupMember, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_FacilityGroupMember }, + { &hf_inap_originalCalledPartyID, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_OriginalCalledPartyID }, + { &hf_inap_redirectingPartyID, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectingPartyID }, + { &hf_inap_redirectionInformation, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_RedirectionInformation }, + { &hf_inap_travellingClassMark, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_TravellingClassMark }, + { &hf_inap_extensions , BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int dissect_inap_TNoAnswerArg(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, - TNoAnswerArg_sequence, hf_index, ett_inap_TNoAnswerArg); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + TNoAnswerArg_sequence, hf_index, ett_inap_TNoAnswerArg); return offset; } -static const ber_old_sequence_t ChargingEvent_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventTypeCharging_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_monitorMode_impl }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_legID_impl }, - { 0, 0, 0, NULL } +static const value_string inap_UnavailableNetworkResource_vals[] = { + { 0, "unavailableResources" }, + { 1, "componentFailure" }, + { 2, "basicCallProcessingException" }, + { 3, "resourceStatusFailure" }, + { 4, "endUserFailure" }, + { 0, NULL } }; + static int -dissect_inap_ChargingEvent(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, - ChargingEvent_sequence, hf_index, ett_inap_ChargingEvent); +dissect_inap_UnavailableNetworkResource(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_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -5023,193 +4312,172 @@ dissect_inap_ChargingEvent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int -dissect_inap_INTEGER_0_255(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_inap_CallID(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_integer(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); return offset; } -static int dissect_callAttemptElapsedTimeValue_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_INTEGER_0_255(TRUE, tvb, offset, actx, tree, hf_inap_callAttemptElapsedTimeValue); -} -static const value_string inap_RequestedInformationValue_vals[] = { - { 0, "callAttemptElapsedTimeValue" }, - { 1, "callStopTimeValue" }, - { 2, "callConnectedElapsedTimeValue" }, - { 3, "calledAddressValue" }, - { 30, "releaseCauseValue" }, - { 0, NULL } -}; - -static const ber_old_choice_t RequestedInformationValue_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_callAttemptElapsedTimeValue_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_callStopTimeValue_impl }, - { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_callConnectedElapsedTimeValue_impl }, - { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_calledAddressValue_impl }, - { 30, BER_CLASS_CON, 30, BER_FLAGS_IMPLTAG, dissect_releaseCauseValue_impl }, - { 0, 0, 0, 0, NULL } +static const ber_sequence_t AddPartyArg_sequence[] = { + { &hf_inap_originalCallID , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallID }, + { &hf_inap_destinationCallID, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallID }, + { NULL, 0, 0, 0, NULL } }; static int -dissect_inap_RequestedInformationValue(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, - RequestedInformationValue_choice, hf_index, ett_inap_RequestedInformationValue, - NULL); +dissect_inap_AddPartyArg(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_sequence(implicit_tag, actx, tree, tvb, offset, + AddPartyArg_sequence, hf_index, ett_inap_AddPartyArg); return offset; } -static int dissect_requestedInformationValue_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_RequestedInformationValue(TRUE, tvb, offset, actx, tree, hf_inap_requestedInformationValue); -} -static const ber_old_sequence_t RequestedInformation_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_requestedInformationType_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_requestedInformationValue_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t AttachArg_sequence[] = { + { &hf_inap_newLegID , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_LegID }, + { &hf_inap_correlationidentifier, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CorrelationID }, + { NULL, 0, 0, 0, NULL } }; static int -dissect_inap_RequestedInformation(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, - RequestedInformation_sequence, hf_index, ett_inap_RequestedInformation); +dissect_inap_AttachArg(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_sequence(implicit_tag, actx, tree, tvb, offset, + AttachArg_sequence, hf_index, ett_inap_AttachArg); return offset; } -static int dissect_RequestedInformationList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_RequestedInformation(FALSE, tvb, offset, actx, tree, hf_inap_RequestedInformationList_item); -} -static const ber_old_sequence_t RequestedInformationList_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RequestedInformationList_item }, +static const value_string inap_LegStatus_vals[] = { + { 0, "connected" }, + { 1, "unconnected" }, + { 2, "pending" }, + { 3, "interacting" }, + { 0, NULL } }; + static int -dissect_inap_RequestedInformationList(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, - RequestedInformationList_sequence_of, hf_index, ett_inap_RequestedInformationList); +dissect_inap_LegStatus(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_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); return offset; } -static const value_string inap_UnavailableNetworkResource_vals[] = { - { 0, "unavailableResources" }, - { 1, "componentFailure" }, - { 2, "basicCallProcessingException" }, - { 3, "resourceStatusFailure" }, - { 4, "endUserFailure" }, - { 0, NULL } +static const ber_sequence_t LegInformation_sequence[] = { + { &hf_inap_legID , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_LegID }, + { &hf_inap_legStatus , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_LegStatus }, + { NULL, 0, 0, 0, NULL } }; - static int -dissect_inap_UnavailableNetworkResource(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_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); +dissect_inap_LegInformation(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_sequence(implicit_tag, actx, tree, tvb, offset, + LegInformation_sequence, hf_index, ett_inap_LegInformation); return offset; } -static const value_string inap_T_problem_01_vals[] = { - { 0, "unknownOperation" }, - { 1, "tooLate" }, - { 2, "operationNotCancellable" }, - { 0, NULL } +static const ber_sequence_t CallPartyHandlingResultsArg_sequence_of[1] = { + { &hf_inap_CallPartyHandlingResultsArg_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_inap_LegInformation }, }; - static int -dissect_inap_T_problem_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_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); +dissect_inap_CallPartyHandlingResultsArg(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_sequence_of(implicit_tag, actx, tree, tvb, offset, + CallPartyHandlingResultsArg_sequence_of, hf_index, ett_inap_CallPartyHandlingResultsArg); return offset; } -static int dissect_problem_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_T_problem_01(TRUE, tvb, offset, actx, tree, hf_inap_problem_01); -} +static const ber_sequence_t ChangePartiesArg_sequence[] = { + { &hf_inap_callID , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallID }, + { &hf_inap_targetCallID , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_CallID }, + { &hf_inap_legToBeConnectedID, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_LegID }, + { NULL, 0, 0, 0, NULL } +}; static int -dissect_inap_INTEGER_M128_127(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_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); +dissect_inap_ChangePartiesArg(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_sequence(implicit_tag, actx, tree, tvb, offset, + ChangePartiesArg_sequence, hf_index, ett_inap_ChangePartiesArg); return offset; } -static int dissect_operation_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_inap_INTEGER_M128_127(TRUE, tvb, offset, actx, tree, hf_inap_operation); -} -static const ber_old_sequence_t CancelFailed_sequence[] = { - { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_problem_01_impl }, - { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_operation_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t DetachArg_sequence[] = { + { &hf_inap_legToBeDetached, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_LegID }, + { &hf_inap_correlationidentifier, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CorrelationID }, + { NULL, 0, 0, 0, NULL } }; static int -dissect_inap_CancelFailed(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, - CancelFailed_sequence, hf_index, ett_inap_CancelFailed); +dissect_inap_DetachArg(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_sequence(implicit_tag, actx, tree, tvb, offset, + DetachArg_sequence, hf_index, ett_inap_DetachArg); return offset; } -static const value_string inap_RequestedInfoError_vals[] = { - { 1, "unknownRequestedInfo" }, - { 2, "requestedInfoNotAvailable" }, - { 0, NULL } +static const ber_sequence_t HoldCallPartyConnectionArg_sequence[] = { + { &hf_inap_callID , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallID }, + { &hf_inap_legID , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_LegID }, + { NULL, 0, 0, 0, NULL } }; - static int -dissect_inap_RequestedInfoError(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_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); +dissect_inap_HoldCallPartyConnectionArg(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_sequence(implicit_tag, actx, tree, tvb, offset, + HoldCallPartyConnectionArg_sequence, hf_index, ett_inap_HoldCallPartyConnectionArg); return offset; } -static const value_string inap_SystemFailure_vals[] = { - { 0, "unavailableResources" }, - { 1, "componentFailure" }, - { 2, "basicCallProcessingException" }, - { 3, "resourceStatusFailure" }, - { 4, "endUserFailure" }, - { 0, NULL } +static const ber_sequence_t ReconnectArg_sequence[] = { + { &hf_inap_callID , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallID }, + { &hf_inap_heldLegID , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_LegID }, + { NULL, 0, 0, 0, NULL } }; +static int +dissect_inap_ReconnectArg(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_sequence(implicit_tag, actx, tree, tvb, offset, + ReconnectArg_sequence, hf_index, ett_inap_ReconnectArg); + + return offset; +} + + static int -dissect_inap_SystemFailure(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_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); +dissect_inap_CauseQ763(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_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); return offset; } -static const value_string inap_TaskRefused_vals[] = { - { 0, "generic" }, - { 1, "unobtainable" }, - { 2, "congestion" }, - { 0, NULL } +static const ber_sequence_t ReleaseCallPartyConnectionArg_sequence[] = { + { &hf_inap_legToBeReleased, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_LegID }, + { &hf_inap_callID , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CallID }, + { &hf_inap_releaseCause_01, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inap_CauseQ763 }, + { NULL, 0, 0, 0, NULL } }; - static int -dissect_inap_TaskRefused(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_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); +dissect_inap_ReleaseCallPartyConnectionArg(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_sequence(implicit_tag, actx, tree, tvb, offset, + ReleaseCallPartyConnectionArg_sequence, hf_index, ett_inap_ReleaseCallPartyConnectionArg); return offset; } @@ -5316,10 +4584,10 @@ static void dissect_HoldCallInNetworkArg_PDU(tvbuff_t *tvb _U_, packet_info *pin asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); dissect_inap_HoldCallInNetworkArg(FALSE, tvb, 0, &asn1_ctx, tree, hf_inap_HoldCallInNetworkArg_PDU); } -static void dissect_InitialDP_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +static void dissect_InitialDPArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - dissect_inap_InitialDP(FALSE, tvb, 0, &asn1_ctx, tree, hf_inap_InitialDP_PDU); + dissect_inap_InitialDPArg(FALSE, tvb, 0, &asn1_ctx, tree, hf_inap_InitialDPArg_PDU); } static void dissect_InitiateCallAttemptArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { asn1_ctx_t asn1_ctx; @@ -5346,10 +4614,10 @@ static void dissect_ODisconnectArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); dissect_inap_ODisconnectArg(FALSE, tvb, 0, &asn1_ctx, tree, hf_inap_ODisconnectArg_PDU); } -static void dissect_ONoAnswer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +static void dissect_ONoAnswerArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - dissect_inap_ONoAnswer(FALSE, tvb, 0, &asn1_ctx, tree, hf_inap_ONoAnswer_PDU); + dissect_inap_ONoAnswerArg(FALSE, tvb, 0, &asn1_ctx, tree, hf_inap_ONoAnswerArg_PDU); } static void dissect_OriginationAttemptAuthorizedArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { asn1_ctx_t asn1_ctx; @@ -5396,10 +4664,10 @@ static void dissect_RequestFirstStatusMatchReportArg_PDU(tvbuff_t *tvb _U_, pack asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); dissect_inap_RequestFirstStatusMatchReportArg(FALSE, tvb, 0, &asn1_ctx, tree, hf_inap_RequestFirstStatusMatchReportArg_PDU); } -static void dissect_RequestNotificationChargingEvent_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +static void dissect_RequestNotificationChargingEventArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - dissect_inap_RequestNotificationChargingEvent(FALSE, tvb, 0, &asn1_ctx, tree, hf_inap_RequestNotificationChargingEvent_PDU); + dissect_inap_RequestNotificationChargingEventArg(FALSE, tvb, 0, &asn1_ctx, tree, hf_inap_RequestNotificationChargingEventArg_PDU); } static void dissect_RequestReportBCSMEventArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { asn1_ctx_t asn1_ctx; @@ -5493,7 +4761,7 @@ TC-Invokable OPERATION ::= static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_) { switch(opcode){ case 0: /*InitialDP*/ - offset=dissect_inap_InitialDP(FALSE, tvb, offset, actx, tree, hf_inap_InitialDP_PDU); + offset=dissect_inap_InitialDPArg(FALSE, tvb, offset, actx, tree, hf_inap_InitialDPArg_PDU); break; case 1: /*1 OriginationAttemptAuthorized */ offset=dissect_inap_OriginationAttemptAuthorizedArg(FALSE, tvb, offset, actx, tree, hf_inap_OriginationAttemptAuthorizedArg_PDU); @@ -5511,7 +4779,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ offset=dissect_inap_OCalledPartyBusyArg(FALSE, tvb, offset, actx, tree, hf_inap_OCalledPartyBusyArg_PDU); break; case 6: /*6 oNoAnswer */ - offset=dissect_inap_ONoAnswer(FALSE, tvb, offset, actx, tree, hf_inap_ONoAnswer_PDU); + offset=dissect_inap_ONoAnswerArg(FALSE, tvb, offset, actx, tree, hf_inap_ONoAnswerArg_PDU); break; case 7: /*7 oAnswer */ offset=dissect_inap_OAnswerArg(FALSE, tvb, offset, actx, tree, hf_inap_OAnswerArg_PDU); @@ -5569,7 +4837,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ offset=dissect_inap_EventReportBCSMArg(FALSE, tvb, offset, actx, tree, hf_inap_EventReportBCSMArg_PDU); break; case 25: /*25, "RequestNotificationChargingEvent */ - offset=dissect_inap_RequestNotificationChargingEvent(FALSE, tvb, offset, actx, tree, hf_inap_RequestNotificationChargingEvent_PDU); + offset=dissect_inap_RequestNotificationChargingEventArg(FALSE, tvb, offset, actx, tree, hf_inap_RequestNotificationChargingEventArg_PDU); break; case 26: /*26, "EventNotificationCharging */ offset=dissect_inap_EventNotificationChargingArg(FALSE, tvb, offset, actx, tree, hf_inap_EventNotificationChargingArg_PDU); @@ -5845,10 +5113,10 @@ void proto_register_inap(void) { { "HoldCallInNetworkArg", "inap.HoldCallInNetworkArg", FT_UINT32, BASE_DEC, VALS(inap_HoldCallInNetworkArg_vals), 0, "inap.HoldCallInNetworkArg", HFILL }}, - { &hf_inap_InitialDP_PDU, - { "InitialDP", "inap.InitialDP", + { &hf_inap_InitialDPArg_PDU, + { "InitialDPArg", "inap.InitialDPArg", FT_NONE, BASE_NONE, NULL, 0, - "inap.InitialDP", HFILL }}, + "inap.InitialDPArg", HFILL }}, { &hf_inap_InitiateCallAttemptArg_PDU, { "InitiateCallAttemptArg", "inap.InitiateCallAttemptArg", FT_NONE, BASE_NONE, NULL, 0, @@ -5869,10 +5137,10 @@ void proto_register_inap(void) { { "ODisconnectArg", "inap.ODisconnectArg", FT_NONE, BASE_NONE, NULL, 0, "inap.ODisconnectArg", HFILL }}, - { &hf_inap_ONoAnswer_PDU, - { "ONoAnswer", "inap.ONoAnswer", + { &hf_inap_ONoAnswerArg_PDU, + { "ONoAnswerArg", "inap.ONoAnswerArg", FT_NONE, BASE_NONE, NULL, 0, - "inap.ONoAnswer", HFILL }}, + "inap.ONoAnswerArg", HFILL }}, { &hf_inap_OriginationAttemptAuthorizedArg_PDU, { "OriginationAttemptAuthorizedArg", "inap.OriginationAttemptAuthorizedArg", FT_NONE, BASE_NONE, NULL, 0, @@ -5891,7 +5159,7 @@ void proto_register_inap(void) { "inap.ReceivedInformationArg", HFILL }}, { &hf_inap_ReleaseCallArg_PDU, { "ReleaseCallArg", "inap.ReleaseCallArg", - FT_UINT32, BASE_DEC, VALS(inap_ReleaseCallArg_vals), 0, + FT_BYTES, BASE_HEX, NULL, 0, "inap.ReleaseCallArg", HFILL }}, { &hf_inap_RequestCurrentStatusReportArg_PDU, { "RequestCurrentStatusReportArg", "inap.RequestCurrentStatusReportArg", @@ -5909,10 +5177,10 @@ void proto_register_inap(void) { { "RequestFirstStatusMatchReportArg", "inap.RequestFirstStatusMatchReportArg", FT_NONE, BASE_NONE, NULL, 0, "inap.RequestFirstStatusMatchReportArg", HFILL }}, - { &hf_inap_RequestNotificationChargingEvent_PDU, - { "RequestNotificationChargingEvent", "inap.RequestNotificationChargingEvent", + { &hf_inap_RequestNotificationChargingEventArg_PDU, + { "RequestNotificationChargingEventArg", "inap.RequestNotificationChargingEventArg", FT_UINT32, BASE_DEC, NULL, 0, - "inap.RequestNotificationChargingEvent", HFILL }}, + "inap.RequestNotificationChargingEventArg", HFILL }}, { &hf_inap_RequestReportBCSMEventArg_PDU, { "RequestReportBCSMEventArg", "inap.RequestReportBCSMEventArg", FT_NONE, BASE_NONE, NULL, 0, @@ -6061,78 +5329,14 @@ void proto_register_inap(void) { { "localValue", "inap.localValue", FT_INT32, BASE_DEC, NULL, 0, "inap.LocalErrorcode", HFILL }}, - { &hf_inap_originalCallID, - { "originalCallID", "inap.originalCallID", - FT_INT32, BASE_DEC, NULL, 0, - "inap.CallID", HFILL }}, - { &hf_inap_destinationCallID, - { "destinationCallID", "inap.destinationCallID", - FT_INT32, BASE_DEC, NULL, 0, - "inap.CallID", HFILL }}, - { &hf_inap_newLegID, - { "newLegID", "inap.newLegID", - FT_BYTES, BASE_HEX, NULL, 0, - "inap.OCTET_STRING", HFILL }}, - { &hf_inap_correlationidentifier, - { "correlationidentifier", "inap.correlationidentifier", - FT_BYTES, BASE_HEX, NULL, 0, - "inap.OCTET_STRING", HFILL }}, - { &hf_inap_CallPartyHandlingResultsArg_item, - { "Item", "inap.CallPartyHandlingResultsArg_item", - FT_NONE, BASE_NONE, NULL, 0, - "inap.LegInformation", HFILL }}, - { &hf_inap_callID, - { "callID", "inap.callID", - FT_INT32, BASE_DEC, NULL, 0, - "inap.CallID", HFILL }}, - { &hf_inap_targetCallID, - { "targetCallID", "inap.targetCallID", - FT_INT32, BASE_DEC, NULL, 0, - "inap.CallID", HFILL }}, - { &hf_inap_legToBeConnectedID, - { "legToBeConnectedID", "inap.legToBeConnectedID", - FT_BYTES, BASE_HEX, NULL, 0, - "inap.OCTET_STRING", HFILL }}, - { &hf_inap_legToBeDetached, - { "legToBeDetached", "inap.legToBeDetached", - FT_BYTES, BASE_HEX, NULL, 0, - "inap.OCTET_STRING", HFILL }}, - { &hf_inap_legID, - { "legID", "inap.legID", - FT_UINT32, BASE_DEC, VALS(inap_LegID_vals), 0, - "inap.LegID", HFILL }}, - { &hf_inap_heldLegID, - { "heldLegID", "inap.heldLegID", - FT_UINT32, BASE_DEC, VALS(inap_LegID_vals), 0, - "inap.LegID", HFILL }}, - { &hf_inap_legToBeReleased, - { "legToBeReleased", "inap.legToBeReleased", - FT_UINT32, BASE_DEC, VALS(inap_LegID_vals), 0, - "inap.LegID", HFILL }}, - { &hf_inap_releaseCause, - { "releaseCause", "inap.releaseCause", - FT_BYTES, BASE_HEX, NULL, 0, - "inap.Cause", HFILL }}, - { &hf_inap_legStatus, - { "legStatus", "inap.legStatus", - FT_UINT32, BASE_DEC, VALS(inap_LegStatus_vals), 0, - "inap.LegStatus", HFILL }}, - { &hf_inap_Extensions_item, - { "Item", "inap.Extensions_item", - FT_NONE, BASE_NONE, NULL, 0, - "inap.Extensions_item", HFILL }}, - { &hf_inap_type, - { "type", "inap.type", + { &hf_inap_problem_01, + { "problem", "inap.problem", + FT_UINT32, BASE_DEC, VALS(inap_T_problem_01_vals), 0, + "inap.T_problem_01", HFILL }}, + { &hf_inap_operation, + { "operation", "inap.operation", FT_INT32, BASE_DEC, NULL, 0, - "inap.INTEGER", HFILL }}, - { &hf_inap_criticality, - { "criticality", "inap.criticality", - FT_UINT32, BASE_DEC, VALS(inap_T_criticality_vals), 0, - "inap.T_criticality", HFILL }}, - { &hf_inap_value, - { "value", "inap.value", - FT_BYTES, BASE_HEX, NULL, 0, - "inap.OCTET_STRING", HFILL }}, + "inap.INTEGER_M128_127", HFILL }}, { &hf_inap_filteredCallTreatment, { "filteredCallTreatment", "inap.filteredCallTreatment", FT_NONE, BASE_NONE, NULL, 0, @@ -6156,7 +5360,11 @@ void proto_register_inap(void) { { &hf_inap_extensions, { "extensions", "inap.extensions", FT_UINT32, BASE_DEC, NULL, 0, - "inap.Extensions", HFILL }}, + "inap.SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField", HFILL }}, + { &hf_inap_extensions_item, + { "Item", "inap.extensions_item", + FT_NONE, BASE_NONE, NULL, 0, + "inap.ExtensionField", HFILL }}, { &hf_inap_dpSpecificCommonParameters, { "dpSpecificCommonParameters", "inap.dpSpecificCommonParameters", FT_NONE, BASE_NONE, NULL, 0, @@ -6281,6 +5489,10 @@ void proto_register_inap(void) { { "gapTreatment", "inap.gapTreatment", FT_UINT32, BASE_DEC, VALS(inap_GapTreatment_vals), 0, "inap.GapTreatment", HFILL }}, + { &hf_inap_requestedInformationList, + { "requestedInformationList", "inap.requestedInformationList", + FT_UINT32, BASE_DEC, NULL, 0, + "inap.RequestedInformationList", HFILL }}, { &hf_inap_requestedInformationTypeList, { "requestedInformationTypeList", "inap.requestedInformationTypeList", FT_UINT32, BASE_DEC, NULL, 0, @@ -6325,10 +5537,14 @@ void proto_register_inap(void) { { "ipRoutingAddress", "inap.ipRoutingAddress", FT_BYTES, BASE_HEX, NULL, 0, "inap.IPRoutingAddress", HFILL }}, - { &hf_inap_both2, - { "both2", "inap.both2", + { &hf_inap_legID, + { "legID", "inap.legID", + FT_UINT32, BASE_DEC, VALS(inap_LegID_vals), 0, + "inap.LegID", HFILL }}, + { &hf_inap_both, + { "both", "inap.both", FT_NONE, BASE_NONE, NULL, 0, - "inap.T_both2", HFILL }}, + "inap.T_both", HFILL }}, { &hf_inap_none, { "none", "inap.none", FT_NONE, BASE_NONE, NULL, 0, @@ -6437,6 +5653,10 @@ void proto_register_inap(void) { { "busyCause", "inap.busyCause", FT_BYTES, BASE_HEX, NULL, 0, "inap.Cause", HFILL }}, + { &hf_inap_releaseCause, + { "releaseCause", "inap.releaseCause", + FT_BYTES, BASE_HEX, NULL, 0, + "inap.Cause", HFILL }}, { &hf_inap_connectTime, { "connectTime", "inap.connectTime", FT_UINT32, BASE_DEC, NULL, 0, @@ -6465,14 +5685,6 @@ void proto_register_inap(void) { { "iA5Response", "inap.iA5Response", FT_STRING, BASE_NONE, NULL, 0, "inap.IA5String", HFILL }}, - { &hf_inap_initialCallSegment, - { "initialCallSegment", "inap.initialCallSegment", - FT_BYTES, BASE_HEX, NULL, 0, - "inap.Cause", HFILL }}, - { &hf_inap_allCallSegments, - { "allCallSegments", "inap.allCallSegments", - FT_NONE, BASE_NONE, NULL, 0, - "inap.T_allCallSegments", HFILL }}, { &hf_inap_resourceStatus, { "resourceStatus", "inap.resourceStatus", FT_UINT32, BASE_DEC, VALS(inap_ResourceStatus_vals), 0, @@ -6481,14 +5693,10 @@ void proto_register_inap(void) { { "monitorDuration", "inap.monitorDuration", FT_INT32, BASE_DEC, NULL, 0, "inap.Duration", HFILL }}, - { &hf_inap_RequestNotificationChargingEvent_item, - { "Item", "inap.RequestNotificationChargingEvent_item", + { &hf_inap_RequestNotificationChargingEventArg_item, + { "Item", "inap.RequestNotificationChargingEventArg_item", FT_NONE, BASE_NONE, NULL, 0, - "inap.RequestNotificationChargingEvent_item", HFILL }}, - { &hf_inap_eventTypeCharging2, - { "eventTypeCharging2", "inap.eventTypeCharging2", - FT_BYTES, BASE_HEX, NULL, 0, - "inap.OCTET_STRING", HFILL }}, + "inap.ChargingEvent", HFILL }}, { &hf_inap_bcsmEvents, { "bcsmEvents", "inap.bcsmEvents", FT_UINT32, BASE_DEC, NULL, 0, @@ -6544,7 +5752,7 @@ void proto_register_inap(void) { { &hf_inap_bearerCap, { "bearerCap", "inap.bearerCap", FT_BYTES, BASE_HEX, NULL, 0, - "inap.BearerCap", HFILL }}, + "inap.T_bearerCap", HFILL }}, { &hf_inap_tmr, { "tmr", "inap.tmr", FT_BYTES, BASE_HEX, NULL, 0, @@ -6681,6 +5889,18 @@ void proto_register_inap(void) { { "tDisconnectSpecificInfo", "inap.tDisconnectSpecificInfo", FT_NONE, BASE_NONE, NULL, 0, "inap.T_tDisconnectSpecificInfo", HFILL }}, + { &hf_inap_type, + { "type", "inap.type", + FT_UINT32, BASE_DEC, NULL, 0, + "inap.ExtensionType", HFILL }}, + { &hf_inap_criticality, + { "criticality", "inap.criticality", + FT_UINT32, BASE_DEC, VALS(inap_Criticality_vals), 0, + "inap.Criticality", HFILL }}, + { &hf_inap_value, + { "value", "inap.value", + FT_NONE, BASE_NONE, NULL, 0, + "inap.T_value", HFILL }}, { &hf_inap_trunkGroupID, { "trunkGroupID", "inap.trunkGroupID", FT_INT32, BASE_DEC, NULL, 0, @@ -6705,8 +5925,8 @@ void proto_register_inap(void) { { "maximumNumberOfCounters", "inap.maximumNumberOfCounters", FT_UINT32, BASE_DEC, NULL, 0, "inap.MaximumNumberOfCounters", HFILL }}, - { &hf_inap_interval1, - { "interval1", "inap.interval1", + { &hf_inap_interval, + { "interval", "inap.interval", FT_INT32, BASE_DEC, NULL, 0, "inap.INTEGER_M1_32000", HFILL }}, { &hf_inap_numberOfCalls, @@ -6761,10 +5981,10 @@ void proto_register_inap(void) { { "gapInterval", "inap.gapInterval", FT_INT32, BASE_DEC, NULL, 0, "inap.Interval", HFILL }}, - { &hf_inap_both, + { &hf_inap_both_01, { "both", "inap.both", FT_NONE, BASE_NONE, NULL, 0, - "inap.T_both", HFILL }}, + "inap.T_both_01", HFILL }}, { &hf_inap_messageID, { "messageID", "inap.messageID", FT_UINT32, BASE_DEC, VALS(inap_MessageID_vals), 0, @@ -6773,11 +5993,11 @@ void proto_register_inap(void) { { "numberOfRepetitions", "inap.numberOfRepetitions", FT_UINT32, BASE_DEC, NULL, 0, "inap.INTEGER_1_127", HFILL }}, - { &hf_inap_duration3, - { "duration3", "inap.duration3", + { &hf_inap_duration_01, + { "duration", "inap.duration", FT_UINT32, BASE_DEC, NULL, 0, "inap.INTEGER_0_32767", HFILL }}, - { &hf_inap_interval, + { &hf_inap_interval_01, { "interval", "inap.interval", FT_UINT32, BASE_DEC, NULL, 0, "inap.INTEGER_0_32767", HFILL }}, @@ -6892,13 +6112,13 @@ void proto_register_inap(void) { { &hf_inap_RouteList_item, { "Item", "inap.RouteList_item", FT_BYTES, BASE_HEX, NULL, 0, - "inap.OCTET_STRING", HFILL }}, + "inap.OCTET_STRING_SIZE_minRouteListLength_maxRouteListLength", HFILL }}, { &hf_inap_toneID, { "toneID", "inap.toneID", FT_UINT32, BASE_DEC, NULL, 0, "inap.Integer4", HFILL }}, - { &hf_inap_tone_duration, - { "tone-duration", "inap.tone_duration", + { &hf_inap_duration_02, + { "duration", "inap.duration", FT_UINT32, BASE_DEC, NULL, 0, "inap.Integer4", HFILL }}, { &hf_inap_integer, @@ -6913,22 +6133,66 @@ void proto_register_inap(void) { { "time", "inap.time", FT_BYTES, BASE_HEX, NULL, 0, "inap.OCTET_STRING_SIZE_2", HFILL }}, - { &hf_inap_date2, - { "date2", "inap.date2", + { &hf_inap_date, + { "date", "inap.date", FT_BYTES, BASE_HEX, NULL, 0, "inap.OCTET_STRING_SIZE_3", HFILL }}, { &hf_inap_price, { "price", "inap.price", FT_BYTES, BASE_HEX, NULL, 0, "inap.OCTET_STRING_SIZE_4", HFILL }}, - { &hf_inap_problem_01, - { "problem", "inap.problem", - FT_UINT32, BASE_DEC, VALS(inap_T_problem_01_vals), 0, - "inap.T_problem_01", HFILL }}, - { &hf_inap_operation, - { "operation", "inap.operation", + { &hf_inap_originalCallID, + { "originalCallID", "inap.originalCallID", FT_INT32, BASE_DEC, NULL, 0, - "inap.INTEGER_M128_127", HFILL }}, + "inap.CallID", HFILL }}, + { &hf_inap_destinationCallID, + { "destinationCallID", "inap.destinationCallID", + FT_INT32, BASE_DEC, NULL, 0, + "inap.CallID", HFILL }}, + { &hf_inap_newLegID, + { "newLegID", "inap.newLegID", + FT_UINT32, BASE_DEC, VALS(inap_LegID_vals), 0, + "inap.LegID", HFILL }}, + { &hf_inap_correlationidentifier, + { "correlationidentifier", "inap.correlationidentifier", + FT_BYTES, BASE_HEX, NULL, 0, + "inap.CorrelationID", HFILL }}, + { &hf_inap_CallPartyHandlingResultsArg_item, + { "Item", "inap.CallPartyHandlingResultsArg_item", + FT_NONE, BASE_NONE, NULL, 0, + "inap.LegInformation", HFILL }}, + { &hf_inap_callID, + { "callID", "inap.callID", + FT_INT32, BASE_DEC, NULL, 0, + "inap.CallID", HFILL }}, + { &hf_inap_targetCallID, + { "targetCallID", "inap.targetCallID", + FT_INT32, BASE_DEC, NULL, 0, + "inap.CallID", HFILL }}, + { &hf_inap_legToBeConnectedID, + { "legToBeConnectedID", "inap.legToBeConnectedID", + FT_UINT32, BASE_DEC, VALS(inap_LegID_vals), 0, + "inap.LegID", HFILL }}, + { &hf_inap_legToBeDetached, + { "legToBeDetached", "inap.legToBeDetached", + FT_UINT32, BASE_DEC, VALS(inap_LegID_vals), 0, + "inap.LegID", HFILL }}, + { &hf_inap_heldLegID, + { "heldLegID", "inap.heldLegID", + FT_UINT32, BASE_DEC, VALS(inap_LegID_vals), 0, + "inap.LegID", HFILL }}, + { &hf_inap_legToBeReleased, + { "legToBeReleased", "inap.legToBeReleased", + FT_UINT32, BASE_DEC, VALS(inap_LegID_vals), 0, + "inap.LegID", HFILL }}, + { &hf_inap_releaseCause_01, + { "releaseCause", "inap.releaseCause", + FT_BYTES, BASE_HEX, NULL, 0, + "inap.CauseQ763", HFILL }}, + { &hf_inap_legStatus, + { "legStatus", "inap.legStatus", + FT_UINT32, BASE_DEC, VALS(inap_LegStatus_vals), 0, + "inap.LegStatus", HFILL }}, /*--- End of included file: packet-inap-hfarr.c ---*/ #line 459 "packet-inap-template.c" @@ -6956,18 +6220,9 @@ void proto_register_inap(void) { &ett_inap_T_problem, &ett_inap_OPERATION, &ett_inap_ERROR, - &ett_inap_AddPartyArg, - &ett_inap_AttachArg, - &ett_inap_CallPartyHandlingResultsArg, - &ett_inap_ChangePartiesArg, - &ett_inap_DetachArg, - &ett_inap_HoldCallPartyConnectionArg, - &ett_inap_ReconnectArg, - &ett_inap_ReleaseCallPartyConnectionArg, - &ett_inap_LegInformation, - &ett_inap_Extensions, - &ett_inap_Extensions_item, + &ett_inap_CancelFailed, &ett_inap_ActivateServiceFilteringArg, + &ett_inap_SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField, &ett_inap_AnalysedInformationArg, &ett_inap_AnalyseInformationArg, &ett_inap_ApplyChargingArg, @@ -6982,30 +6237,27 @@ void proto_register_inap(void) { &ett_inap_ConnectArg, &ett_inap_ConnectToResourceArg, &ett_inap_T_resourceAddress, - &ett_inap_T_both2, + &ett_inap_T_both, &ett_inap_DpSpecificCommonParameters, &ett_inap_EstablishTemporaryConnectionArg, &ett_inap_EventNotificationChargingArg, &ett_inap_EventReportBCSMArg, &ett_inap_HoldCallInNetworkArg, - &ett_inap_InitialDP, + &ett_inap_InitialDPArg, &ett_inap_InitiateCallAttemptArg, &ett_inap_MidCallArg, &ett_inap_OAnswerArg, &ett_inap_OCalledPartyBusyArg, &ett_inap_ODisconnectArg, - &ett_inap_ONoAnswer, + &ett_inap_ONoAnswerArg, &ett_inap_OriginationAttemptAuthorizedArg, &ett_inap_PlayAnnouncementArg, &ett_inap_PromptAndCollectUserInformationArg, &ett_inap_ReceivedInformationArg, - &ett_inap_ReleaseCallArg, - &ett_inap_T_allCallSegments, &ett_inap_RequestCurrentStatusReportResultArg, &ett_inap_RequestEveryStatusChangeReportArg, &ett_inap_RequestFirstStatusMatchReportArg, - &ett_inap_RequestNotificationChargingEvent, - &ett_inap_RequestNotificationChargingEvent_item, + &ett_inap_RequestNotificationChargingEventArg, &ett_inap_RequestReportBCSMEventArg, &ett_inap_SEQUENCE_SIZE_1_numOfBCSMEvents_OF_BCSMEvent, &ett_inap_ResetTimerArg, @@ -7043,6 +6295,7 @@ void proto_register_inap(void) { &ett_inap_T_tAnswerSpecificInfo, &ett_inap_T_tMidCallSpecificInfo, &ett_inap_T_tDisconnectSpecificInfo, + &ett_inap_ExtensionField, &ett_inap_FacilityGroup, &ett_inap_FilteredCallTreatment, &ett_inap_FilteringCharacteristics, @@ -7055,7 +6308,7 @@ void proto_register_inap(void) { &ett_inap_GapOnService, &ett_inap_GapIndicators, &ett_inap_GapTreatment, - &ett_inap_T_both, + &ett_inap_T_both_01, &ett_inap_InbandInfo, &ett_inap_InformationToSend, &ett_inap_LegID, @@ -7074,7 +6327,15 @@ void proto_register_inap(void) { &ett_inap_ServiceAddressInformation, &ett_inap_Tone, &ett_inap_VariablePart, - &ett_inap_CancelFailed, + &ett_inap_AddPartyArg, + &ett_inap_AttachArg, + &ett_inap_CallPartyHandlingResultsArg, + &ett_inap_ChangePartiesArg, + &ett_inap_DetachArg, + &ett_inap_HoldCallPartyConnectionArg, + &ett_inap_ReconnectArg, + &ett_inap_ReleaseCallPartyConnectionArg, + &ett_inap_LegInformation, /*--- End of included file: packet-inap-ettarr.c ---*/ #line 471 "packet-inap-template.c" |