RRC: upgrade dissector to v13.2.0

Change-Id: Id2f7b90549057accf23b040cafcee738a2c0d9ee
Reviewed-on: https://code.wireshark.org/review/14800
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: Michael Mann <mmann78@netscape.net>

7 files changed, 139 insertions, 119 deletions

diff --git a/epan/dissectors/asn1/rrc/Class-definitions.asn b/epan/dissectors/asn1/rrc/Class-definitions.asn
index 7b082180e2..55a755eb3e 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 V13.1.0 (2015-12)
+-- 3GPP TS 25.331 V13.2.0 (2016-03)
 --
 -- 11.1	General message structure
 --
diff --git a/epan/dissectors/asn1/rrc/Constant-definitions.asn b/epan/dissectors/asn1/rrc/Constant-definitions.asn
index 28a25fafa7..8cdcfe6824 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 V13.1.0 (2015-12)
+-- 3GPP TS 25.331 V13.2.0 (2016-03)
 --
 -- 11.4	Constant definitions
 --
diff --git a/epan/dissectors/asn1/rrc/InformationElements.asn b/epan/dissectors/asn1/rrc/InformationElements.asn
index 495400a8a7..7c609e27f6 100644
--- a/epan/dissectors/asn1/rrc/InformationElements.asn
+++ b/epan/dissectors/asn1/rrc/InformationElements.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 25.331 V13.1.0 (2015-12)
+-- 3GPP TS 25.331 V13.2.0 (2016-03)
 --
 -- 11.3	Information element definitions
 --
@@ -807,13 +807,6 @@ AccessStratumReleaseIndicator ::=	ENUMERATED {
 -- by absence of the field
 ActivationTime ::=					INTEGER (0..255)
 
-AddPos-Mode ::=					ENUMERATED {
-										standalone,
-										ue-assisted,
-										both,
-										spare1
-										}
-
 BackoffControlParams ::=			SEQUENCE {
 	n-AP-RetransMax						N-AP-RetransMax,
 	n-AccessFails						N-AccessFails,
@@ -1210,8 +1203,9 @@ DL-PhysChCapabilityFDD-vc50ext ::=		SEQUENCE {
     supportofDPCCH2                                 ENUMERATED { true }			OPTIONAL
 }
 
-DL-PhysChCapabilityFDD-vdxyext ::=		SEQUENCE {
-	supportforPowerControlAlgorithm3				ENUMERATED { true }				OPTIONAL
+DL-PhysChCapabilityFDD-vd20ext ::=	SEQUENCE {
+	supportofPowerControlAlgorithm3			ENUMERATED { true }				OPTIONAL,
+	supportofBlindHarqRetransmissionsforHsdpa		ENUMERATED { true }				OPTIONAL
 }
 
 DL-PhysChCapabilityTDD ::=			SEQUENCE {
@@ -1795,6 +1789,9 @@ MultiModeRAT-Capability-vc50ext ::=	SEQUENCE {
 	supportOfRAN-AssistedWLAN-Interworking-RAN-Rules		ENUMERATED { true }		OPTIONAL,
 	supportOfRAN-AssistedWLAN-Interworking-ANDSF-Policies		ENUMERATED { true }		OPTIONAL
 }
+MultiModeRAT-Capability-vd20ext ::=	SEQUENCE {
+	supportOfExtendedEUTRAFrequencyPriority		ENUMERATED { true }		OPTIONAL
+}
 N-300 ::=							INTEGER (0..7)
 
 N-301 ::=							INTEGER (0..7)
@@ -2045,10 +2042,10 @@ PhysicalChannelCapability-vc50ext ::=	SEQUENCE {
 	}		OPTIONAL
 }
 
-PhysicalChannelCapability-vdxyext ::=	SEQUENCE {
+PhysicalChannelCapability-vd20ext ::=	SEQUENCE {
 	fddPhysChCapability						SEQUENCE {
-		downlinkPhysChCapability			DL-PhysChCapabilityFDD-vdxyext			OPTIONAL,
-		uplinkPhysChCapability			UL-PhysChCapabilityFDD-vdxyext			OPTIONAL
+		downlinkPhysChCapability					DL-PhysChCapabilityFDD-vd20ext	OPTIONAL,
+		uplinkPhysChCapability					UL-PhysChCapabilityFDD-vd20ext	OPTIONAL
 	}		OPTIONAL
 }
 
@@ -2118,8 +2115,7 @@ ProtocolErrorCause ::=				ENUMERATED {
 ProtocolErrorIndicator ::=			ENUMERATED {
 										noError, errorOccurred }
 
-ProtocolErrorIndicatorWithMoreInfo ::=
-									CHOICE {
+ProtocolErrorIndicatorWithMoreInfo ::= 	CHOICE {
 	noError								NULL,
 	errorOccurred						SEQUENCE {
 		rrc-TransactionIdentifier			RRC-TransactionIdentifier,
@@ -2724,7 +2720,8 @@ UE-AddPos-Supported-List ::= 		SEQUENCE (SIZE (1..maxAddPos)) OF UE-AddPos-eleme
 UE-AddPos-element ::= SEQUENCE{
 	addPos-ID							ENUMERATED {barometricPressure, wlan, bt, mbs,
 														spare4, spare3, spare2, spare1 },
-	addPos-Mode						AddPos-Mode
+	addPos-Mode						 ENUMERATED {standalone, ue-assisted,
+																	both, spare1 }
 }
 
 UE-BasedNetworkPerformanceMeasurementsParameters ::= 	SEQUENCE {
@@ -2882,9 +2879,9 @@ UE-RadioAccessCapability-LaterNonCriticalExtensions ::= SEQUENCE {
 							vc50NonCriticalExtensions		SEQUENCE {
 								ue-RadioAccessCapability-vc50ext
 											UE-RadioAccessCapability-vc50ext-IEs,
-								vdxyNonCriticalExtensions			SEQUENCE {
-									ue-RadioAccessCapability-vdxyext
-											UE-RadioAccessCapability-vdxyext-IEs,
+								vd20NonCriticalExtensions			SEQUENCE {
+									ue-RadioAccessCapability-vd20ext
+											UE-RadioAccessCapability-vd20ext-IEs,
 									nonCriticalExtensions			SEQUENCE {} OPTIONAL
 								} 		OPTIONAL
 							}		OPTIONAL
@@ -2951,7 +2948,8 @@ UE-RadioAccessCapability-vb50ext-IEs ::= SEQUENCE {
 	rsrvcc-SupportFromUTRA-CS-to-EUTRA-FDD	ENUMERATED { true }			OPTIONAL,
 	rsrvcc-SupportFromUTRA-CS-to-EUTRA-TDD	ENUMERATED { true }			OPTIONAL,
 	supportOfHSDPCCHPowerOffsetExtension		ENUMERATED { true }			OPTIONAL,
-	supportOfSTTDOnDLControlChannelsWhenMultiflowOperationIsActive		ENUMERATED { true }			OPTIONAL
+	supportOfSTTDOnDLControlChannelsWhenMultiflowOperationIsActive
+														ENUMERATED { true }			OPTIONAL
 }
 
 UE-RadioAccessCapability-vb70ext-IEs ::= SEQUENCE {
@@ -2974,12 +2972,18 @@ UE-RadioAccessCapability-vc50ext-IEs ::= SEQUENCE {
     physicalChannelCapability					PhysicalChannelCapability-vc50ext	OPTIONAL
 }
 
-UE-RadioAccessCapability-vdxyext-IEs ::= SEQUENCE {
-	ue-RadioAccessCapabBandCombList-vdxyext	UE-RadioAccessCapabBandCombList-vdxyext		OPTIONAL,
+UE-RadioAccessCapability-vd20ext-IEs ::=		SEQUENCE {
+	ue-RadioAccessCapabBandCombList		UE-RadioAccessCapabBandCombList-vd20ext	OPTIONAL,
+	multiModeRAT-Capability						MultiModeRAT-Capability-vd20ext			OPTIONAL,
 	-- UE physical channel capability
-    physicalChannelCapability					PhysicalChannelCapability-vdxyext	OPTIONAL,
-	-- UE radio access capability
-	ue-PositioningCapability					UE-PositioningCapability-vdxyext		OPTIONAL
+	physicalChannelCapability				PhysicalChannelCapability-vd20ext		OPTIONAL,
+	-- UE positioning capability
+	ue-PositioningCapability				UE-PositioningCapability-vd20ext			OPTIONAL,
+	-- the capability is for FDD only
+	supportofRetrievableConfigurations			ENUMERATED { true }						OPTIONAL,
+	supportofURAPCHwithSeamlessTransition		ENUMERATED { true }						OPTIONAL,
+	supportofImprovedSynchronizedRRCProcedures	ENUMERATED { true }						OPTIONAL,
+	supportofEnhancedStateTransition			ENUMERATED { true }						OPTIONAL
 }
 
 UE-ConnTimersAndConstants ::=		SEQUENCE {
@@ -3242,8 +3246,8 @@ UE-RadioAccessCapability-vbc0ext ::= SEQUENCE {
 	ue-RadioAccessCapabBandCombList-va40ext	UE-RadioAccessCapabBandCombList-va40ext																								OPTIONAL
 }
 
-UE-RadioAccessCapability-vdxyext ::= SEQUENCE {
-	ue-RadioAccessCapabBandCombList-vdxyext	UE-RadioAccessCapabBandCombList-vdxyext		OPTIONAL
+UE-RadioAccessCapability-vd20ext ::= SEQUENCE {
+	ue-RadioAccessCapabBandCombList	UE-RadioAccessCapabBandCombList-vd20ext	OPTIONAL
 }
 
 
@@ -3378,7 +3382,7 @@ UE-PositioningCapability-v860ext ::= SEQUENCE {
 										UE-GANSSPositioning-Capability-v860ext-IEs	OPTIONAL
 }
 
-UE-PositioningCapability-vdxyext ::= SEQUENCE {
+UE-PositioningCapability-vd20ext ::= SEQUENCE {
 	ue-Positioning-AddPos-Capability	UE-AddPos-Supported-List	OPTIONAL
 }
 
@@ -3507,7 +3511,7 @@ UE-RadioAccessCapabilityComp2-vc50ext ::= SEQUENCE {
 	simultaneousSupportforDCHEnhancementsAndDPCCHDiscntTx	ENUMERATED { true }		OPTIONAL
 }
 
-UE-RadioAccessCapabilityComp2-vdxyext ::= SEQUENCE {
+UE-RadioAccessCapabilityComp2-vd20ext ::= SEQUENCE {
 	supportOfDualCellEDCHwithDPDCH			ENUMERATED { true }					OPTIONAL
 }
 
@@ -3575,7 +3579,8 @@ UE-RadioAccessCapabBandCombList-vb50ext ::= SEQUENCE (SIZE (1..16)) OF
 																	SupportedCarrierCombination-ext
 
 
-UE-RadioAccessCapabBandCombList-vdxyext ::= SEQUENCE (SIZE (1..16)) OF SupportDualBandDualCellEdch
+UE-RadioAccessCapabBandCombList-vd20ext ::= SEQUENCE (SIZE (1..16)) OF
+											SupportDualBandDualCellEdch
 
 SupportedCarrierCombination ::= SEQUENCE {
 	carrierCombination12					BOOLEAN,
@@ -3670,7 +3675,7 @@ UL-PhysChCapabilityFDD-vc50ext ::=		SEQUENCE {
 	dtx-enhancements									ENUMERATED { true }		OPTIONAL
 }
 
-UL-PhysChCapabilityFDD-vdxyext ::=		SEQUENCE {
+UL-PhysChCapabilityFDD-vd20ext ::=		SEQUENCE {
 	supportOfDualCellEDCHwithDPDCH			ENUMERATED { true }				OPTIONAL
 }
 
@@ -4208,9 +4213,6 @@ PollWindow ::=						ENUMERATED {
 										pw50, pw60, pw70, pw80, pw85,
 										pw90, pw95, pw99 }
 
-PreconfiguredRetrievableConfig ::=	SEQUENCE {
-	retrievableConfigList					RetrievableConfig-List
-}
 
 PredefinedConfigIdentity ::=		INTEGER (0..15)
 
@@ -4746,11 +4748,11 @@ RetrievableConfig ::=	SEQUENCE {
 RetrievableConfigData ::=	SEQUENCE {
 	srb-InformationSetupList			SRB-InformationSetupList-r11			OPTIONAL,
 	rab-InformationSetupList			RAB-InformationSetupList-r11			OPTIONAL,
-	rb-InformationSetupList			RB-InformationSetupList-r11			OPTIONAL,
+	rb-InformationReconfigList		RB-InformationReconfigList-r11		OPTIONAL,
 	ul-CommonTransChInfo				UL-CommonTransChInfo-r12				OPTIONAL,
 	ul-TransChInfoList					UL-AddReconfTransChInfoList-r8		OPTIONAL,
 	dl-CommonTransChInfo				DL-CommonTransChInfo-r4				OPTIONAL,
-	dl-TransChInfoList					DL-AddReconfTransChInfoList-r11		OPTIONAL,
+	dl-TransChInfoList					DL-AddReconfTransChInfoList-r13		OPTIONAL,
 	dtx-drx-Info						DTX-DRX-Info-r12						OPTIONAL,
 	hs-scch-LessInfo					HS-SCCH-LessInfo-r7					OPTIONAL,
 	mimoParameters						MIMO-Parameters-r9						OPTIONAL,
@@ -4769,7 +4771,7 @@ RetrievableConfigInfo ::=			SEQUENCE {
 	retrievableConfigToBeInvoked		RetrievableConfigIdentity			OPTIONAL,
 	retrievableConfigToBeStored		RetrievableConfigIdentity			OPTIONAL,
 	retrievableConfigToBeRemoved		RetrievableConfigListToRemove		OPTIONAL,
-	preconfiguredRetrievableConfig	PreconfiguredRetrievableConfig	OPTIONAL
+	preconfiguredRetrievableConfig	RetrievableConfig-List			OPTIONAL
 }
 
 RetrievableConfig-List ::= 	SEQUENCE (SIZE(1.. maxRetrievConfig)) OF
@@ -5475,14 +5477,15 @@ DL-AddReconfTransChInfoList-r7 ::=	SEQUENCE (SIZE (1..maxTrCHpreconf)) OF
 DL-AddReconfTransChInfoList-r9 ::=	SEQUENCE (SIZE (1..maxTrCHpreconf)) OF
 										DL-AddReconfTransChInformation-r9
 
-DL-AddReconfTransChInfoList-r13 ::=	SEQUENCE (SIZE (1..maxTrCHpreconf)) OF
+DL-AddReconfTransChInfoList-r11 ::=	SEQUENCE (SIZE (1..maxTrCHpreconf)) OF
+										DL-AddReconfTransChInformation-r11
+
+DL-AddReconfTransChInfoList-r13 ::=	SEQUENCE (SIZE (1..maxTrCH)) OF
 										DL-AddReconfTransChInformation-r13
 
 DL-AddReconfTransChInfoList-TDD128-v9c0ext ::=	SEQUENCE (SIZE (1..maxTrCHpreconf)) OF
 										DL-AddReconfTransChInformation-TDD128-v9c0ext
 
-DL-AddReconfTransChInfoList-r11 ::=	SEQUENCE (SIZE (1..maxTrCHpreconf)) OF
-										DL-AddReconfTransChInformation-r11
 
 -- ASN.1 for IE "Added or Reconfigured DL TrCH information"
 -- in case of messages other than: Radio Bearer Release message and
@@ -5540,6 +5543,16 @@ DL-AddReconfTransChInformation-r9 ::= SEQUENCE {
 	dch-QualityTarget					QualityTarget						OPTIONAL
 }
 
+DL-AddReconfTransChInformation-r11 ::= SEQUENCE {
+	dl-TransportChannelType				DL-TrCH-TypeId1-r5,
+	tfs-SignallingMode					CHOICE {
+		explicit-config						TransportFormatSet,
+		sameAsULTrCH						UL-TransportChannelIdentity,
+		hsdsch								HSDSCH-Info-r11
+	},
+	dch-QualityTarget					QualityTarget						OPTIONAL
+}
+
 DL-AddReconfTransChInformation-r13 ::= SEQUENCE {
 	dl-TransportChannelType				DL-TrCH-TypeId1-r5,
 	tfs-SignallingMode						CHOICE {
@@ -5554,16 +5567,6 @@ DL-AddReconfTransChInformation-TDD128-v9c0ext ::= SEQUENCE {
 	hsdsch								HSDSCH-Info-TDD128-v9c0ext		OPTIONAL
 }
 
-DL-AddReconfTransChInformation-r11 ::= SEQUENCE {
-	dl-TransportChannelType				DL-TrCH-TypeId1-r5,
-	tfs-SignallingMode					CHOICE {
-		explicit-config						TransportFormatSet,
-		sameAsULTrCH						UL-TransportChannelIdentity,
-		hsdsch								HSDSCH-Info-r11
-	},
-	dch-QualityTarget					QualityTarget						OPTIONAL
-}
-
 -- ASN.1 for IE "Added or Reconfigured DL TrCH information"
 -- in case of Radio Bearer Release message and
 -- Radio Bearer Reconfiguration message
@@ -5790,26 +5793,26 @@ HSDSCH-Info-r9 ::=					SEQUENCE {
 	}		OPTIONAL
 }
 
-HSDSCH-Info-r13 ::=					SEQUENCE {
-	harqInfo							HARQ-Info-r13			OPTIONAL,
+HSDSCH-Info-r11 ::=					SEQUENCE {
+	harqInfo							HARQ-Info-r11			OPTIONAL,
 	dl-MAC-HeaderType					CHOICE {
 		mac-hs								AddOrReconfMAC-dFlow,
-		mac-ehs								AddOrReconfMAC-ehs-ReordQ-r9
+		mac-ehs								AddOrReconfMAC-ehs-ReordQ-r11
 	}		OPTIONAL
 }
 
-HSDSCH-Info-TDD128-v9c0ext ::=			SEQUENCE {
-	mac-ehs								AddOrReconfMAC-ehs-ReordQ-TDD128-v9c0ext		OPTIONAL
-}
-
-HSDSCH-Info-r11 ::=					SEQUENCE {
-	harqInfo							HARQ-Info-r11			OPTIONAL,
+HSDSCH-Info-r13 ::=				SEQUENCE {
+	harqInfo							HARQ-Info-r13			OPTIONAL,
 	dl-MAC-HeaderType					CHOICE {
 		mac-hs								AddOrReconfMAC-dFlow,
 		mac-ehs								AddOrReconfMAC-ehs-ReordQ-r11
 	}		OPTIONAL
 }
 
+HSDSCH-Info-TDD128-v9c0ext ::=			SEQUENCE {
+	mac-ehs								AddOrReconfMAC-ehs-ReordQ-TDD128-v9c0ext		OPTIONAL
+}
+
 HARQ-Info ::=						SEQUENCE {
 	numberOfProcesses					INTEGER (1..8),
 	memoryPartitioning					CHOICE {
@@ -7831,7 +7834,7 @@ DL-FDPCH-InfoPerRL-r13 ::=		SEQUENCE {
 	dl-ChannelisationCode				INTEGER (0..255),
 	tpc-CombinationIndex				TPC-CombinationIndex,
 	sttdIndication						STTDIndication							OPTIONAL,
-	powerControlAlgorithm3			PowerControlAlgorithm3				OPTIONAL
+	powerControlAlgorithm3-Config	PowerControlAlgorithm3-Config			OPTIONAL
 }
 
 DL-DPCH-InfoPerRL-PostFDD ::=								SEQUENCE {
@@ -11189,9 +11192,9 @@ PowerControlAlgorithm ::=			CHOICE {
 	algorithm2							NULL
 }
 
-PowerControlAlgorithm3 ::=			SEQUENCE {
+PowerControlAlgorithm3-Config ::=	SEQUENCE {
 	tPCSlotPosition						INTEGER (0..4)					OPTIONAL,
-	tPC-StepSize						TPC-StepSizeFDD					OPTIONAL,
+	tpcStepSize						TPC-StepSizeFDD					OPTIONAL,
 	decimationFactor					ENUMERATED {slots3, slots5}		OPTIONAL
 }
 
@@ -15175,7 +15178,7 @@ EUTRA-FrequencyAndPriorityInfo-vc50ext ::=	SEQUENCE {
 	reducedMeasurementPerformance		ENUMERATED {true}							OPTIONAL
 }
 
-EUTRA-FrequencyAndPriorityInfo-vdxyext ::=	SEQUENCE {
+EUTRA-FrequencyAndPriorityInfo-vd20ext ::=	SEQUENCE {
 	subpriority							ENUMERATED {oDot2,oDot4,oDot6,oDot8}		OPTIONAL
 }
 
@@ -15205,7 +15208,7 @@ EUTRA-FrequencyAndPriorityInfoExtension-vc50ext ::=	SEQUENCE {
 	reducedMeasurementPerformance		ENUMERATED {true}							OPTIONAL
 }
 
-EUTRA-FrequencyAndPriorityInfoExtension-vdxyext ::=	SEQUENCE {
+EUTRA-FrequencyAndPriorityInfoExtension-vd20ext ::=	SEQUENCE {
 	subpriority							ENUMERATED {oDot2,oDot4,oDot6,oDot8}		OPTIONAL
 }
 
@@ -15218,8 +15221,8 @@ EUTRA-FrequencyAndPriorityInfoExtensionList-vb80ext ::=	SEQUENCE  (SIZE (1..maxN
 EUTRA-FrequencyAndPriorityInfoExtensionList-vc50ext ::=	SEQUENCE  (SIZE (1..maxNumEUTRAFreqs)) OF
 											EUTRA-FrequencyAndPriorityInfoExtension-vc50ext
 
-EUTRA-FrequencyAndPriorityInfoExtensionList-vdxyext ::=	SEQUENCE  (SIZE (1..maxNumEUTRAFreqs)) OF
-											EUTRA-FrequencyAndPriorityInfoExtension-vdxyext
+EUTRA-FrequencyAndPriorityInfoExtensionList-vd20ext ::=	SEQUENCE  (SIZE (1..maxNumEUTRAFreqs)) OF
+											EUTRA-FrequencyAndPriorityInfoExtension-vd20ext
 
 EUTRA-FrequencyAndPriorityInfoList ::=	SEQUENCE (SIZE (1..maxNumEUTRAFreqs)) OF
 											EUTRA-FrequencyAndPriorityInfo
@@ -15233,8 +15236,8 @@ EUTRA-FrequencyAndPriorityInfoList-vb50ext ::=	SEQUENCE  (SIZE (1..maxNumEUTRAFr
 EUTRA-FrequencyAndPriorityInfoList-vc50ext ::=	SEQUENCE  (SIZE (1..maxNumEUTRAFreqs)) OF
 											EUTRA-FrequencyAndPriorityInfo-vc50ext
 
-EUTRA-FrequencyAndPriorityInfoList-vdxyext ::=	SEQUENCE  (SIZE (1..maxNumEUTRAFreqs)) OF
-											EUTRA-FrequencyAndPriorityInfo-vdxyext
+EUTRA-FrequencyAndPriorityInfoList-vd20ext ::=	SEQUENCE  (SIZE (1..maxNumEUTRAFreqs)) OF
+											EUTRA-FrequencyAndPriorityInfo-vd20ext
 
 EUTRA-FrequencyList ::=				SEQUENCE {
 	eutraFrequencyRemoval				EUTRA-FrequencyRemoval,
@@ -18469,8 +18472,8 @@ MeasuredResults-v860ext ::= CHOICE {
 	ue-positioning-MeasuredResults		UE-Positioning-MeasuredResults-v860ext
 }
 
-MeasuredResults-vdxyext ::= CHOICE {
-	ue-positioning-MeasuredResults		UE-Positioning-MeasuredResults-vdxyext
+MeasuredResults-vd20ext ::= CHOICE {
+	ue-positioning-MeasuredResults		UE-Positioning-MeasuredResults-vd20ext
 }
 
 MeasuredResultsList-v920ext ::=		SEQUENCE (SIZE (1..maxAdditionalMeas)) OF
@@ -18479,8 +18482,8 @@ MeasuredResultsList-v920ext ::=		SEQUENCE (SIZE (1..maxAdditionalMeas)) OF
 MeasuredResultsList-vc50ext ::=		SEQUENCE (SIZE (1..maxAdditionalMeas)) OF
 										MeasuredResults-vc50ext
 
-MeasuredResultsList-vdxyext ::=		SEQUENCE (SIZE (1..maxAdditionalMeas)) OF
-										MeasuredResults-vdxyext
+MeasuredResultsList-vd20ext ::=		SEQUENCE (SIZE (1..maxAdditionalMeas)) OF
+										MeasuredResults-vd20ext
 
 MeasuredResultsListOnSecUlFreq ::=	SEQUENCE (SIZE (1..maxAdditionalMeas)) OF
 										MeasuredResultsOnSecUlFreq
@@ -21588,9 +21591,9 @@ UE-Positioning-MeasuredResults-vc50ext ::= SEQUENCE {
 	ue-positioning-Error					UE-Positioning-Error-vc50ext				OPTIONAL
 }
 
-UE-Positioning-MeasuredResults-vdxyext ::= SEQUENCE {
+UE-Positioning-MeasuredResults-vd20ext ::= SEQUENCE {
 	ue-positioning-AddPos-MeasurementResults 	UE-Positioning-AddPos-MeasuredResults	OPTIONAL,
-	ue-positioning-PositionEstimateInfo			UE-Positioning-PositionEstimateInfo-vdxyext
+	ue-positioning-PositionEstimateInfo		UE-Positioning-PositionEstimateInfo-vd20ext
 																						OPTIONAL
 }
 
@@ -22025,7 +22028,7 @@ UE-Positioning-PositionEstimateInfo-v770ext ::= SEQUENCE {
 								UE-Positioning-GPS-ReferenceTimeUncertainty	OPTIONAL
 }
 
-UE-Positioning-PositionEstimateInfo-vdxyext ::= SEQUENCE {
+UE-Positioning-PositionEstimateInfo-vd20ext ::= SEQUENCE {
 	locationTimeStamp					UTCTime OPTIONAL
 }
 
@@ -22359,9 +22362,11 @@ ACDC-Barring ::= 					CHOICE {
 	acdc-acb-barringBitmap			BIT STRING (SIZE (10))
 }
 
-ACDC-Parameters ::= 				CHOICE {
-	acdc-ParametersPerPLMN-List		ACDC-ParametersPerPLMN-List,
-	acdc-ParametersForAll				ACDC-ParametersForAll
+ACDC-Parameters ::= 				SEQUENCE {
+	barringRepresentation				CHOICE {
+		acdc-ParametersPerPLMN-List		ACDC-ParametersPerPLMN-List,
+		acdc-ParametersForAll				ACDC-ParametersForAll
+	}
 }
 
 ACDC-ParametersForAll ::=			SEQUENCE {
@@ -24448,8 +24453,8 @@ SysInfoType19 ::=						SEQUENCE {
 							sysInfoType19-vb80ext			SysInfoType19-vb80ext,
 							vc50NonCriticalExtensions		SEQUENCE {
 								sysInfoType19-vc50ext			SysInfoType19-vc50ext,
-								vdxyNonCriticalExtensions			SEQUENCE {
-									sysInfoType19-vdxyext			SysInfoType19-vdxyext,
+								vd20NonCriticalExtensions			SEQUENCE {
+									sysInfoType19-vd20ext			SysInfoType19-vd20ext,
 									nonCriticalExtensions			SEQUENCE {}			OPTIONAL
 								}			OPTIONAL
 							}	OPTIONAL
@@ -24495,10 +24500,10 @@ SysInfoType19-vc50ext	::=				SEQUENCE {
 									EUTRA-FrequencyAndPriorityInfoExtensionList-vc50ext		OPTIONAL
 }
 
-SysInfoType19-vdxyext	::=				SEQUENCE {
-		eutra-FrequencyAndPriorityInfoList-vdxyext	EUTRA-FrequencyAndPriorityInfoList-vdxyext OPTIONAL,
-		eutra-FrequencyAndPriorityInfoExtensionList-vdxyext
-									EUTRA-FrequencyAndPriorityInfoExtensionList-vdxyext		OPTIONAL
+SysInfoType19-vd20ext	::=				SEQUENCE {
+		eutra-FrequencyAndPriorityInfoList-vd20ext	EUTRA-FrequencyAndPriorityInfoList-vd20ext OPTIONAL,
+		eutra-FrequencyAndPriorityInfoExtensionList-vd20ext
+									EUTRA-FrequencyAndPriorityInfoExtensionList-vd20ext		OPTIONAL
 }
 
 SysInfoType20 ::=					SEQUENCE {
diff --git a/epan/dissectors/asn1/rrc/Internode-definitions.asn b/epan/dissectors/asn1/rrc/Internode-definitions.asn
index f7e4f541c1..5a9098dc49 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 V13.1.0 (2015-12)
+-- 3GPP TS 25.331 V13.2.0 (2016-03)
 --
 -- 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 67d523bbae..dba8cbaaeb 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 V13.1.0 (2015-12)
+-- 3GPP TS 25.331 V13.2.0 (2016-03)
 --
 -- 11.2	PDU definitions
 --
@@ -134,7 +134,7 @@ IMPORTS
 	UE-RadioAccessCapability-vb50ext,
 	UE-RadioAccessCapability-vb70ext,
 	UE-RadioAccessCapability-vbc0ext,
-	UE-RadioAccessCapability-vdxyext,
+	UE-RadioAccessCapability-vd20ext,
 	UE-RadioAccessCapabilityComp,
 	UE-RadioAccessCapabilityComp-ext,
 	UE-RadioAccessCapabilityComp-v770ext,
@@ -146,7 +146,7 @@ IMPORTS
 	UE-RadioAccessCapabilityComp2-va40ext,
 	UE-RadioAccessCapabilityComp2-vb50ext,
 	UE-RadioAccessCapabilityComp2-vc50ext,
-	UE-RadioAccessCapabilityComp2-vdxyext,
+	UE-RadioAccessCapabilityComp2-vd20ext,
 	UE-RadioAccessCapabilityComp-TDD128,
 	UE-RadioAccessCapabilityInfo-v770ext,
 	UE-RadioAccessCapabilityInfo-TDD128-v8b0ext,
@@ -490,7 +490,7 @@ IMPORTS
 	MeasuredResults-v860ext,
 	MeasuredResults-v920ext,
 	MeasuredResults-vc50ext,
-	MeasuredResults-vdxyext,
+	MeasuredResults-vd20ext,
 	MeasuredResultsOnSecUlFreq,
 	MeasuredResultsOnSecUlFreq-vc50ext,
 	MeasuredResultsListOnSecUlFreq,
@@ -501,7 +501,7 @@ IMPORTS
 	MeasuredResultsList-v860ext,
 	MeasuredResultsList-v920ext,
 	MeasuredResultsList-vc50ext,
-	MeasuredResultsList-vdxyext,
+	MeasuredResultsList-vd20ext,
 	MeasuredResultsOnRACH,
 	MeasuredResultsOnRACHFDD-r11,
 	MeasuredResultsOnRACH-v7g0ext,
@@ -1004,8 +1004,7 @@ ActiveSetUpdate-r10-IEs ::= SEQUENCE {
 
 ActiveSetUpdate-vb50ext-IEs ::= SEQUENCE {
 		ulOLTDInfoFDD						UL-OLTD-InfoFDD			OPTIONAL,
-		rl-AdditionInformationList			RL-AdditionInformationList-vb50ext
-																				OPTIONAL
+		rl-AdditionInformationList		RL-AdditionInformationList-vb50ext	OPTIONAL
 }
 
 ActiveSetUpdate-r11-IEs ::= SEQUENCE {
@@ -1248,8 +1247,10 @@ AssistanceDataDelivery-v4b0ext-IEs ::= SEQUENCE {
 AssistanceDataDelivery-v770ext-IEs ::= SEQUENCE {
 	ue-Positioning-OTDOA-AssistanceData-UEB-ext
 										UE-Positioning-OTDOA-AssistanceData-UEB-ext		OPTIONAL,
-	ue-Positioning-GPS-AssistanceData	UE-Positioning-GPS-AssistanceData-v770ext		OPTIONAL,
-	ue-positioning-GANSS-AssistanceData	UE-Positioning-GANSS-AssistanceData				OPTIONAL
+	ue-Positioning-GPS-AssistanceData
+									UE-Positioning-GPS-AssistanceData-v770ext		OPTIONAL,
+	ue-positioning-GANSS-AssistanceData
+									UE-Positioning-GANSS-AssistanceData				OPTIONAL
 }
 
 AssistanceDataDelivery-v860ext-IEs ::= SEQUENCE {
@@ -1470,7 +1471,8 @@ CellUpdate-v860ext-IEs ::=			SEQUENCE {
 
 CellUpdate-va40ext-IEs ::= 			SEQUENCE {
 	-- User equipment IEs
-		securityRevertStatusIndicator	ENUMERATED { revertedBack, normalOperation }	OPTIONAL,
+		securityRevertStatusIndicator
+									ENUMERATED { revertedBack, normalOperation }	OPTIONAL,
 	-- Other IEs
 		loggedMeasAvailable				ENUMERATED { true }					OPTIONAL,
 		loggedANRResultsAvailable		ENUMERATED { true }					OPTIONAL
@@ -1498,7 +1500,8 @@ CellUpdateFDD-r11	::=	SEQUENCE	{
 	supportOfCommonEDCH				ENUMERATED { true }				OPTIONAL,
 	supportOfHS-DSCHDRXOperation	ENUMERATED { true }				OPTIONAL,
 	supportOfMACiis					ENUMERATED { true }				OPTIONAL,
-	securityRevertStatusIndicator	ENUMERATED { revertedBack, normalOperation }	OPTIONAL,
+	securityRevertStatusIndicator
+									ENUMERATED { revertedBack, normalOperation }	OPTIONAL,
 	spare4							ENUMERATED { true }				OPTIONAL,
 	spare3							ENUMERATED { true }				OPTIONAL,
 	spare2							ENUMERATED { true }				OPTIONAL,
@@ -2433,7 +2436,7 @@ CellUpdateConfirm-r13-IEs ::= SEQUENCE {
 		new-H-RNTI						H-RNTI								OPTIONAL,
 		newPrimary-E-RNTI				E-RNTI								OPTIONAL,
 		newSecondary-E-RNTI			E-RNTI									OPTIONAL,
-		uraPCHWithSeamlessTransitionRNTIHandlingMode	ENUMERATED { true }		OPTIONAL,
+		rntiHandlingAtCellReselection			ENUMERATED { true }					OPTIONAL,
 		rrc-StateIndicator				RRC-StateIndicator,
 		utran-DRX-CycleLengthCoeff		UTRAN-DRX-CycleLengthCoefficient-r7	OPTIONAL,
 		waitTime						WaitTime							OPTIONAL,
@@ -2446,14 +2449,14 @@ CellUpdateConfirm-r13-IEs ::= SEQUENCE {
 		supportForChangeOfUE-Capability	BOOLEAN								OPTIONAL,
 	-- Specification mode information
 	-- Radio bearer IEs
-		rab-InformationSetup			RAB-InformationSetup-r8				OPTIONAL,
+		rab-InformationSetup					RAB-InformationSetup-r11				OPTIONAL,
 		rb-InformationReleaseList		RB-InformationReleaseList			OPTIONAL,
 		rb-InformationReconfigList		RB-InformationReconfigList-r11		OPTIONAL,
 		rb-InformationAffectedList		RB-InformationAffectedList-r8		OPTIONAL,
 		dl-CounterSynchronisationInfo	DL-CounterSynchronisationInfo-r5	OPTIONAL,
 		pdcp-ROHC-TargetMode			PDCP-ROHC-TargetMode				OPTIONAL,
+		retrievableConfigInfo					RetrievableConfigInfo					OPTIONAL,
 		otherStateConfig				OtherStateConfig					OPTIONAL,
-		retrievableConfigInfo			RetrievableConfigInfo				OPTIONAL,
 	-- Transport channel IEs
 		ul-CommonTransChInfo			UL-CommonTransChInfo-r12				OPTIONAL,
 		ul-deletedTransChInfoList		UL-DeletedTransChInfoList-r6		OPTIONAL,
@@ -3586,7 +3589,8 @@ HandoverToUTRANCommand-r12-IEs ::= SEQUENCE {
 				dch-Enhancements-Info-FDD		DCH-Enhancements-Info-FDD			OPTIONAL,
 				frequencyInfo					FrequencyInfo,
 				multi-frequencyInfo				Multi-frequencyInfo-LCR-r7		OPTIONAL,
-				dl-SecondaryCellInfoFDD	DL-SecondaryCellInfoFDD-HandoverToUtran	OPTIONAL,
+				dl-SecondaryCellInfoFDD
+											DL-SecondaryCellInfoFDD-HandoverToUtran	OPTIONAL,
 				ulSecondaryCellInfoFDD	UL-SecondaryCellInfoFDD					OPTIONAL,
 				additionalDLSecCellInfoHandoverToUtranListFDD																	AdditionalDLSecCellInfoHandoverToUtranListFDD		OPTIONAL
 			},
@@ -4093,7 +4097,8 @@ InterRATHandoverInfo-v3a0ext-IEs ::= SEQUENCE {
 
 InterRATHandoverInfo-v3d0ext-IEs ::= SEQUENCE {
 	-- User equipment IEs
-		uESpecificBehaviourInformation1interRAT	UESpecificBehaviourInformation1interRAT	OPTIONAL
+		uESpecificBehaviourInformation1interRAT
+											UESpecificBehaviourInformation1interRAT	OPTIONAL
 }
 
 InterRATHandoverInfo-v3g0ext-IEs ::= SEQUENCE {
@@ -4181,7 +4186,7 @@ InterRATHandoverInfo-NonCriticalExtension-v6b0-IEs ::=	SEQUENCE {
 														vc50NonCriticalExtensions	SEQUENCE {
 																interRATHandoverInfo-vc50ext
 																	InterRATHandoverInfo-vc50ext-IEs,
-															vdxyNonCriticalExtensions	SEQUENCE {																interRATHandoverInfo-vdxyext																			InterRATHandoverInfo-vdxyext-IEs,
+															vd20NonCriticalExtensions	SEQUENCE {																interRATHandoverInfo-vd20ext																			InterRATHandoverInfo-vd20ext-IEs,
 																	nonCriticalExtensions	SEQUENCE {}	OPTIONAL
 															}	OPTIONAL
 														}	OPTIONAL
@@ -4274,9 +4279,12 @@ InterRATHandoverInfo-va80ext-IEs ::=	SEQUENCE {
 }
 
 InterRATHandoverInfo-vb50ext-IEs ::=	SEQUENCE {
-		ue-RadioAccessCapabilityInfo-vb50ext	UE-RadioAccessCapability-vb50ext	OPTIONAL,
-		ue-RadioAccessCapabilityComp2		UE-RadioAccessCapabilityComp2-vb50ext	OPTIONAL,
-		ue-RadioAccessCapabilityInfo-TDD128	UE-RadioAccessCapabilityInfo-TDD128-vb50ext	OPTIONAL
+		ue-RadioAccessCapabilityInfo-vb50ext
+										UE-RadioAccessCapability-vb50ext				OPTIONAL,
+		ue-RadioAccessCapabilityComp2
+										UE-RadioAccessCapabilityComp2-vb50ext		OPTIONAL,
+		ue-RadioAccessCapabilityInfo-TDD128
+										UE-RadioAccessCapabilityInfo-TDD128-vb50ext	OPTIONAL
 }
 
 InterRATHandoverInfo-vb70ext-IEs ::=	SEQUENCE {
@@ -4291,9 +4299,9 @@ InterRATHandoverInfo-vc50ext-IEs ::=	SEQUENCE {
 		ue-RadioAccessCapabilityComp2		UE-RadioAccessCapabilityComp2-vc50ext	OPTIONAL
 }
 
-InterRATHandoverInfo-vdxyext-IEs ::=	SEQUENCE {
-		ue-RadioAccessCapabilityInfo-vdxyext		UE-RadioAccessCapability-vdxyext	OPTIONAL,
-		ue-RadioAccessCapabilityComp2		UE-RadioAccessCapabilityComp2-vdxyext	OPTIONAL
+InterRATHandoverInfo-vd20ext-IEs ::=	SEQUENCE {
+		ue-RadioAccessCapabilityInfo		UE-RadioAccessCapability-vd20ext			OPTIONAL,
+		ue-RadioAccessCapabilityComp2		UE-RadioAccessCapabilityComp2-vd20ext	OPTIONAL
 }
 
 -- ***************************************************
@@ -4476,7 +4484,8 @@ MeasurementControl-r3-IEs ::= SEQUENCE {
 }
 
 MeasurementControl-v390ext ::= SEQUENCE {
-		ue-Positioning-Measurement-v390ext		UE-Positioning-Measurement-v390ext	OPTIONAL
+		ue-Positioning-Measurement-v390ext
+											UE-Positioning-Measurement-v390ext		OPTIONAL
 }
 
 MeasurementControl-v3a0ext ::= SEQUENCE {
@@ -4741,9 +4750,9 @@ MeasurementReport ::= SEQUENCE {
 														vc50NonCriticalExtensions		SEQUENCE {
 															measurementReport-vc50ext
 																	MeasurementReport-vc50ext-IEs,
-															vdxyNonCriticalExtensions	SEQUENCE {
-																measurementReport-vdxyext
-																	MeasurementReport-vdxyext-IEs,
+															vd20NonCriticalExtensions	SEQUENCE {
+																measurementReport-vd20ext
+																	MeasurementReport-vd20ext-IEs,
 																nonCriticalExtensions
 																	SEQUENCE {}		OPTIONAL
 															}		OPTIONAL
@@ -4848,10 +4857,9 @@ MeasurementReport-vc50ext-IEs ::= SEQUENCE {
 	eutra-EventResultsForCELLFACH	EUTRA-EventResultsForCELLFACH-vc50ext	OPTIONAL
 }
 
-MeasurementReport-vdxyext-IEs ::= SEQUENCE {
+MeasurementReport-vd20ext-IEs ::=	SEQUENCE {
 	-- Measurement IEs
-	measuredResults					MeasuredResults-vdxyext					OPTIONAL,
-	additionalMeasuredResults		MeasuredResultsList-vdxyext				OPTIONAL
+	measuredResults						MeasuredResults-vd20ext					OPTIONAL
 }
 
 -- ***************************************************
@@ -7013,7 +7021,7 @@ RadioBearerReconfiguration-r13-IEs ::= SEQUENCE {
 		new-H-RNTI						H-RNTI										OPTIONAL,
 		newPrimary-E-RNTI				E-RNTI										OPTIONAL,
 		newSecondary-E-RNTI			E-RNTI										OPTIONAL,
-		uraPCHWithSeamlessTransitionRNTIHandlingMode	ENUMERATED { true }	OPTIONAL,
+		rntiHandlingAtCellReselection			ENUMERATED { true }	OPTIONAL,
 		rrc-StateIndicator				RRC-StateIndicator,
 		ueMobilityStateIndicator		High-MobilityDetected						OPTIONAL,
 		utran-DRX-CycleLengthCoeff		UTRAN-DRX-CycleLengthCoefficient-r7			OPTIONAL,
@@ -9413,7 +9421,11 @@ RRCConnectionRelease-CCCH ::= CHOICE {
 								va40NonCriticalExtensions			SEQUENCE {
 									rrcConnectionRelease-va40ext
 																RRCConnectionRelease-va40ext-IEs,
+									vd20NonCriticalExtensions			SEQUENCE {
+										rrcConnectionRelease-vd20ext
+															RRCConnectionRelease-CCCH-vd20ext-IEs,
 									nonCriticalExtensions		SEQUENCE {}	OPTIONAL
+									}	OPTIONAL
 								}	OPTIONAL
 							}	OPTIONAL
 						}	OPTIONAL
@@ -9448,6 +9460,8 @@ RRCConnectionRelease-CCCH-v860ext-IEs ::= RRCConnectionRelease-v860ext-IEs
 
 -- The R10 non-critical extension is identical to the one sent on DCCH.
 RRCConnectionRelease-CCCH-va40ext-IEs ::= RRCConnectionRelease-va40ext-IEs
+-- The R11 non-critical extension is identical to the one sent on DCCH.
+RRCConnectionRelease-CCCH-vd20ext-IEs ::= RRCConnectionRelease-vb50ext-IEs
 
 -- ***************************************************
 --
diff --git a/epan/dissectors/asn1/rrc/packet-rrc-template.c b/epan/dissectors/asn1/rrc/packet-rrc-template.c
index ab88609d75..2e12cb32ae 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 V13.1.0 (2015-12)
+ * Ref: 3GPP TS 25.331 V13.2.0 (2016-03)
  */
 
 /**
diff --git a/epan/dissectors/asn1/rrc/rrc.cnf b/epan/dissectors/asn1/rrc/rrc.cnf
index 0a29d8662d..32bf9c9556 100644
--- a/epan/dissectors/asn1/rrc/rrc.cnf
+++ b/epan/dissectors/asn1/rrc/rrc.cnf
@@ -68,6 +68,7 @@ UE-Positioning-GANSS-Data
 GANSSDecipheringKeys
 GSM-CellID
 RRCConnectionRelease-CCCH-va40ext-IEs
+MeasuredResultsList-vd20ext
 #.END
 
 #.PDU