Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 389 insertions, 26 deletions

diff --git a/epan/dissectors/asn1/e1ap/E1AP-IEs.asn b/epan/dissectors/asn1/e1ap/E1AP-IEs.asn
index 536691e6..baeb3522 100644
--- a/epan/dissectors/asn1/e1ap/E1AP-IEs.asn
+++ b/epan/dissectors/asn1/e1ap/E1AP-IEs.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 37.483 V17.5.0 (2023-06)
+-- 3GPP TS 37.483 V18.2.0 (2024-06)
 -- **************************************************************
 --
 -- Information Element Definitions
@@ -24,6 +24,7 @@ IMPORTS
 	id-QoSFlowMappingIndication,
 	id-TNLAssociationTransportLayerAddressgNBCUUP,
 	id-Cause,
+	id-BCBearerContextNGU-TNLInfoatNGRAN-Request,
 	id-QoSMonitoringRequest,
 	id-QosMonitoringReportingFrequency,
 	id-QoSMonitoringDisabled,
@@ -76,6 +77,30 @@ IMPORTS
 	id-PDCP-COUNT-Reset,
 	id-MBSSessionAssociatedInfoNonSupportToSupport,
 	id-VersionID,
+	id-MBSAreaSessionID,
+	id-Secondary-PDU-Session-Data-Forwarding-Information,
+	id-MBSSessionResourceNotification,
+	id-MCBearerContextInactivityTimer,
+	id-MCBearerContextStatusChange,
+	id-SpecialTriggeringPurpose,
+	id-F1UTunnelNotEstablished,
+	id-PDUSetQoSParameters,
+	id-N6JitterInformation,
+	id-ECNMarkingorCongestionInformationReportingRequest,
+	id-ECNMarkingorCongestionInformationReportingStatus,
+	id-PDUSetbasedHandlingIndicator,
+	id-IndirectPathIndication,
+	id-F1U-TNL-InfoToAdd-List,
+	id-F1U-TNL-InfoAdded-List,
+	id-F1U-TNL-InfoToAddOrModify-List,
+	id-F1U-TNL-InfoAddedOrModified-List,
+	id-F1U-TNL-InfoToRelease-List,
+	id-BroadcastF1U-ContextReferenceE1,
+	id-PSIbasedDiscardTimer,
+	id-UserPlaneErrorIndicator,
+	id-MaximumDataBurstVolume,
+	id-PDCPSNGapReport,
+	id-UserPlaneFailureIndication,
 	maxnoofMBSAreaSessionIDs,
 	maxnoofSharedNG-UTerminations,
 	maxnoofMRBs,
@@ -100,7 +125,12 @@ IMPORTS
 	maxnoofDataForwardingTunneltoE-UTRAN,
 	maxnoofExtNRCGI,
 	maxnoofECGI,
-	maxnoofSMBRValues
+	maxnoofSMBRValues,
+	maxnoofCellsforMBS,
+	maxnoofTAIforMBS,
+	maxnoofMBSServiceAreaInformation,
+	maxnoofDUs
+
 
 FROM E1AP-Constants
 
@@ -167,9 +197,12 @@ AlternativeQoSParaSetItem ::= SEQUENCE {
 }
 
 AlternativeQoSParaSetItem-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
+		{ ID id-MaximumDataBurstVolume	CRITICALITY ignore	EXTENSION MaxDataBurstVolume		PRESENCE optional		},
 	...
 }
 
+AssociatedSessionID ::= OCTET STRING
+
 -- B
 
 -- BCBearerContextToSetup
@@ -210,6 +243,7 @@ BCMRBSetupConfiguration-Item ::= SEQUENCE {
 }
 
 BCMRBSetupConfiguration-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
+	{ID id-F1U-TNL-InfoToAdd-List	CRITICALITY ignore	EXTENSION F1U-TNL-InfoToAdd-List	PRESENCE optional},
 	...
 }
 
@@ -250,6 +284,7 @@ BCMRBSetupResponseList-Item ::= SEQUENCE {
 }
 
 BCMRBSetupResponseList-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
+	{ID id-F1U-TNL-InfoAdded-List	CRITICALITY ignore	EXTENSION F1U-TNL-InfoAdded-List	PRESENCE optional},
 	...
 }
 
@@ -289,6 +324,17 @@ BCBearerContextToModify ::= SEQUENCE {
 }
 
 BCBearerContextToModify-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
+	{ID id-BCBearerContextNGU-TNLInfoatNGRAN-Request	CRITICALITY ignore	EXTENSION BCBearerContextNGU-TNLInfoatNGRAN-Request	PRESENCE optional},
+	...
+}
+
+BCBearerContextNGU-TNLInfoatNGRAN-Request ::= CHOICE {
+	locationindependent				MBSNGUInformationAtNGRAN-Request,
+	locationdependent				MBSNGUInformationAtNGRAN-Request-List,
+	choice-extension	ProtocolIE-SingleContainer	{{ BCBearerContextNGU-TNLInfoatNGRAN-Request-ExtIEs}}
+}
+
+BCBearerContextNGU-TNLInfoatNGRAN-Request-ExtIEs E1AP-PROTOCOL-IES ::= {
 	...
 }
 
@@ -305,6 +351,8 @@ BCMRBModifyConfiguration-Item ::= SEQUENCE {
 }
 
 BCMRBModifyConfiguration-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
+	{ID id-F1U-TNL-InfoToAddOrModify-List	CRITICALITY ignore	EXTENSION F1U-TNL-InfoToAddOrModify-List	PRESENCE optional}|
+	{ID id-F1U-TNL-InfoToRelease-List		CRITICALITY ignore	EXTENSION F1U-TNL-InfoToRelease-List			PRESENCE optional},
 	...
 }
 
@@ -348,9 +396,12 @@ BCMRBSetupModifyResponseList-Item ::= SEQUENCE {
 }
 
 BCMRBSetupModifyResponseList-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
+	{ID id-F1U-TNL-InfoAddedOrModified-List	CRITICALITY ignore	EXTENSION F1U-TNL-InfoAddedOrModified-List	PRESENCE optional},
 	...
 }
 
+BroadcastF1U-ContextReferenceE1 ::= OCTET STRING (SIZE(4))
+
 
 -- BCBearerContextToModifyRequired
 
@@ -391,6 +442,7 @@ BufferSize	::=	ENUMERATED	{
 	...
 }
 
+
 -- C
 
 Cause ::= CHOICE {
@@ -600,7 +652,8 @@ Data-Forwarding-Information	::=	SEQUENCE {
 }
 
 Data-Forwarding-Information-ExtIEs		E1AP-PROTOCOL-EXTENSION ::= {
-	{ID id-DataForwardingtoNG-RANQoSFlowInformationList	CRITICALITY ignore	EXTENSION DataForwardingtoNG-RANQoSFlowInformationList	PRESENCE optional},
+	{ID id-DataForwardingtoNG-RANQoSFlowInformationList	CRITICALITY ignore	EXTENSION DataForwardingtoNG-RANQoSFlowInformationList	PRESENCE optional}|
+	{ID id-PDUSetbasedHandlingIndicator CRITICALITY ignore	EXTENSION PDUSetbasedHandlingIndicator								PRESENCE optional},
 	...
 }
 
@@ -685,6 +738,8 @@ DiscardTimer	::=	ENUMERATED {ms10, ms20, ms30, ms40, ms50, ms60, ms75, ms100, ms
 
 DiscardTimerExtended	::=	ENUMERATED {ms0dot5, ms1, ms2, ms4, ms6, ms8,..., ms2000}
 
+PSIbasedDiscardTimer	::=	ENUMERATED {ms0, ms2, ms4, ms6, ms8, ms10, ms12, ms14, ms18, ms22, ms26, ms30, ms40, ms50, ms75, ms100, ...}
+
 DLDiscarding ::= SEQUENCE {
 	dLDiscardingCountVal			PDCP-Count,
 	iE-Extensions					ProtocolExtensionContainer { { DLDiscarding-ExtIEs } } 		OPTIONAL
@@ -1212,7 +1267,8 @@ DRB-To-Setup-Item-NG-RAN-ExtIEs		E1AP-PROTOCOL-EXTENSION ::= {
 	{ID id-DAPSRequestInfo				CRITICALITY ignore	EXTENSION DAPSRequestInfo					PRESENCE optional}|
 	{ID id-ignoreMappingRuleIndication	CRITICALITY reject	EXTENSION IgnoreMappingRuleIndication	PRESENCE optional}|
 	{ID id-QoSFlowsDRBRemapping			CRITICALITY reject	EXTENSION QoS-Flows-DRB-Remapping			PRESENCE optional}|
-	{ID id-SDTindicatorSetup			CRITICALITY reject	EXTENSION SDTindicatorSetup					PRESENCE optional},
+	{ID id-SDTindicatorSetup			CRITICALITY reject	EXTENSION SDTindicatorSetup					PRESENCE optional}|
+	{ID id-SpecialTriggeringPurpose		CRITICALITY ignore	EXTENSION SpecialTriggeringPurpose			PRESENCE optional},
 	...
 }
 
@@ -1235,7 +1291,8 @@ DRB-To-Setup-Mod-Item-NG-RAN-ExtIEs		E1AP-PROTOCOL-EXTENSION ::= {
 	{ID id-DRB-QoS						CRITICALITY ignore	EXTENSION QoSFlowLevelQoSParameters		PRESENCE optional}|
 	{ID id-ignoreMappingRuleIndication	CRITICALITY reject	EXTENSION IgnoreMappingRuleIndication	PRESENCE optional}|
 	{ID id-DAPSRequestInfo				CRITICALITY ignore	EXTENSION DAPSRequestInfo				PRESENCE optional}|
-	{ID id-SDTindicatorSetup			CRITICALITY reject	EXTENSION SDTindicatorSetup				PRESENCE optional},
+	{ID id-SDTindicatorSetup			CRITICALITY reject	EXTENSION SDTindicatorSetup				PRESENCE optional}|
+	{ID id-SpecialTriggeringPurpose		CRITICALITY ignore	EXTENSION SpecialTriggeringPurpose		PRESENCE optional},
 	...
 }
 
@@ -1267,7 +1324,9 @@ Dynamic5QIDescriptor	::= SEQUENCE {
 	packetErrorRate						PacketErrorRate,
 	fiveQI								INTEGER (0..255, ...)								OPTIONAL,
 	delayCritical						ENUMERATED {delay-critical, non-delay-critical}		OPTIONAL,
+-- This IE shall be present if the GBR QoS Flow Information IE is present in the QoS Flow Level QoS Parameters IE.--
 	averagingWindow 					AveragingWindow										OPTIONAL,
+-- This IE shall be present if the GBR QoS Flow Information IE is present in the QoS Flow Level QoS Parameters IE.--
 	maxDataBurstVolume					MaxDataBurstVolume									OPTIONAL,
 	iE-Extensions					ProtocolExtensionContainer { { Dynamic5QIDescriptor-ExtIEs } } OPTIONAL
 }
@@ -1300,6 +1359,21 @@ EarlyForwardingCOUNTInfo-ExtIEs E1AP-PROTOCOL-IES ::= {
 
 EarlyForwardingCOUNTReq ::= ENUMERATED { first-dl-count, dl-discarding, ...}
 
+ECNMarkingorCongestionInformationReportingRequest ::= CHOICE {
+	eCNMarkingatNGRAN						ENUMERATED { ul, dl, both, stop, ...},
+	eCNMarkingatUPF							ENUMERATED { ul, dl, both, stop, ...},
+	congestionInformation					ENUMERATED { ul, dl, both, stop, ...},
+	choice-extension	ProtocolIE-SingleContainer	{{ECNMarkingorCongestionInformationReportingRequest-ExtIEs}}
+}
+
+ECNMarkingorCongestionInformationReportingRequest-ExtIEs E1AP-PROTOCOL-IES ::= {
+	...
+}
+
+
+ECNMarkingorCongestionInformationReportingStatus ::= ENUMERATED { active, not-active, ...}
+
+
 EHC-Common-Parameters ::= SEQUENCE {
 	ehc-CID-Length						ENUMERATED { bits7, bits15, ...},
 	iE-Extensions						ProtocolExtensionContainer { { EHC-Common-Parameters-ExtIEs } } 		OPTIONAL
@@ -1425,6 +1499,72 @@ FirstDLCount-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+FiveGS-TAC ::= OCTET STRING (SIZE(3))
+
+F1U-TNL-InfoAdded-List ::= SEQUENCE (SIZE(1..maxnoofDUs)) OF F1U-TNL-InfoAdded-Item
+
+F1U-TNL-InfoAdded-Item ::= SEQUENCE {
+	broadcastF1U-ContextReferenceE1				BroadcastF1U-ContextReferenceE1,
+	bcBearerContextF1U-TNLInfoatCU				BCBearerContextF1U-TNLInfoatCU,
+	iE-Extensions		ProtocolExtensionContainer { {F1U-TNL-InfoAdded-Item-ExtIEs} }	OPTIONAL,
+	...
+}
+
+F1U-TNL-InfoAdded-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+F1U-TNL-InfoToAdd-List ::= SEQUENCE (SIZE(1..maxnoofDUs)) OF F1U-TNL-InfoToAdd-Item
+
+F1U-TNL-InfoToAdd-Item ::= SEQUENCE {
+	broadcastF1U-ContextReferenceE1				BroadcastF1U-ContextReferenceE1,
+	iE-Extensions		ProtocolExtensionContainer { {F1U-TNL-InfoToAdd-Item-ExtIEs} }	OPTIONAL,
+	...
+}
+
+F1U-TNL-InfoToAdd-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+F1U-TNL-InfoAddedOrModified-List ::= SEQUENCE (SIZE(1..maxnoofDUs)) OF F1U-TNL-InfoAddedOrModified-Item
+
+F1U-TNL-InfoAddedOrModified-Item ::= SEQUENCE {
+	broadcastF1U-ContextReferenceE1				BroadcastF1U-ContextReferenceE1,
+	bcBearerContextF1U-TNLInfoatCU				BCBearerContextF1U-TNLInfoatCU					OPTIONAL,
+	iE-Extensions		ProtocolExtensionContainer { {F1U-TNL-InfoAddedOrModified-Item-ExtIEs} }	OPTIONAL,
+	...
+}
+
+F1U-TNL-InfoAddedOrModified-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+F1U-TNL-InfoToAddOrModify-List ::= SEQUENCE (SIZE(1..maxnoofDUs)) OF F1U-TNL-InfoToAddOrModify-Item
+
+F1U-TNL-InfoToAddOrModify-Item ::= SEQUENCE {
+	broadcastF1U-ContextReferenceE1				BroadcastF1U-ContextReferenceE1,
+	bcBearerContextF1U-TNLInfoatDU				BCBearerContextF1U-TNLInfoatDU					OPTIONAL,
+	iE-Extensions		ProtocolExtensionContainer { {F1U-TNL-InfoToAddOrModify-Item-ExtIEs} }	OPTIONAL,
+	...
+}
+
+F1U-TNL-InfoToAddOrModify-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+F1U-TNL-InfoToRelease-List ::= SEQUENCE (SIZE(1..maxnoofDUs)) OF F1U-TNL-InfoToRelease-Item
+
+F1U-TNL-InfoToRelease-Item ::= SEQUENCE {
+	broadcastF1U-ContextReferenceE1				BroadcastF1U-ContextReferenceE1,
+	iE-Extensions		ProtocolExtensionContainer { {F1U-TNL-InfoToRelease-Item-ExtIEs} }	OPTIONAL,
+	...
+}
+
+F1U-TNL-InfoToRelease-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
 -- G
 
 GlobalMBSSessionID ::= SEQUENCE {
@@ -1644,6 +1784,12 @@ HW-CapacityIndicator-ExtIEs	E1AP-PROTOCOL-EXTENSION ::= {
 
 -- I
 
+
+IndirectPathIndication	::=	ENUMERATED	{
+	true,
+	...
+}
+
 IgnoreMappingRuleIndication	::=	ENUMERATED	{
 	true,
 	...
@@ -1679,8 +1825,11 @@ InterfacesToTrace ::= BIT STRING (SIZE(8))
 ImmediateMDT ::= SEQUENCE {
 measurementsToActivate		MeasurementsToActivate,
 	measurementFour 	M4Configuration		OPTIONAL,
+-- This IE shall be present if the Measurements to Activate IE has the fourth bit set to “1”.--
 	measurementSix 				M6Configuration		OPTIONAL,
+-- This IE shall be present if the Measurements to Activate IE has the seventh bit set to “1”.--
 	measurementSeven 			M7Configuration	    OPTIONAL,
+-- This IE shall be present if the Measurements to Activate IE has the eighth bit set to “1”.--
 	iE-Extensions				ProtocolExtensionContainer { { ImmediateMDT-ExtIEs} } OPTIONAL,
 	...
 }
@@ -1700,6 +1849,9 @@ IAB-donor-CU-UPPSKInfoItemExtIEs 	E1AP-PROTOCOL-EXTENSION ::= {
 }
 IAB-donor-CU-UPPSK	::= OCTET STRING
 
+InactivityInformationRequest ::= ENUMERATED {true, ...}
+
+
 -- J
 
 -- K
@@ -1750,6 +1902,7 @@ LocationDependentMBSF1UInformationAtDU-Item ::= SEQUENCE {
 }
 
 LocationDependentMBSF1UInformationAtDU-Item-ExtIEs		E1AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-F1UTunnelNotEstablished		CRITICALITY		ignore		EXTENSION		F1UTunnelNotEstablished		PRESENCE		optional	},
 	...
 }
 
@@ -1809,6 +1962,7 @@ MBSF1UInformationAtDU ::= SEQUENCE {
 }
 
 MBSF1UInformationAtDU-ExtIEs		E1AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-F1UTunnelNotEstablished		CRITICALITY		ignore		EXTENSION		F1UTunnelNotEstablished		PRESENCE		optional	},
 	...
 }
 
@@ -1842,6 +1996,20 @@ MBSNGUInformationAtNGRAN-ExtIEs E1AP-PROTOCOL-IES ::= {
 	...
 }
 
+MBSNGUInformationAtNGRAN-Request ::=	ENUMERATED {true, ... }
+
+MBSNGUInformationAtNGRAN-Request-List ::= SEQUENCE (SIZE(1..maxnoofMBSAreaSessionIDs)) OF MBSNGUInformationAtNGRAN-Request-Item
+
+MBSNGUInformationAtNGRAN-Request-Item ::= SEQUENCE {
+	mbsAreaSession-ID							MBSAreaSessionID,
+	mbsNGUInformationAtNGRAN-Request			MBSNGUInformationAtNGRAN-Request,
+	iE-Extensions							ProtocolExtensionContainer	{ { MBSNGUInformationAtNGRAN-Request-Item-ExtIEs } }	OPTIONAL,
+	...
+}
+
+MBSNGUInformationAtNGRAN-Request-Item-ExtIEs		E1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 MBSSessionAssociatedInfoNonSupportToSupport ::= SEQUENCE {
 	ue-Reference-ID						GNB-CU-CP-UE-E1AP-ID,
@@ -1857,7 +2025,7 @@ MBSSessionAssociatedInfoNonSupportToSupport-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
 
 MBSSessionAssociatedInformation ::= SEQUENCE {
 	mbsSessionAssociatedInformationList		MBSSessionAssociatedInformationList,
-	mbsSessionForwardingAddress				TransportLayerAddress,
+	mbsSessionForwardingAddress				UP-TNL-Information,
 	iE-Extensions		ProtocolExtensionContainer { {MBSSessionAssociatedInformation-ExtIEs} }	OPTIONAL,
 	...
 }
@@ -1893,6 +2061,38 @@ MBS-Support-Info-ToAdd-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
 
 MBS-Support-Info-ToRemove-List ::= SEQUENCE (SIZE(1..maxnoofMBSSessionIDs)) OF MBS-Support-Info-ToRemove-Item
 
+MBSSessionResourceNotification ::= CHOICE {
+	mbs-DL-Data-Arrival				MBS-DL-Data-Arrival,
+	inactivity						MCBearerContext-Inactivity,
+	choice-extension				ProtocolIE-SingleContainer	{{ MBSSessionResourceNotification-ExtIEs}}
+}
+
+MBSSessionResourceNotification-ExtIEs E1AP-PROTOCOL-IES ::= {
+	...
+}
+
+MBS-DL-Data-Arrival ::= SEQUENCE {
+	dlDataArrival					ENUMERATED {true, ...},
+	ppi								PPI							OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { { MBS-DL-Data-Arrival-ExtIEs} }	OPTIONAL,
+	...
+}
+
+MBS-DL-Data-Arrival-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+MCBearerContext-Inactivity ::= SEQUENCE {
+	mcBearerContext-Inactivity-Indication						ENUMERATED {true, ...},
+	iE-Extensions		ProtocolExtensionContainer { {MCBearerContext-Inactivity-ExtIEs} }	OPTIONAL,
+	...
+}
+
+MCBearerContext-Inactivity-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 MBS-Support-Info-ToRemove-Item ::= SEQUENCE {
 	globalMBSSessionID					GlobalMBSSessionID,
 	iE-Extensions		ProtocolExtensionContainer { { MBS-Support-Info-ToRemove-Item-ExtIEs} }	OPTIONAL,
@@ -1914,7 +2114,10 @@ MCBearerContextToSetup ::= SEQUENCE {
 }
 
 MCBearerContextToSetup-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
-	{ID id-MBSSessionAssociatedInfoNonSupportToSupport	CRITICALITY ignore	EXTENSION MBSSessionAssociatedInfoNonSupportToSupport	PRESENCE optional},
+	{ID id-MBSSessionAssociatedInfoNonSupportToSupport	CRITICALITY ignore	EXTENSION MBSSessionAssociatedInfoNonSupportToSupport	PRESENCE optional}|
+	{ID id-MBSAreaSessionID					CRITICALITY ignore	EXTENSION MBSAreaSessionID					PRESENCE optional}|
+	{ID id-MCBearerContextInactivityTimer		CRITICALITY ignore	EXTENSION Inactivity-Timer					PRESENCE optional}|
+	{ID id-MCBearerContextStatusChange		CRITICALITY ignore	EXTENSION MCBearerContextStatusChange		PRESENCE optional},
 	...
 }
 
@@ -1933,6 +2136,8 @@ MCMRBSetupConfiguration-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+MCBearerContextStatusChange	::=	ENUMERATED {suspend, resume, ...}
+
 
 -- MCBearerContextToSetupResponse
 
@@ -2008,7 +2213,9 @@ MCBearerContextToModify-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
 	{ID id-MCForwardingResourceRequest					CRITICALITY ignore	EXTENSION MCForwardingResourceRequest						PRESENCE optional}|
 	{ID id-MCForwardingResourceIndication				CRITICALITY ignore	EXTENSION MCForwardingResourceIndication					PRESENCE optional}|
 	{ID id-MCForwardingResourceRelease					CRITICALITY ignore	EXTENSION MCForwardingResourceRelease						PRESENCE optional}|
-	{ID id-MBSSessionAssociatedInfoNonSupportToSupport	CRITICALITY ignore	EXTENSION MBSSessionAssociatedInfoNonSupportToSupport	PRESENCE optional},
+	{ID id-MBSSessionAssociatedInfoNonSupportToSupport	CRITICALITY ignore	EXTENSION MBSSessionAssociatedInfoNonSupportToSupport	PRESENCE optional}|
+	{ID id-MCBearerContextInactivityTimer					CRITICALITY ignore	EXTENSION Inactivity-Timer										PRESENCE optional}|
+	{ID id-MCBearerContextStatusChange					CRITICALITY ignore	EXTENSION MCBearerContextStatusChange						PRESENCE optional},
 	...
 }
 
@@ -2430,6 +2637,71 @@ MDTPLMNList ::= SEQUENCE (SIZE(1..maxnoofMDTPLMNs)) OF PLMN-Identity
 
 MDTPLMNModificationList ::= SEQUENCE (SIZE(0..maxnoofMDTPLMNs)) OF PLMN-Identity
 
+MT-SDT-Information ::= SEQUENCE {
+	mT-SDT-Data-Size			MT-SDT-Data-Size,
+	iE-Extensions				ProtocolExtensionContainer { {MT-SDT-Information-ExtIEs} } OPTIONAL
+}
+
+MT-SDT-Information-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+MT-SDT-Information-Request ::=	ENUMERATED {true, ...}
+
+MT-SDT-Data-Size::= INTEGER (1..96000, ...)
+
+
+
+
+MBS-ServiceArea ::= SEQUENCE {
+	mBS-ServiceAreaInformationList		MBS-ServiceAreaInformationList				OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { {MBS-ServiceArea-ExtIEs} }	OPTIONAL,
+	...
+}
+
+MBS-ServiceArea-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+MBS-ServiceAreaInformation ::= SEQUENCE {
+	mBS-ServiceAreaCellList		MBS-ServiceAreaCellList																OPTIONAL,
+	mBS-ServiceAreaTAIList		MBS-ServiceAreaTAIList																OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { {MBS-ServiceAreaInformation-ExtIEs} }	OPTIONAL,
+	...
+}
+
+MBS-ServiceAreaInformation-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+MBS-ServiceAreaCellList ::= SEQUENCE (SIZE(1.. maxnoofCellsforMBS)) OF NR-CGI
+
+MBS-ServiceAreaTAIList ::= SEQUENCE (SIZE(1.. maxnoofTAIforMBS)) OF MBS-ServiceAreaTAIList-Item
+MBS-ServiceAreaTAIList-Item ::= SEQUENCE {
+	plmn-ID							PLMN-Identity,
+	fiveGS-TAC						FiveGS-TAC,
+	iE-Extensions					ProtocolExtensionContainer { {MBS-ServiceAreaTAIList-Item-ExtIEs} }	OPTIONAL,
+	...
+}
+
+MBS-ServiceAreaTAIList-Item-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+MBS-ServiceAreaInformationList ::= SEQUENCE (SIZE(1..maxnoofMBSServiceAreaInformation)) OF MBS-ServiceAreaInformationItem
+
+MBS-ServiceAreaInformationItem ::= SEQUENCE {
+	mBS-AreaSessionID					MBSAreaSessionID,
+	mBS-ServiceAreaInformation 			MBS-ServiceAreaInformation,
+	iE-Extensions						ProtocolExtensionContainer { { MBS-ServiceAreaInformationItem-ExtIEs} }	OPTIONAL,
+	...
+}
+MBS-ServiceAreaInformationItem-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 -- N
 
 NetworkInstance ::= INTEGER (1..256, ...)
@@ -2547,6 +2819,19 @@ Extended-NR-CGI-Support-Item-ExtIEs	E1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+N6JitterInformation ::= SEQUENCE {
+	n6JitterLowerBound		INTEGER (-127..127),
+	n6JitterUpperBound		INTEGER (-127..127),
+	iE-Extensions	ProtocolExtensionContainer { { N6JitterInformationExtIEs } }	OPTIONAL,
+	...
+}
+
+N6JitterInformationExtIEs 	E1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+
 -- O
 
 OutOfOrderDelivery	::=	ENUMERATED	{
@@ -2596,10 +2881,14 @@ PDCP-Configuration-ExtIEs		E1AP-PROTOCOL-EXTENSION ::= {
 	{ ID id-AdditionalPDCPduplicationInformation		CRITICALITY ignore	EXTENSION AdditionalPDCPduplicationInformation	PRESENCE optional	}|
 	{ ID id-EHC-Parameters								CRITICALITY ignore	EXTENSION EHC-Parameters									PRESENCE optional}|
 	{ ID id-UDC-Parameters								CRITICALITY ignore	EXTENSION UDC-Parameters									PRESENCE optional}|
-	{ ID id-DiscardTimerExtended								CRITICALITY reject	EXTENSION DiscardTimerExtended									PRESENCE optional},
+	{ ID id-DiscardTimerExtended								CRITICALITY reject	EXTENSION DiscardTimerExtended									PRESENCE optional}|
+	{ ID id-PSIbasedDiscardTimer						CRITICALITY ignore	EXTENSION PSIbasedDiscardTimer								PRESENCE optional}|
+	{ ID id-PDCPSNGapReport						CRITICALITY ignore	EXTENSION PDCPSNGapReport														PRESENCE optional},
 	...
 }
 
+PDCPSNGapReport	::=	ENUMERATED {true, ...}
+
 PDCP-COUNT-Reset	::=	ENUMERATED	{
 	true,
 	...
@@ -2655,9 +2944,9 @@ PDCP-SN-Size	::=	ENUMERATED	{
 	s-12,
 	s-18,
 	...,
-s-7,
-s-15,
-s-16
+	s-7,
+	s-15,
+	s-16
 }
 
 PDCP-SN-Status-Information ::= SEQUENCE {
@@ -2863,7 +3152,9 @@ PDU-Session-Resource-To-Modify-Item-ExtIEs		E1AP-PROTOCOL-EXTENSION ::= {
 	{ID id-redundant-nG-UL-UP-TNL-Information			CRITICALITY ignore	EXTENSION 	UP-TNL-Information								PRESENCE optional	}|
 	{ID id-RedundantCommonNetworkInstance				CRITICALITY ignore	EXTENSION 	CommonNetworkInstance							PRESENCE optional	}|
 	{ID id-DataForwardingtoE-UTRANInformationList		CRITICALITY ignore	EXTENSION 	DataForwardingtoE-UTRANInformationList	PRESENCE optional	}|
-	{ID id-SecurityIndicationModify						CRITICALITY ignore	EXTENSION 	SecurityIndication								PRESENCE optional	},
+	{ID id-SecurityIndicationModify						CRITICALITY ignore	EXTENSION 	SecurityIndication								PRESENCE optional	}|
+	{ID id-Secondary-PDU-Session-Data-Forwarding-Information	CRITICALITY ignore	EXTENSION 	Data-Forwarding-Information		PRESENCE optional	}|
+	{ID id-UserPlaneFailureIndication					CRITICALITY ignore	EXTENSION 	UserPlaneFailureIndication						PRESENCE optional	},
 	...
 }
 
@@ -2876,7 +3167,8 @@ PDU-Session-Resource-To-Remove-Item	::=	SEQUENCE {
 }
 
 PDU-Session-Resource-To-Remove-Item-ExtIEs		E1AP-PROTOCOL-EXTENSION ::= {
-	{ID id-Cause		CRITICALITY ignore	EXTENSION Cause		PRESENCE optional},
+	{ID id-Cause		CRITICALITY ignore	EXTENSION Cause		PRESENCE optional}|
+	{ID id-UserPlaneErrorIndicator		CRITICALITY ignore	EXTENSION UserPlaneErrorIndicator		PRESENCE optional},
 	...
 }
 
@@ -2902,7 +3194,8 @@ PDU-Session-Resource-To-Setup-Item-ExtIEs		E1AP-PROTOCOL-EXTENSION ::= {
 	{ ID id-CommonNetworkInstance						CRITICALITY ignore	EXTENSION CommonNetworkInstance								PRESENCE optional	}|
 	{ ID id-redundant-nG-UL-UP-TNL-Information		CRITICALITY ignore	EXTENSION 	UP-TNL-Information					PRESENCE optional	}|
 	{ ID id-RedundantCommonNetworkInstance			CRITICALITY ignore	EXTENSION 	CommonNetworkInstance				PRESENCE optional	}|
-	{ ID id-RedundantPDUSessionInformation			CRITICALITY ignore	EXTENSION 	RedundantPDUSessionInformation	PRESENCE optional	},
+	{ ID id-RedundantPDUSessionInformation			CRITICALITY ignore	EXTENSION 	RedundantPDUSessionInformation	PRESENCE optional	}|
+	{ID id-SpecialTriggeringPurpose			CRITICALITY ignore	EXTENSION SpecialTriggeringPurpose					PRESENCE optional},
 	...
 }
 
@@ -2926,7 +3219,8 @@ PDU-Session-Resource-To-Setup-Mod-Item-ExtIEs		E1AP-PROTOCOL-EXTENSION ::= {
 	{ID id-NetworkInstance		CRITICALITY ignore	EXTENSION NetworkInstance		PRESENCE optional}|
 	{ID id-CommonNetworkInstance	CRITICALITY ignore	EXTENSION CommonNetworkInstance	PRESENCE optional}|
 	{ID id-redundant-nG-UL-UP-TNL-Information		CRITICALITY ignore	EXTENSION 	UP-TNL-Information		PRESENCE optional	}|
-	{ID id-RedundantCommonNetworkInstance			CRITICALITY ignore	EXTENSION 	CommonNetworkInstance	PRESENCE optional	},
+	{ID id-RedundantCommonNetworkInstance			CRITICALITY ignore	EXTENSION 	CommonNetworkInstance	PRESENCE optional	}|
+	{ID id-SpecialTriggeringPurpose			CRITICALITY ignore	EXTENSION SpecialTriggeringPurpose					PRESENCE optional},
 	...
 }
 
@@ -2952,6 +3246,8 @@ PDU-Session-Type ::= ENUMERATED {
 	...
 }
 
+PDUSetbasedHandlingIndicator ::= ENUMERATED {supported, ...}
+
 PLMN-Identity ::= OCTET STRING (SIZE(3))
 
 PortNumber ::= BIT STRING (SIZE(16))
@@ -2976,6 +3272,27 @@ PrivacyIndicator ::= ENUMERATED {
 	...
 }
 
+PDUSetQoSParameters	::= SEQUENCE {
+	ulPDUSetQoSInformation	PDUSetQoSInformation	OPTIONAL,
+	dlPDUSetQoSInformation	PDUSetQoSInformation	OPTIONAL,
+	iE-Extensions			ProtocolExtensionContainer { { PDUSetQoSParameters-ExtIEs } }	OPTIONAL
+}
+
+PDUSetQoSParameters-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
+	...
+	}
+
+PDUSetQoSInformation ::= SEQUENCE {
+	pduSetDelayBudget						ExtendedPacketDelayBudget						OPTIONAL,
+	pduSetErrorRate							PacketErrorRate									OPTIONAL,
+	pduSetIntegratedHandlingInformation		ENUMERATED {true, false, ...}					OPTIONAL,
+	iE-Extensions			ProtocolExtensionContainer { { PDUSetQoSInformation-ExtIEs } }	OPTIONAL
+}
+
+PDUSetQoSInformation-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 -- Q
 
 QCI ::= INTEGER (0..255)
@@ -3002,7 +3319,8 @@ QoS-Flow-Item	::=	SEQUENCE {
 
 QoS-Flow-Item-ExtIEs		E1AP-PROTOCOL-EXTENSION ::= {
 	{ID id-QoSFlowMappingIndication		CRITICALITY ignore	EXTENSION QoS-Flow-Mapping-Indication		PRESENCE optional}|
-	{ID id-DataForwardingSourceIPAddress	CRITICALITY ignore	EXTENSION TransportLayerAddress					PRESENCE optional},
+	{ID id-DataForwardingSourceIPAddress	CRITICALITY ignore	EXTENSION TransportLayerAddress					PRESENCE optional}|
+	{ID id-ECNMarkingorCongestionInformationReportingStatus	CRITICALITY ignore	EXTENSION ECNMarkingorCongestionInformationReportingStatus					PRESENCE optional},
 	...
 }
 
@@ -3062,7 +3380,8 @@ QoS-Flow-QoS-Parameter-Item	::=	SEQUENCE {
 
 QoS-Flow-QoS-Parameter-Item-ExtIEs		E1AP-PROTOCOL-EXTENSION ::= {
 	{ID id-RedundantQosFlowIndicator		CRITICALITY ignore 	EXTENSION RedundantQoSFlowIndicator			PRESENCE optional}|
-	{ID id-TSCTrafficCharacteristics 		CRITICALITY ignore 	EXTENSION TSCTrafficCharacteristics 			PRESENCE optional},
+	{ID id-TSCTrafficCharacteristics 		CRITICALITY ignore 	EXTENSION TSCTrafficCharacteristics 			PRESENCE optional}|
+	{ID id-ECNMarkingorCongestionInformationReportingRequest 		CRITICALITY ignore 	EXTENSION ECNMarkingorCongestionInformationReportingRequest 			PRESENCE optional},
 	...
 }
 
@@ -3083,7 +3402,8 @@ QoSFlowLevelQoSParameters-ExtIEs 	E1AP-PROTOCOL-EXTENSION ::= {
 	{ID id-MCG-OfferedGBRQoSFlowInfo		CRITICALITY ignore	EXTENSION GBR-QoSFlowInformation				PRESENCE optional}|
 	{ID id-QosMonitoringReportingFrequency	CRITICALITY ignore	EXTENSION QosMonitoringReportingFrequency	PRESENCE optional}|
 	{ID id-QoSMonitoringDisabled			CRITICALITY ignore	EXTENSION QosMonitoringDisabled					PRESENCE optional}|
-	{ID id-DataForwardingSourceIPAddress	CRITICALITY ignore	EXTENSION TransportLayerAddress					PRESENCE optional},
+	{ID id-DataForwardingSourceIPAddress	CRITICALITY ignore	EXTENSION TransportLayerAddress					PRESENCE optional}|
+	{ID id-PDUSetQoSParameters				CRITICALITY ignore	EXTENSION PDUSetQoSParameters 					PRESENCE optional},
 	...
 }
 
@@ -3218,6 +3538,10 @@ ROHC-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
 
 -- S
 
+SDT-data-size-threshold ::= INTEGER (1.. 192000, ...)
+
+SDT-data-size-threshold-Crossed ::=	ENUMERATED {true, ...}
+
 SCGActivationStatus	::=		ENUMERATED { scg-activated, scg-deactivated, ...}
 
 SecurityAlgorithm	::= SEQUENCE {
@@ -3235,6 +3559,7 @@ SecurityIndication ::= SEQUENCE {
 	integrityProtectionIndication			IntegrityProtectionIndication,
 	confidentialityProtectionIndication		ConfidentialityProtectionIndication,
 	maximumIPdatarate							MaximumIPdatarate							OPTIONAL,
+-- This IE shall be present if the Integrity Protection Indication IE within the Security Indication IE is set to “required” or “preferred”.--
 	iE-Extensions		ProtocolExtensionContainer { {SecurityIndication-ExtIEs} }	OPTIONAL,
 	...
 }
@@ -3321,6 +3646,16 @@ SubscriberProfileIDforRFP ::= INTEGER (1..256, ...)
 
 SurvivalTime ::= INTEGER (0..1920000, ...)
 
+SpecialTriggeringPurpose ::= ENUMERATED {
+	indirect-data-forwarding,
+	...
+}
+
+F1UTunnelNotEstablished::= ENUMERATED {
+	true,
+	...
+}
+
 -- T
 
 TimeToWait ::= ENUMERATED {v1s, v2s, v5s, v10s, v20s, v60s, ...}
@@ -3346,8 +3681,8 @@ TNL-AvailableCapacityIndicator-ExtIEs	E1AP-PROTOCOL-EXTENSION ::= {
 }
 
 TSCTrafficCharacteristics		::= SEQUENCE {
-	tSCTrafficCharacteristicsUL				TSCTrafficInformation			OPTIONAL,
-	tSCTrafficCharacteristicsDL				TSCTrafficInformation			OPTIONAL,
+	tSCTrafficCharacteristicsUL				TSCAssistanceInformation			OPTIONAL,
+	tSCTrafficCharacteristicsDL				TSCAssistanceInformation			OPTIONAL,
 	iE-Extensions							ProtocolExtensionContainer { { TSCTrafficCharacteristics-ExtIEs } }	OPTIONAL
 }
 
@@ -3355,14 +3690,15 @@ TSCTrafficCharacteristics-ExtIEs 	E1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-TSCTrafficInformation			::= SEQUENCE {
+TSCAssistanceInformation			::= SEQUENCE {
 	periodicity						Periodicity,
 	burstArrivalTime						BurstArrivalTime				OPTIONAL,
-	iE-Extensions							ProtocolExtensionContainer { { TSCTrafficInformation-ExtIEs } }	OPTIONAL
+	iE-Extensions							ProtocolExtensionContainer { { TSCAssistanceInformation-ExtIEs } }	OPTIONAL
 }
 
-TSCTrafficInformation-ExtIEs 	E1AP-PROTOCOL-EXTENSION ::= {
-	{ID id-SurvivalTime		CRITICALITY ignore		EXTENSION SurvivalTime		PRESENCE optional},
+TSCAssistanceInformation-ExtIEs 	E1AP-PROTOCOL-EXTENSION ::= {
+	{ID id-SurvivalTime				CRITICALITY ignore		EXTENSION SurvivalTime				PRESENCE optional}|
+	{ID id-N6JitterInformation		CRITICALITY ignore		EXTENSION N6JitterInformation		PRESENCE optional},
 	...
 }
 
@@ -3533,7 +3869,8 @@ UP-Parameters-Item ::= SEQUENCE {
 }
 
 UP-Parameters-Item-ExtIEs	E1AP-PROTOCOL-EXTENSION ::= {
-	{ID id-QoS-Mapping-Information	CRITICALITY reject	EXTENSION QoS-Mapping-Information	PRESENCE optional},
+	{ID id-QoS-Mapping-Information	CRITICALITY reject	EXTENSION QoS-Mapping-Information	PRESENCE optional}|
+	{ID id-IndirectPathIndication 	CRITICALITY ignore	EXTENSION IndirectPathIndication 	PRESENCE optional},
 	...
 }
 
@@ -3570,6 +3907,32 @@ UplinkOnlyROHC-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
 
 URIaddress ::= VisibleString
 
+UserPlaneErrorIndicator ::= ENUMERATED {
+	gTP-U-error-indication-received,
+	...
+}
+
+UEInactivityInformation ::= INTEGER (1..7200, ...)
+
+UserPlaneFailureIndication ::= SEQUENCE {
+	userPlaneFailureType			UserPlaneFailureType,
+	nG-DL-UP-TNL-Information			UP-TNL-Information,
+	nG-UL-UP-TNL-Information			UP-TNL-Information,
+
+	iE-Extensions		ProtocolExtensionContainer { { UserPlaneFailureIndication-ExtIEs} }	OPTIONAL,
+	...
+}
+
+UserPlaneFailureIndication-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+UserPlaneFailureType ::= ENUMERATED {
+	gtp-u-error-indication-received,
+	up-path-failure,
+	...
+}
+
 -- V
 
 -- W