RRC: upgrade dissector to v13.5.0

Change-Id: I95323ed8aabff7a20442c848fa0dc39854297584
Reviewed-on: https://code.wireshark.org/review/19527
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

6 files changed, 31 insertions, 28 deletions

diff --git a/epan/dissectors/asn1/rrc/Class-definitions.asn b/epan/dissectors/asn1/rrc/Class-definitions.asn
index f920bdedcf..fb44fab66d 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.3.0 (2016-07)
+-- 3GPP TS 25.331 V13.5.0 (2016-12)
 --
 -- 11.1	General message structure
 --
diff --git a/epan/dissectors/asn1/rrc/Constant-definitions.asn b/epan/dissectors/asn1/rrc/Constant-definitions.asn
index 1d652f73a8..e4e0a8039b 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.3.0 (2016-07)
+-- 3GPP TS 25.331 V13.5.0 (2016-12)
 --
 -- 11.4	Constant definitions
 --
diff --git a/epan/dissectors/asn1/rrc/InformationElements.asn b/epan/dissectors/asn1/rrc/InformationElements.asn
index fa5cf96cb9..6b8c238387 100644
--- a/epan/dissectors/asn1/rrc/InformationElements.asn
+++ b/epan/dissectors/asn1/rrc/InformationElements.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 25.331 V13.3.0 (2016-07)
+-- 3GPP TS 25.331 V13.5.0 (2016-12)
 --
 -- 11.3	Information element definitions
 --
diff --git a/epan/dissectors/asn1/rrc/Internode-definitions.asn b/epan/dissectors/asn1/rrc/Internode-definitions.asn
index 5573f25117..3dc96c45b5 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.3.0 (2016-07)
+-- 3GPP TS 25.331 V13.5.0 (2016-12)
 --
 -- 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 c7e69a88d2..3e8a461a43 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.3.0 (2016-07)
+-- 3GPP TS 25.331 V13.5.0 (2016-12)
 --
 -- 11.2	PDU definitions
 --
@@ -4043,7 +4043,7 @@ InterRATHandoverInfo ::= SEQUENCE {
 	},
 	ue-CapabilityContainer			CHOICE {
 		absent							NULL,
-		-- present is an octet aligned string containing IE UE-RadioAccessCapabilityInfo
+		-- present is an octet aligned string containing Ie UE-RadioAccessCapabilityInfo
 		present							OCTET STRING (SIZE (0..63))
 	},
 	-- Non critical extensions
@@ -4180,17 +4180,9 @@ InterRATHandoverInfo-NonCriticalExtension-v6b0-IEs ::=	SEQUENCE {
 												vb70NonCriticalExtensions			SEQUENCE {
 													interRATHandoverInfo-vb70ext
 																InterRATHandoverInfo-vb70ext-IEs,
-													vbc0NonCriticalExtensions			SEQUENCE {
-														interRATHandoverInfo-vbc0ext
-																InterRATHandoverInfo-vbc0ext-IEs,
-														vc50NonCriticalExtensions	SEQUENCE {
-																interRATHandoverInfo-vc50ext
-																	InterRATHandoverInfo-vc50ext-IEs, 
-															vd20NonCriticalExtensions	SEQUENCE {																interRATHandoverInfo-vd20ext																			InterRATHandoverInfo-vd20ext-IEs,
-																	nonCriticalExtensions	SEQUENCE {}	OPTIONAL
-															}	OPTIONAL
-														}	OPTIONAL
-													} 	OPTIONAL
+													laterNonCriticalExtensions
+												InterRATHandoverInfo-LaterNonCriticalExtensions
+															OPTIONAL
 												}	OPTIONAL
 											}	OPTIONAL
 										}	OPTIONAL
@@ -4295,6 +4287,17 @@ InterRATHandoverInfo-vbc0ext-IEs ::= SEQUENCE {
 		ue-RadioAccessCapabilityInfo-vbc0ext	UE-RadioAccessCapability-vbc0ext		OPTIONAL
 }
 
+InterRATHandoverInfo-LaterNonCriticalExtensions ::=	SEQUENCE {
+		interRATHandoverInfo-vbc0ext		InterRATHandoverInfo-vbc0ext-IEs,
+		vc50NonCriticalExtensions			SEQUENCE {
+			interRATHandoverInfo-vc50ext			InterRATHandoverInfo-vc50ext-IEs,
+			vd20NonCriticalExtensions				SEQUENCE {
+				interRATHandoverInfo-vd20ext			InterRATHandoverInfo-vd20ext-IEs,
+				nonCriticalExtensions					SEQUENCE {}				OPTIONAL
+			}	OPTIONAL
+		}	OPTIONAL
+}
+
 InterRATHandoverInfo-vc50ext-IEs ::=	SEQUENCE {
 		ue-RadioAccessCapabilityComp2		UE-RadioAccessCapabilityComp2-vc50ext	OPTIONAL
 }
@@ -4747,16 +4750,8 @@ MeasurementReport ::= SEQUENCE {
 													vb50NonCriticalExtensions		SEQUENCE {
 														measurementReport-vb50ext	
 																	MeasurementReport-vb50ext-IEs,
-														vc50NonCriticalExtensions		SEQUENCE {
-															measurementReport-vc50ext	
-																	MeasurementReport-vc50ext-IEs,
-															vd20NonCriticalExtensions	SEQUENCE {
-																measurementReport-vd20ext	
-																	MeasurementReport-vd20ext-IEs,
-																nonCriticalExtensions
-																	SEQUENCE {}		OPTIONAL
-															}		OPTIONAL
-														}		OPTIONAL
+														laterNonCriticalExtensions
+									MeasurementReport-LaterNonCriticalExtensions	OPTIONAL
 													}		OPTIONAL
 												}		OPTIONAL
 											}		OPTIONAL
@@ -4844,6 +4839,14 @@ MeasurementReport-vb50ext-IEs ::=	SEQUENCE {
 	eutra-EventResults						EUTRA-EventResults-vb50ext				OPTIONAL
 }
 
+MeasurementReport-LaterNonCriticalExtensions ::=	SEQUENCE {
+	measurementReport-vc50ext			MeasurementReport-vc50ext-IEs,
+	vd20NonCriticalExtensions			SEQUENCE {
+		measurementReport-vd20ext			MeasurementReport-vd20ext-IEs,
+		nonCriticalExtensions				SEQUENCE {}							OPTIONAL
+	}		OPTIONAL
+}
+
 MeasurementReport-vc50ext-IEs ::=	SEQUENCE {
 	-- Measurement IEs
 	measuredResultsOnRACH					MeasuredResultsOnRACH-vc50ext			OPTIONAL,
diff --git a/epan/dissectors/asn1/rrc/packet-rrc-template.c b/epan/dissectors/asn1/rrc/packet-rrc-template.c
index 2e12cb32ae..72306c0ee6 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.2.0 (2016-03)
+ * Ref: 3GPP TS 25.331 V13.5.0 (2016-12)
  */
 
 /**