X2AP: upgrade dissector to v15.5.0

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

1 files changed, 40 insertions, 14 deletions

diff --git a/epan/dissectors/asn1/x2ap/X2AP-IEs.asn b/epan/dissectors/asn1/x2ap/X2AP-IEs.asn
index 6910221139..e2f5389740 100644
--- a/epan/dissectors/asn1/x2ap/X2AP-IEs.asn
+++ b/epan/dissectors/asn1/x2ap/X2AP-IEs.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V15.4.0 (2018-12)
+-- 3GPP TS 36.423 V15.5.0 (2019-03)
 -- 9.3.5	Information Element definitions
 -- **************************************************************
 --
@@ -15,6 +15,9 @@ DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
 
 IMPORTS
+NRNeighbour-Information
+
+FROM X2AP-PDU-Contents
 
 	id-E-RAB-Item,
 	id-Number-of-Antennaports,
@@ -72,6 +75,8 @@ IMPORTS
 	id-NRCGI,
 	id-MeNBCoordinationAssistanceInformation,
 	id-SgNBCoordinationAssistanceInformation,
+	id-NRNeighbourInfoToAdd,
+	id-LastNG-RANPLMNIdentity,
 
 
 	maxnoofBearers,
@@ -696,6 +701,7 @@ DeliveryStatus-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+DesiredActNotificationLevel	::= ENUMERATED {none, e-rab, ue-level, ...}
 
 DL-ABS-status::= INTEGER (0..100)
 
@@ -759,6 +765,8 @@ ECGI-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+EndcSONConfigurationTransfer ::= OCTET STRING
+
 EnhancedRNTP ::= SEQUENCE {
 	enhancedRNTPBitmap			BIT STRING (SIZE(12..8800, ...)),
 	rNTP-High-Power-Threshold	RNTP-Threshold,
@@ -1131,7 +1139,8 @@ HandoverRestrictionList ::= SEQUENCE {
 HandoverRestrictionList-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	{ ID id-NRrestrictioninEPSasSecondaryRAT			CRITICALITY ignore	EXTENSION NRrestrictioninEPSasSecondaryRAT			PRESENCE optional}|
 	{ ID id-CNTypeRestrictions						CRITICALITY ignore	EXTENSION CNTypeRestrictions								PRESENCE optional}|
-	{ ID id-NRrestrictionin5GS						CRITICALITY ignore	EXTENSION NRrestrictionin5GS								PRESENCE optional},
+	{ ID id-NRrestrictionin5GS						CRITICALITY ignore	EXTENSION NRrestrictionin5GS								PRESENCE optional}|
+	{ ID id-LastNG-RANPLMNIdentity					CRITICALITY ignore	EXTENSION PLMN-Identity										PRESENCE optional},
 	...
 }
 
@@ -1221,6 +1230,21 @@ LoadIndicator ::= ENUMERATED {
 	...
 }
 
+LocationInformationSgNB ::= SEQUENCE {
+	pSCell-id			NRCGI,
+	iE-Extensions		ProtocolExtensionContainer { {LocationInformationSgNB-ExtIEs} } OPTIONAL,
+	...
+}
+
+LocationInformationSgNB-ExtIEs X2AP-PROTOCOL-EXTENSION ::={
+	...
+}
+
+LocationInformationSgNBReporting ::= ENUMERATED {
+	pSCell,
+	...
+}
+
 LocationReportingInformation ::= SEQUENCE {
 	eventType		EventType,
 	reportArea		ReportArea,
@@ -1466,16 +1490,6 @@ SplitSRB-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-UENRMeasurement ::= SEQUENCE {
-	uENRMeasurements			RRCContainer,
-	iE-Extensions			ProtocolExtensionContainer { {UENRMeasurement-ExtIEs} } OPTIONAL,
-	...
-}
-
-UENRMeasurement-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
-	...
-}
-
 -- N
 
 Neighbour-Information ::= SEQUENCE (SIZE (0..maxnoofNeighbours)) OF SEQUENCE {
@@ -1563,6 +1577,16 @@ NRS-NSSS-PowerOffset ::= ENUMERATED { minusThree, zero, three, ...}
 
 FiveGS-TAC ::= OCTET STRING (SIZE (3))
 
+NRUeReport ::= SEQUENCE {
+	uENRMeasurements			RRCContainer,
+	iE-Extensions			ProtocolExtensionContainer { { NRUeReport-ExtIEs} } OPTIONAL,
+	...
+}
+
+NRUeReport-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 NRUESecurityCapabilities ::= SEQUENCE {
 	nRencryptionAlgorithms				NRencryptionAlgorithms,
 	nRintegrityProtectionAlgorithms		NRintegrityProtectionAlgorithms,
@@ -2007,6 +2031,7 @@ ServedCells ::= SEQUENCE (SIZE (1.. maxCellineNB)) OF SEQUENCE {
 }
 
 ServedCell-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-NRNeighbourInfoToAdd			CRITICALITY ignore	EXTENSION NRNeighbour-Information				PRESENCE optional },
 	...
 }
 
@@ -2318,9 +2343,10 @@ TDD-Info ::= SEQUENCE {
 	iE-Extensions					ProtocolExtensionContainer { {TDD-Info-ExtIEs} } OPTIONAL,
 	...
 }
+
 TDD-Info-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
-	{ ID id-AdditionalSpecialSubframe-Info	CRITICALITY ignore	EXTENSION AdditionalSpecialSubframe-Info	PRESENCE optional}|
-	{ ID id-eARFCNExtension					CRITICALITY reject	EXTENSION EARFCNExtension						PRESENCE optional}|
+	{ ID id-AdditionalSpecialSubframe-Info			CRITICALITY ignore	EXTENSION AdditionalSpecialSubframe-Info				PRESENCE optional}|
+	{ ID id-eARFCNExtension							CRITICALITY reject	EXTENSION EARFCNExtension									PRESENCE optional}|
 	{ ID id-AdditionalSpecialSubframeExtension-Info	CRITICALITY ignore	EXTENSION AdditionalSpecialSubframeExtension-Info	PRESENCE optional},
 	...
 }