NGAP: upgrade dissector to v16.5.0

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
 -- **************************************************************
 --

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

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
 -- **************************************************************
 --

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} }

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
 -- **************************************************************
 --

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
 -- **************************************************************
 --

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=&parameter_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
 

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"
   };