RRC: upgrade dissector to v14.4.0

Change-Id: I49cf3e5981efe5b28eb012bab50cf55636636a38
Reviewed-on: https://code.wireshark.org/review/23762
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

6 files changed, 29 insertions, 29 deletions

diff --git a/epan/dissectors/asn1/rrc/Class-definitions.asn b/epan/dissectors/asn1/rrc/Class-definitions.asn
index 23aeb490b5..3ccb84d51f 100644
--- a/epan/dissectors/asn1/rrc/Class-definitions.asn
+++ b/epan/dissectors/asn1/rrc/Class-definitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 25.331 V14.3.0 (2017-06)
+-- 3GPP TS 25.331 V14.4.0 (2017-09)
 --
 -- 11.1	General message structure
 --
diff --git a/epan/dissectors/asn1/rrc/Constant-definitions.asn b/epan/dissectors/asn1/rrc/Constant-definitions.asn
index 64c58ffdbc..7171a84460 100644
--- a/epan/dissectors/asn1/rrc/Constant-definitions.asn
+++ b/epan/dissectors/asn1/rrc/Constant-definitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 25.331 V14.3.0 (2017-06)
+-- 3GPP TS 25.331 V14.4.0 (2017-09)
 --
 -- 11.4	Constant definitions
 --
diff --git a/epan/dissectors/asn1/rrc/InformationElements.asn b/epan/dissectors/asn1/rrc/InformationElements.asn
index fcb5f3d0d9..b56067aaa4 100644
--- a/epan/dissectors/asn1/rrc/InformationElements.asn
+++ b/epan/dissectors/asn1/rrc/InformationElements.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 25.331 V14.3.0 (2017-06)
+-- 3GPP TS 25.331 V14.4.0 (2017-09)
 --
 -- 11.3	Information element definitions
 --
@@ -1216,7 +1216,7 @@ DL-PhysChCapabilityFDD-vd20ext ::=	SEQUENCE {
 	supportofBlindHarqRetransmissionsforHsdpa		ENUMERATED { true }				OPTIONAL
 }
 
-DL-PhysChCapabilityFDD-vexyext ::=	SEQUENCE {
+DL-PhysChCapabilityFDD-ve30ext ::=	SEQUENCE {
 	supportofHS-SCCHDrxOperation			ENUMERATED { true }				OPTIONAL
 }
 
@@ -1738,7 +1738,7 @@ MeasurementCapability-vc50ext ::=	SEQUENCE {
 	enhancedUPHReporting							ENUMERATED { true }		OPTIONAL
 }
 
-MeasurementCapability-vexyext ::=	SEQUENCE {
+MeasurementCapability-ve30ext ::=	SEQUENCE {
 	rrcEventsforUPHReporting							ENUMERATED { true }			OPTIONAL,
 	qoEMeasurementCollectionForStreamingServices	ENUMERATED { true }			OPTIONAL
 }
@@ -2067,10 +2067,10 @@ PhysicalChannelCapability-vd20ext ::=	SEQUENCE {
 		uplinkPhysChCapability					UL-PhysChCapabilityFDD-vd20ext	OPTIONAL
 	}		OPTIONAL
 }
-PhysicalChannelCapability-vexyext ::=	SEQUENCE {
+PhysicalChannelCapability-ve30ext ::=	SEQUENCE {
 	fddPhysChCapability						SEQUENCE {
-		downlinkPhysChCapability					DL-PhysChCapabilityFDD-vexyext	OPTIONAL,
-		uplinkPhysChCapability					UL-PhysChCapabilityFDD-vexyext	OPTIONAL
+		downlinkPhysChCapability					DL-PhysChCapabilityFDD-ve30ext	OPTIONAL,
+		uplinkPhysChCapability					UL-PhysChCapabilityFDD-ve30ext	OPTIONAL
 	}		OPTIONAL
 }
 
@@ -2926,7 +2926,7 @@ UE-RadioAccessCapability-LaterNonCriticalExtensions ::=	SEQUENCE {
 								vd20NonCriticalExtensions			SEQUENCE {
 									ue-RadioAccessCapability-vd20ext
 											UE-RadioAccessCapability-vd20ext-IEs,
-									vexyNonCriticalExtensions		UE-RadioAccessCapability-vexyext-IEs OPTIONAL
+									ve30NonCriticalExtensions		UE-RadioAccessCapability-ve30ext-IEs OPTIONAL
 								}		OPTIONAL
 							}		OPTIONAL
 						}		OPTIONAL
@@ -3030,10 +3030,10 @@ UE-RadioAccessCapability-vd20ext-IEs ::=		SEQUENCE {
 	supportofEnhancedStateTransition			ENUMERATED { true }						OPTIONAL
 }
 
-UE-RadioAccessCapability-vexyext-IEs ::=		SEQUENCE {
-	measurementCapability							MeasurementCapability-vexyext		OPTIONAL,
+UE-RadioAccessCapability-ve30ext-IEs ::=		SEQUENCE {
+	measurementCapability							MeasurementCapability-ve30ext		OPTIONAL,
 	supportofSimultaneousSetupandReleaseofRABsRBs	ENUMERATED { true }					OPTIONAL,
-	physicalChannelCapability						PhysicalChannelCapability-vexyext	OPTIONAL,
+	physicalChannelCapability						PhysicalChannelCapability-ve30ext	OPTIONAL,
 	nonCriticalExtensions						SEQUENCE {}							OPTIONAL
 }
 
@@ -3731,7 +3731,7 @@ UL-PhysChCapabilityFDD-vd20ext ::=		SEQUENCE {
 	supportOfDualCellEDCHwithDPDCH			ENUMERATED { true }				OPTIONAL
 }
 
-UL-PhysChCapabilityFDD-vexyext ::=		SEQUENCE {
+UL-PhysChCapabilityFDD-ve30ext ::=		SEQUENCE {
 	supportOfDualCellEDCHOperationEnhancements			ENUMERATED { true }				OPTIONAL
 }
 
@@ -18587,8 +18587,8 @@ MeasuredResults-vd20ext ::= CHOICE {
 	ue-positioning-MeasuredResults		UE-Positioning-MeasuredResults-vd20ext
 }
 
-MeasuredResults-vexyext ::= CHOICE {
-	ueInternalMeasuredResults				UE-InternalMeasuredResults-vexyext
+MeasuredResults-ve30ext ::= CHOICE {
+	ueInternalMeasuredResults				UE-InternalMeasuredResults-ve30ext
 }
 
 
@@ -20752,10 +20752,10 @@ UE-InternalEventResults ::=			CHOICE {
 	event6e								NULL,
 	event6f								PrimaryCPICH-Info,
 	event6g								PrimaryCPICH-Info,
-	ue-InternalEventResults-vxyext				UE-InternalEventResults-vxyext-IEs
+	ue-InternalEventResults-v30ext				UE-InternalEventResults-v30ext-IEs
 }
 
-UE-InternalEventResults-vxyext-IEs ::=	CHOICE {
+UE-InternalEventResults-v30ext-IEs ::=	CHOICE {
 	event6h								NULL,
 	event6i								NULL,
 	spare6								NULL,
@@ -20789,7 +20789,7 @@ UE-InternalMeasuredResults ::=		SEQUENCE {
 	}
 }
 
-UE-InternalMeasuredResults-vexyext ::=	SEQUENCE {
+UE-InternalMeasuredResults-ve30ext ::=	SEQUENCE {
 	modeSpecificInfo					CHOICE {
 		fdd									SEQUENCE {
 			ue-powerheadroom					UE-PowerHeadroom			OPTIONAL
diff --git a/epan/dissectors/asn1/rrc/Internode-definitions.asn b/epan/dissectors/asn1/rrc/Internode-definitions.asn
index 3f96dee2bf..e084513de2 100644
--- a/epan/dissectors/asn1/rrc/Internode-definitions.asn
+++ b/epan/dissectors/asn1/rrc/Internode-definitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 25.331 V14.3.0 (2017-06)
+-- 3GPP TS 25.331 V14.4.0 (2017-09)
 --
 -- 11.5	RRC information between network nodes
 --
diff --git a/epan/dissectors/asn1/rrc/PDU-definitions.asn b/epan/dissectors/asn1/rrc/PDU-definitions.asn
index f37aac0a12..c4555cec77 100644
--- a/epan/dissectors/asn1/rrc/PDU-definitions.asn
+++ b/epan/dissectors/asn1/rrc/PDU-definitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 25.331 V14.3.0 (2017-06)
+-- 3GPP TS 25.331 V14.4.0 (2017-09)
 --
 -- 11.2	PDU definitions
 --
@@ -497,7 +497,7 @@ IMPORTS
 	MeasuredResults-v920ext,
 	MeasuredResults-vc50ext,
 	MeasuredResults-vd20ext,
-	MeasuredResults-vexyext,
+	MeasuredResults-ve30ext,
 	MeasuredResultsOnSecUlFreq,
 	MeasuredResultsOnSecUlFreq-vc50ext,
 	MeasuredResultsListOnSecUlFreq,
@@ -1409,7 +1409,7 @@ CellUpdate ::= SEQUENCE {
 										cellUpdate-vb50ext				CellUpdate-vb50ext-IEs,
 										vc50NonCriticalExtensions		SEQUENCE {
 											cellUpdate-vc50ext				CellUpdate-vc50ext-IEs,
-											vexyLaterNonCriticalExtensions CellUpdate-vexyext-IEs	OPTIONAL
+											ve30LaterNonCriticalExtensions CellUpdate-ve30ext-IEs	OPTIONAL
 										}		OPTIONAL
 									}		OPTIONAL
 								}		OPTIONAL
@@ -1421,7 +1421,7 @@ CellUpdate ::= SEQUENCE {
 		}	OPTIONAL
 }
 
-CellUpdate-vexyext-IEs ::= SEQUENCE {
+CellUpdate-ve30ext-IEs ::= SEQUENCE {
 	-- User equipment IEs
 		cellUpdateCause-ext2			CellUpdateCause-ext2			OPTIONAL,
 		nonCriticalExtensions			SEQUENCE {}					OPTIONAL
@@ -3808,7 +3808,7 @@ InitialDirectTransfer ::= SEQUENCE {
 									initialDirectTransfer-vb50ext	InitialDirectTransfer-vb50ext-IEs,
 									vc50NonCriticalExtensions		SEQUENCE {
 										initialDirectTransfer-vc50ext	InitialDirectTransfer-vc50ext-IEs,
-										vexyNonCriticalExtensions		InitialDirectTransfer-vexyext-IEs		OPTIONAL
+										ve30NonCriticalExtensions		InitialDirectTransfer-ve30ext-IEs		OPTIONAL
 									}		OPTIONAL
 								}		OPTIONAL
 							}		OPTIONAL
@@ -3864,7 +3864,7 @@ InitialDirectTransfer-vc50ext-IEs ::= SEQUENCE {
 		measuredResultsOnRACH					MeasuredResultsOnRACH-vc50ext			OPTIONAL
 }
 
-InitialDirectTransfer-vexyext-IEs ::= SEQUENCE {
+InitialDirectTransfer-ve30ext-IEs ::= SEQUENCE {
 	-- Other IEs
 		dcnIdentity						INTEGER (0..65535)					OPTIONAL,
 		nonCriticalExtensions				SEQUENCE {}						OPTIONAL
@@ -4986,7 +4986,7 @@ MeasurementReport-LaterNonCriticalExtensions ::=	SEQUENCE {
 	measurementReport-vc50ext			MeasurementReport-vc50ext-IEs,
 	vd20NonCriticalExtensions			SEQUENCE {
 		measurementReport-vd20ext			MeasurementReport-vd20ext-IEs,
-		vexyNonCriticalExtensions			MeasurementReport-vexyext-IEs		OPTIONAL
+		ve30NonCriticalExtensions			MeasurementReport-ve30ext-IEs		OPTIONAL
 	}	OPTIONAL
 }
 
@@ -5008,9 +5008,9 @@ MeasurementReport-vd20ext-IEs ::=	SEQUENCE {
 	measuredResults						MeasuredResults-vd20ext					OPTIONAL
 }
 
-MeasurementReport-vexyext-IEs ::=	SEQUENCE {
+MeasurementReport-ve30ext-IEs ::=	SEQUENCE {
 	-- Measurement IEs
-	measuredResults						MeasuredResults-vexyext					OPTIONAL,
+	measuredResults						MeasuredResults-ve30ext					OPTIONAL,
 	applicationLayerMeasurementReporting		ApplicationLayerMeasurementReporting	OPTIONAL,
 	nonCriticalExtensions				SEQUENCE {}								OPTIONAL
 }
diff --git a/epan/dissectors/asn1/rrc/packet-rrc-template.c b/epan/dissectors/asn1/rrc/packet-rrc-template.c
index 1c51dbdef3..fc12efcec0 100644
--- a/epan/dissectors/asn1/rrc/packet-rrc-template.c
+++ b/epan/dissectors/asn1/rrc/packet-rrc-template.c
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Ref: 3GPP TS 25.331 V14.3.0 (2017-06)
+ * Ref: 3GPP TS 25.331 V14.4.0 (2017-09)
  */
 
 /**