Update to V12.2.0 (2014-06), remove deprecated APIs

Change-Id: Icfd140f39a440dda197c6e68a4cb7daec2ae0e09
Reviewed-on: https://code.wireshark.org/review/4066
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

7 files changed, 440 insertions, 61 deletions

diff --git a/asn1/x2ap/X2AP-CommonDataTypes.asn b/asn1/x2ap/X2AP-CommonDataTypes.asn
index bd3c7096cc..a738ddfcec 100644
--- a/asn1/x2ap/X2AP-CommonDataTypes.asn
+++ b/asn1/x2ap/X2AP-CommonDataTypes.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V10.3.0 (2011-09)
+-- 3GPP TS 36.423 V12.2.0 (2014-06)
 
 -- 9.3.6	Common definitions
 -- **************************************************************
diff --git a/asn1/x2ap/X2AP-Constants.asn b/asn1/x2ap/X2AP-Constants.asn
index 548ba66171..2fadd89053 100644
--- a/asn1/x2ap/X2AP-Constants.asn
+++ b/asn1/x2ap/X2AP-Constants.asn
@@ -41,6 +41,8 @@ id-mobilitySettingsChange										ProcedureCode ::= 12
 id-rLFIndication												ProcedureCode ::= 13
 id-handoverReport												ProcedureCode ::= 14
 id-cellActivation												ProcedureCode ::= 15
+id-x2Release													ProcedureCode ::= 16
+id-x2MessageTransfer											ProcedureCode ::= 17
 
 
 
@@ -51,8 +53,11 @@ id-cellActivation												ProcedureCode ::= 15
 -- **************************************************************
 
 maxEARFCN									INTEGER ::= 65535
+maxEARFCNPlusOne							INTEGER ::= 65536
+newmaxEARFCN								INTEGER ::= 262143
 maxInterfaces								INTEGER ::= 16
 maxCellineNB								INTEGER ::= 256
+maxnoofBands								INTEGER ::= 16
 maxnoofBearers								INTEGER ::= 256
 maxNrOfErrors								INTEGER ::= 256
 maxnoofPDCP-SN								INTEGER ::= 16
@@ -69,6 +74,8 @@ maxnoofMBSFN								INTEGER ::= 8
 maxFailedMeasObjects						INTEGER ::= 32
 maxnoofCellIDforMDT							INTEGER ::= 32
 maxnoofTAforMDT								INTEGER ::= 8
+maxnoofMBMSServiceAreaIdentities			INTEGER ::= 256
+maxnoofMDTPLMNs								INTEGER ::= 16
 
 
 -- **************************************************************
@@ -151,5 +158,32 @@ id-CSGMembershipStatus														ProtocolIE-ID ::= 71
 id-MDTConfiguration															ProtocolIE-ID ::= 72
 id-ManagementBasedMDTallowed												ProtocolIE-ID ::= 74
 id-RRCConnSetupIndicator													ProtocolIE-ID ::= 75
+id-NeighbourTAC																ProtocolIE-ID ::= 76
+id-Time-UE-StayedInCell-EnhancedGranularity									ProtocolIE-ID ::= 77
+id-RRCConnReestabIndicator													ProtocolIE-ID ::= 78
+id-MBMS-Service-Area-List													ProtocolIE-ID ::= 79
+id-HO-cause																	ProtocolIE-ID ::= 80
+id-TargetCellInUTRAN														ProtocolIE-ID ::= 81
+id-MobilityInformation														ProtocolIE-ID ::= 82
+id-SourceCellCRNTI															ProtocolIE-ID ::= 83
+id-MultibandInfoList														ProtocolIE-ID ::= 84
+id-M3Configuration															ProtocolIE-ID ::= 85
+id-M4Configuration															ProtocolIE-ID ::= 86
+id-M5Configuration															ProtocolIE-ID ::= 87
+id-MDT-Location-Info														ProtocolIE-ID ::= 88
+id-ManagementBasedMDTPLMNList												ProtocolIE-ID ::= 89
+id-SignallingBasedMDTPLMNList												ProtocolIE-ID ::= 90
+id-ReceiveStatusOfULPDCPSDUsExtended										ProtocolIE-ID ::= 91
+id-ULCOUNTValueExtended														ProtocolIE-ID ::= 92
+id-DLCOUNTValueExtended														ProtocolIE-ID ::= 93
+id-eARFCNExtension															ProtocolIE-ID ::= 94
+id-UL-EARFCNExtension														ProtocolIE-ID ::= 95
+id-DL-EARFCNExtension														ProtocolIE-ID ::= 96
+id-AdditionalSpecialSubframe-Info											ProtocolIE-ID ::= 97
+id-Masked-IMEISV															ProtocolIE-ID ::= 98
+id-IntendedULDLConfiguration												ProtocolIE-ID ::= 99
+id-ExtendedULInterferenceOverloadInfo										ProtocolIE-ID ::= 100
+id-RNL-Header																ProtocolIE-ID ::= 101
+id-x2APMessage																ProtocolIE-ID ::= 102
 
 END
diff --git a/asn1/x2ap/X2AP-Containers.asn b/asn1/x2ap/X2AP-Containers.asn
index 9aa4977d24..caf6a5f95e 100644
--- a/asn1/x2ap/X2AP-Containers.asn
+++ b/asn1/x2ap/X2AP-Containers.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V10.3.0 (2011-09)
+-- 3GPP TS 36.423  V12.2.0 (2014-06)
 -- 9.3.8	Container Definitions
 -- **************************************************************
 --
diff --git a/asn1/x2ap/X2AP-IEs.asn b/asn1/x2ap/X2AP-IEs.asn
index f7bf089d12..2431695732 100644
--- a/asn1/x2ap/X2AP-IEs.asn
+++ b/asn1/x2ap/X2AP-IEs.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V10.3.0 (2011-09)
+-- 3GPP TS 36.423 V12.2.0 (2014-06)
 -- 9.3.5	Information Element Definitions
 -- **************************************************************
 --
@@ -22,11 +22,28 @@ IMPORTS
 	id-PRACH-Configuration,
 	id-CSG-Id,
 	id-MDTConfiguration,
+	id-SignallingBasedMDTPLMNList,
+	id-MultibandInfoList,
+	id-NeighbourTAC,
+	id-Time-UE-StayedInCell-EnhancedGranularity,
+	id-MBMS-Service-Area-List,
+	id-HO-cause,
+	id-eARFCNExtension,
+	id-DL-EARFCNExtension,
+	id-UL-EARFCNExtension,
+	id-M3Configuration,
+	id-M4Configuration,
+	id-M5Configuration,
+	id-MDT-Location-Info,
+	id-AdditionalSpecialSubframe-Info,
 	maxnoofBearers,
 	maxCellineNB,
 	maxEARFCN,
+	maxEARFCNPlusOne,
+	newmaxEARFCN,
 	maxInterfaces,
 	
+	maxnoofBands,
 	maxnoofBPLMNs,
 	maxnoofCells,
 	maxnoofEPLMNs,
@@ -39,7 +56,9 @@ IMPORTS
 	maxPools,
 	maxnoofMBSFN,
 	maxnoofTAforMDT,
-	maxnoofCellIDforMDT
+	maxnoofCellIDforMDT,
+	maxnoofMBMSServiceAreaIdentities,
+	maxnoofMDTPLMNs
 
 FROM X2AP-Constants
 
@@ -102,6 +121,32 @@ ABS-Status-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 
 DL-ABS-status::= INTEGER (0..100)
 
+AdditionalSpecialSubframe-Info ::=		SEQUENCE {
+	additionalspecialSubframePatterns		AdditionalSpecialSubframePatterns,
+	cyclicPrefixDL							CyclicPrefixDL,
+	cyclicPrefixUL							CyclicPrefixUL,
+	iE-Extensions							ProtocolExtensionContainer { { AdditionalSpecialSubframe-Info-ExtIEs} } OPTIONAL,
+	...
+}
+
+AdditionalSpecialSubframe-Info-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+AdditionalSpecialSubframePatterns ::= ENUMERATED {
+	ssp0,
+	ssp1,
+	ssp2,
+	ssp3,
+	ssp4,
+	ssp5,
+	ssp6,
+	ssp7,
+	ssp8,
+	ssp9,
+	...
+}
+
 AS-SecurityInformation ::= SEQUENCE {
 	key-eNodeB-star		Key-eNodeB-Star,
 	nextHopChainingCount			NextHopChainingCount,
@@ -130,7 +175,8 @@ AreaScopeOfMDT ::= CHOICE {
 	cellBased					CellBasedMDT,
 	tABased						TABasedMDT,
 	pLMNWide					NULL,
-	...
+	...,
+	tAIBased					TAIBasedMDT
 }
 
 -- B
@@ -272,6 +318,16 @@ COUNTvalue-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+COUNTValueExtended ::= SEQUENCE {
+	pDCP-SNExtended			PDCP-SNExtended,
+	hFNModified				HFNModified,
+	iE-Extensions			ProtocolExtensionContainer { { COUNTValueExtended-ExtIEs} } OPTIONAL,
+	...
+}
+
+COUNTValueExtended-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 CriticalityDiagnostics ::= SEQUENCE {
 	procedureCode					ProcedureCode					OPTIONAL,
@@ -344,6 +400,8 @@ DL-Total-PRB-usage::= INTEGER (0..100)
 
 EARFCN ::= INTEGER (0..maxEARFCN)
 
+EARFCNExtension ::= INTEGER(maxEARFCNPlusOne..newmaxEARFCN, ...)
+
 FDD-Info ::= SEQUENCE {
 	uL-EARFCN						EARFCN,
 	dL-EARFCN						EARFCN,
@@ -354,6 +412,8 @@ FDD-Info ::= SEQUENCE {
 }
 
 FDD-Info-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-UL-EARFCNExtension		CRITICALITY reject	EXTENSION EARFCNExtension		PRESENCE optional}|
+	{ ID id-DL-EARFCNExtension		CRITICALITY reject	EXTENSION EARFCNExtension		PRESENCE optional},
 	...
 }
 
@@ -366,6 +426,8 @@ TDD-Info ::= SEQUENCE {
 	...
 }
 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},
 	...
 }
 
@@ -438,6 +500,16 @@ EventType ::= ENUMERATED{
 	...
 }
 
+ExtendedULInterferenceOverloadInfo ::= SEQUENCE {
+	associatedSubframes							BIT STRING (SIZE (5)),
+	extended-ul-InterferenceOverloadIndication	UL-InterferenceOverloadIndication,
+	iE-Extensions								ProtocolExtensionContainer { { ExtendedULInterferenceOverloadInfo-ExtIEs} } OPTIONAL,
+	...
+}
+
+ExtendedULInterferenceOverloadInfo-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 -- F
 
@@ -484,6 +556,8 @@ ForbiddenLACs ::= SEQUENCE (SIZE(1..maxnoofForbLACs)) OF LAC
 
 Fourframes ::= BIT STRING (SIZE (24))
 
+FreqBandIndicator ::= INTEGER (1..256, ...)
+
 -- G
 
 GBR-QosInformation ::= SEQUENCE {
@@ -557,7 +631,8 @@ GUMMEI-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 HandoverReportType  ::= ENUMERATED {
 	hoTooEarly,
 	hoToWrongCell,
-	...
+	...,
+	interRATpingpong
 }
 
 HandoverRestrictionList ::= SEQUENCE {
@@ -576,6 +651,8 @@ HandoverRestrictionList-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 
 HFN ::= INTEGER (0..1048575)
 
+HFNModified ::= INTEGER (0..131071)
+
 HWLoadIndicator ::= SEQUENCE {
 	dLHWLoadIndicator			LoadIndicator,
 	uLHWLoadIndicator			LoadIndicator,
@@ -590,6 +667,8 @@ HWLoadIndicator-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 
 -- I
 
+Masked-IMEISV ::= BIT STRING (SIZE (64))
+
 InvokeIndication ::= ENUMERATED{
 	abs-information,
 	...
@@ -625,6 +704,9 @@ LastVisitedEUTRANCellInformation ::= SEQUENCE {
 }
 
 LastVisitedEUTRANCellInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+-- Extension for Rel-11 to support enhanced granularity for time UE stayed in cell --
+	{ ID id-Time-UE-StayedInCell-EnhancedGranularity	CRITICALITY ignore	EXTENSION Time-UE-StayedInCell-EnhancedGranularity	PRESENCE optional}|
+	{ ID id-HO-cause									CRITICALITY ignore	EXTENSION Cause							PRESENCE optional},
 	...
 }
 
@@ -635,6 +717,7 @@ LastVisitedGERANCellInformation ::= CHOICE {
 	...
 }
 
+Links-to-log ::= ENUMERATED {uplink, downlink, both-uplink-and-downlink, ...}
 
 LoadIndicator ::= ENUMERATED {
 	lowLoad,
@@ -659,6 +742,45 @@ LocationReportingInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::={
 
 -- M
 
+M3Configuration ::= SEQUENCE {
+	m3period			M3period,
+	iE-Extensions		ProtocolExtensionContainer { { M3Configuration-ExtIEs} } OPTIONAL,
+	...
+}
+
+M3Configuration-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+M3period ::= ENUMERATED {ms100, ms1000, ms10000, ... } 
+
+M4Configuration ::= SEQUENCE {
+	m4period			M4period,
+	m4-links-to-log		Links-to-log,
+	iE-Extensions		ProtocolExtensionContainer { { M4Configuration-ExtIEs} } OPTIONAL,
+	...
+}
+
+M4Configuration-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+M4period ::= ENUMERATED {ms1024, ms2048, ms5120, ms10240, min1, ... } 
+
+
+M5Configuration ::= SEQUENCE {
+	m5period			M5period,
+	m5-links-to-log		Links-to-log,
+	iE-Extensions		ProtocolExtensionContainer { { M5Configuration-ExtIEs} } OPTIONAL,
+	...
+}
+
+M5Configuration-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+M5period ::= ENUMERATED {ms1024, ms2048, ms5120, ms10240, min1, ... }
+
 MDT-Activation		::= ENUMERATED { 
 	immediate-MDT-only,
 	immediate-MDT-and-Trace,
@@ -669,19 +791,28 @@ MDT-Configuration ::= SEQUENCE {
 	mdt-Activation				MDT-Activation,
 	areaScopeOfMDT				AreaScopeOfMDT,
 	measurementsToActivate		MeasurementsToActivate,
-	reportingTriggerMDT			ReportingTriggerMDT,
-	thresholdeventA2			ThresholdEventA2			OPTIONAL,
--- Included in case of event-triggered reporting for measurement M1
-	periodicReportingMDT		PeriodicReportingMDT		OPTIONAL,
--- Included in case of periodic reporting
+	m1reportingTrigger			M1ReportingTrigger,
+	m1thresholdeventA2			M1ThresholdEventA2			OPTIONAL,
+-- Included in case of event-triggered, or event-triggered periodic reporting for measurement M1
+	m1periodicReporting			M1PeriodicReporting			OPTIONAL,
+-- Included in case of periodic, or event-triggered periodic reporting for measurement M1
 	iE-Extensions				ProtocolExtensionContainer { { MDT-Configuration-ExtIEs} } OPTIONAL,
 	...
 }
 
 MDT-Configuration-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	{ID id-M3Configuration				CRITICALITY ignore	EXTENSION M3Configuration		PRESENCE conditional}|
+	{ID id-M4Configuration				CRITICALITY ignore	EXTENSION M4Configuration		PRESENCE conditional}|
+	{ID id-M5Configuration				CRITICALITY ignore	EXTENSION M5Configuration		PRESENCE conditional}|
+	{ID id-MDT-Location-Info			CRITICALITY ignore	EXTENSION MDT-Location-Info		PRESENCE optional}|
+	{ID id-SignallingBasedMDTPLMNList	CRITICALITY ignore	EXTENSION MDTPLMNList			PRESENCE optional},
 	...
 }
 
+MDTPLMNList ::= SEQUENCE (SIZE(1..maxnoofMDTPLMNs)) OF PLMN-Identity
+
+MDT-Location-Info ::= BIT STRING (SIZE (8))
+
 MeasurementsToActivate::= BIT STRING (SIZE (8))
 
 MeasurementThresholdA2 ::= CHOICE { 
@@ -696,6 +827,10 @@ MME-Code		::= OCTET STRING (SIZE (1))
 
 Measurement-ID	::= INTEGER (1..4095, ...) 
 
+MBMS-Service-Area-Identity-List ::= SEQUENCE (SIZE(1.. maxnoofMBMSServiceAreaIdentities)) OF MBMS-Service-Area-Identity
+
+MBMS-Service-Area-Identity ::= OCTET STRING (SIZE (2))
+
 MBSFN-Subframe-Infolist::= SEQUENCE (SIZE(1.. maxnoofMBSFN)) OF MBSFN-Subframe-Info
 
 MBSFN-Subframe-Info	::= SEQUENCE {
@@ -723,6 +858,18 @@ MobilityParametersInformation ::= SEQUENCE {
 	...
 }
 
+MultibandInfoList ::= SEQUENCE (SIZE(1..maxnoofBands)) OF BandInfo 
+
+
+BandInfo	::= SEQUENCE {
+	freqBandIndicator		FreqBandIndicator,
+	iE-Extensions			ProtocolExtensionContainer { { BandInfo-ExtIEs } } 	OPTIONAL,
+	...
+}
+
+BandInfo-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 -- N
 
@@ -735,6 +882,8 @@ Neighbour-Information ::= SEQUENCE (SIZE (0..maxnoofNeighbours)) OF SEQUENCE {
 }
 
 Neighbour-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-NeighbourTAC		CRITICALITY ignore	EXTENSION TAC				PRESENCE optional}|
+	{ ID id-eARFCNExtension		CRITICALITY reject	EXTENSION EARFCNExtension	PRESENCE optional},
 	...
 }
 
@@ -753,18 +902,20 @@ Oneframe ::= BIT STRING (SIZE (6))
 
 -- P
 
-PDCP-SN ::= INTEGER (0..4095)  
+PDCP-SN ::= INTEGER (0..4095)
+
+PDCP-SNExtended ::= INTEGER (0..32767)
 
 PCI ::= INTEGER (0..503, ...)
 
-PeriodicReportingMDT ::= SEQUENCE { 
+M1PeriodicReporting ::= SEQUENCE { 
 	reportInterval				ReportIntervalMDT,
 	reportAmount				ReportAmountMDT,
-	iE-Extensions				ProtocolExtensionContainer { { PeriodicReportingMDT-ExtIEs} } OPTIONAL,
+	iE-Extensions				ProtocolExtensionContainer { { M1PeriodicReporting-ExtIEs} } OPTIONAL,
 	...
 }
 
-PeriodicReportingMDT-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+M1PeriodicReporting-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -832,6 +983,8 @@ RadioResourceStatus-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 
 ReceiveStatusofULPDCPSDUs ::= BIT STRING (SIZE(4096))
 
+ReceiveStatusOfULPDCPSDUsExtended ::= BIT STRING (SIZE(1..16384))
+
 Registration-Request	::= ENUMERATED {
 	start,
 	stop,
@@ -864,10 +1017,11 @@ ReportIntervalMDT ::= ENUMERATED {ms120, ms240, ms480, ms640, ms1024, ms2048, ms
 
 ReportCharacteristics	::= BIT STRING (SIZE (32))
 
-ReportingTriggerMDT::= ENUMERATED{
+M1ReportingTrigger::= ENUMERATED{
 	periodic,
 	a2eventtriggered,
-	...
+	...,
+	a2eventtriggered-periodic
 }
 
 RNTP-Threshold ::= ENUMERATED {
@@ -892,6 +1046,11 @@ RNTP-Threshold ::= ENUMERATED {
 
 RRC-Context ::= OCTET STRING
 
+RRCConnReestabIndicator ::= ENUMERATED {
+	reconfigurationFailure, handoverFailure, otherFailure, ...
+}
+-- The values correspond to the values of ReestablishmentCause reported from the UE in the RRCConnectionReestablishmentRequest, as defined in TS 36.331 [9]
+
 RRCConnSetupIndicator::= ENUMERATED {
 	rrcConnSetup,
 	...
@@ -938,7 +1097,9 @@ ServedCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	{ ID id-Number-of-Antennaports		CRITICALITY ignore	EXTENSION Number-of-Antennaports			PRESENCE optional }|
 	{ ID id-PRACH-Configuration			CRITICALITY ignore	EXTENSION PRACH-Configuration				PRESENCE optional }|
 	{ ID id-MBSFN-Subframe-Info			CRITICALITY ignore	EXTENSION MBSFN-Subframe-Infolist			PRESENCE optional }|
-	{ ID id-CSG-Id						CRITICALITY ignore	EXTENSION CSG-Id							PRESENCE optional },
+	{ ID id-CSG-Id						CRITICALITY ignore	EXTENSION CSG-Id							PRESENCE optional }|
+	{ ID id-MBMS-Service-Area-List		CRITICALITY ignore	EXTENSION MBMS-Service-Area-Identity-List	PRESENCE optional }|
+	{ ID id-MultibandInfoList			CRITICALITY ignore	EXTENSION MultibandInfoList					PRESENCE optional },
 	...
 }
 
@@ -1010,13 +1171,38 @@ TABasedMDT-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 
 TAListforMDT ::= SEQUENCE (SIZE(1..maxnoofTAforMDT)) OF TAC
 
-ThresholdEventA2 ::= SEQUENCE { 
+TAIBasedMDT ::= SEQUENCE {
+	tAIListforMDT			TAIListforMDT,
+	iE-Extensions			ProtocolExtensionContainer { {TAIBasedMDT-ExtIEs} } OPTIONAL,
+	...
+}
+
+TAIBasedMDT-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+TAIListforMDT ::= SEQUENCE (SIZE(1..maxnoofTAforMDT)) OF TAI-Item
+
+TAI-Item ::= SEQUENCE {
+	tAC					TAC,
+	pLMN-Identity		PLMN-Identity,
+	iE-Extensions		ProtocolExtensionContainer { { TAI-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+TAI-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+TargetCellInUTRAN ::= OCTET STRING -- This IE is to be encoded according to the UTRAN Cell ID in the Last Visited UTRAN Cell Information IE in TS 25.413 [24]
+
+M1ThresholdEventA2 ::= SEQUENCE { 
 	measurementThreshold		MeasurementThresholdA2,
-	iE-Extensions				ProtocolExtensionContainer { { ThresholdEventA2-ExtIEs} } OPTIONAL,
+	iE-Extensions				ProtocolExtensionContainer { { M1ThresholdEventA2-ExtIEs} } OPTIONAL,
 	...
 }
 
-ThresholdEventA2-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+M1ThresholdEventA2-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -1038,6 +1224,8 @@ TimeToWait ::= ENUMERATED {
 
 Time-UE-StayedInCell ::= INTEGER (0..4095)
 
+Time-UE-StayedInCell-EnhancedGranularity ::= INTEGER (0..40950)
+
 
 TraceActivation ::= SEQUENCE {
 	eUTRANTraceID					EUTRANTraceID,
diff --git a/asn1/x2ap/X2AP-PDU-Contents.asn b/asn1/x2ap/X2AP-PDU-Contents.asn
index 35b2e56865..a73d78794f 100644
--- a/asn1/x2ap/X2AP-PDU-Contents.asn
+++ b/asn1/x2ap/X2AP-PDU-Contents.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V10.3.0 (2011-09)
+-- 3GPP TS 36.423 V12.2.0 (2014-06)
 -- 9.3.4	PDU Definitions
 -- **************************************************************
 --
@@ -7,10 +7,10 @@
 -- **************************************************************
 
 X2AP-PDU-Contents {
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
 eps-Access (21) modules (3) x2ap (2) version1 (1) x2ap-PDU-Contents (1) }
 
-DEFINITIONS AUTOMATIC TAGS ::=
+DEFINITIONS AUTOMATIC TAGS ::= 
 
 BEGIN
 
@@ -44,10 +44,12 @@ IMPORTS
 	GUMMEI,
 	HandoverReportType,
 	HandoverRestrictionList,
+	Masked-IMEISV,
 	InvokeIndication,
 	LocationReportingInformation,
 	MDT-Configuration,
 	ManagementBasedMDTallowed,
+	MDTPLMNList,
 	Neighbour-Information,
 	PCI,
 	PDCP-SN,
@@ -56,6 +58,7 @@ IMPORTS
 	Registration-Request,
 	RelativeNarrowbandTxPower,
 	RadioResourceStatus,
+	RRCConnReestabIndicator,
 	RRCConnSetupIndicator,
 	UE-RLF-Report-Container,
 	RRC-Context,
@@ -64,11 +67,12 @@ IMPORTS
 	ShortMAC-I,
 	SRVCCOperationPossible,
 	SubscriberProfileIDforRFP,
+	TargetCellInUTRAN,
 	TargeteNBtoSource-eNBTransparentContainer,
 	TimeToWait,
 	TraceActivation,
 	TraceDepth,
-
+	
 	TransportLayerAddress,
 	UEAggregateMaximumBitRate,
 	UE-HistoryInformation,
@@ -82,11 +86,14 @@ IMPORTS
 	Measurement-ID,
 	ReportCharacteristics,
 	MobilityParametersInformation,
-	MobilityParametersModificationRange
-
-
-
-
+	MobilityParametersModificationRange,
+	ReceiveStatusOfULPDCPSDUsExtended,
+	COUNTValueExtended,
+	SubframeAssignment,
+	ExtendedULInterferenceOverloadInfo
+	
+	
+	
 FROM X2AP-IEs
 
 	PrivateIE-Container{},
@@ -125,6 +132,7 @@ FROM X2AP-Containers
 	id-GUGroupIDToAddList,
 	id-GUGroupIDToDeleteList,
 	id-GUMMEI-ID,
+	id-Masked-IMEISV,
 	id-InvokeIndication,
 	id-New-eNB-UE-X2AP-ID,
 	id-Old-eNB-UE-X2AP-ID,
@@ -172,6 +180,18 @@ FROM X2AP-Containers
 	id-ManagementBasedMDTallowed,
 	id-ABS-Status,
 	id-RRCConnSetupIndicator,
+	id-RRCConnReestabIndicator,
+	id-TargetCellInUTRAN,
+	id-MobilityInformation,
+	id-SourceCellCRNTI,
+	id-ManagementBasedMDTPLMNList,
+	id-ReceiveStatusOfULPDCPSDUsExtended,
+	id-ULCOUNTValueExtended,
+	id-DLCOUNTValueExtended,
+	id-IntendedULDLConfiguration,
+	id-ExtendedULInterferenceOverloadInfo,
+	id-RNL-Header,
+	id-x2APMessage,
 
 	maxCellineNB,
 	maxnoofBearers,
@@ -179,7 +199,7 @@ FROM X2AP-Containers
 	maxFailedMeasObjects,
 	maxnoofCellIDforMDT,
 	maxnoofTAforMDT
-
+	
 FROM X2AP-Constants;
 
 -- **************************************************************
@@ -194,15 +214,17 @@ HandoverRequest ::= SEQUENCE {
 }
 
 HandoverRequest-IEs X2AP-PROTOCOL-IES ::= {
-	{ ID id-Old-eNB-UE-X2AP-ID				CRITICALITY reject	TYPE UE-X2AP-ID					PRESENCE mandatory }|
-	{ ID id-Cause							CRITICALITY ignore	TYPE Cause						PRESENCE mandatory }|
-	{ ID id-TargetCell-ID					CRITICALITY reject	TYPE ECGI						PRESENCE mandatory }|
-	{ ID id-GUMMEI-ID						CRITICALITY reject	TYPE GUMMEI						PRESENCE mandatory }|
-	{ ID id-UE-ContextInformation			CRITICALITY reject	TYPE UE-ContextInformation		PRESENCE mandatory }|
-	{ ID id-UE-HistoryInformation			CRITICALITY ignore	TYPE UE-HistoryInformation		PRESENCE mandatory }|
+	{ ID id-Old-eNB-UE-X2AP-ID				CRITICALITY reject	TYPE UE-X2AP-ID					PRESENCE mandatory}|
+	{ ID id-Cause							CRITICALITY ignore	TYPE Cause						PRESENCE mandatory}|
+	{ ID id-TargetCell-ID					CRITICALITY reject	TYPE ECGI						PRESENCE mandatory}|
+	{ ID id-GUMMEI-ID						CRITICALITY reject	TYPE GUMMEI						PRESENCE mandatory}|
+	{ ID id-UE-ContextInformation			CRITICALITY reject	TYPE UE-ContextInformation		PRESENCE mandatory}|
+	{ ID id-UE-HistoryInformation			CRITICALITY ignore	TYPE UE-HistoryInformation		PRESENCE mandatory}|
 	{ ID id-TraceActivation					CRITICALITY ignore	TYPE TraceActivation			PRESENCE optional}|
 	{ ID id-SRVCCOperationPossible			CRITICALITY ignore	TYPE SRVCCOperationPossible		PRESENCE optional}|
-	{ ID id-CSGMembershipStatus				CRITICALITY reject	TYPE CSGMembershipStatus		PRESENCE optional},
+	{ ID id-CSGMembershipStatus				CRITICALITY reject	TYPE CSGMembershipStatus		PRESENCE optional}|
+	{ ID id-MobilityInformation				CRITICALITY ignore	TYPE MobilityInformation		PRESENCE optional}|
+	{ ID id-Masked-IMEISV					CRITICALITY ignore	TYPE Masked-IMEISV				PRESENCE optional},
 	...
 }
 
@@ -221,7 +243,8 @@ UE-ContextInformation ::= SEQUENCE {
 }
 
 UE-ContextInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
-{ ID id-ManagementBasedMDTallowed	CRITICALITY ignore	EXTENSION ManagementBasedMDTallowed		PRESENCE optional },
+{ ID id-ManagementBasedMDTallowed	CRITICALITY ignore	EXTENSION ManagementBasedMDTallowed		PRESENCE optional }|
+{ ID id-ManagementBasedMDTPLMNList	CRITICALITY ignore	EXTENSION MDTPLMNList					PRESENCE optional },
 	...
 }
 
@@ -245,6 +268,7 @@ E-RABs-ToBeSetup-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+MobilityInformation ::= BIT STRING (SIZE(32))
 
 
 -- **************************************************************
@@ -319,11 +343,15 @@ HandoverReport ::= SEQUENCE {
 }
 
 HandoverReport-IEs X2AP-PROTOCOL-IES ::= {
-	{ ID id-HandoverReportType			CRITICALITY ignore	TYPE HandoverReportType PRESENCE mandatory}|
-	{ ID id-Cause						CRITICALITY ignore	TYPE Cause				PRESENCE mandatory} |
-	{ ID id-SourceCellECGI				CRITICALITY ignore	TYPE ECGI				PRESENCE mandatory}|
-	{ ID id-FailureCellECGI				CRITICALITY ignore	TYPE ECGI				PRESENCE mandatory} |
-	{ ID id-Re-establishmentCellECGI	CRITICALITY ignore	TYPE ECGI				PRESENCE conditional} -- The IE shall be present if the Handover Report Type IE is set to "HO to Wrong Cell" -- ,
+	{ ID id-HandoverReportType			CRITICALITY ignore	TYPE HandoverReportType			PRESENCE mandatory}|
+	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory}|
+	{ ID id-SourceCellECGI				CRITICALITY ignore	TYPE ECGI						PRESENCE mandatory}|
+	{ ID id-FailureCellECGI				CRITICALITY ignore	TYPE ECGI						PRESENCE mandatory}|
+	{ ID id-Re-establishmentCellECGI	CRITICALITY ignore	TYPE ECGI						PRESENCE conditional} -- The IE shall be present if the Handover Report Type IE is set to “HO to Wrong Cell” -- |
+	{ ID id-TargetCellInUTRAN			CRITICALITY ignore	TYPE TargetCellInUTRAN			PRESENCE conditional} -- The IE shall be present if the Handover Report Type IE is set to "InterRAT ping-pong" --|
+	{ ID id-SourceCellCRNTI				CRITICALITY ignore	TYPE CRNTI						PRESENCE optional}|
+	{ ID id-MobilityInformation			CRITICALITY ignore	TYPE MobilityInformation		PRESENCE optional}|
+	{ ID id-UE-RLF-Report-Container		CRITICALITY ignore	TYPE UE-RLF-Report-Container	PRESENCE optional},
 	...
 }
 
@@ -353,7 +381,7 @@ E-RABs-SubjectToStatusTransfer-ItemIEs X2AP-PROTOCOL-IES ::= {
 
 E-RABs-SubjectToStatusTransfer-Item ::= SEQUENCE {
 	e-RAB-ID								E-RAB-ID,
-
+	
 	receiveStatusofULPDCPSDUs				ReceiveStatusofULPDCPSDUs			OPTIONAL,
 	uL-COUNTvalue					COUNTvalue,
 	dL-COUNTvalue					COUNTvalue,
@@ -362,6 +390,9 @@ E-RABs-SubjectToStatusTransfer-Item ::= SEQUENCE {
 }
 
 E-RABs-SubjectToStatusTransfer-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-ReceiveStatusOfULPDCPSDUsExtended	CRITICALITY ignore	EXTENSION ReceiveStatusOfULPDCPSDUsExtended		PRESENCE optional}|
+	{ ID id-ULCOUNTValueExtended				CRITICALITY ignore	EXTENSION COUNTValueExtended							PRESENCE optional}|
+	{ ID id-DLCOUNTValueExtended				CRITICALITY ignore	EXTENSION COUNTValueExtended							PRESENCE optional},
 	...
 }
 
@@ -371,7 +402,7 @@ E-RABs-SubjectToStatusTransfer-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 
 -- **************************************************************
 --
--- UE Context Release
+-- UE Context Release 
 --
 -- **************************************************************
 
@@ -550,8 +581,10 @@ CellInformation-Item ::= SEQUENCE {
 }
 
 CellInformation-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
-{ ID id-ABSInformation			CRITICALITY ignore	EXTENSION ABSInformation		PRESENCE optional }|
-{ ID id-InvokeIndication		CRITICALITY ignore	EXTENSION InvokeIndication		PRESENCE optional },
+{ ID id-ABSInformation						CRITICALITY ignore	EXTENSION ABSInformation							PRESENCE optional }|
+{ ID id-InvokeIndication					CRITICALITY ignore	EXTENSION InvokeIndication							PRESENCE optional }|
+{ ID id-IntendedULDLConfiguration			CRITICALITY ignore	EXTENSION SubframeAssignment						PRESENCE optional }|
+{ ID id-ExtendedULInterferenceOverloadInfo	CRITICALITY ignore	EXTENSION ExtendedULInterferenceOverloadInfo	PRESENCE optional },
 	...
 }
 
@@ -576,7 +609,7 @@ ENBConfigurationUpdate-IEs X2AP-PROTOCOL-IES ::= {
 }
 
 ServedCellsToModify::= SEQUENCE (SIZE (1..maxCellineNB)) OF ServedCellsToModify-Item
-
+ 
 ServedCellsToModify-Item::= SEQUENCE {
 	old-ecgi						ECGI,
 	servedCellInfo					ServedCell-Information,
@@ -642,7 +675,7 @@ ResourceStatusRequest ::= SEQUENCE {
 
 ResourceStatusRequest-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-ENB1-Measurement-ID		CRITICALITY reject	TYPE Measurement-ID					PRESENCE mandatory}|
-	{ ID id-ENB2-Measurement-ID		CRITICALITY ignore	TYPE Measurement-ID					PRESENCE conditional}|-- The IE shall be present if the Registration Request IE is set to "Stop"--
+	{ ID id-ENB2-Measurement-ID		CRITICALITY ignore	TYPE Measurement-ID					PRESENCE conditional}|-- The IE shall be present if the Registration Request IE is set to “Stop”--
 	{ ID id-Registration-Request	CRITICALITY reject	TYPE Registration-Request			PRESENCE mandatory}|
 	{ ID id-ReportCharacteristics	CRITICALITY reject	TYPE ReportCharacteristics			PRESENCE optional}|
 	{ ID id-CellToReport			CRITICALITY ignore	TYPE CellToReport-List				PRESENCE mandatory}|
@@ -904,7 +937,8 @@ RLFIndication-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-FailureCellCRNTI			CRITICALITY ignore	TYPE CRNTI						PRESENCE mandatory}|
 	{ ID id-ShortMAC-I					CRITICALITY ignore	TYPE ShortMAC-I					PRESENCE optional}|
 	{ ID id-UE-RLF-Report-Container		CRITICALITY ignore	TYPE UE-RLF-Report-Container	PRESENCE optional}|
-	{ ID id-RRCConnSetupIndicator		CRITICALITY reject	TYPE RRCConnSetupIndicator		PRESENCE optional},
+	{ ID id-RRCConnSetupIndicator		CRITICALITY reject	TYPE RRCConnSetupIndicator		PRESENCE optional}|
+	{ ID id-RRCConnReestabIndicator		CRITICALITY ignore	TYPE RRCConnReestabIndicator	PRESENCE optional},
 	...
 }
 
@@ -926,7 +960,7 @@ CellActivationRequest-IEs X2AP-PROTOCOL-IES ::= {
 }
 
 ServedCellsToActivate::= SEQUENCE (SIZE (1..maxCellineNB)) OF ServedCellsToActivate-Item
-
+ 
 ServedCellsToActivate-Item::= SEQUENCE {
 	ecgi						ECGI,
 	iE-Extensions					ProtocolExtensionContainer { { ServedCellsToActivate-Item-ExtIEs} } OPTIONAL,
@@ -955,7 +989,7 @@ CellActivationResponse-IEs X2AP-PROTOCOL-IES ::= {
 }
 
 ActivatedCellList ::= SEQUENCE (SIZE (1..maxCellineNB)) OF ActivatedCellList-Item
-
+ 
 ActivatedCellList-Item::= SEQUENCE {
 	ecgi								ECGI,
 	iE-Extensions						ProtocolExtensionContainer { { ActivatedCellList-Item-ExtIEs} } OPTIONAL,
@@ -983,4 +1017,50 @@ CellActivationFailure-IEs X2AP-PROTOCOL-IES ::= {
 	...
 }
 
+-- **************************************************************
+--
+-- X2 RELEASE
+--
+-- **************************************************************
+
+X2Release ::= SEQUENCE {
+	protocolIEs                     ProtocolIE-Container       {{X2Release-IEs}},
+	...
+}
+
+X2Release-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-GlobalENB-ID			CRITICALITY reject	TYPE GlobalENB-ID			PRESENCE mandatory},
+...
+}
+
+-- **************************************************************
+--
+-- X2 Message Transfer 
+--
+-- **************************************************************
+
+X2MessageTransfer ::= SEQUENCE {
+	protocolIEs                     ProtocolIE-Container       {{X2MessageTransfer-IEs}},
+	...
+}
+
+X2MessageTransfer-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-RNL-Header	CRITICALITY reject	TYPE RNL-Header				PRESENCE mandatory}|
+	{ ID id-x2APMessage	CRITICALITY reject	TYPE X2AP-Message			PRESENCE optional},
+	...
+}
+
+RNL-Header ::= SEQUENCE {
+	target-GlobalENB-ID	GlobalENB-ID	OPTIONAL,
+	source-GlobalENB-ID	GlobalENB-ID,
+	iE-Extensions						ProtocolExtensionContainer { { RNL-Header-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+RNL-Header-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+X2AP-Message ::= OCTET STRING
+
 END
diff --git a/asn1/x2ap/X2AP-PDU-Descriptions.asn b/asn1/x2ap/X2AP-PDU-Descriptions.asn
index e08e878987..189e45ad5a 100644
--- a/asn1/x2ap/X2AP-PDU-Descriptions.asn
+++ b/asn1/x2ap/X2AP-PDU-Descriptions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V10.3.0 (2011-09)
+-- 3GPP TS 36.423 V12.2.0 (2014-06)
 -- 9.3.3	Elementary Procedure Definitions
 -- **************************************************************
 --
@@ -6,7 +6,7 @@
 --
 -- **************************************************************
 
-X2AP-PDU-Descriptions {
+ X2AP-PDU-Descriptions {
 itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
 eps-Access (21) modules (3) x2ap (2) version1 (1) x2ap-PDU-Descriptions (0) }
 
@@ -54,7 +54,9 @@ FROM X2AP-CommonDataTypes
 	X2SetupResponse,
 	MobilityChangeRequest,
 	MobilityChangeAcknowledge,
-	MobilityChangeFailure
+	MobilityChangeFailure,
+	X2Release,
+	X2MessageTransfer
 
 
 
@@ -77,7 +79,9 @@ FROM X2AP-PDU-Contents
 	id-snStatusTransfer,
 	id-uEContextRelease,
 	id-x2Setup,
-	id-mobilitySettingsChange
+	id-mobilitySettingsChange,
+	id-x2Release,
+	id-x2MessageTransfer
 
 
 
@@ -168,7 +172,10 @@ X2AP-ELEMENTARY-PROCEDURES-CLASS-2 X2AP-ELEMENTARY-PROCEDURE ::= {
 	resourceStatusReporting					|
 	loadIndication							|
 	privateMessage							|
-	rLFIndication							|	handoverReport,
+	rLFIndication							|
+	handoverReport							|
+	x2Release								|
+	x2MessageTransfer,
 	...
 
 }
@@ -291,5 +298,16 @@ cellActivation	X2AP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY				reject
 }
 
+x2Release X2AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		X2Release
+	PROCEDURE CODE			id-x2Release
+	CRITICALITY				reject
+}
+
+x2MessageTransfer X2AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		X2MessageTransfer
+	PROCEDURE CODE			id-x2MessageTransfer
+	CRITICALITY				reject
+}
 
 END
diff --git a/asn1/x2ap/x2ap.cnf b/asn1/x2ap/x2ap.cnf
index 761c050ba4..c8cbb7ebed 100644
--- a/asn1/x2ap/x2ap.cnf
+++ b/asn1/x2ap/x2ap.cnf
@@ -78,7 +78,7 @@ ProtocolIE-ContainerPairList
 
 %(DEFAULT_BODY)s
 
-	if(tvb_length(tvb)==0)
+	if(tvb_reported_length(tvb)==0)
 		return offset;
 
 	if (!parameter_tvb)
@@ -115,7 +115,7 @@ ProtocolExtensionID TYPE = FT_UINT8  DISPLAY = BASE_DEC STRINGS = VALS(x2ap_Prot
   if (!parameter_tvb)
     return offset;
 	/* Get the length */
-	tvb_len = tvb_length(parameter_tvb);
+	tvb_len = tvb_reported_length(parameter_tvb);
 	subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_TransportLayerAddress);
 	if (tvb_len==4){
 		/* IPv4 */
@@ -157,6 +157,9 @@ id-mobilitySettingsChange				ProcedureCode
 id-rLFIndication						ProcedureCode
 id-handoverReport						ProcedureCode
 id-cellActivation						ProcedureCode
+id-x2Release							ProcedureCode
+id-x2MessageTransfer					ProcedureCode
+
 
 # ProtocolIE-ID
 
@@ -234,6 +237,33 @@ id-CSGMembershipStatus														ProtocolIE-ID
 id-MDTConfiguration															ProtocolIE-ID
 id-ManagementBasedMDTallowed												ProtocolIE-ID
 id-RRCConnSetupIndicator													ProtocolIE-ID
+id-NeighbourTAC																ProtocolIE-ID
+id-Time-UE-StayedInCell-EnhancedGranularity									ProtocolIE-ID
+id-RRCConnReestabIndicator													ProtocolIE-ID
+id-MBMS-Service-Area-List													ProtocolIE-ID
+id-HO-cause																	ProtocolIE-ID
+id-TargetCellInUTRAN														ProtocolIE-ID
+id-MobilityInformation														ProtocolIE-ID
+id-SourceCellCRNTI															ProtocolIE-ID
+id-MultibandInfoList														ProtocolIE-ID
+id-M3Configuration															ProtocolIE-ID
+id-M4Configuration															ProtocolIE-ID
+id-M5Configuration															ProtocolIE-ID
+id-MDT-Location-Info														ProtocolIE-ID
+id-ManagementBasedMDTPLMNList												ProtocolIE-ID
+id-SignallingBasedMDTPLMNList												ProtocolIE-ID
+id-ReceiveStatusOfULPDCPSDUsExtended										ProtocolIE-ID
+id-ULCOUNTValueExtended														ProtocolIE-ID
+id-DLCOUNTValueExtended														ProtocolIE-ID
+id-eARFCNExtension															ProtocolIE-ID
+id-UL-EARFCNExtension														ProtocolIE-ID
+id-DL-EARFCNExtension														ProtocolIE-ID
+id-AdditionalSpecialSubframe-Info											ProtocolIE-ID
+id-Masked-IMEISV															ProtocolIE-ID
+id-IntendedULDLConfiguration												ProtocolIE-ID
+id-ExtendedULInterferenceOverloadInfo										ProtocolIE-ID
+id-RNL-Header																ProtocolIE-ID
+id-x2APMessage																ProtocolIE-ID
 
 #.REGISTER_NEW
 
@@ -301,7 +331,13 @@ CompleteFailureCauseInformation-List		N x2ap.ies id-CompleteFailureCauseInformat
 CompleteFailureCauseInformation-Item		N x2ap.ies id-CompleteFailureCauseInformation-Item
 CSGMembershipStatus							N x2ap.ies id-CSGMembershipStatus
 RRCConnSetupIndicator						N x2ap.ies id-RRCConnSetupIndicator
-
+RRCConnReestabIndicator						N x2ap.ies id-RRCConnReestabIndicator
+TargetCellInUTRAN							N x2ap.ies id-TargetCellInUTRAN
+MobilityInformation							N x2ap.ies id-MobilityInformation
+CRNTI										N x2ap.ies id-SourceCellCRNTI
+Masked-IMEISV								N x2ap.ies id-Masked-IMEISV
+RNL-Header									N x2ap.ies id-RNL-Header
+X2AP-Message								N x2ap.ies id-x2APMessage
 
 #X2AP-PROTOCOL-EXTENSION
 Number-of-Antennaports						N x2ap.extension id-Number-of-Antennaports
@@ -316,6 +352,26 @@ ABS-Status									N x2ap.extension id-ABS-Status
 CSG-Id										N x2ap.extension id-CSG-Id
 MDT-Configuration							N x2ap.extension id-MDTConfiguration
 ManagementBasedMDTallowed					N x2ap.extension id-ManagementBasedMDTallowed
+TAC											N x2ap.extension id-NeighbourTAC
+Time-UE-StayedInCell-EnhancedGranularity	N x2ap.extension id-Time-UE-StayedInCell-EnhancedGranularity
+MBMS-Service-Area-Identity-List				N x2ap.extension id-MBMS-Service-Area-List
+Cause										N x2ap.extension id-HO-cause
+MultibandInfoList							N x2ap.extension id-MultibandInfoList
+M3Configuration								N x2ap.extension id-M3Configuration
+M4Configuration								N x2ap.extension id-M4Configuration
+M5Configuration								N x2ap.extension id-M5Configuration
+MDT-Location-Info							N x2ap.extension id-MDT-Location-Info
+MDTPLMNList									N x2ap.extension id-ManagementBasedMDTPLMNList
+MDTPLMNList									N x2ap.extension id-SignallingBasedMDTPLMNList
+ReceiveStatusOfULPDCPSDUsExtended			N x2ap.extension id-ReceiveStatusOfULPDCPSDUsExtended
+COUNTValueExtended							N x2ap.extension id-ULCOUNTValueExtended
+COUNTValueExtended							N x2ap.extension id-DLCOUNTValueExtended
+EARFCNExtension								N x2ap.extension id-eARFCNExtension
+EARFCNExtension								N x2ap.extension id-UL-EARFCNExtension
+EARFCNExtension								N x2ap.extension id-DL-EARFCNExtension
+AdditionalSpecialSubframe-Info				N x2ap.extension id-AdditionalSpecialSubframe-Info
+SubframeAssignment							N x2ap.extension id-IntendedULDLConfiguration
+ExtendedULInterferenceOverloadInfo			N x2ap.extension id-ExtendedULInterferenceOverloadInfo
 
 # X2AP-PDU-Descriptions.asn  Interface Elementary Procedures
 #X2AP-ELEMENTARY-PROCEDURE
@@ -364,6 +420,9 @@ CellActivationRequest				N x2ap.proc.imsg id-cellActivation
 CellActivationResponse				N x2ap.proc.sout id-cellActivation
 CellActivationFailure				N x2ap.proc.uout id-cellActivation
 
+X2Release							N x2ap.proc.imsg id-x2Release
+
+X2MessageTransfer					N x2ap.proc.imsg id-x2MessageTransfer
 
 #.TYPE_ATTR
 BitRate TYPE = FT_UINT64 DISPLAY = BASE_DEC STRINGS = NULL