XnAP: upgrade dissector to v17.6.0

9 files changed, 108 insertions, 32 deletions

diff --git a/epan/dissectors/asn1/xnap/XnAP-CommonDataTypes.asn b/epan/dissectors/asn1/xnap/XnAP-CommonDataTypes.asn
index 84fc1ec493..329d1cc22c 100644
--- a/epan/dissectors/asn1/xnap/XnAP-CommonDataTypes.asn
+++ b/epan/dissectors/asn1/xnap/XnAP-CommonDataTypes.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.423 V17.5.0 (2023-06)
+-- 3GPP TS 38.423 V17.6.0 (2023-09)
 -- 9.3.6	Common definitions
 -- **************************************************************
 --
diff --git a/epan/dissectors/asn1/xnap/XnAP-Constants.asn b/epan/dissectors/asn1/xnap/XnAP-Constants.asn
index 27da94af35..4ec236773d 100644
--- a/epan/dissectors/asn1/xnap/XnAP-Constants.asn
+++ b/epan/dissectors/asn1/xnap/XnAP-Constants.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.423 V17.5.0 (2023-06)
+-- 3GPP TS 38.423 V17.6.0 (2023-09)
 -- 9.3.7	Constant definitions
 -- **************************************************************
 --
@@ -575,6 +575,9 @@ id-AdditionalListofPDUSessionResourceChangeConfirmInfo-SNterminated									Prot
 id-UERLFReportContainerLTEExtension																ProtocolIE-ID ::= 370
 id-ExcessPacketDelayThresholdConfiguration															ProtocolIE-ID ::= 371
 id-HashedUEIdentityIndexValue																		ProtocolIE-ID ::= 372
+id-QosFlowMappingIndication																			ProtocolIE-ID ::= 373
+id-Full-and-Short-I-RNTI-Profile-List																ProtocolIE-ID ::= 374
+
 
 
 END
diff --git a/epan/dissectors/asn1/xnap/XnAP-Containers.asn b/epan/dissectors/asn1/xnap/XnAP-Containers.asn
index 097ae2af4e..28ada49992 100644
--- a/epan/dissectors/asn1/xnap/XnAP-Containers.asn
+++ b/epan/dissectors/asn1/xnap/XnAP-Containers.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.423 V17.5.0 (2023-06)
+-- 3GPP TS 38.423 V17.6.0 (2023-09)
 -- 9.3.8	Container definitions
 -- **************************************************************
 --
diff --git a/epan/dissectors/asn1/xnap/XnAP-IEs.asn b/epan/dissectors/asn1/xnap/XnAP-IEs.asn
index d15c829d75..1a00fa9a3a 100644
--- a/epan/dissectors/asn1/xnap/XnAP-IEs.asn
+++ b/epan/dissectors/asn1/xnap/XnAP-IEs.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.423 V17.5.0 (2023-06)
+-- 3GPP TS 38.423 V17.6.0 (2023-09)
 -- 9.3.5	Information Element definitions
 -- **************************************************************
 --
@@ -135,6 +135,8 @@ IMPORTS
 	id-CoverageModificationCause,
 	id-UERLFReportContainerLTEExtension,
 	id-ExcessPacketDelayThresholdConfiguration,
+	id-Full-and-Short-I-RNTI-Profile-List,
+	id-QosFlowMappingIndication,
 	maxEARFCN,
 	maxnoofAllowedAreas,
 	maxnoofAMFRegions,
@@ -745,7 +747,7 @@ CapacityValue ::= INTEGER (0..100)
 CapacityValueInfo ::= SEQUENCE {
 	capacityValue				CapacityValue,
 	ssbAreaCapacityValueList 	SSBAreaCapacityValue-List 	OPTIONAL,
-iE-Extension 				ProtocolExtensionContainer { {CapacityValueInfo-ExtIEs} } OPTIONAL,
+	iE-Extension 				ProtocolExtensionContainer { {CapacityValueInfo-ExtIEs} } OPTIONAL,
 	...
 }
 
@@ -958,12 +960,12 @@ CellMeasurementResult ::= SEQUENCE (SIZE(1..maxnoofCellsinNG-RANnode)) OF CellMe
 
 CellMeasurementResult-Item	::= SEQUENCE {
 	cell-ID								GlobalNG-RANCell-ID,
-radioResourceStatus					RadioResourceStatus				OPTIONAL,
-tNLCapacityIndicator				TNLCapacityIndicator			OPTIONAL,
-compositeAvailableCapacityGroup		CompositeAvailableCapacityGroup	OPTIONAL,
-sliceAvailableCapacity				SliceAvailableCapacity			OPTIONAL,
-numberofActiveUEs					NumberofActiveUEs				OPTIONAL,
-rRCConnections						RRCConnections					OPTIONAL,
+	radioResourceStatus					RadioResourceStatus				OPTIONAL,
+	tNLCapacityIndicator				TNLCapacityIndicator			OPTIONAL,
+	compositeAvailableCapacityGroup		CompositeAvailableCapacityGroup	OPTIONAL,
+	sliceAvailableCapacity				SliceAvailableCapacity			OPTIONAL,
+	numberofActiveUEs					NumberofActiveUEs				OPTIONAL,
+	rRCConnections						RRCConnections					OPTIONAL,
 	iE-Extensions						ProtocolExtensionContainer { { CellMeasurementResult-Item-ExtIEs} }	OPTIONAL,
 	...
 }
@@ -990,8 +992,8 @@ CellToReport ::= SEQUENCE (SIZE(1..maxnoofCellsinNG-RANnode)) OF CellToReport-It
 
 CellToReport-Item	::= SEQUENCE {
 	cell-ID									GlobalNG-RANCell-ID,
-sSBToReport-List                        SSBToReport-List			OPTIONAL,
-sliceToReport-List                      SliceToReport-List			OPTIONAL,
+	sSBToReport-List                        SSBToReport-List			OPTIONAL,
+	sliceToReport-List                      SliceToReport-List			OPTIONAL,
 	iE-Extensions						ProtocolExtensionContainer { { CellToReport-Item-ExtIEs} }	OPTIONAL,
 	...
 }
@@ -2811,9 +2813,23 @@ Local-NG-RAN-Node-Identifier ::= CHOICE {
 }
 
 Local-NG-RAN-Node-Identifier-ExtIEs XNAP-PROTOCOL-IES ::= {
+	{ ID id-Full-and-Short-I-RNTI-Profile-List		CRITICALITY ignore	TYPE Full-and-Short-I-RNTI-Profile-List	PRESENCE mandatory},
 	...
 }
 
+Full-and-Short-I-RNTI-Profile-List::= SEQUENCE {
+
+	full-I-RNTI-Profile-List					Full-I-RNTI-Profile-List,
+	short-I-RNTI-Profile-List					Short-I-RNTI-Profile-List,
+	iE-Extensions								ProtocolExtensionContainer { { Full-and-Short-I-RNTI-Profile-List-ExtIEs} }	OPTIONAL,
+	...
+}
+
+Full-and-Short-I-RNTI-Profile-List-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
 Full-I-RNTI-Profile-List ::= CHOICE {
 	full-I-RNTI-Profile-0	BIT STRING (SIZE (21)),
 	full-I-RNTI-Profile-1	BIT STRING (SIZE (18)),
@@ -4271,7 +4287,7 @@ NonGBRResources-Offered ::= ENUMERATED {true, ...}
 
 NRV2XServicesAuthorized ::= SEQUENCE {
 	vehicleUE			VehicleUE											OPTIONAL,
-pedestrianUE 		PedestrianUE						OPTIONAL,
+	pedestrianUE 		PedestrianUE						OPTIONAL,
 	iE-Extensions		ProtocolExtensionContainer { {NRV2XServicesAuthorized-ExtIEs} }	OPTIONAL,
 	...
 }
@@ -5177,6 +5193,7 @@ QoSFlowsSetupMappedtoDRB-ModRqd-SNterminated-Item ::= SEQUENCE {
 }
 
 QoSFlowsSetupMappedtoDRB-ModRqd-SNterminated-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
+	{ID id-QosFlowMappingIndication	CRITICALITY ignore	EXTENSION QoSFlowMappingIndication		PRESENCE optional},
 	...
 }
 
@@ -5212,6 +5229,7 @@ QoSFlowsModifiedMappedtoDRB-ModRqd-SNterminated-Item ::= SEQUENCE {
 }
 
 QoSFlowsModifiedMappedtoDRB-ModRqd-SNterminated-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
+	{ID id-QosFlowMappingIndication	CRITICALITY ignore	EXTENSION QoSFlowMappingIndication		PRESENCE optional},
 	...
 }
 
@@ -5579,10 +5597,10 @@ QoSFlowwithCause-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
 }
 
 QoS-Mapping-Information ::= SEQUENCE {
-dscp							BIT STRING (SIZE(6))			OPTIONAL,
-flow-label						BIT STRING (SIZE(20))		OPTIONAL,
-iE-Extensions					ProtocolExtensionContainer { {QoS-Mapping-Information-ExtIEs} }	OPTIONAL,
-...
+	dscp							BIT STRING (SIZE(6))			OPTIONAL,
+	flow-label						BIT STRING (SIZE(20))		OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { {QoS-Mapping-Information-ExtIEs} }	OPTIONAL,
+	...
 }
 
 QoS-Mapping-Information-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
@@ -5818,7 +5836,7 @@ ReportCharacteristics ::=  BIT STRING(SIZE(32))
 
 ReportingPeriodicity ::= ENUMERATED {
 	half-thousand-ms,
-one-thousand-ms,
+	one-thousand-ms,
 	two-thousand-ms,
 	five-thousand-ms,
 	ten-thousand-ms,
@@ -6702,8 +6720,8 @@ SNMobilityInformation ::= BIT STRING (SIZE(32))
 
 
 SNTriggered ::=ENUMERATED{
-true,
-...
+	true,
+	...
 }
 
 SpecialSubframeInfo-E-UTRA ::= SEQUENCE {
@@ -6747,8 +6765,8 @@ SplitSRBsTypes ::= ENUMERATED {srb1, srb2, srb1and2, ...}
 SSBAreaCapacityValue-List ::= SEQUENCE (SIZE(1..maxnoofSSBAreas)) OF SSBAreaCapacityValue-List-Item
 
 SSBAreaCapacityValue-List-Item	::= SEQUENCE {
-sSBIndex				INTEGER(0..63),
-ssbAreaCapacityValue	INTEGER (0..100),
+	sSBIndex				INTEGER(0..63),
+	ssbAreaCapacityValue	INTEGER (0..100),
 	iE-Extensions						ProtocolExtensionContainer { { SSBAreaCapacityValue-List-Item-ExtIEs} }	OPTIONAL,
 	...
 }
@@ -6763,9 +6781,9 @@ SSBAreaRadioResourceStatus-List ::= SEQUENCE (SIZE(1..maxnoofSSBAreas)) OF SSBAr
 
 SSBAreaRadioResourceStatus-List-Item	::= SEQUENCE {
 	sSBIndex								INTEGER(0..63),
-ssb-Area-DL-GBR-PRB-usage	DL-GBR-PRB-usage,
-ssb-Area-UL-GBR-PRB-usage	UL-GBR-PRB-usage,
-ssb-Area-dL-non-GBR-PRB-usage		DL-non-GBR-PRB-usage,
+	ssb-Area-DL-GBR-PRB-usage	DL-GBR-PRB-usage,
+	ssb-Area-UL-GBR-PRB-usage	UL-GBR-PRB-usage,
+	ssb-Area-dL-non-GBR-PRB-usage		DL-non-GBR-PRB-usage,
 	ssb-Area-uL-non-GBR-PRB-usage		UL-non-GBR-PRB-usage,
 	ssb-Area-dL-Total-PRB-usage			DL-Total-PRB-usage,
 	ssb-Area-uL-Total-PRB-usage			UL-Total-PRB-usage,
diff --git a/epan/dissectors/asn1/xnap/XnAP-PDU-Contents.asn b/epan/dissectors/asn1/xnap/XnAP-PDU-Contents.asn
index 842a1adb30..0f3e0aff73 100644
--- a/epan/dissectors/asn1/xnap/XnAP-PDU-Contents.asn
+++ b/epan/dissectors/asn1/xnap/XnAP-PDU-Contents.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.423 V17.5.0 (2023-06)
+-- 3GPP TS 38.423 V17.6.0 (2023-09)
 -- 9.3.4	PDU Definitions
 -- **************************************************************
 --
@@ -2791,7 +2791,7 @@ CellTrafficTraceIEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-NG-RANTraceID					CRITICALITY ignore	TYPE NG-RANTraceID				PRESENCE mandatory	}|
 	{ ID id-TraceCollectionEntityIPAddress	CRITICALITY ignore	TYPE TransportLayerAddress			PRESENCE mandatory	}|
 	{ ID id-PrivacyIndicator				CRITICALITY ignore	TYPE PrivacyIndicator				PRESENCE optional	}|
-{ ID id-TraceCollectionEntityURI		CRITICALITY ignore	TYPE URIaddress						PRESENCE optional},
+	{ ID id-TraceCollectionEntityURI		CRITICALITY ignore	TYPE URIaddress						PRESENCE optional},
 	...
 }
 
diff --git a/epan/dissectors/asn1/xnap/XnAP-PDU-Descriptions.asn b/epan/dissectors/asn1/xnap/XnAP-PDU-Descriptions.asn
index a3af527122..bd6990437f 100644
--- a/epan/dissectors/asn1/xnap/XnAP-PDU-Descriptions.asn
+++ b/epan/dissectors/asn1/xnap/XnAP-PDU-Descriptions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.423 V17.5.0 (2023-06)
+-- 3GPP TS 38.423 V17.6.0 (2023-09)
 -- 9.3.3	Elementary Procedure Definitions
 -- **************************************************************
 --
diff --git a/epan/dissectors/asn1/xnap/packet-xnap-template.c b/epan/dissectors/asn1/xnap/packet-xnap-template.c
index 5249e74b0f..892503e6ab 100644
--- a/epan/dissectors/asn1/xnap/packet-xnap-template.c
+++ b/epan/dissectors/asn1/xnap/packet-xnap-template.c
@@ -10,7 +10,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
  * Ref:
- * 3GPP TS 38.423 V17.5.0 (2023-06)
+ * 3GPP TS 38.423 V17.6.0 (2023-09)
  */
 
 #include "config.h"
diff --git a/epan/dissectors/asn1/xnap/xnap.cnf b/epan/dissectors/asn1/xnap/xnap.cnf
index cc3b855fe5..b1284ba3de 100644
--- a/epan/dissectors/asn1/xnap/xnap.cnf
+++ b/epan/dissectors/asn1/xnap/xnap.cnf
@@ -1527,6 +1527,9 @@ id-AdditionalListofPDUSessionResourceChangeConfirmInfo-SNterminated ProtocolIE-I
 id-UERLFReportContainerLTEExtension                                 ProtocolIE-ID
 id-ExcessPacketDelayThresholdConfiguration                          ProtocolIE-ID
 id-HashedUEIdentityIndexValue                                       ProtocolIE-ID
+id-QosFlowMappingIndication                                         ProtocolIE-ID
+id-Full-and-Short-I-RNTI-Profile-List                               ProtocolIE-ID
+
 
 #.REGISTER
 
@@ -1789,6 +1792,7 @@ F1-terminatingIAB-donorIndicator                  N xnap.ies id-F1-terminatingIA
 SCGreconfigNotification                           N xnap.ies id-SCGreconfigNotification
 UERLFReportContainerLTEExtension                  N xnap.ies id-UERLFReportContainerLTEExtension
 HashedUEIdentityIndexValue                        N xnap.ies id-HashedUEIdentityIndexValue
+Full-and-Short-I-RNTI-Profile-List                N xnap.ies id-Full-and-Short-I-RNTI-Profile-List
 
 #XNAP-PROTOCOL-EXTENSION
 Additional-UL-NG-U-TNLatUPF-List                                 N xnap.extension id-Additional-UL-NG-U-TNLatUPF-List
@@ -1907,6 +1911,7 @@ BeamMeasurementsReportConfiguration                              N xnap.extensio
 CoverageModificationCause                                        N xnap.extension id-CoverageModificationCause
 AdditionalListofPDUSessionResourceChangeConfirmInfo-SNterminated N xnap.extension id-AdditionalListofPDUSessionResourceChangeConfirmInfo-SNterminated
 ExcessPacketDelayThresholdConfiguration                          N xnap.extension id-ExcessPacketDelayThresholdConfiguration
+QoSFlowMappingIndication                                         N xnap.extension id-QosFlowMappingIndication
 
 #XNAP-ELEMENTARY-PROCEDURE
 HandoverRequest                            N xnap.proc.imsg id-handoverPreparation
diff --git a/epan/dissectors/packet-xnap.c b/epan/dissectors/packet-xnap.c
index d7b8fe7ce5..ab321b1bc6 100644
--- a/epan/dissectors/packet-xnap.c
+++ b/epan/dissectors/packet-xnap.c
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
  * Ref:
- * 3GPP TS 38.423 V17.5.0 (2023-06)
+ * 3GPP TS 38.423 V17.6.0 (2023-09)
  */
 
 #include "config.h"
@@ -590,7 +590,9 @@ typedef enum _ProtocolIE_ID_enum {
   id_AdditionalListofPDUSessionResourceChangeConfirmInfo_SNterminated = 369,
   id_UERLFReportContainerLTEExtension = 370,
   id_ExcessPacketDelayThresholdConfiguration = 371,
-  id_HashedUEIdentityIndexValue = 372
+  id_HashedUEIdentityIndexValue = 372,
+  id_QosFlowMappingIndication = 373,
+  id_Full_and_Short_I_RNTI_Profile_List = 374
 } ProtocolIE_ID_enum;
 
 typedef enum _GlobalNG_RANNode_ID_enum {
@@ -720,6 +722,7 @@ static int hf_xnap_InitiatingCondition_FailureIndication_PDU = -1;  /* Initiatin
 static int hf_xnap_xnap_IntendedTDD_DL_ULConfiguration_NR_PDU = -1;  /* IntendedTDD_DL_ULConfiguration_NR */
 static int hf_xnap_InterfaceInstanceIndication_PDU = -1;  /* InterfaceInstanceIndication */
 static int hf_xnap_Local_NG_RAN_Node_Identifier_PDU = -1;  /* Local_NG_RAN_Node_Identifier */
+static int hf_xnap_Full_and_Short_I_RNTI_Profile_List_PDU = -1;  /* Full_and_Short_I_RNTI_Profile_List */
 static int hf_xnap_SCGUEHistoryInformation_PDU = -1;  /* SCGUEHistoryInformation */
 static int hf_xnap_LocationInformationSNReporting_PDU = -1;  /* LocationInformationSNReporting */
 static int hf_xnap_LocationReportingInformation_PDU = -1;  /* LocationReportingInformation */
@@ -796,6 +799,7 @@ static int hf_xnap_PrivacyIndicator_PDU = -1;     /* PrivacyIndicator */
 static int hf_xnap_PSCellChangeHistory_PDU = -1;  /* PSCellChangeHistory */
 static int hf_xnap_PSCellHistoryInformationRetrieve_PDU = -1;  /* PSCellHistoryInformationRetrieve */
 static int hf_xnap_QMCConfigInfo_PDU = -1;        /* QMCConfigInfo */
+static int hf_xnap_QoSFlowMappingIndication_PDU = -1;  /* QoSFlowMappingIndication */
 static int hf_xnap_QoSFlows_List_PDU = -1;        /* QoSFlows_List */
 static int hf_xnap_QoS_Mapping_Information_PDU = -1;  /* QoS_Mapping_Information */
 static int hf_xnap_QoSParaSetNotifyIndex_PDU = -1;  /* QoSParaSetNotifyIndex */
@@ -2615,6 +2619,7 @@ static gint ett_xnap_InitiatingCondition_FailureIndication = -1;
 static gint ett_xnap_IntendedTDD_DL_ULConfiguration_NR = -1;
 static gint ett_xnap_I_RNTI = -1;
 static gint ett_xnap_Local_NG_RAN_Node_Identifier = -1;
+static gint ett_xnap_Full_and_Short_I_RNTI_Profile_List = -1;
 static gint ett_xnap_Full_I_RNTI_Profile_List = -1;
 static gint ett_xnap_Short_I_RNTI_Profile_List = -1;
 static gint ett_xnap_LastVisitedCell_Item = -1;
@@ -3877,6 +3882,8 @@ static const value_string xnap_ProtocolIE_ID_vals[] = {
   { id_UERLFReportContainerLTEExtension, "id-UERLFReportContainerLTEExtension" },
   { id_ExcessPacketDelayThresholdConfiguration, "id-ExcessPacketDelayThresholdConfiguration" },
   { id_HashedUEIdentityIndexValue, "id-HashedUEIdentityIndexValue" },
+  { id_QosFlowMappingIndication, "id-QosFlowMappingIndication" },
+  { id_Full_and_Short_I_RNTI_Profile_List, "id-Full-and-Short-I-RNTI-Profile-List" },
   { 0, NULL }
 };
 
@@ -13776,6 +13783,22 @@ dissect_xnap_Local_NG_RAN_Node_Identifier(tvbuff_t *tvb _U_, int offset _U_, asn
 }
 
 
+static const per_sequence_t Full_and_Short_I_RNTI_Profile_List_sequence[] = {
+  { &hf_xnap_full_I_RNTI_Profile_List, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_Full_I_RNTI_Profile_List },
+  { &hf_xnap_short_I_RNTI_Profile_List, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_Short_I_RNTI_Profile_List },
+  { &hf_xnap_iE_Extensions  , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_ProtocolExtensionContainer },
+  { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_xnap_Full_and_Short_I_RNTI_Profile_List(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_xnap_Full_and_Short_I_RNTI_Profile_List, Full_and_Short_I_RNTI_Profile_List_sequence);
+
+  return offset;
+}
+
+
 
 static int
 dissect_xnap_LastVisitedNGRANCellInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -25684,6 +25707,14 @@ static int dissect_Local_NG_RAN_Node_Identifier_PDU(tvbuff_t *tvb _U_, packet_in
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_Full_and_Short_I_RNTI_Profile_List_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_xnap_Full_and_Short_I_RNTI_Profile_List(tvb, offset, &asn1_ctx, tree, hf_xnap_Full_and_Short_I_RNTI_Profile_List_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_SCGUEHistoryInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -26292,6 +26323,14 @@ static int dissect_QMCConfigInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_QoSFlowMappingIndication_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_xnap_QoSFlowMappingIndication(tvb, offset, &asn1_ctx, tree, hf_xnap_QoSFlowMappingIndication_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_QoSFlows_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -28706,6 +28745,10 @@ void proto_register_xnap(void) {
       { "Local-NG-RAN-Node-Identifier", "xnap.Local_NG_RAN_Node_Identifier",
         FT_UINT32, BASE_DEC, VALS(xnap_Local_NG_RAN_Node_Identifier_vals), 0,
         NULL, HFILL }},
+    { &hf_xnap_Full_and_Short_I_RNTI_Profile_List_PDU,
+      { "Full-and-Short-I-RNTI-Profile-List", "xnap.Full_and_Short_I_RNTI_Profile_List_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_xnap_SCGUEHistoryInformation_PDU,
       { "SCGUEHistoryInformation", "xnap.SCGUEHistoryInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -29010,6 +29053,10 @@ void proto_register_xnap(void) {
       { "QMCConfigInfo", "xnap.QMCConfigInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_xnap_QoSFlowMappingIndication_PDU,
+      { "QoSFlowMappingIndication", "xnap.QoSFlowMappingIndication",
+        FT_UINT32, BASE_DEC, VALS(xnap_QoSFlowMappingIndication_vals), 0,
+        NULL, HFILL }},
     { &hf_xnap_QoSFlows_List_PDU,
       { "QoSFlows-List", "xnap.QoSFlows_List",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -35408,6 +35455,7 @@ void proto_register_xnap(void) {
     &ett_xnap_IntendedTDD_DL_ULConfiguration_NR,
     &ett_xnap_I_RNTI,
     &ett_xnap_Local_NG_RAN_Node_Identifier,
+    &ett_xnap_Full_and_Short_I_RNTI_Profile_List,
     &ett_xnap_Full_I_RNTI_Profile_List,
     &ett_xnap_Short_I_RNTI_Profile_List,
     &ett_xnap_LastVisitedCell_Item,
@@ -36314,6 +36362,7 @@ proto_reg_handoff_xnap(void)
   dissector_add_uint("xnap.ies", id_SCGreconfigNotification, create_dissector_handle(dissect_SCGreconfigNotification_PDU, proto_xnap));
   dissector_add_uint("xnap.ies", id_UERLFReportContainerLTEExtension, create_dissector_handle(dissect_UERLFReportContainerLTEExtension_PDU, proto_xnap));
   dissector_add_uint("xnap.ies", id_HashedUEIdentityIndexValue, create_dissector_handle(dissect_HashedUEIdentityIndexValue_PDU, proto_xnap));
+  dissector_add_uint("xnap.ies", id_Full_and_Short_I_RNTI_Profile_List, create_dissector_handle(dissect_Full_and_Short_I_RNTI_Profile_List_PDU, proto_xnap));
   dissector_add_uint("xnap.extension", id_Additional_UL_NG_U_TNLatUPF_List, create_dissector_handle(dissect_Additional_UL_NG_U_TNLatUPF_List_PDU, proto_xnap));
   dissector_add_uint("xnap.extension", id_SecondarydataForwardingInfoFromTarget_List, create_dissector_handle(dissect_SecondarydataForwardingInfoFromTarget_List_PDU, proto_xnap));
   dissector_add_uint("xnap.extension", id_LastE_UTRANPLMNIdentity, create_dissector_handle(dissect_PLMN_Identity_PDU, proto_xnap));
@@ -36430,6 +36479,7 @@ proto_reg_handoff_xnap(void)
   dissector_add_uint("xnap.extension", id_CoverageModificationCause, create_dissector_handle(dissect_CoverageModificationCause_PDU, proto_xnap));
   dissector_add_uint("xnap.extension", id_AdditionalListofPDUSessionResourceChangeConfirmInfo_SNterminated, create_dissector_handle(dissect_AdditionalListofPDUSessionResourceChangeConfirmInfo_SNterminated_PDU, proto_xnap));
   dissector_add_uint("xnap.extension", id_ExcessPacketDelayThresholdConfiguration, create_dissector_handle(dissect_ExcessPacketDelayThresholdConfiguration_PDU, proto_xnap));
+  dissector_add_uint("xnap.extension", id_QosFlowMappingIndication, create_dissector_handle(dissect_QoSFlowMappingIndication_PDU, proto_xnap));
   dissector_add_uint("xnap.proc.imsg", id_handoverPreparation, create_dissector_handle(dissect_HandoverRequest_PDU, proto_xnap));
   dissector_add_uint("xnap.proc.sout", id_handoverPreparation, create_dissector_handle(dissect_HandoverRequestAcknowledge_PDU, proto_xnap));
   dissector_add_uint("xnap.proc.uout", id_handoverPreparation, create_dissector_handle(dissect_HandoverPreparationFailure_PDU, proto_xnap));