XnAP: upgrade dissector to v15.5.0

Change-Id: I9d269c907c5d43aa48ce690264ac91b1d05ea1d5
Reviewed-on: https://code.wireshark.org/review/34709
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>

9 files changed, 116 insertions, 36 deletions

diff --git a/epan/dissectors/asn1/xnap/XnAP-CommonDataTypes.asn b/epan/dissectors/asn1/xnap/XnAP-CommonDataTypes.asn
index 33b606e236..811308d25e 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 V15.4.0 (2019-07)
+-- 3GPP TS 38.423 V15.5.0 (2019-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 8075729c51..461306d48a 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 V15.4.0 (2019-07)
+-- 3GPP TS 38.423 V15.5.0 (2019-09)
 -- 9.3.7	Constant definitions
 -- **************************************************************
 --
@@ -239,5 +239,7 @@ id-PDUSessionCommonNetworkInstance																	ProtocolIE-ID ::= 127
 id-BPLMN-ID-Info-EUTRA																				ProtocolIE-ID ::= 128
 id-BPLMN-ID-Info-NR																					ProtocolIE-ID ::= 129
 id-InterfaceInstanceIndication																		ProtocolIE-ID ::= 130
+id-S-NG-RANnode-Addition-Trigger-Ind																	ProtocolIE-ID ::= 131
+id-DefaultDRB-Allowed																				ProtocolIE-ID ::= 132
 
 END
diff --git a/epan/dissectors/asn1/xnap/XnAP-Containers.asn b/epan/dissectors/asn1/xnap/XnAP-Containers.asn
index 3fe224cdc5..2e11c54572 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 V15.4.0 (2019-07)
+-- 3GPP TS 38.423 V15.5.0 (2019-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 1eb58899e0..807b87d6fc 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 V15.4.0 (2019-07)
+-- 3GPP TS 38.423 V15.5.0 (2019-09)
 -- 9.3.5	Information Element definitions
 -- **************************************************************
 --
@@ -18,6 +18,7 @@ IMPORTS
 
 
 	id-Additional-UL-NG-U-TNLatUPF-List,
+	id-DefaultDRB-Allowed,
 	id-SecondarydataForwardingInfoFromTarget-List,
 	id-LastE-UTRANPLMNIdentity,
 	id-MaxIPrate-DL,
@@ -541,6 +542,7 @@ DeliveryStatus	::= INTEGER (0..4095, ...)
 
 DesiredActNotificationLevel	::= ENUMERATED {none, qos-flow, pdu-session, ue-level, ...}
 
+DefaultDRB-Allowed ::= ENUMERATED {true, false, ...}
 
 DLForwarding	::= ENUMERATED {dl-forwarding-proposed, ...}
 
@@ -695,7 +697,8 @@ E-UTRAPRACHConfiguration ::= SEQUENCE {
 	zeroCorrelationIndex					INTEGER (0..15),
 	highSpeedFlag							ENUMERATED {true, false, ...},
 	prach-FreqOffset						INTEGER (0..94),
-	prach-ConfigIndex						INTEGER (0..63)								OPTIONAL, -- present for TDD --
+	prach-ConfigIndex						INTEGER (0..63)								OPTIONAL, 
+-- C-ifTDD: This IE shall be present if the EUTRA-Mode-Info IE in the Served Cell Information IE is set to the value “TDD” --
 	iE-Extensions							ProtocolExtensionContainer { {E-UTRAPRACHConfiguration-ExtIEs} }	OPTIONAL,
 	...
 }
@@ -1125,8 +1128,8 @@ ServiceAreaList ::= SEQUENCE (SIZE(1..maxnoofPLMNs)) OF ServiceAreaItem
 
 ServiceAreaItem ::= SEQUENCE {
 	plmn-Identity						PLMN-Identity,
-	allowed-TACs-ServiceArea			SEQUENCE (SIZE(1..maxnoofAllowedAreas)) OF TAC,
-	not-allowed-TACs-ServiceArea		SEQUENCE (SIZE(1..maxnoofAllowedAreas)) OF TAC,
+	allowed-TACs-ServiceArea			SEQUENCE (SIZE(1..maxnoofAllowedAreas)) OF TAC		OPTIONAL,
+	not-allowed-TACs-ServiceArea		SEQUENCE (SIZE(1..maxnoofAllowedAreas)) OF TAC		OPTIONAL,
 	iE-Extensions		ProtocolExtensionContainer { {ServiceAreaItem-ExtIEs} }				OPTIONAL,
 	...
 }
@@ -1672,7 +1675,8 @@ PDUSessionResourceSetupInfo-SNterminated ::= SEQUENCE {
 
 PDUSessionResourceSetupInfo-SNterminated-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-SecurityResult						CRITICALITY reject	EXTENSION SecurityResult							PRESENCE optional}|
-	{ ID id-PDUSessionCommonNetworkInstance		CRITICALITY ignore	EXTENSION PDUSessionCommonNetworkInstance		PRESENCE optional},
+	{ ID id-PDUSessionCommonNetworkInstance		CRITICALITY ignore	EXTENSION PDUSessionCommonNetworkInstance		PRESENCE optional}|
+	{ID id-DefaultDRB-Allowed					CRITICALITY ignore	EXTENSION DefaultDRB-Allowed						PRESENCE optional},
 	...
 }
 
@@ -1855,7 +1859,8 @@ PDUSessionResourceModificationInfo-SNterminated ::= SEQUENCE {
 }
 
 PDUSessionResourceModificationInfo-SNterminated-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-PDUSessionCommonNetworkInstance		CRITICALITY ignore	EXTENSION PDUSessionCommonNetworkInstance		PRESENCE optional},
+	{ ID id-PDUSessionCommonNetworkInstance		CRITICALITY ignore	EXTENSION PDUSessionCommonNetworkInstance		PRESENCE optional}|
+	{ID id-DefaultDRB-Allowed					CRITICALITY ignore	EXTENSION DefaultDRB-Allowed						PRESENCE optional},
 
 	...
 }
@@ -1879,8 +1884,8 @@ DRBsToBeModified-List-Modified-SNterminated ::= SEQUENCE (SIZE(1..maxnoofDRBs))
 
 DRBsToBeModified-List-Modified-SNterminated-Item ::= SEQUENCE {
 	drb-ID									DRB-ID,
-	mN-DL-PDCP-UP-TNLInfo					UPTransportParameters		OPTIONAL,
-	secondary-MN-DL-PDCP-UP-TNLInfo			UPTransportParameters		OPTIONAL,
+	mN-DL-SCG-UP-TNLInfo					UPTransportParameters		OPTIONAL,
+	secondary-MN-DL-SCG-UP-TNLInfo			UPTransportParameters		OPTIONAL,
 	lCID									LCID						OPTIONAL,
 	rlc-status								RLC-Status					OPTIONAL,
 	iE-Extensions					ProtocolExtensionContainer { {DRBsToBeModified-List-Modified-SNterminated-Item-ExtIEs} } 	OPTIONAL,
@@ -3027,6 +3032,12 @@ SliceSupport-List	::= SEQUENCE (SIZE(1..maxnoofSliceItems)) OF S-NSSAI
 
 S-NG-RANnode-SecurityKey ::= BIT STRING (SIZE(256))
 
+S-NG-RANnode-Addition-Trigger-Ind ::= ENUMERATED {
+	sn-change,
+	inter-MN-HO,
+	intra-MN-HO,
+	...
+}
 
 S-NSSAI ::= SEQUENCE {
 	sst						OCTET STRING (SIZE(1)),
diff --git a/epan/dissectors/asn1/xnap/XnAP-PDU-Contents.asn b/epan/dissectors/asn1/xnap/XnAP-PDU-Contents.asn
index 0b45baf790..86d6991744 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 V15.4.0 (2019-07)
+-- 3GPP TS 38.423 V15.5.0 (2019-09)
 -- 9.3.4	PDU Definitions
 -- **************************************************************
 --
@@ -23,7 +23,6 @@ BEGIN
 IMPORTS
 
 	ActivationIDforCellActivation,
-	ActivationIDforCellActivation,
 	AMF-Region-Information,
 	AMF-UE-NGAP-ID,
 	AS-SecurityInformation,
@@ -111,16 +110,15 @@ IMPORTS
 	RRCResumeCause,
 	SCGConfigurationQuery,
 	SecurityIndication,
-	ServedCells-NR,
 	S-NG-RANnode-SecurityKey,
 	SpectrumSharingGroupID,
 	SplitSRBsTypes,
+	S-NG-RANnode-Addition-Trigger-Ind,
 	S-NSSAI,
 	TAISupport-List,
 	Target-CGI,
 	TimeToWait,
 	TraceActivation,
-	TraceActivation,
 	UEAggregateMaximumBitRate,
 	UEContextID,
 	UEContextInfoRetrUECtxtResp,
@@ -224,7 +222,6 @@ FROM XnAP-Containers
 	id-TNLA-Setup-List,
 	id-TNLA-Failed-To-Setup-List,
 	id-TraceActivation,
-	id-TraceActivation,
 	id-UEContextInfoHORequest,
 	id-UEContextInfoRetrUECtxtResp,
 	id-UEContextKeptIndicator,
@@ -238,13 +235,11 @@ FROM XnAP-Containers
 	id-PDUSessionAdmittedAddedAddReqAck,
 	id-PDUSessionNotAdmittedAddReqAck,
 	id-SN-to-MN-Container,
-	id-admittedSplitSRB,
 	id-RRCConfigIndication,
 	id-SplitSRB-RRCTransfer,
 	id-UEReportRRCTransfer,
 	id-PDUSessionReleasedList-RelConf,
 	id-BearersSubjectToCounterCheck,
-	id-PDUSessionReleasedList-RelConf,
 	id-PDUSessionToBeReleasedList-RelRqd,
 	id-ResponseInfo-ReconfCompl,
 	id-initiatingNodeType-ResourceCoordRequest,
@@ -275,6 +270,7 @@ FROM XnAP-Containers
 	id-Secondary-MN-Xn-U-TNLInfoatM,
 	id-NE-DC-TDM-Pattern,
 	id-InterfaceInstanceIndication,
+	id-S-NG-RANnode-Addition-Trigger-Ind,
 
 
 	maxnoofCellsinNG-RANnode,
@@ -580,7 +576,8 @@ SNodeAdditionRequest-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-LocationInformationSNReporting		CRITICALITY ignore		TYPE LocationInformationSNReporting			PRESENCE optional}|
 	{ ID id-MR-DC-ResourceCoordinationInfo		CRITICALITY ignore		TYPE MR-DC-ResourceCoordinationInfo			PRESENCE optional }|
 	{ ID id-MaskedIMEISV						CRITICALITY ignore		TYPE MaskedIMEISV									PRESENCE optional}|
-	{ ID id-NE-DC-TDM-Pattern					CRITICALITY ignore		TYPE NE-DC-TDM-Pattern							PRESENCE optional},
+	{ ID id-NE-DC-TDM-Pattern					CRITICALITY ignore		TYPE NE-DC-TDM-Pattern								PRESENCE optional}|
+	{ ID id-S-NG-RANnode-Addition-Trigger-Ind	CRITICALITY reject		TYPE S-NG-RANnode-Addition-Trigger-Ind		PRESENCE optional},
 	...
 }
 
@@ -867,7 +864,8 @@ SNodeModificationRequestAcknowledge-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-CriticalityDiagnostics					CRITICALITY ignore		TYPE CriticalityDiagnostics							PRESENCE optional }|
 	{ ID id-LocationInformationSN					CRITICALITY ignore		TYPE Target-CGI											PRESENCE optional }|
 	{ ID id-MR-DC-ResourceCoordinationInfo			CRITICALITY ignore		TYPE MR-DC-ResourceCoordinationInfo				PRESENCE optional }|
-	{ ID id-PDUSessionDataForwarding-SNModResponse	CRITICALITY ignore		TYPE PDUSessionDataForwarding-SNModResponse	PRESENCE optional },
+	{ ID id-PDUSessionDataForwarding-SNModResponse	CRITICALITY ignore		TYPE PDUSessionDataForwarding-SNModResponse	PRESENCE optional }|
+	{ ID id-RRCConfigIndication						CRITICALITY reject		TYPE RRCConfigIndication								PRESENCE optional },
 	...
 }
 PDUSessionAdmitted-SNModResponse ::= SEQUENCE {
@@ -991,7 +989,8 @@ SNodeModificationRequired-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-SpareDRBIDs								CRITICALITY ignore		TYPE DRB-List										PRESENCE optional }|
 	{ ID id-RequiredNumberOfDRBIDs					CRITICALITY ignore		TYPE DRB-Number										PRESENCE optional }|
 	{ ID id-LocationInformationSN					CRITICALITY ignore		TYPE Target-CGI										PRESENCE optional }|
-	{ ID id-MR-DC-ResourceCoordinationInfo			CRITICALITY ignore		TYPE MR-DC-ResourceCoordinationInfo			PRESENCE optional },
+	{ ID id-MR-DC-ResourceCoordinationInfo			CRITICALITY ignore		TYPE MR-DC-ResourceCoordinationInfo			PRESENCE optional }|
+	{ ID id-RRCConfigIndication						CRITICALITY reject		TYPE RRCConfigIndication							PRESENCE optional },
 	...
 }
 PDUSessionToBeModifiedSNModRequired::= SEQUENCE (SIZE (1.. maxnoofPDUSessions)) OF 	PDUSessionToBeModifiedSNModRequired-Item
diff --git a/epan/dissectors/asn1/xnap/XnAP-PDU-Descriptions.asn b/epan/dissectors/asn1/xnap/XnAP-PDU-Descriptions.asn
index a9ac9bc4b1..7dc22ed435 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 V15.4.0 (2019-07)
+-- 3GPP TS 38.423 V15.5.0 (2019-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 c843c26f00..f777e1cd4e 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 V15.4.0 (2019-07)
+ * 3GPP TS 38.423 V15.5.0 (2019-09)
  */
 
 #include "config.h"
diff --git a/epan/dissectors/asn1/xnap/xnap.cnf b/epan/dissectors/asn1/xnap/xnap.cnf
index d61936c951..719fe505fa 100644
--- a/epan/dissectors/asn1/xnap/xnap.cnf
+++ b/epan/dissectors/asn1/xnap/xnap.cnf
@@ -707,7 +707,8 @@ id-PDUSessionCommonNetworkInstance            ProtocolIE-ID
 id-BPLMN-ID-Info-EUTRA                        ProtocolIE-ID
 id-BPLMN-ID-Info-NR                           ProtocolIE-ID
 id-InterfaceInstanceIndication                ProtocolIE-ID
-
+id-S-NG-RANnode-Addition-Trigger-Ind          ProtocolIE-ID
+id-DefaultDRB-Allowed                         ProtocolIE-ID
 #.REGISTER
 
 #XNAP-PROTOCOL-IES
@@ -829,6 +830,7 @@ UERadioCapabilityForPaging                        N xnap.ies id-UERadioCapabilit
 PDUSessionDataForwarding-SNModResponse            N xnap.ies id-PDUSessionDataForwarding-SNModResponse
 NE-DC-TDM-Pattern                                 N xnap.ies id-NE-DC-TDM-Pattern
 InterfaceInstanceIndication                       N xnap.ies id-InterfaceInstanceIndication
+S-NG-RANnode-Addition-Trigger-Ind                 N xnap.ies id-S-NG-RANnode-Addition-Trigger-Ind
 
 #XNAP-PROTOCOL-EXTENSION
 Additional-UL-NG-U-TNLatUPF-List                  N xnap.extension id-Additional-UL-NG-U-TNLatUPF-List
@@ -843,6 +845,7 @@ UPTransportLayerInformation                       N xnap.extension id-Secondary-
 PDUSessionCommonNetworkInstance                   N xnap.extension id-PDUSessionCommonNetworkInstance
 BPLMN-ID-Info-EUTRA                               N xnap.extension id-BPLMN-ID-Info-EUTRA
 BPLMN-ID-Info-NR                                  N xnap.extension id-BPLMN-ID-Info-NR
+DefaultDRB-Allowed                                N xnap.extension id-DefaultDRB-Allowed
 
 #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 a3465a9338..44e36689af 100644
--- a/epan/dissectors/packet-xnap.c
+++ b/epan/dissectors/packet-xnap.c
@@ -18,7 +18,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
  * Ref:
- * 3GPP TS 38.423 V15.4.0 (2019-07)
+ * 3GPP TS 38.423 V15.5.0 (2019-09)
  */
 
 #include "config.h"
@@ -257,7 +257,9 @@ typedef enum _ProtocolIE_ID_enum {
   id_PDUSessionCommonNetworkInstance = 127,
   id_BPLMN_ID_Info_EUTRA = 128,
   id_BPLMN_ID_Info_NR = 129,
-  id_InterfaceInstanceIndication = 130
+  id_InterfaceInstanceIndication = 130,
+  id_S_NG_RANnode_Addition_Trigger_Ind = 131,
+  id_DefaultDRB_Allowed = 132
 } ProtocolIE_ID_enum;
 
 typedef enum _GlobalNG_RANNode_ID_enum {
@@ -290,6 +292,7 @@ static int hf_xnap_CellAssistanceInfo_NR_PDU = -1;  /* CellAssistanceInfo_NR */
 static int hf_xnap_CriticalityDiagnostics_PDU = -1;  /* CriticalityDiagnostics */
 static int hf_xnap_XnUAddressInfoperPDUSession_List_PDU = -1;  /* XnUAddressInfoperPDUSession_List */
 static int hf_xnap_DesiredActNotificationLevel_PDU = -1;  /* DesiredActNotificationLevel */
+static int hf_xnap_DefaultDRB_Allowed_PDU = -1;   /* DefaultDRB_Allowed */
 static int hf_xnap_DRB_List_PDU = -1;             /* DRB_List */
 static int hf_xnap_DRB_List_withCause_PDU = -1;   /* DRB_List_withCause */
 static int hf_xnap_DRB_Number_PDU = -1;           /* DRB_Number */
@@ -334,6 +337,7 @@ static int hf_xnap_ServedCellsToUpdate_E_UTRA_PDU = -1;  /* ServedCellsToUpdate_
 static int hf_xnap_ServedCells_NR_PDU = -1;       /* ServedCells_NR */
 static int hf_xnap_ServedCellsToUpdate_NR_PDU = -1;  /* ServedCellsToUpdate_NR */
 static int hf_xnap_S_NG_RANnode_SecurityKey_PDU = -1;  /* S_NG_RANnode_SecurityKey */
+static int hf_xnap_S_NG_RANnode_Addition_Trigger_Ind_PDU = -1;  /* S_NG_RANnode_Addition_Trigger_Ind */
 static int hf_xnap_S_NSSAI_PDU = -1;              /* S_NSSAI */
 static int hf_xnap_SplitSRBsTypes_PDU = -1;       /* SplitSRBsTypes */
 static int hf_xnap_TAISupport_List_PDU = -1;      /* TAISupport_List */
@@ -752,8 +756,8 @@ static int hf_xnap_drbsToBeModifiedList = -1;     /* DRBsToBeModified_List_Modif
 static int hf_xnap_dRBsToBeReleased = -1;         /* DRB_List_withCause */
 static int hf_xnap_QoSFlowsToBeSetup_List_Modified_SNterminated_item = -1;  /* QoSFlowsToBeSetup_List_Modified_SNterminated_Item */
 static int hf_xnap_DRBsToBeModified_List_Modified_SNterminated_item = -1;  /* DRBsToBeModified_List_Modified_SNterminated_Item */
-static int hf_xnap_mN_DL_PDCP_UP_TNLInfo = -1;    /* UPTransportParameters */
-static int hf_xnap_secondary_MN_DL_PDCP_UP_TNLInfo = -1;  /* UPTransportParameters */
+static int hf_xnap_mN_DL_SCG_UP_TNLInfo = -1;     /* UPTransportParameters */
+static int hf_xnap_secondary_MN_DL_SCG_UP_TNLInfo = -1;  /* UPTransportParameters */
 static int hf_xnap_rlc_status = -1;               /* RLC_Status */
 static int hf_xnap_dRBsToBeModified = -1;         /* DRBsToBeModifiedList_ModificationResponse_SNterminated */
 static int hf_xnap_qosFlowsNotAdmittedTBAdded = -1;  /* QoSFlows_List_withCause */
@@ -1866,6 +1870,8 @@ static const value_string xnap_ProtocolIE_ID_vals[] = {
   { id_BPLMN_ID_Info_EUTRA, "id-BPLMN-ID-Info-EUTRA" },
   { id_BPLMN_ID_Info_NR, "id-BPLMN-ID-Info-NR" },
   { id_InterfaceInstanceIndication, "id-InterfaceInstanceIndication" },
+  { id_S_NG_RANnode_Addition_Trigger_Ind, "id-S-NG-RANnode-Addition-Trigger-Ind" },
+  { id_DefaultDRB_Allowed, "id-DefaultDRB-Allowed" },
   { 0, NULL }
 };
 
@@ -4027,6 +4033,22 @@ dissect_xnap_DesiredActNotificationLevel(tvbuff_t *tvb _U_, int offset _U_, asn1
 }
 
 
+static const value_string xnap_DefaultDRB_Allowed_vals[] = {
+  {   0, "true" },
+  {   1, "false" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_xnap_DefaultDRB_Allowed(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,
+                                     2, NULL, TRUE, 0, NULL);
+
+  return offset;
+}
+
+
 static const per_sequence_t DRB_List_sequence_of[1] = {
   { &hf_xnap_DRB_List_item  , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_xnap_DRB_ID },
 };
@@ -5228,8 +5250,8 @@ dissect_xnap_SEQUENCE_SIZE_1_maxnoofAllowedAreas_OF_TAC(tvbuff_t *tvb _U_, int o
 
 static const per_sequence_t ServiceAreaItem_sequence[] = {
   { &hf_xnap_plmn_Identity  , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_PLMN_Identity },
-  { &hf_xnap_allowed_TACs_ServiceArea, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_SEQUENCE_SIZE_1_maxnoofAllowedAreas_OF_TAC },
-  { &hf_xnap_not_allowed_TACs_ServiceArea, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_SEQUENCE_SIZE_1_maxnoofAllowedAreas_OF_TAC },
+  { &hf_xnap_allowed_TACs_ServiceArea, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_SEQUENCE_SIZE_1_maxnoofAllowedAreas_OF_TAC },
+  { &hf_xnap_not_allowed_TACs_ServiceArea, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_SEQUENCE_SIZE_1_maxnoofAllowedAreas_OF_TAC },
   { &hf_xnap_iE_Extensions  , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_ProtocolExtensionContainer },
   { NULL, 0, 0, NULL }
 };
@@ -7029,8 +7051,8 @@ dissect_xnap_RLC_Status(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
 
 static const per_sequence_t DRBsToBeModified_List_Modified_SNterminated_Item_sequence[] = {
   { &hf_xnap_drb_ID         , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_DRB_ID },
-  { &hf_xnap_mN_DL_PDCP_UP_TNLInfo, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_UPTransportParameters },
-  { &hf_xnap_secondary_MN_DL_PDCP_UP_TNLInfo, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_UPTransportParameters },
+  { &hf_xnap_mN_DL_SCG_UP_TNLInfo, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_UPTransportParameters },
+  { &hf_xnap_secondary_MN_DL_SCG_UP_TNLInfo, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_UPTransportParameters },
   { &hf_xnap_lCID           , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_LCID },
   { &hf_xnap_rlc_status     , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_RLC_Status },
   { &hf_xnap_iE_Extensions  , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_ProtocolExtensionContainer },
@@ -8764,6 +8786,23 @@ dissect_xnap_S_NG_RANnode_SecurityKey(tvbuff_t *tvb _U_, int offset _U_, asn1_ct
 }
 
 
+static const value_string xnap_S_NG_RANnode_Addition_Trigger_Ind_vals[] = {
+  {   0, "sn-change" },
+  {   1, "inter-MN-HO" },
+  {   2, "intra-MN-HO" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_xnap_S_NG_RANnode_Addition_Trigger_Ind(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);
+
+  return offset;
+}
+
+
 
 static int
 dissect_xnap_SpectrumSharingGroupID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -11832,6 +11871,14 @@ static int dissect_DesiredActNotificationLevel_PDU(tvbuff_t *tvb _U_, packet_inf
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_DefaultDRB_Allowed_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_DefaultDRB_Allowed(tvb, offset, &asn1_ctx, tree, hf_xnap_DefaultDRB_Allowed_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_DRB_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;
@@ -12184,6 +12231,14 @@ static int dissect_S_NG_RANnode_SecurityKey_PDU(tvbuff_t *tvb _U_, packet_info *
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_S_NG_RANnode_Addition_Trigger_Ind_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_S_NG_RANnode_Addition_Trigger_Ind(tvb, offset, &asn1_ctx, tree, hf_xnap_S_NG_RANnode_Addition_Trigger_Ind_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_S_NSSAI_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -13208,6 +13263,10 @@ void proto_register_xnap(void) {
       { "DesiredActNotificationLevel", "xnap.DesiredActNotificationLevel",
         FT_UINT32, BASE_DEC, VALS(xnap_DesiredActNotificationLevel_vals), 0,
         NULL, HFILL }},
+    { &hf_xnap_DefaultDRB_Allowed_PDU,
+      { "DefaultDRB-Allowed", "xnap.DefaultDRB_Allowed",
+        FT_UINT32, BASE_DEC, VALS(xnap_DefaultDRB_Allowed_vals), 0,
+        NULL, HFILL }},
     { &hf_xnap_DRB_List_PDU,
       { "DRB-List", "xnap.DRB_List",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -13384,6 +13443,10 @@ void proto_register_xnap(void) {
       { "S-NG-RANnode-SecurityKey", "xnap.S_NG_RANnode_SecurityKey",
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_xnap_S_NG_RANnode_Addition_Trigger_Ind_PDU,
+      { "S-NG-RANnode-Addition-Trigger-Ind", "xnap.S_NG_RANnode_Addition_Trigger_Ind",
+        FT_UINT32, BASE_DEC, VALS(xnap_S_NG_RANnode_Addition_Trigger_Ind_vals), 0,
+        NULL, HFILL }},
     { &hf_xnap_S_NSSAI_PDU,
       { "S-NSSAI", "xnap.S_NSSAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -15056,12 +15119,12 @@ void proto_register_xnap(void) {
       { "DRBsToBeModified-List-Modified-SNterminated-Item", "xnap.DRBsToBeModified_List_Modified_SNterminated_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_xnap_mN_DL_PDCP_UP_TNLInfo,
-      { "mN-DL-PDCP-UP-TNLInfo", "xnap.mN_DL_PDCP_UP_TNLInfo",
+    { &hf_xnap_mN_DL_SCG_UP_TNLInfo,
+      { "mN-DL-SCG-UP-TNLInfo", "xnap.mN_DL_SCG_UP_TNLInfo",
         FT_UINT32, BASE_DEC, NULL, 0,
         "UPTransportParameters", HFILL }},
-    { &hf_xnap_secondary_MN_DL_PDCP_UP_TNLInfo,
-      { "secondary-MN-DL-PDCP-UP-TNLInfo", "xnap.secondary_MN_DL_PDCP_UP_TNLInfo",
+    { &hf_xnap_secondary_MN_DL_SCG_UP_TNLInfo,
+      { "secondary-MN-DL-SCG-UP-TNLInfo", "xnap.secondary_MN_DL_SCG_UP_TNLInfo",
         FT_UINT32, BASE_DEC, NULL, 0,
         "UPTransportParameters", HFILL }},
     { &hf_xnap_rlc_status,
@@ -16994,6 +17057,7 @@ proto_reg_handoff_xnap(void)
   dissector_add_uint("xnap.ies", id_PDUSessionDataForwarding_SNModResponse, create_dissector_handle(dissect_PDUSessionDataForwarding_SNModResponse_PDU, proto_xnap));
   dissector_add_uint("xnap.ies", id_NE_DC_TDM_Pattern, create_dissector_handle(dissect_NE_DC_TDM_Pattern_PDU, proto_xnap));
   dissector_add_uint("xnap.ies", id_InterfaceInstanceIndication, create_dissector_handle(dissect_InterfaceInstanceIndication_PDU, proto_xnap));
+  dissector_add_uint("xnap.ies", id_S_NG_RANnode_Addition_Trigger_Ind, create_dissector_handle(dissect_S_NG_RANnode_Addition_Trigger_Ind_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));
@@ -17006,6 +17070,7 @@ proto_reg_handoff_xnap(void)
   dissector_add_uint("xnap.extension", id_PDUSessionCommonNetworkInstance, create_dissector_handle(dissect_PDUSessionCommonNetworkInstance_PDU, proto_xnap));
   dissector_add_uint("xnap.extension", id_BPLMN_ID_Info_EUTRA, create_dissector_handle(dissect_BPLMN_ID_Info_EUTRA_PDU, proto_xnap));
   dissector_add_uint("xnap.extension", id_BPLMN_ID_Info_NR, create_dissector_handle(dissect_BPLMN_ID_Info_NR_PDU, proto_xnap));
+  dissector_add_uint("xnap.extension", id_DefaultDRB_Allowed, create_dissector_handle(dissect_DefaultDRB_Allowed_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));