[RANAP] Update to 3GPP TS 25.413 V14.0.0 (2017-03)

Change-Id: I5d448a4daf438b05a30473e999574803e5d6ade9
Reviewed-on: https://code.wireshark.org/review/21730
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

7 files changed, 92 insertions, 18 deletions

diff --git a/epan/dissectors/asn1/ranap/RANAP-CommonDataTypes.asn b/epan/dissectors/asn1/ranap/RANAP-CommonDataTypes.asn
index 662d2770cf..0287dfc93b 100644
--- a/epan/dissectors/asn1/ranap/RANAP-CommonDataTypes.asn
+++ b/epan/dissectors/asn1/ranap/RANAP-CommonDataTypes.asn
@@ -1,6 +1,6 @@
 -- RANAP-CommonDataTypes.asn
 --
--- 3GPP TS 25.413 V13.2.0 (2016-06)
+-- 3GPP TS 25.413 V14.0.0 (2017-03)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.5	Common Definitions
diff --git a/epan/dissectors/asn1/ranap/RANAP-Constants.asn b/epan/dissectors/asn1/ranap/RANAP-Constants.asn
index 2deaebfd12..46360d0f11 100644
--- a/epan/dissectors/asn1/ranap/RANAP-Constants.asn
+++ b/epan/dissectors/asn1/ranap/RANAP-Constants.asn
@@ -1,6 +1,6 @@
 -- RANAP-Constants.asn
 --
--- 3GPP TS 25.413 V13.2.0 (2016-06)
+-- 3GPP TS 25.413 V14.0.0 (2017-03)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.6	Constant Definitions
@@ -33,6 +33,7 @@ id-RelocationCancel					INTEGER ::= 4
 id-SRNS-ContextTransfer				INTEGER ::= 5
 id-SecurityModeControl				INTEGER ::= 6
 id-DataVolumeReport					INTEGER ::= 7
+--WS Extension
 id-Not-Used-8						INTEGER ::= 8
 id-Reset							INTEGER ::= 9
 id-RAB-ReleaseRequest				INTEGER ::= 10
@@ -126,6 +127,7 @@ maxNrOfLAIs							INTEGER ::= 8
 maxSizeOfIMSInfo					INTEGER ::= 32
 maxnoofMDTPLMNs						INTEGER ::= 16
 maxAddPosSet						INTEGER ::= 8
+maxnoofPLMNs						INTEGER ::= 16
 
 -- **************************************************************
 --
@@ -134,6 +136,7 @@ maxAddPosSet						INTEGER ::= 8
 -- **************************************************************
 
 id-AreaIdentity 								INTEGER ::= 0
+-- WS Extension
 id-Not-Used-1 									INTEGER ::= 1
 id-Not-Used-2 									INTEGER ::= 2
 id-CN-DomainIndicator 							INTEGER ::= 3
@@ -206,6 +209,7 @@ id-UE-ID 										INTEGER ::= 69
 id-UL-GTP-PDU-SequenceNumber 					INTEGER ::= 70
 id-RAB-FailedtoReportItem						INTEGER ::= 71
 id-RAB-FailedtoReportList 						INTEGER ::= 72
+-- WS Extension
 id-Not-Used-73 									INTEGER ::= 73
 id-Not-Used-74 									INTEGER ::= 74
 id-KeyStatus									INTEGER ::= 75
@@ -234,8 +238,9 @@ id-LastKnownServiceArea							INTEGER ::= 97
 id-SRB-TrCH-Mapping								INTEGER ::= 98
 id-InterSystemInformation-TransparentContainer	INTEGER ::= 99
 id-NewBSS-To-OldBSS-Information 						INTEGER ::= 100
-id-Not-Used-101 										INTEGER ::= 101
-id-Not-Used-102 										INTEGER ::= 102
+-- WS extension
+id-Not-Used-101											INTEGER ::= 101
+id-Not-Used-102											INTEGER ::= 102
 id-SourceRNC-PDCP-context-info							INTEGER ::= 103
 id-InformationTransferID								INTEGER ::= 104
 id-SNA-Access-Information								INTEGER ::= 105
@@ -365,7 +370,8 @@ id-SRVCC-Operation-Possible								INTEGER ::= 228
 id-CSG-Id-List											INTEGER ::= 229
 id-PSRABtobeReplaced									INTEGER ::= 230
 id-E-UTRAN-Service-Handover								INTEGER ::= 231
-id-Not-Used-232 										INTEGER ::= 232
+-- WS Extension
+id-Not-Used-232											INTEGER ::= 232
 id-UE-AggregateMaximumBitRate							INTEGER ::= 233
 id-CSG-Membership-Status 								INTEGER ::= 234
 id-Cell-Access-Mode										INTEGER ::= 235
@@ -379,7 +385,6 @@ id-Correlation-ID										INTEGER ::= 242
 id-IRAT-Measurement-Configuration						INTEGER ::= 243
 id-MDT-Configuration									INTEGER ::= 244
 id-Priority-Class-Indicator								INTEGER ::= 245
-id-Not-Used-246 										INTEGER ::= 246
 id-RNSAPRelocationParameters							INTEGER ::= 247
 id-RABParametersList									INTEGER ::= 248
 id-Management-Based-MDT-Allowed							INTEGER ::= 249
@@ -424,5 +429,8 @@ id-P-TMSI												INTEGER ::= 287
 id-RANAP-Message										INTEGER ::= 288
 id-PowerSavingIndicator									INTEGER ::= 289
 id-UE-Usage-Type										INTEGER ::= 290
+id-DCN-ID												INTEGER ::= 291
+id-UE-Application-Layer-Measurement-Configuration				INTEGER ::= 292
+id-UE-Application-Layer-Measurement-Configuration-For-Relocation				INTEGER ::= 293
 
 END
diff --git a/epan/dissectors/asn1/ranap/RANAP-Containers.asn b/epan/dissectors/asn1/ranap/RANAP-Containers.asn
index 9a7881bbbc..f920a62af1 100644
--- a/epan/dissectors/asn1/ranap/RANAP-Containers.asn
+++ b/epan/dissectors/asn1/ranap/RANAP-Containers.asn
@@ -1,6 +1,6 @@
 -- RANAP-Containers.asn
 --
--- 3GPP TS 25.413 V13.2.0 (2016-06)
+-- 3GPP TS 25.413 V14.0.0 (2017-03)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.7	Container Definitions
diff --git a/epan/dissectors/asn1/ranap/RANAP-IEs.asn b/epan/dissectors/asn1/ranap/RANAP-IEs.asn
index f60d02da0b..3b47d0122d 100644
--- a/epan/dissectors/asn1/ranap/RANAP-IEs.asn
+++ b/epan/dissectors/asn1/ranap/RANAP-IEs.asn
@@ -1,6 +1,6 @@
 -- RANAP-IEs.asn
 --
--- 3GPP TS 25.413 V13.2.0 (2016-06)
+-- 3GPP TS 25.413 V14.0.0 (2017-03)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.4	Information Element Definitions
@@ -53,6 +53,7 @@ IMPORTS
 	maxSizeOfIMSInfo,
 	maxnoofMDTPLMNs,
 	maxAddPosSet,
+	maxnoofPLMNs,
 
 	id-CN-DomainIndicator,
 	id-MessageStructure,
@@ -290,9 +291,32 @@ AlternativeRABConfigurationRequest ::= ENUMERATED{
 	...
 }
 
+UE-Application-Layer-Measurement-Configuration	::= SEQUENCE {
+		applicationLayerContainerForMeasurementConfiguration		OCTET STRING ( SIZE (1..1000)),
+		areaScopeForUEApplicationLayerMeasurementConfiguration					AreaScopeForUEApplicationLayerMeasurementConfiguration,
+		...
+}
+
+UE-Application-Layer-Measurement-Configuration-For-Relocation	::= SEQUENCE {
+		areaScopeForUEApplicationLayerMeasurementConfiguration					AreaScopeForUEApplicationLayerMeasurementConfiguration,
+		traceReference						TraceReference,
+		tracePropagationParameters			TracePropagationParameters OPTIONAL,
+		traceCollectionEntityIPAddress		TransportLayerAddress			OPTIONAL,
+		...
+}
+
+
 APN	::= OCTET STRING (SIZE (1..255))
 -- Reference: 23.003
 
+AreaScopeForUEApplicationLayerMeasurementConfiguration ::=	CHOICE {
+	cellbased			CellBased,
+	labased				LABased,
+	rabased				RABased,
+	plmn-area-based		PLMNBased,
+	...
+}
+
 AreaIdentity ::= CHOICE {
 	sAI				SAI,
 	geographicalArea		GeographicalArea,
@@ -661,6 +685,9 @@ DataVolumeReportingIndication ::= ENUMERATED {
 
 DCH-ID ::= INTEGER (0..255)
 
+DCN-ID ::= INTEGER (0..65535)
+
+
 DeliveryOfErroneousSDU ::= ENUMERATED {
 	yes,
 	no,
@@ -717,7 +744,10 @@ E-DCH-MAC-d-Flow-ID		::= INTEGER (0.. maxNrOfEDCHMACdFlows-1)
 ENB-ID ::= CHOICE {
 	macroENB-ID			BIT STRING (SIZE(20)),
 	homeENB-ID			BIT STRING (SIZE(28)),
-	...
+	...,
+	short-macroENB-ID		BIT STRING (SIZE(18)),
+	long-macroENB-ID		BIT STRING (SIZE(21))
+
 }
 
 EncryptionAlgorithm 			::= INTEGER { no-encryption (0), standard-UMTS-encryption-algorith-UEA1 (1), standard-UMTS-encryption-algorithm-UEA2 (2) } (0..15)
@@ -1577,6 +1607,21 @@ LoggingDuration	::=	ENUMERATED {
 
 
 
+PLMNBased::= SEQUENCE {
+	plmnList				PLMNList,
+	iE-Extensions		ProtocolExtensionContainer { {PLMNBased-ExtIEs} } OPTIONAL,
+	...
+}
+
+PLMNBased-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+PLMNList ::= SEQUENCE (SIZE (1.. maxnoofPLMNs)) OF
+	PLMNidentity
+
+
+
 PLMNidentity 				::= TBCD-STRING (SIZE (3))
 
 PLMNs-in-shared-network ::= SEQUENCE (SIZE (1..maxNrOfPLMNsSN)) OF
diff --git a/epan/dissectors/asn1/ranap/RANAP-PDU-Contents.asn b/epan/dissectors/asn1/ranap/RANAP-PDU-Contents.asn
index 4301328952..840fd6953d 100644
--- a/epan/dissectors/asn1/ranap/RANAP-PDU-Contents.asn
+++ b/epan/dissectors/asn1/ranap/RANAP-PDU-Contents.asn
@@ -1,6 +1,6 @@
 -- RANAP-PDU-Contents.asn
 --
--- 3GPP TS 25.413 V13.2.0 (2016-06)
+-- 3GPP TS 25.413 V14.0.0 (2017-03)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.3	PDU Definitions
@@ -28,6 +28,8 @@ BEGIN
 
 IMPORTS
 	AccuracyFulfilmentIndicator,
+	UE-Application-Layer-Measurement-Configuration,
+	UE-Application-Layer-Measurement-Configuration-For-Relocation,
 	APN,
 	BroadcastAssistanceDataDecipheringKeys,
 	LocationRelatedDataRequestType,
@@ -190,7 +192,8 @@ IMPORTS
 	P-TMSI,
 	BarometricPressure,
 	CivicAddress,
-	UE-Usage-Type
+	UE-Usage-Type,
+	DCN-ID
 
 FROM RANAP-IEs
 
@@ -214,6 +217,8 @@ FROM RANAP-Containers
 	maxnoofMulticastServicesPerUE,
 
 	id-AccuracyFulfilmentIndicator,
+	id-UE-Application-Layer-Measurement-Configuration,
+	id-UE-Application-Layer-Measurement-Configuration-For-Relocation,
 	id-APN,
 	id-AreaIdentity,
 	id-Alt-RAB-Parameters,
@@ -441,7 +446,8 @@ FROM RANAP-Containers
 	id-PowerSavingIndicator,
 	id-BarometricPressure,
 	id-CivicAddress,
-	id-UE-Usage-Type
+	id-UE-Usage-Type,
+	id-DCN-ID
 
 FROM RANAP-Constants;
 
@@ -595,7 +601,10 @@ RelocationRequiredExtensions RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 9 to communicate to the CN the hybrid access status of the target cell --
 	{ ID id-Cell-Access-Mode							CRITICALITY reject	EXTENSION Cell-Access-Mode										PRESENCE optional} |
 -- Extension for Release 11 for rSRVCC operation --
-	{ ID id-RSRVCC-HO-Indication						CRITICALITY reject	EXTENSION RSRVCC-HO-Indication									PRESENCE optional},
+	{ ID id-RSRVCC-HO-Indication						CRITICALITY reject	EXTENSION RSRVCC-HO-Indication									PRESENCE optional}|
+-- Extension for Release 14 to support QoE function --
+	{ID id-UE-Application-Layer-Measurement-Configuration-For-Relocation CRITICALITY ignore	EXTENSION UE-Application-Layer-Measurement-Configuration-For-Relocation	PRESENCE optional},
+
 	...
 }
 
@@ -795,7 +804,10 @@ RelocationRequestExtensions RANAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-MSISDN							CRITICALITY ignore	EXTENSION MSISDN						PRESENCE optional}|
 -- Extension for Release 11 to support rSRVCC in case of network sharing –
 	{ ID id-AnchorPLMN-ID					CRITICALITY ignore	EXTENSION PLMNidentity					PRESENCE optional}|
-	{ ID id-PowerSavingIndicator			CRITICALITY ignore	EXTENSION PowerSavingIndicator			PRESENCE optional},
+	{ ID id-PowerSavingIndicator			CRITICALITY ignore	EXTENSION PowerSavingIndicator			PRESENCE optional}|
+-- Extension for Release 14 to support QoE function --
+	{ID id-UE-Application-Layer-Measurement-Configuration-For-Relocation CRITICALITY ignore	EXTENSION UE-Application-Layer-Measurement-Configuration-For-Relocation	PRESENCE optional},
+
 	...
 }
 
@@ -1824,7 +1836,9 @@ CN-InvokeTraceExtensions RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 10 to support MDT--
 	{ ID id-MDT-Configuration					CRITICALITY ignore	EXTENSION MDT-Configuration						PRESENCE optional}|
 -- Extension for Release 10 to support MDT--
-	{ ID id-Trace-Collection-Entity-IP-Addess	CRITICALITY ignore	EXTENSION TransportLayerAddress				PRESENCE optional},
+	{ ID id-Trace-Collection-Entity-IP-Addess	CRITICALITY ignore	EXTENSION TransportLayerAddress				PRESENCE optional}|
+-- Extension for Release 14 to support QoE function --
+	{ID id-UE-Application-Layer-Measurement-Configuration CRITICALITY ignore	EXTENSION UE-Application-Layer-Measurement-Configuration	PRESENCE optional},
 	...
 }
 
@@ -1999,7 +2013,9 @@ InitialUE-MessageExtensions RANAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-LHN-ID							CRITICALITY ignore	EXTENSION LHN-ID							PRESENCE optional}|
 -- Extension for Release 13 to support DCN --
 	{ ID id-SGSN-Group-Identity				CRITICALITY ignore	EXTENSION SGSN-Group-Identity				PRESENCE optional}|
-	{ ID id-UE-Usage-Type					CRITICALITY ignore	EXTENSION UE-Usage-Type						PRESENCE optional},
+	{ ID id-UE-Usage-Type					CRITICALITY ignore	EXTENSION UE-Usage-Type						PRESENCE optional}|
+	{ ID id-DCN-ID							CRITICALITY ignore	EXTENSION DCN-ID							PRESENCE optional},
+
 	...
 }
 
diff --git a/epan/dissectors/asn1/ranap/RANAP-PDU-Descriptions.asn b/epan/dissectors/asn1/ranap/RANAP-PDU-Descriptions.asn
index 4f5b38bc4e..92d4b0f276 100644
--- a/epan/dissectors/asn1/ranap/RANAP-PDU-Descriptions.asn
+++ b/epan/dissectors/asn1/ranap/RANAP-PDU-Descriptions.asn
@@ -1,6 +1,6 @@
 -- RANAP-PDU-Descriptions.asn
 --
--- 3GPP TS 25.413 V13.2.0 (2016-06)
+-- 3GPP TS 25.413 V14.0.0 (2017-03)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.2	Elementary Procedure Definitions
diff --git a/epan/dissectors/asn1/ranap/ranap.cnf b/epan/dissectors/asn1/ranap/ranap.cnf
index bdbc463291..0161440bcf 100644
--- a/epan/dissectors/asn1/ranap/ranap.cnf
+++ b/epan/dissectors/asn1/ranap/ranap.cnf
@@ -762,6 +762,9 @@ id-P-TMSI                                       ProtocolIE-ID
 id-RANAP-Message                                ProtocolIE-ID
 id-PowerSavingIndicator                         ProtocolIE-ID
 id-UE-Usage-Type                                ProtocolIE-ID
+id-DCN-ID                                                           ProtocolIE-ID
+id-UE-Application-Layer-Measurement-Configuration                   ProtocolIE-ID
+id-UE-Application-Layer-Measurement-Configuration-For-Relocation    ProtocolIE-ID
 #.END
 
 #.REGISTER
@@ -1062,7 +1065,9 @@ BarometricPressure                                        N ranap.extension id-B
 Additional-PositioningDataSet                             N ranap.extension id-Additional-PositioningDataSet
 CivicAddress                                              N ranap.extension id-CivicAddress
 PowerSavingIndicator                                      N ranap.extension id-PowerSavingIndicator
-
+DCN-ID                                                    N ranap.extension id-DCN-ID
+UE-Application-Layer-Measurement-Configuration                   N ranap.extension id-UE-Application-Layer-Measurement-Configuration
+UE-Application-Layer-Measurement-Configuration-For-Relocation    N ranap.extension id-UE-Application-Layer-Measurement-Configuration-For-Relocation
 
 #RANAP-ELEMENTARY-PROCEDURE
 Iu-ReleaseCommand                             N ranap.proc.imsg id-Iu-Release