diff --git a/epan/dissectors/asn1/ngap/NGAP-CommonDataTypes.asn b/epan/dissectors/asn1/ngap/NGAP-CommonDataTypes.asn index a3a31f5fec..98173d202f 100644 --- a/epan/dissectors/asn1/ngap/NGAP-CommonDataTypes.asn +++ b/epan/dissectors/asn1/ngap/NGAP-CommonDataTypes.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.413 V16.4.0 (2021-01) +-- 3GPP TS 38.413 V16.5.0 (2021-04) -- 9.4.6 Common Definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/ngap/NGAP-Constants.asn b/epan/dissectors/asn1/ngap/NGAP-Constants.asn index b7ad2f2b02..588d0367f0 100644 --- a/epan/dissectors/asn1/ngap/NGAP-Constants.asn +++ b/epan/dissectors/asn1/ngap/NGAP-Constants.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.413 V16.4.0 (2021-01) +-- 3GPP TS 38.413 V16.5.0 (2021-04) -- 9.4.7 Constant Definitions -- ************************************************************** -- @@ -460,5 +460,8 @@ maxProtocolIEs INTEGER ::= 65535 id-GlobalCable-ID ProtocolIE-ID ::= 275 id-QosMonitoringReportingFrequency ProtocolIE-ID ::= 276 id-QosFlowParametersList ProtocolIE-ID ::= 277 + id-QosFlowFeedbackList ProtocolIE-ID ::= 278 + id-BurstArrivalTimeDownlink ProtocolIE-ID ::= 279 + id-ExtendedUEIdentityIndexValue ProtocolIE-ID ::= 280 END diff --git a/epan/dissectors/asn1/ngap/NGAP-Containers.asn b/epan/dissectors/asn1/ngap/NGAP-Containers.asn index 95e37538f2..19a97dd5f4 100644 --- a/epan/dissectors/asn1/ngap/NGAP-Containers.asn +++ b/epan/dissectors/asn1/ngap/NGAP-Containers.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.413 V16.4.0 (2021-01) +-- 3GPP TS 38.413 V16.5.0 (2021-04) -- 9.4.8 Container Definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/ngap/NGAP-IEs.asn b/epan/dissectors/asn1/ngap/NGAP-IEs.asn index 376b816e58..13df52198e 100644 --- a/epan/dissectors/asn1/ngap/NGAP-IEs.asn +++ b/epan/dissectors/asn1/ngap/NGAP-IEs.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.413 V16.4.0 (2021-01) +-- 3GPP TS 38.413 V16.5.0 (2021-04) -- 9.4.5 Information Element Definitions -- ************************************************************** -- @@ -27,6 +27,7 @@ IMPORTS id-AdditionalRedundantUL-NGU-UP-TNLInformation, id-AdditionalUL-NGU-UP-TNLInformation, id-AlternativeQoSParaSetList, + id-BurstArrivalTimeDownlink, id-Cause, id-CNPacketDelayBudgetDL, id-CNPacketDelayBudgetUL, @@ -46,6 +47,7 @@ IMPORTS id-ExtendedRATRestrictionInformation, id-ExtendedSliceSupportList, id-ExtendedTAISliceSupportList, + id-ExtendedUEIdentityIndexValue, id-GlobalCable-ID, id-GlobalRANNodeID, id-GlobalTNGF-ID, @@ -70,6 +72,7 @@ IMPORTS id-PDUSessionType, id-PSCellInformation, id-QosFlowAddOrModifyRequestList, + id-QosFlowFeedbackList, id-QosFlowParametersList, id-QosFlowSetupRequestList, id-QosFlowToReleaseList, @@ -677,7 +680,7 @@ CauseMisc ::= ENUMERATED { not-enough-user-plane-processing-resources, hardware-failure, om-intervention, - unknown-PLMN, + unknown-PLMN-or-SNPN, unspecified, ... } @@ -971,7 +974,8 @@ CoreNetworkAssistanceInformationForInactive ::= SEQUENCE { } CoreNetworkAssistanceInformationForInactive-ExtIEs NGAP-PROTOCOL-EXTENSION ::= { - { ID id-PagingeDRXInformation CRITICALITY ignore EXTENSION PagingeDRXInformation PRESENCE optional }, + { ID id-PagingeDRXInformation CRITICALITY ignore EXTENSION PagingeDRXInformation PRESENCE optional }| + { ID id-ExtendedUEIdentityIndexValue CRITICALITY reject EXTENSION ExtendedUEIdentityIndexValue PRESENCE optional }, ... } @@ -1603,6 +1607,7 @@ ExtendedRNC-ID ::= INTEGER (4096..65535) ExtendedSliceSupportList ::= SEQUENCE (SIZE(1..maxnoofExtSliceItems)) OF SliceSupportItem +ExtendedUEIdentityIndexValue ::= BIT STRING (SIZE(16)) EventTrigger::= CHOICE { outOfCoverage ENUMERATED {true, ...}, @@ -3277,7 +3282,8 @@ PDUSessionResourceModifyRequestTransferIEs NGAP-PROTOCOL-IES ::= { { ID id-AdditionalUL-NGU-UP-TNLInformation CRITICALITY reject TYPE UPTransportLayerInformationList PRESENCE optional }| { ID id-CommonNetworkInstance CRITICALITY ignore TYPE CommonNetworkInstance PRESENCE optional }| { ID id-AdditionalRedundantUL-NGU-UP-TNLInformation CRITICALITY ignore TYPE UPTransportLayerInformationList PRESENCE optional }| - { ID id-RedundantCommonNetworkInstance CRITICALITY ignore TYPE CommonNetworkInstance PRESENCE optional }, + { ID id-RedundantCommonNetworkInstance CRITICALITY ignore TYPE CommonNetworkInstance PRESENCE optional }| + { ID id-RedundantUL-NGU-UP-TNLInformation CRITICALITY ignore TYPE UPTransportLayerInformation PRESENCE optional }, ... } @@ -3413,7 +3419,8 @@ PDUSessionResourceNotifyTransfer ::= SEQUENCE { } PDUSessionResourceNotifyTransfer-ExtIEs NGAP-PROTOCOL-EXTENSION ::= { - { ID id-SecondaryRATUsageInformation CRITICALITY ignore EXTENSION SecondaryRATUsageInformation PRESENCE optional }, + { ID id-SecondaryRATUsageInformation CRITICALITY ignore EXTENSION SecondaryRATUsageInformation PRESENCE optional }| + { ID id-QosFlowFeedbackList CRITICALITY ignore EXTENSION QosFlowFeedbackList PRESENCE optional }, ... } @@ -3846,6 +3853,21 @@ QosFlowAddOrModifyResponseItem-ExtIEs NGAP-PROTOCOL-EXTENSION ::= { ... } +QosFlowFeedbackList ::= SEQUENCE (SIZE(1..maxnoofQosFlows)) OF QosFlowFeedbackItem + +QosFlowFeedbackItem ::= SEQUENCE { + qosFlowIdentifier QosFlowIdentifier, + updateFeedback UpdateFeedback OPTIONAL, + cNpacketDelayBudgetDL ExtendedPacketDelayBudget OPTIONAL, + cNpacketDelayBudgetUL ExtendedPacketDelayBudget OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {QosFlowFeedbackItem-ExtIEs} } OPTIONAL, + ... +} + +QosFlowFeedbackItem-ExtIEs NGAP-PROTOCOL-EXTENSION ::= { + ... +} + QosFlowIdentifier ::= INTEGER (0..63, ...) QosFlowInformationList ::= SEQUENCE (SIZE(1..maxnoofQosFlows)) OF QosFlowInformationItem @@ -3879,7 +3901,7 @@ QosFlowLevelQosParameters-ExtIEs NGAP-PROTOCOL-EXTENSION ::= { } -QosMonitoringRequest ::= ENUMERATED {ul, dl, both, ...} +QosMonitoringRequest ::= ENUMERATED {ul, dl, both, ..., stop} QosMonitoringReportingFrequency ::= INTEGER (1..1800, ...) @@ -3931,6 +3953,9 @@ QosFlowParametersItem ::= SEQUENCE { } QosFlowParametersItem-ExtIEs NGAP-PROTOCOL-EXTENSION ::= { + { ID id-CNPacketDelayBudgetDL CRITICALITY ignore EXTENSION ExtendedPacketDelayBudget PRESENCE optional }| + { ID id-CNPacketDelayBudgetUL CRITICALITY ignore EXTENSION ExtendedPacketDelayBudget PRESENCE optional }| + { ID id-BurstArrivalTimeDownlink CRITICALITY ignore EXTENSION BurstArrivalTime PRESENCE optional }, ... } @@ -5135,6 +5160,8 @@ ULForwarding ::= ENUMERATED { ... } +UpdateFeedback ::= BIT STRING (SIZE(8, ...)) + UPTransportLayerInformation ::= CHOICE { gTPTunnel GTPTunnel, choice-Extensions ProtocolIE-SingleContainer { {UPTransportLayerInformation-ExtIEs} } diff --git a/epan/dissectors/asn1/ngap/NGAP-PDU-Contents.asn b/epan/dissectors/asn1/ngap/NGAP-PDU-Contents.asn index f76b060a1c..bd2401dc27 100644 --- a/epan/dissectors/asn1/ngap/NGAP-PDU-Contents.asn +++ b/epan/dissectors/asn1/ngap/NGAP-PDU-Contents.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.413 V16.4.0 (2021-01) +-- 3GPP TS 38.413 V16.5.0 (2021-04) -- 9.4.4 PDU Definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/ngap/NGAP-PDU-Descriptions.asn b/epan/dissectors/asn1/ngap/NGAP-PDU-Descriptions.asn index ec7f9e0d9b..dfd63ba350 100644 --- a/epan/dissectors/asn1/ngap/NGAP-PDU-Descriptions.asn +++ b/epan/dissectors/asn1/ngap/NGAP-PDU-Descriptions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.413 V16.4.0 (2021-01) +-- 3GPP TS 38.413 V16.5.0 (2021-04) -- 9.4.3 Elementary Procedure Definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/ngap/ngap.cnf b/epan/dissectors/asn1/ngap/ngap.cnf index b20ee0b84a..ac94bf2658 100644 --- a/epan/dissectors/asn1/ngap/ngap.cnf +++ b/epan/dissectors/asn1/ngap/ngap.cnf @@ -1132,6 +1132,20 @@ FiveG-TMSI TYPE = FT_UINT32 DISPLAY = BASE_DEC_HEX #.TYPE_ATTR QosMonitoringReportingFrequency DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +#.FN_BODY UpdateFeedback VAL_PTR=¶meter_tvb + tvbuff_t *parameter_tvb = NULL; +%(DEFAULT_BODY)s + if (parameter_tvb) { + static int * const fields[] = { + &hf_ngap_UpdateFeedback_CN_PDB_DL, + &hf_ngap_UpdateFeedback_CN_PDB_UL, + &hf_ngap_UpdateFeedback_reserved, + NULL + }; + proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_ngap_UpdateFeedback); + proto_tree_add_bitmask_list(subtree, parameter_tvb, 0, 1, fields, ENC_BIG_ENDIAN); + } + #.ASSIGN_VALUE_TO_TYPE # NGAP does not have constants assigned to types, they are pure INTEGER # ProcedureCode @@ -1480,6 +1494,9 @@ id-Extended-AMFName ProtocolIE-ID id-GlobalCable-ID ProtocolIE-ID id-QosMonitoringReportingFrequency ProtocolIE-ID id-QosFlowParametersList ProtocolIE-ID +id-QosFlowFeedbackList ProtocolIE-ID +id-BurstArrivalTimeDownlink ProtocolIE-ID +id-ExtendedUEIdentityIndexValue ProtocolIE-ID #.END @@ -1770,6 +1787,9 @@ ExtendedSliceSupportList N ngap.extension id-Exten ConfiguredTACIndication N ngap.extension id-ConfiguredTACIndication QosMonitoringReportingFrequency N ngap.extension id-QosMonitoringReportingFrequency QosFlowParametersList N ngap.extension id-QosFlowParametersList +QosFlowFeedbackList N ngap.extension id-QosFlowFeedbackList +BurstArrivalTime N ngap.extension id-BurstArrivalTimeDownlink +ExtendedUEIdentityIndexValue N ngap.extension id-ExtendedUEIdentityIndexValue #NGAP-ELEMENTARY-PROCEDURE diff --git a/epan/dissectors/asn1/ngap/packet-ngap-template.c b/epan/dissectors/asn1/ngap/packet-ngap-template.c index 91acd75ef1..9dc5ab46fe 100644 --- a/epan/dissectors/asn1/ngap/packet-ngap-template.c +++ b/epan/dissectors/asn1/ngap/packet-ngap-template.c @@ -8,7 +8,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later * - * References: 3GPP TS 38.413 v16.4.0 (2021-01) + * References: 3GPP TS 38.413 v16.5.0 (2021-04) */ #include "config.h" @@ -115,6 +115,9 @@ static int hf_ngap_MeasurementsToActivate_reserved = -1; static int hf_ngap_MDT_Location_Information_GNSS = -1; static int hf_ngap_MDT_Location_Information_reserved = -1; static int hf_ngap_GlobalCable_ID_str = -1; +static int hf_ngap_UpdateFeedback_CN_PDB_DL = -1; +static int hf_ngap_UpdateFeedback_CN_PDB_UL = -1; +static int hf_ngap_UpdateFeedback_reserved = -1; #include "packet-ngap-hf.c" /* Initialize the subtree pointers */ @@ -157,6 +160,7 @@ static gint ett_ngap_NRUERLFReportContainer = -1; static gint ett_ngap_TargettoSource_Failure_TransparentContainer = -1; static gint ett_ngap_UERadioCapabilityForPagingOfNB_IoT = -1; static gint ett_ngap_GlobalCable_ID = -1; +static gint ett_ngap_UpdateFeedback = -1; #include "packet-ngap-ett.c" static expert_field ei_ngap_number_pages_le15 = EI_INIT; @@ -460,6 +464,11 @@ ngap_is_nbiot_ue(packet_info *pinfo) return FALSE; } +const true_false_string ngap_not_updated_updated = { + "Not updated", + "Updated" +}; + #include "packet-ngap-fn.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) @@ -915,6 +924,18 @@ void proto_register_ngap(void) { { "GlobalCable-ID", "ngap.GlobalCable_ID.str", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_ngap_UpdateFeedback_CN_PDB_DL, + { "CN PDB DL", "ngap.UpdateFeedback.CN_PDB_DL", + FT_BOOLEAN, 8, TFS(&ngap_not_updated_updated), 0x80, + NULL, HFILL }}, + { &hf_ngap_UpdateFeedback_CN_PDB_UL, + { "CN PDB UL", "ngap.UpdateFeedback.CN_PDB_UL", + FT_BOOLEAN, 8, TFS(&ngap_not_updated_updated), 0x40, + NULL, HFILL }}, + { &hf_ngap_UpdateFeedback_reserved, + { "Reserved", "ngap.UpdateFeedback.reserved", + FT_UINT8, BASE_HEX, NULL, 0x3f, + NULL, HFILL }}, #include "packet-ngap-hfarr.c" }; @@ -959,6 +980,7 @@ void proto_register_ngap(void) { &ett_ngap_TargettoSource_Failure_TransparentContainer, &ett_ngap_UERadioCapabilityForPagingOfNB_IoT, &ett_ngap_GlobalCable_ID, + &ett_ngap_UpdateFeedback, #include "packet-ngap-ettarr.c" }; diff --git a/epan/dissectors/packet-ngap.c b/epan/dissectors/packet-ngap.c index 1850e6330d..a12fb35101 100644 --- a/epan/dissectors/packet-ngap.c +++ b/epan/dissectors/packet-ngap.c @@ -16,7 +16,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later * - * References: 3GPP TS 38.413 v16.4.0 (2021-01) + * References: 3GPP TS 38.413 v16.5.0 (2021-04) */ #include "config.h" @@ -482,7 +482,10 @@ typedef enum _ProtocolIE_ID_enum { id_Extended_AMFName = 274, id_GlobalCable_ID = 275, id_QosMonitoringReportingFrequency = 276, - id_QosFlowParametersList = 277 + id_QosFlowParametersList = 277, + id_QosFlowFeedbackList = 278, + id_BurstArrivalTimeDownlink = 279, + id_ExtendedUEIdentityIndexValue = 280 } ProtocolIE_ID_enum; typedef enum _GlobalRANNodeID_enum { @@ -558,6 +561,9 @@ static int hf_ngap_MeasurementsToActivate_reserved = -1; static int hf_ngap_MDT_Location_Information_GNSS = -1; static int hf_ngap_MDT_Location_Information_reserved = -1; static int hf_ngap_GlobalCable_ID_str = -1; +static int hf_ngap_UpdateFeedback_CN_PDB_DL = -1; +static int hf_ngap_UpdateFeedback_CN_PDB_UL = -1; +static int hf_ngap_UpdateFeedback_reserved = -1; /*--- Included file: packet-ngap-hf.c ---*/ #line 1 "./asn1/ngap/packet-ngap-hf.c" @@ -577,6 +583,7 @@ static int hf_ngap_AssociatedQosFlowList_PDU = -1; /* AssociatedQosFlowList */ static int hf_ngap_AuthenticatedIndication_PDU = -1; /* AuthenticatedIndication */ static int hf_ngap_BroadcastCancelledAreaList_PDU = -1; /* BroadcastCancelledAreaList */ static int hf_ngap_BroadcastCompletedAreaList_PDU = -1; /* BroadcastCompletedAreaList */ +static int hf_ngap_BurstArrivalTime_PDU = -1; /* BurstArrivalTime */ static int hf_ngap_CancelAllWarningMessages_PDU = -1; /* CancelAllWarningMessages */ static int hf_ngap_Cause_PDU = -1; /* Cause */ static int hf_ngap_CellIDListForRestart_PDU = -1; /* CellIDListForRestart */ @@ -614,6 +621,7 @@ static int hf_ngap_ExtendedPacketDelayBudget_PDU = -1; /* ExtendedPacketDelayBu static int hf_ngap_Extended_RANNodeName_PDU = -1; /* Extended_RANNodeName */ static int hf_ngap_ExtendedRATRestrictionInformation_PDU = -1; /* ExtendedRATRestrictionInformation */ static int hf_ngap_ExtendedSliceSupportList_PDU = -1; /* ExtendedSliceSupportList */ +static int hf_ngap_ExtendedUEIdentityIndexValue_PDU = -1; /* ExtendedUEIdentityIndexValue */ static int hf_ngap_FiveG_S_TMSI_PDU = -1; /* FiveG_S_TMSI */ static int hf_ngap_GlobalCable_ID_PDU = -1; /* GlobalCable_ID */ static int hf_ngap_GlobalRANNodeID_PDU = -1; /* GlobalRANNodeID */ @@ -738,6 +746,7 @@ static int hf_ngap_PLMNIdentity_PDU = -1; /* PLMNIdentity */ static int hf_ngap_PLMNSupportList_PDU = -1; /* PLMNSupportList */ static int hf_ngap_PWSFailedCellIDList_PDU = -1; /* PWSFailedCellIDList */ static int hf_ngap_QosFlowAddOrModifyRequestList_PDU = -1; /* QosFlowAddOrModifyRequestList */ +static int hf_ngap_QosFlowFeedbackList_PDU = -1; /* QosFlowFeedbackList */ static int hf_ngap_QosMonitoringRequest_PDU = -1; /* QosMonitoringRequest */ static int hf_ngap_QosMonitoringReportingFrequency_PDU = -1; /* QosMonitoringReportingFrequency */ static int hf_ngap_QosFlowListWithCause_PDU = -1; /* QosFlowListWithCause */ @@ -1451,6 +1460,10 @@ static int hf_ngap_QosFlowAcceptedList_item = -1; /* QosFlowAcceptedItem */ static int hf_ngap_QosFlowAddOrModifyRequestList_item = -1; /* QosFlowAddOrModifyRequestItem */ static int hf_ngap_qosFlowLevelQosParameters = -1; /* QosFlowLevelQosParameters */ static int hf_ngap_QosFlowAddOrModifyResponseList_item = -1; /* QosFlowAddOrModifyResponseItem */ +static int hf_ngap_QosFlowFeedbackList_item = -1; /* QosFlowFeedbackItem */ +static int hf_ngap_updateFeedback = -1; /* UpdateFeedback */ +static int hf_ngap_cNpacketDelayBudgetDL = -1; /* ExtendedPacketDelayBudget */ +static int hf_ngap_cNpacketDelayBudgetUL = -1; /* ExtendedPacketDelayBudget */ static int hf_ngap_QosFlowInformationList_item = -1; /* QosFlowInformationItem */ static int hf_ngap_qosCharacteristics = -1; /* QosCharacteristics */ static int hf_ngap_allocationAndRetentionPriority = -1; /* AllocationAndRetentionPriority */ @@ -1655,7 +1668,7 @@ static int hf_ngap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_ngap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ /*--- End of included file: packet-ngap-hf.c ---*/ -#line 119 "./asn1/ngap/packet-ngap-template.c" +#line 122 "./asn1/ngap/packet-ngap-template.c" /* Initialize the subtree pointers */ static gint ett_ngap = -1; @@ -1697,6 +1710,7 @@ static gint ett_ngap_NRUERLFReportContainer = -1; static gint ett_ngap_TargettoSource_Failure_TransparentContainer = -1; static gint ett_ngap_UERadioCapabilityForPagingOfNB_IoT = -1; static gint ett_ngap_GlobalCable_ID = -1; +static gint ett_ngap_UpdateFeedback = -1; /*--- Included file: packet-ngap-ett.c ---*/ #line 1 "./asn1/ngap/packet-ngap-ett.c" @@ -2053,6 +2067,8 @@ static gint ett_ngap_QosFlowAddOrModifyRequestList = -1; static gint ett_ngap_QosFlowAddOrModifyRequestItem = -1; static gint ett_ngap_QosFlowAddOrModifyResponseList = -1; static gint ett_ngap_QosFlowAddOrModifyResponseItem = -1; +static gint ett_ngap_QosFlowFeedbackList = -1; +static gint ett_ngap_QosFlowFeedbackItem = -1; static gint ett_ngap_QosFlowInformationList = -1; static gint ett_ngap_QosFlowInformationItem = -1; static gint ett_ngap_QosFlowLevelQosParameters = -1; @@ -2303,7 +2319,7 @@ static gint ett_ngap_SuccessfulOutcome = -1; static gint ett_ngap_UnsuccessfulOutcome = -1; /*--- End of included file: packet-ngap-ett.c ---*/ -#line 161 "./asn1/ngap/packet-ngap-template.c" +#line 165 "./asn1/ngap/packet-ngap-template.c" static expert_field ei_ngap_number_pages_le15 = EI_INIT; @@ -2606,6 +2622,11 @@ ngap_is_nbiot_ue(packet_info *pinfo) return FALSE; } +const true_false_string ngap_not_updated_updated = { + "Not updated", + "Updated" +}; + /*--- Included file: packet-ngap-fn.c ---*/ #line 1 "./asn1/ngap/packet-ngap-fn.c" @@ -3055,6 +3076,9 @@ static const value_string ngap_ProtocolIE_ID_vals[] = { { id_GlobalCable_ID, "id-GlobalCable-ID" }, { id_QosMonitoringReportingFrequency, "id-QosMonitoringReportingFrequency" }, { id_QosFlowParametersList, "id-QosFlowParametersList" }, + { id_QosFlowFeedbackList, "id-QosFlowFeedbackList" }, + { id_BurstArrivalTimeDownlink, "id-BurstArrivalTimeDownlink" }, + { id_ExtendedUEIdentityIndexValue, "id-ExtendedUEIdentityIndexValue" }, { 0, NULL } }; @@ -6112,7 +6136,7 @@ static const value_string ngap_CauseMisc_vals[] = { { 1, "not-enough-user-plane-processing-resources" }, { 2, "hardware-failure" }, { 3, "om-intervention" }, - { 4, "unknown-PLMN" }, + { 4, "unknown-PLMN-or-SNPN" }, { 5, "unspecified" }, { 0, NULL } }; @@ -8047,6 +8071,16 @@ dissect_ngap_ExtendedSliceSupportList(tvbuff_t *tvb _U_, int offset _U_, asn1_ct } + +static int +dissect_ngap_ExtendedUEIdentityIndexValue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, + 16, 16, FALSE, NULL, 0, NULL, NULL); + + return offset; +} + + static const value_string ngap_T_outOfCoverage_vals[] = { { 0, "true" }, { 0, NULL } @@ -13920,10 +13954,68 @@ dissect_ngap_QosFlowAddOrModifyRequestList(tvbuff_t *tvb _U_, int offset _U_, as } + +static int +dissect_ngap_UpdateFeedback(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1136 "./asn1/ngap/ngap.cnf" + tvbuff_t *parameter_tvb = NULL; + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, + 8, 8, TRUE, NULL, 0, ¶meter_tvb, NULL); + + if (parameter_tvb) { + static int * const fields[] = { + &hf_ngap_UpdateFeedback_CN_PDB_DL, + &hf_ngap_UpdateFeedback_CN_PDB_UL, + &hf_ngap_UpdateFeedback_reserved, + NULL + }; + proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_ngap_UpdateFeedback); + proto_tree_add_bitmask_list(subtree, parameter_tvb, 0, 1, fields, ENC_BIG_ENDIAN); + } + + + + return offset; +} + + +static const per_sequence_t QosFlowFeedbackItem_sequence[] = { + { &hf_ngap_qosFlowIdentifier, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowIdentifier }, + { &hf_ngap_updateFeedback , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_UpdateFeedback }, + { &hf_ngap_cNpacketDelayBudgetDL, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ExtendedPacketDelayBudget }, + { &hf_ngap_cNpacketDelayBudgetUL, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ExtendedPacketDelayBudget }, + { &hf_ngap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_ngap_QosFlowFeedbackItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_ngap_QosFlowFeedbackItem, QosFlowFeedbackItem_sequence); + + return offset; +} + + +static const per_sequence_t QosFlowFeedbackList_sequence_of[1] = { + { &hf_ngap_QosFlowFeedbackList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ngap_QosFlowFeedbackItem }, +}; + +static int +dissect_ngap_QosFlowFeedbackList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_ngap_QosFlowFeedbackList, QosFlowFeedbackList_sequence_of, + 1, maxnoofQosFlows, FALSE); + + return offset; +} + + static const value_string ngap_QosMonitoringRequest_vals[] = { { 0, "ul" }, { 1, "dl" }, { 2, "both" }, + { 3, "stop" }, { 0, NULL } }; @@ -13931,7 +14023,7 @@ static const value_string ngap_QosMonitoringRequest_vals[] = { static int dissect_ngap_QosMonitoringRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, - 3, NULL, TRUE, 0, NULL); + 3, NULL, TRUE, 1, NULL); return offset; } @@ -16385,7 +16477,7 @@ static const per_sequence_t PDUSessionResourceSetupRequest_sequence[] = { static int dissect_ngap_PDUSessionResourceSetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2121 "./asn1/ngap/ngap.cnf" +#line 2141 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceSetupRequest"); @@ -16403,7 +16495,7 @@ static const per_sequence_t PDUSessionResourceSetupResponse_sequence[] = { static int dissect_ngap_PDUSessionResourceSetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2124 "./asn1/ngap/ngap.cnf" +#line 2144 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceSetupResponse"); @@ -16421,7 +16513,7 @@ static const per_sequence_t PDUSessionResourceReleaseCommand_sequence[] = { static int dissect_ngap_PDUSessionResourceReleaseCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2115 "./asn1/ngap/ngap.cnf" +#line 2135 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceReleaseCommand"); @@ -16439,7 +16531,7 @@ static const per_sequence_t PDUSessionResourceReleaseResponse_sequence[] = { static int dissect_ngap_PDUSessionResourceReleaseResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2118 "./asn1/ngap/ngap.cnf" +#line 2138 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceReleaseResponse"); @@ -16457,7 +16549,7 @@ static const per_sequence_t PDUSessionResourceModifyRequest_sequence[] = { static int dissect_ngap_PDUSessionResourceModifyRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2100 "./asn1/ngap/ngap.cnf" +#line 2120 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceModifyRequest"); @@ -16475,7 +16567,7 @@ static const per_sequence_t PDUSessionResourceModifyResponse_sequence[] = { static int dissect_ngap_PDUSessionResourceModifyResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2103 "./asn1/ngap/ngap.cnf" +#line 2123 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceModifyResponse"); @@ -16493,7 +16585,7 @@ static const per_sequence_t PDUSessionResourceNotify_sequence[] = { static int dissect_ngap_PDUSessionResourceNotify(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2112 "./asn1/ngap/ngap.cnf" +#line 2132 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceNotify"); @@ -16511,7 +16603,7 @@ static const per_sequence_t PDUSessionResourceModifyIndication_sequence[] = { static int dissect_ngap_PDUSessionResourceModifyIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2106 "./asn1/ngap/ngap.cnf" +#line 2126 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceModifyIndication"); @@ -16529,7 +16621,7 @@ static const per_sequence_t PDUSessionResourceModifyConfirm_sequence[] = { static int dissect_ngap_PDUSessionResourceModifyConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2109 "./asn1/ngap/ngap.cnf" +#line 2129 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceModifyConfirm"); @@ -16547,7 +16639,7 @@ static const per_sequence_t InitialContextSetupRequest_sequence[] = { static int dissect_ngap_InitialContextSetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2043 "./asn1/ngap/ngap.cnf" +#line 2063 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "InitialContextSetupRequest"); @@ -16565,7 +16657,7 @@ static const per_sequence_t InitialContextSetupResponse_sequence[] = { static int dissect_ngap_InitialContextSetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2046 "./asn1/ngap/ngap.cnf" +#line 2066 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "InitialContextSetupResponse"); @@ -16583,7 +16675,7 @@ static const per_sequence_t InitialContextSetupFailure_sequence[] = { static int dissect_ngap_InitialContextSetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2049 "./asn1/ngap/ngap.cnf" +#line 2069 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "InitialContextSetupFailure"); @@ -16601,7 +16693,7 @@ static const per_sequence_t UEContextReleaseRequest_sequence[] = { static int dissect_ngap_UEContextReleaseRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2187 "./asn1/ngap/ngap.cnf" +#line 2207 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextReleaseRequest"); @@ -16619,7 +16711,7 @@ static const per_sequence_t UEContextReleaseCommand_sequence[] = { static int dissect_ngap_UEContextReleaseCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2181 "./asn1/ngap/ngap.cnf" +#line 2201 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextReleaseCommand"); @@ -16637,7 +16729,7 @@ static const per_sequence_t UEContextReleaseComplete_sequence[] = { static int dissect_ngap_UEContextReleaseComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2184 "./asn1/ngap/ngap.cnf" +#line 2204 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextReleaseComplete"); @@ -16655,7 +16747,7 @@ static const per_sequence_t UEContextResumeRequest_sequence[] = { static int dissect_ngap_UEContextResumeRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2190 "./asn1/ngap/ngap.cnf" +#line 2210 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextResumeRequest"); @@ -16673,7 +16765,7 @@ static const per_sequence_t UEContextResumeResponse_sequence[] = { static int dissect_ngap_UEContextResumeResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2193 "./asn1/ngap/ngap.cnf" +#line 2213 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextResumeResponse"); @@ -16691,7 +16783,7 @@ static const per_sequence_t UEContextResumeFailure_sequence[] = { static int dissect_ngap_UEContextResumeFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2196 "./asn1/ngap/ngap.cnf" +#line 2216 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextResumeFailure"); @@ -16709,7 +16801,7 @@ static const per_sequence_t UEContextSuspendRequest_sequence[] = { static int dissect_ngap_UEContextSuspendRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2199 "./asn1/ngap/ngap.cnf" +#line 2219 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextSuspendRequest"); @@ -16727,7 +16819,7 @@ static const per_sequence_t UEContextSuspendResponse_sequence[] = { static int dissect_ngap_UEContextSuspendResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2202 "./asn1/ngap/ngap.cnf" +#line 2222 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextSuspendResponse"); @@ -16745,7 +16837,7 @@ static const per_sequence_t UEContextSuspendFailure_sequence[] = { static int dissect_ngap_UEContextSuspendFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2205 "./asn1/ngap/ngap.cnf" +#line 2225 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextSuspendFailure"); @@ -16763,7 +16855,7 @@ static const per_sequence_t UEContextModificationRequest_sequence[] = { static int dissect_ngap_UEContextModificationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2172 "./asn1/ngap/ngap.cnf" +#line 2192 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationRequest"); @@ -16781,7 +16873,7 @@ static const per_sequence_t UEContextModificationResponse_sequence[] = { static int dissect_ngap_UEContextModificationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2175 "./asn1/ngap/ngap.cnf" +#line 2195 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationResponse"); @@ -16799,7 +16891,7 @@ static const per_sequence_t UEContextModificationFailure_sequence[] = { static int dissect_ngap_UEContextModificationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2178 "./asn1/ngap/ngap.cnf" +#line 2198 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationFailure"); @@ -16817,7 +16909,7 @@ static const per_sequence_t RRCInactiveTransitionReport_sequence[] = { static int dissect_ngap_RRCInactiveTransitionReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2160 "./asn1/ngap/ngap.cnf" +#line 2180 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RRCInactiveTransitionReport"); @@ -16835,7 +16927,7 @@ static const per_sequence_t RetrieveUEInformation_sequence[] = { static int dissect_ngap_RetrieveUEInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2157 "./asn1/ngap/ngap.cnf" +#line 2177 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RetrieveUEInformation"); @@ -16853,7 +16945,7 @@ static const per_sequence_t UEInformationTransfer_sequence[] = { static int dissect_ngap_UEInformationTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2208 "./asn1/ngap/ngap.cnf" +#line 2228 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEInformationTransfer"); @@ -16871,7 +16963,7 @@ static const per_sequence_t RANCPRelocationIndication_sequence[] = { static int dissect_ngap_RANCPRelocationIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2151 "./asn1/ngap/ngap.cnf" +#line 2171 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RANCPRelocationIndication"); @@ -16889,7 +16981,7 @@ static const per_sequence_t HandoverRequired_sequence[] = { static int dissect_ngap_HandoverRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2022 "./asn1/ngap/ngap.cnf" +#line 2042 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverRequired"); @@ -16907,7 +16999,7 @@ static const per_sequence_t HandoverCommand_sequence[] = { static int dissect_ngap_HandoverCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2025 "./asn1/ngap/ngap.cnf" +#line 2045 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverCommand"); @@ -16925,7 +17017,7 @@ static const per_sequence_t HandoverPreparationFailure_sequence[] = { static int dissect_ngap_HandoverPreparationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2028 "./asn1/ngap/ngap.cnf" +#line 2048 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverPreparationFailure"); @@ -16964,7 +17056,7 @@ static const per_sequence_t HandoverRequestAcknowledge_sequence[] = { static int dissect_ngap_HandoverRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2034 "./asn1/ngap/ngap.cnf" +#line 2054 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverRequestAcknowledge"); @@ -16982,7 +17074,7 @@ static const per_sequence_t HandoverFailure_sequence[] = { static int dissect_ngap_HandoverFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2037 "./asn1/ngap/ngap.cnf" +#line 2057 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverFailure"); @@ -17000,7 +17092,7 @@ static const per_sequence_t HandoverNotify_sequence[] = { static int dissect_ngap_HandoverNotify(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2019 "./asn1/ngap/ngap.cnf" +#line 2039 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverNotify"); @@ -17018,7 +17110,7 @@ static const per_sequence_t PathSwitchRequest_sequence[] = { static int dissect_ngap_PathSwitchRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2091 "./asn1/ngap/ngap.cnf" +#line 2111 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PathSwitchRequest"); @@ -17036,7 +17128,7 @@ static const per_sequence_t PathSwitchRequestAcknowledge_sequence[] = { static int dissect_ngap_PathSwitchRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2094 "./asn1/ngap/ngap.cnf" +#line 2114 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PathSwitchRequestAcknowledge"); @@ -17054,7 +17146,7 @@ static const per_sequence_t PathSwitchRequestFailure_sequence[] = { static int dissect_ngap_PathSwitchRequestFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2097 "./asn1/ngap/ngap.cnf" +#line 2117 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PathSwitchRequestFailure"); @@ -17072,7 +17164,7 @@ static const per_sequence_t HandoverCancel_sequence[] = { static int dissect_ngap_HandoverCancel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2013 "./asn1/ngap/ngap.cnf" +#line 2033 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverCancel"); @@ -17090,7 +17182,7 @@ static const per_sequence_t HandoverCancelAcknowledge_sequence[] = { static int dissect_ngap_HandoverCancelAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2016 "./asn1/ngap/ngap.cnf" +#line 2036 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverCancelAcknowledge"); @@ -17108,7 +17200,7 @@ static const per_sequence_t HandoverSuccess_sequence[] = { static int dissect_ngap_HandoverSuccess(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2040 "./asn1/ngap/ngap.cnf" +#line 2060 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverSuccess"); @@ -17126,7 +17218,7 @@ static const per_sequence_t UplinkRANEarlyStatusTransfer_sequence[] = { static int dissect_ngap_UplinkRANEarlyStatusTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2238 "./asn1/ngap/ngap.cnf" +#line 2258 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UplinkRANEarlyStatusTransfer"); @@ -17144,7 +17236,7 @@ static const per_sequence_t DownlinkRANEarlyStatusTransfer_sequence[] = { static int dissect_ngap_DownlinkRANEarlyStatusTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2001 "./asn1/ngap/ngap.cnf" +#line 2021 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DownlinkRANEarlyStatusTransfer"); @@ -17162,7 +17254,7 @@ static const per_sequence_t UplinkRANStatusTransfer_sequence[] = { static int dissect_ngap_UplinkRANStatusTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2241 "./asn1/ngap/ngap.cnf" +#line 2261 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UplinkRANStatusTransfer"); @@ -17180,7 +17272,7 @@ static const per_sequence_t DownlinkRANStatusTransfer_sequence[] = { static int dissect_ngap_DownlinkRANStatusTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2004 "./asn1/ngap/ngap.cnf" +#line 2024 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DownlinkRANStatusTransfer"); @@ -17198,7 +17290,7 @@ static const per_sequence_t Paging_sequence[] = { static int dissect_ngap_Paging(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2088 "./asn1/ngap/ngap.cnf" +#line 2108 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Paging"); @@ -17309,7 +17401,7 @@ static const per_sequence_t NASNonDeliveryIndication_sequence[] = { static int dissect_ngap_NASNonDeliveryIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2064 "./asn1/ngap/ngap.cnf" +#line 2084 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NASNonDeliveryIndication"); @@ -17327,7 +17419,7 @@ static const per_sequence_t RerouteNASRequest_sequence[] = { static int dissect_ngap_RerouteNASRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2154 "./asn1/ngap/ngap.cnf" +#line 2174 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RerouteNASRequest"); @@ -17367,7 +17459,7 @@ static const per_sequence_t NGSetupRequest_sequence[] = { static int dissect_ngap_NGSetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2073 "./asn1/ngap/ngap.cnf" +#line 2093 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NGSetupRequest"); @@ -17385,7 +17477,7 @@ static const per_sequence_t NGSetupResponse_sequence[] = { static int dissect_ngap_NGSetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2076 "./asn1/ngap/ngap.cnf" +#line 2096 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NGSetupResponse"); @@ -17403,7 +17495,7 @@ static const per_sequence_t NGSetupFailure_sequence[] = { static int dissect_ngap_NGSetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2079 "./asn1/ngap/ngap.cnf" +#line 2099 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NGSetupFailure"); @@ -17421,7 +17513,7 @@ static const per_sequence_t RANConfigurationUpdate_sequence[] = { static int dissect_ngap_RANConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2142 "./asn1/ngap/ngap.cnf" +#line 2162 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RANConfigurationUpdate"); @@ -17439,7 +17531,7 @@ static const per_sequence_t RANConfigurationUpdateAcknowledge_sequence[] = { static int dissect_ngap_RANConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2145 "./asn1/ngap/ngap.cnf" +#line 2165 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RANConfigurationUpdateAcknowledge"); @@ -17457,7 +17549,7 @@ static const per_sequence_t RANConfigurationUpdateFailure_sequence[] = { static int dissect_ngap_RANConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2148 "./asn1/ngap/ngap.cnf" +#line 2168 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RANConfigurationUpdateFailure"); @@ -17475,7 +17567,7 @@ static const per_sequence_t AMFConfigurationUpdate_sequence[] = { static int dissect_ngap_AMFConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1968 "./asn1/ngap/ngap.cnf" +#line 1988 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "AMFConfigurationUpdate"); @@ -17493,7 +17585,7 @@ static const per_sequence_t AMFConfigurationUpdateAcknowledge_sequence[] = { static int dissect_ngap_AMFConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1971 "./asn1/ngap/ngap.cnf" +#line 1991 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "AMFConfigurationUpdateAcknowledge"); @@ -17511,7 +17603,7 @@ static const per_sequence_t AMFConfigurationUpdateFailure_sequence[] = { static int dissect_ngap_AMFConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1974 "./asn1/ngap/ngap.cnf" +#line 1994 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "AMFConfigurationUpdateFailure"); @@ -17529,7 +17621,7 @@ static const per_sequence_t AMFStatusIndication_sequence[] = { static int dissect_ngap_AMFStatusIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1980 "./asn1/ngap/ngap.cnf" +#line 2000 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "AMFStatusIndication"); @@ -17547,7 +17639,7 @@ static const per_sequence_t NGReset_sequence[] = { static int dissect_ngap_NGReset(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2067 "./asn1/ngap/ngap.cnf" +#line 2087 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NGReset"); @@ -17565,7 +17657,7 @@ static const per_sequence_t NGResetAcknowledge_sequence[] = { static int dissect_ngap_NGResetAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2070 "./asn1/ngap/ngap.cnf" +#line 2090 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NGResetAcknowledge"); @@ -17583,7 +17675,7 @@ static const per_sequence_t ErrorIndication_sequence[] = { static int dissect_ngap_ErrorIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2010 "./asn1/ngap/ngap.cnf" +#line 2030 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ErrorIndication"); @@ -17601,7 +17693,7 @@ static const per_sequence_t OverloadStart_sequence[] = { static int dissect_ngap_OverloadStart(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2082 "./asn1/ngap/ngap.cnf" +#line 2102 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "OverloadStart"); @@ -17619,7 +17711,7 @@ static const per_sequence_t OverloadStop_sequence[] = { static int dissect_ngap_OverloadStop(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2085 "./asn1/ngap/ngap.cnf" +#line 2105 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "OverloadStop"); @@ -17637,7 +17729,7 @@ static const per_sequence_t UplinkRANConfigurationTransfer_sequence[] = { static int dissect_ngap_UplinkRANConfigurationTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2235 "./asn1/ngap/ngap.cnf" +#line 2255 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UplinkRANConfigurationTransfer"); @@ -17655,7 +17747,7 @@ static const per_sequence_t DownlinkRANConfigurationTransfer_sequence[] = { static int dissect_ngap_DownlinkRANConfigurationTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1998 "./asn1/ngap/ngap.cnf" +#line 2018 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DownlinkRANConfigurationTransfer"); @@ -17673,7 +17765,7 @@ static const per_sequence_t WriteReplaceWarningRequest_sequence[] = { static int dissect_ngap_WriteReplaceWarningRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2247 "./asn1/ngap/ngap.cnf" +#line 2267 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "WriteReplaceWarningRequest"); @@ -17691,7 +17783,7 @@ static const per_sequence_t WriteReplaceWarningResponse_sequence[] = { static int dissect_ngap_WriteReplaceWarningResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2250 "./asn1/ngap/ngap.cnf" +#line 2270 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "WriteReplaceWarningResponse"); @@ -17709,7 +17801,7 @@ static const per_sequence_t PWSCancelRequest_sequence[] = { static int dissect_ngap_PWSCancelRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2130 "./asn1/ngap/ngap.cnf" +#line 2150 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWSCancelRequest"); @@ -17727,7 +17819,7 @@ static const per_sequence_t PWSCancelResponse_sequence[] = { static int dissect_ngap_PWSCancelResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2133 "./asn1/ngap/ngap.cnf" +#line 2153 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWSCancelResponse"); @@ -17745,7 +17837,7 @@ static const per_sequence_t PWSRestartIndication_sequence[] = { static int dissect_ngap_PWSRestartIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2139 "./asn1/ngap/ngap.cnf" +#line 2159 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWSRestartIndication"); @@ -17763,7 +17855,7 @@ static const per_sequence_t PWSFailureIndication_sequence[] = { static int dissect_ngap_PWSFailureIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2136 "./asn1/ngap/ngap.cnf" +#line 2156 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWSFailureIndication"); @@ -17781,7 +17873,7 @@ static const per_sequence_t DownlinkUEAssociatedNRPPaTransport_sequence[] = { static int dissect_ngap_DownlinkUEAssociatedNRPPaTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2007 "./asn1/ngap/ngap.cnf" +#line 2027 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DownlinkUEAssociatedNRPPaTransport"); @@ -17799,7 +17891,7 @@ static const per_sequence_t UplinkUEAssociatedNRPPaTransport_sequence[] = { static int dissect_ngap_UplinkUEAssociatedNRPPaTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2244 "./asn1/ngap/ngap.cnf" +#line 2264 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UplinkUEAssociatedNRPPaTransport"); @@ -17817,7 +17909,7 @@ static const per_sequence_t DownlinkNonUEAssociatedNRPPaTransport_sequence[] = { static int dissect_ngap_DownlinkNonUEAssociatedNRPPaTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1995 "./asn1/ngap/ngap.cnf" +#line 2015 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DownlinkNonUEAssociatedNRPPaTransport"); @@ -17835,7 +17927,7 @@ static const per_sequence_t UplinkNonUEAssociatedNRPPaTransport_sequence[] = { static int dissect_ngap_UplinkNonUEAssociatedNRPPaTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2232 "./asn1/ngap/ngap.cnf" +#line 2252 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UplinkNonUEAssociatedNRPPaTransport"); @@ -17853,7 +17945,7 @@ static const per_sequence_t TraceStart_sequence[] = { static int dissect_ngap_TraceStart(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2169 "./asn1/ngap/ngap.cnf" +#line 2189 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "TraceStart"); @@ -17871,7 +17963,7 @@ static const per_sequence_t TraceFailureIndication_sequence[] = { static int dissect_ngap_TraceFailureIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2166 "./asn1/ngap/ngap.cnf" +#line 2186 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "TraceFailureIndication"); @@ -17889,7 +17981,7 @@ static const per_sequence_t DeactivateTrace_sequence[] = { static int dissect_ngap_DeactivateTrace(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1989 "./asn1/ngap/ngap.cnf" +#line 2009 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DeactivateTrace"); @@ -17907,7 +17999,7 @@ static const per_sequence_t CellTrafficTrace_sequence[] = { static int dissect_ngap_CellTrafficTrace(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1983 "./asn1/ngap/ngap.cnf" +#line 2003 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "CellTrafficTrace"); @@ -17925,7 +18017,7 @@ static const per_sequence_t LocationReportingControl_sequence[] = { static int dissect_ngap_LocationReportingControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2058 "./asn1/ngap/ngap.cnf" +#line 2078 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "LocationReportingControl"); @@ -17943,7 +18035,7 @@ static const per_sequence_t LocationReportingFailureIndication_sequence[] = { static int dissect_ngap_LocationReportingFailureIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2061 "./asn1/ngap/ngap.cnf" +#line 2081 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "LocationReportingFailureIndication"); @@ -17961,7 +18053,7 @@ static const per_sequence_t LocationReport_sequence[] = { static int dissect_ngap_LocationReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2055 "./asn1/ngap/ngap.cnf" +#line 2075 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "LocationReport"); @@ -17979,7 +18071,7 @@ static const per_sequence_t UETNLABindingReleaseRequest_sequence[] = { static int dissect_ngap_UETNLABindingReleaseRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2226 "./asn1/ngap/ngap.cnf" +#line 2246 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UETNLABindingReleaseRequest"); @@ -17997,7 +18089,7 @@ static const per_sequence_t UERadioCapabilityInfoIndication_sequence[] = { static int dissect_ngap_UERadioCapabilityInfoIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2223 "./asn1/ngap/ngap.cnf" +#line 2243 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UERadioCapabilityInfoIndication"); @@ -18015,7 +18107,7 @@ static const per_sequence_t UERadioCapabilityCheckRequest_sequence[] = { static int dissect_ngap_UERadioCapabilityCheckRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2211 "./asn1/ngap/ngap.cnf" +#line 2231 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UERadioCapabilityCheckRequest"); @@ -18033,7 +18125,7 @@ static const per_sequence_t UERadioCapabilityCheckResponse_sequence[] = { static int dissect_ngap_UERadioCapabilityCheckResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2214 "./asn1/ngap/ngap.cnf" +#line 2234 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UERadioCapabilityCheckResponse"); @@ -18051,7 +18143,7 @@ static const per_sequence_t PrivateMessage_sequence[] = { static int dissect_ngap_PrivateMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2127 "./asn1/ngap/ngap.cnf" +#line 2147 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PrivateMessage"); @@ -18069,7 +18161,7 @@ static const per_sequence_t SecondaryRATDataUsageReport_sequence[] = { static int dissect_ngap_SecondaryRATDataUsageReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2163 "./asn1/ngap/ngap.cnf" +#line 2183 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SecondaryRATDataUsageReport"); @@ -18087,7 +18179,7 @@ static const per_sequence_t UplinkRIMInformationTransfer_sequence[] = { static int dissect_ngap_UplinkRIMInformationTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2253 "./asn1/ngap/ngap.cnf" +#line 2273 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UplinkRIMInformationTransfer"); @@ -18105,7 +18197,7 @@ static const per_sequence_t DownlinkRIMInformationTransfer_sequence[] = { static int dissect_ngap_DownlinkRIMInformationTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2256 "./asn1/ngap/ngap.cnf" +#line 2276 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DownlinkRIMInformationTransfer"); @@ -18123,7 +18215,7 @@ static const per_sequence_t ConnectionEstablishmentIndication_sequence[] = { static int dissect_ngap_ConnectionEstablishmentIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1986 "./asn1/ngap/ngap.cnf" +#line 2006 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ConnectionEstablishmentIndication"); @@ -18141,7 +18233,7 @@ static const per_sequence_t UERadioCapabilityIDMappingRequest_sequence[] = { static int dissect_ngap_UERadioCapabilityIDMappingRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2217 "./asn1/ngap/ngap.cnf" +#line 2237 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UERadioCapabilityIDMappingRequest"); @@ -18159,7 +18251,7 @@ static const per_sequence_t UERadioCapabilityIDMappingResponse_sequence[] = { static int dissect_ngap_UERadioCapabilityIDMappingResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2220 "./asn1/ngap/ngap.cnf" +#line 2240 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UERadioCapabilityIDMappingResponse"); @@ -18177,7 +18269,7 @@ static const per_sequence_t AMFCPRelocationIndication_sequence[] = { static int dissect_ngap_AMFCPRelocationIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1977 "./asn1/ngap/ngap.cnf" +#line 1997 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "AMFCPRelocationIndication"); @@ -18440,6 +18532,14 @@ static int dissect_BroadcastCompletedAreaList_PDU(tvbuff_t *tvb _U_, packet_info offset += 7; offset >>= 3; return offset; } +static int dissect_BurstArrivalTime_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_ngap_BurstArrivalTime(tvb, offset, &asn1_ctx, tree, hf_ngap_BurstArrivalTime_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_CancelAllWarningMessages_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -18736,6 +18836,14 @@ static int dissect_ExtendedSliceSupportList_PDU(tvbuff_t *tvb _U_, packet_info * offset += 7; offset >>= 3; return offset; } +static int dissect_ExtendedUEIdentityIndexValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_ngap_ExtendedUEIdentityIndexValue(tvb, offset, &asn1_ctx, tree, hf_ngap_ExtendedUEIdentityIndexValue_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_FiveG_S_TMSI_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -19728,6 +19836,14 @@ static int dissect_QosFlowAddOrModifyRequestList_PDU(tvbuff_t *tvb _U_, packet_i offset += 7; offset >>= 3; return offset; } +static int dissect_QosFlowFeedbackList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_ngap_QosFlowFeedbackList(tvb, offset, &asn1_ctx, tree, hf_ngap_QosFlowFeedbackList_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_QosMonitoringRequest_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -21331,7 +21447,7 @@ static int dissect_UEContextSuspendRequestTransfer_PDU(tvbuff_t *tvb _U_, packet /*--- End of included file: packet-ngap-fn.c ---*/ -#line 464 "./asn1/ngap/packet-ngap-template.c" +#line 473 "./asn1/ngap/packet-ngap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -21849,6 +21965,9 @@ proto_reg_handoff_ngap(void) dissector_add_uint("ngap.extension", id_ConfiguredTACIndication, create_dissector_handle(dissect_ConfiguredTACIndication_PDU, proto_ngap)); dissector_add_uint("ngap.extension", id_QosMonitoringReportingFrequency, create_dissector_handle(dissect_QosMonitoringReportingFrequency_PDU, proto_ngap)); dissector_add_uint("ngap.extension", id_QosFlowParametersList, create_dissector_handle(dissect_QosFlowParametersList_PDU, proto_ngap)); + dissector_add_uint("ngap.extension", id_QosFlowFeedbackList, create_dissector_handle(dissect_QosFlowFeedbackList_PDU, proto_ngap)); + dissector_add_uint("ngap.extension", id_BurstArrivalTimeDownlink, create_dissector_handle(dissect_BurstArrivalTime_PDU, proto_ngap)); + dissector_add_uint("ngap.extension", id_ExtendedUEIdentityIndexValue, create_dissector_handle(dissect_ExtendedUEIdentityIndexValue_PDU, proto_ngap)); dissector_add_uint("ngap.proc.imsg", id_AMFConfigurationUpdate, create_dissector_handle(dissect_AMFConfigurationUpdate_PDU, proto_ngap)); dissector_add_uint("ngap.proc.sout", id_AMFConfigurationUpdate, create_dissector_handle(dissect_AMFConfigurationUpdateAcknowledge_PDU, proto_ngap)); dissector_add_uint("ngap.proc.uout", id_AMFConfigurationUpdate, create_dissector_handle(dissect_AMFConfigurationUpdateFailure_PDU, proto_ngap)); @@ -21976,7 +22095,7 @@ proto_reg_handoff_ngap(void) /*--- End of included file: packet-ngap-dis-tab.c ---*/ -#line 699 "./asn1/ngap/packet-ngap-template.c" +#line 708 "./asn1/ngap/packet-ngap-template.c" dissector_add_string("media_type", "application/vnd.3gpp.ngap", ngap_media_type_handle); } else { @@ -22196,6 +22315,18 @@ void proto_register_ngap(void) { { "GlobalCable-ID", "ngap.GlobalCable_ID.str", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_ngap_UpdateFeedback_CN_PDB_DL, + { "CN PDB DL", "ngap.UpdateFeedback.CN_PDB_DL", + FT_BOOLEAN, 8, TFS(&ngap_not_updated_updated), 0x80, + NULL, HFILL }}, + { &hf_ngap_UpdateFeedback_CN_PDB_UL, + { "CN PDB UL", "ngap.UpdateFeedback.CN_PDB_UL", + FT_BOOLEAN, 8, TFS(&ngap_not_updated_updated), 0x40, + NULL, HFILL }}, + { &hf_ngap_UpdateFeedback_reserved, + { "Reserved", "ngap.UpdateFeedback.reserved", + FT_UINT8, BASE_HEX, NULL, 0x3f, + NULL, HFILL }}, /*--- Included file: packet-ngap-hfarr.c ---*/ #line 1 "./asn1/ngap/packet-ngap-hfarr.c" @@ -22263,6 +22394,10 @@ void proto_register_ngap(void) { { "BroadcastCompletedAreaList", "ngap.BroadcastCompletedAreaList", FT_UINT32, BASE_DEC, VALS(ngap_BroadcastCompletedAreaList_vals), 0, NULL, HFILL }}, + { &hf_ngap_BurstArrivalTime_PDU, + { "BurstArrivalTime", "ngap.BurstArrivalTime", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_ngap_CancelAllWarningMessages_PDU, { "CancelAllWarningMessages", "ngap.CancelAllWarningMessages", FT_UINT32, BASE_DEC, VALS(ngap_CancelAllWarningMessages_vals), 0, @@ -22411,6 +22546,10 @@ void proto_register_ngap(void) { { "ExtendedSliceSupportList", "ngap.ExtendedSliceSupportList", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_ngap_ExtendedUEIdentityIndexValue_PDU, + { "ExtendedUEIdentityIndexValue", "ngap.ExtendedUEIdentityIndexValue", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_ngap_FiveG_S_TMSI_PDU, { "FiveG-S-TMSI", "ngap.FiveG_S_TMSI_element", FT_NONE, BASE_NONE, NULL, 0, @@ -22907,6 +23046,10 @@ void proto_register_ngap(void) { { "QosFlowAddOrModifyRequestList", "ngap.QosFlowAddOrModifyRequestList", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_ngap_QosFlowFeedbackList_PDU, + { "QosFlowFeedbackList", "ngap.QosFlowFeedbackList", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, { &hf_ngap_QosMonitoringRequest_PDU, { "QosMonitoringRequest", "ngap.QosMonitoringRequest", FT_UINT32, BASE_DEC, VALS(ngap_QosMonitoringRequest_vals), 0, @@ -25759,6 +25902,22 @@ void proto_register_ngap(void) { { "QosFlowAddOrModifyResponseItem", "ngap.QosFlowAddOrModifyResponseItem_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_ngap_QosFlowFeedbackList_item, + { "QosFlowFeedbackItem", "ngap.QosFlowFeedbackItem_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_ngap_updateFeedback, + { "updateFeedback", "ngap.updateFeedback", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_ngap_cNpacketDelayBudgetDL, + { "cNpacketDelayBudgetDL", "ngap.cNpacketDelayBudgetDL", + FT_UINT32, BASE_CUSTOM, CF_FUNC(ngap_ExtendedPacketDelayBudget_fmt), 0, + "ExtendedPacketDelayBudget", HFILL }}, + { &hf_ngap_cNpacketDelayBudgetUL, + { "cNpacketDelayBudgetUL", "ngap.cNpacketDelayBudgetUL", + FT_UINT32, BASE_CUSTOM, CF_FUNC(ngap_ExtendedPacketDelayBudget_fmt), 0, + "ExtendedPacketDelayBudget", HFILL }}, { &hf_ngap_QosFlowInformationList_item, { "QosFlowInformationItem", "ngap.QosFlowInformationItem_element", FT_NONE, BASE_NONE, NULL, 0, @@ -26569,7 +26728,7 @@ void proto_register_ngap(void) { "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-ngap-hfarr.c ---*/ -#line 919 "./asn1/ngap/packet-ngap-template.c" +#line 940 "./asn1/ngap/packet-ngap-template.c" }; /* List of subtrees */ @@ -26613,6 +26772,7 @@ void proto_register_ngap(void) { &ett_ngap_TargettoSource_Failure_TransparentContainer, &ett_ngap_UERadioCapabilityForPagingOfNB_IoT, &ett_ngap_GlobalCable_ID, + &ett_ngap_UpdateFeedback, /*--- Included file: packet-ngap-ettarr.c ---*/ #line 1 "./asn1/ngap/packet-ngap-ettarr.c" @@ -26969,6 +27129,8 @@ void proto_register_ngap(void) { &ett_ngap_QosFlowAddOrModifyRequestItem, &ett_ngap_QosFlowAddOrModifyResponseList, &ett_ngap_QosFlowAddOrModifyResponseItem, + &ett_ngap_QosFlowFeedbackList, + &ett_ngap_QosFlowFeedbackItem, &ett_ngap_QosFlowInformationList, &ett_ngap_QosFlowInformationItem, &ett_ngap_QosFlowLevelQosParameters, @@ -27219,7 +27381,7 @@ void proto_register_ngap(void) { &ett_ngap_UnsuccessfulOutcome, /*--- End of included file: packet-ngap-ettarr.c ---*/ -#line 963 "./asn1/ngap/packet-ngap-template.c" +#line 985 "./asn1/ngap/packet-ngap-template.c" }; static ei_register_info ei[] = {