LTE RRC: upgrade dissector to v15.9.0

Change-Id: I214a985e5d421070d931eb90d5f0848998dfdca2
Reviewed-on: https://code.wireshark.org/review/36697
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>

9 files changed, 47 insertions, 17 deletions

diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
index c3b2a8b738..814d1eb62c 100644
--- a/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
+++ b/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V15.8.0 (2019-12)
+-- 3GPP TS 36.331 V15.9.0 (2020-03)
 --
 EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
 
diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn
index 7d34b43209..1662c16262 100644
--- a/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn
+++ b/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V15.8.0 (2019-12)
+-- 3GPP TS 36.331 V15.9.0 (2020-03)
 --
 EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
 
@@ -770,6 +770,11 @@ MeasReportAppLayer-r15 ::=		SEQUENCE {
 MeasReportAppLayer-r15-IEs ::=		SEQUENCE {
 	measReportAppLayerContainer-r15		OCTET STRING (SIZE(1..8000))			OPTIONAL,
 	serviceType-r15						ENUMERATED {qoe, qoemtsi, spare6, spare5, spare4, spare3, spare2, spare1}		OPTIONAL,
+	nonCriticalExtension				MeasReportAppLayer-v1590-IEs				OPTIONAL
+}
+
+MeasReportAppLayer-v1590-IEs ::=	SEQUENCE {
+	lateNonCriticalExtension			OCTET STRING						OPTIONAL,
 	nonCriticalExtension				SEQUENCE {}						OPTIONAL
 }
 
@@ -2136,7 +2141,12 @@ RRCEarlyDataComplete-r15-IEs ::=	SEQUENCE {
 	idleModeMobilityControlInfo-r15		IdleModeMobilityControlInfo			OPTIONAL,	-- Need OP
 	idleModeMobilityControlInfoExt-r15	IdleModeMobilityControlInfo-v9e0	OPTIONAL,	-- Cond IdleInfoEUTRA
 	redirectedCarrierInfo-r15			RedirectedCarrierInfo-r15-IEs		OPTIONAL,	-- Need ON
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL
+	nonCriticalExtension				RRCEarlyDataComplete-v1590-IEs	OPTIONAL
+}
+
+RRCEarlyDataComplete-v1590-IEs ::=	SEQUENCE {
+	lateNonCriticalExtension				OCTET STRING					OPTIONAL,
+	nonCriticalExtension					SEQUENCE {}					OPTIONAL
 }
 
 RedirectedCarrierInfo-r15-IEs ::=	CHOICE {
@@ -2160,7 +2170,12 @@ RRCEarlyDataRequest-r15-IEs ::=	SEQUENCE {
 	s-TMSI-r15						S-TMSI,
 	establishmentCause-r15			ENUMERATED {mo-Data, delayTolerantAccess},
 	dedicatedInfoNAS-r15				DedicatedInfoNAS,
-	nonCriticalExtension				SEQUENCE {}			OPTIONAL
+	nonCriticalExtension				RRCEarlyDataRequest-v1590-IEs			OPTIONAL
+}
+
+RRCEarlyDataRequest-v1590-IEs ::=	SEQUENCE {
+	lateNonCriticalExtension				OCTET STRING					OPTIONAL,
+	nonCriticalExtension					SEQUENCE {}					OPTIONAL
 }
 
 
@@ -2218,8 +2233,13 @@ SCGFailureInformationNR-r15 ::=		SEQUENCE {
 }
 
 SCGFailureInformationNR-r15-IEs ::=	SEQUENCE {
-	failureReportSCG-NR-r15				FailureReportSCG-NR-r15			OPTIONAL,
-	nonCriticalExtension				SEQUENCE {}						OPTIONAL
+	failureReportSCG-NR-r15				FailureReportSCG-NR-r15				OPTIONAL,
+	nonCriticalExtension					SCGFailureInformationNR-v1590-IEs	OPTIONAL
+}
+
+SCGFailureInformationNR-v1590-IEs ::=	SEQUENCE {
+	lateNonCriticalExtension					OCTET STRING					OPTIONAL,
+	nonCriticalExtension						SEQUENCE {}					OPTIONAL
 }
 
 FailureReportSCG-NR-r15 ::=		SEQUENCE {
@@ -5628,7 +5648,7 @@ LogicalChannelConfig ::=			SEQUENCE {
 			release			NULL,
 			setup			ENUMERATED {spucch, pucch}
 		}										OPTIONAL,								-- Need ON
-		channellAccessPriority-r15			CHOICE {
+		channelAccessPriority-r15			CHOICE {
 			release									NULL,
 			setup									INTEGER (1..4)
 		}										OPTIONAL,		-- Need ON
diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn
index e993e64037..7d0052e401 100644
--- a/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn
+++ b/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V15.8.0 (2019-12)
+-- 3GPP TS 36.331 V15.9.0 (2020-03)
 --
 EUTRA-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::=
 
diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn
index 7ca8f04029..98fee05117 100644
--- a/epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn
+++ b/epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V15.8.0 (2019-12)
+-- 3GPP TS 36.331 V15.9.0 (2020-03)
 --
 EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
 
diff --git a/epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn b/epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn
index 24ac0e713d..7467b9f60e 100644
--- a/epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn
+++ b/epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V15.8.0 (2019-12)
+-- 3GPP TS 36.331 V15.9.0 (2020-03)
 --
 NBIOT-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
 
diff --git a/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn b/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn
index 22ce9c6c3d..c86efdfd29 100644
--- a/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn
+++ b/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V15.8.0 (2019-12)
+-- 3GPP TS 36.331 V15.9.0 (2020-03)
 --
 NBIOT-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
 
@@ -646,7 +646,12 @@ RRCEarlyDataComplete-NB-r15-IEs ::=	SEQUENCE {
 	extendedWaitTime-r15				INTEGER (1..1800)				OPTIONAL,	-- Need ON
 	redirectedCarrierInfo-r15 			RedirectedCarrierInfo-NB-r13	OPTIONAL, 	-- Need ON
 	redirectedCarrierInfoExt-r15		RedirectedCarrierInfo-NB-v1430	OPTIONAL,	-- Cond Redirection
-	nonCriticalExtension				SEQUENCE {}						OPTIONAL
+	nonCriticalExtension				RRCEarlyDataComplete-NB-v1590-IEs	OPTIONAL
+}
+
+RRCEarlyDataComplete-NB-v1590-IEs ::=	SEQUENCE {
+	lateNonCriticalExtension					OCTET STRING					OPTIONAL,
+	nonCriticalExtension						SEQUENCE {}					OPTIONAL
 }
 
 
@@ -660,9 +665,14 @@ RRCEarlyDataRequest-NB-r15 ::=		SEQUENCE {
 RRCEarlyDataRequest-NB-r15-IEs ::=	SEQUENCE {
 	s-TMSI-r15							S-TMSI,
 	establishmentCause-r15				ENUMERATED {mo-Data, mo-ExceptionData, delayTolerantAccess, spare1},
-	cqi-NPDCCH-r15						CQI-NPDCCH-NB-r14 			OPTIONAL,
+	cqi-NPDCCH-r15						CQI-NPDCCH-NB-r14						OPTIONAL,
 	dedicatedInfoNAS-r15				DedicatedInfoNAS,
-	nonCriticalExtension				SEQUENCE {}					OPTIONAL
+	nonCriticalExtension				RRCEarlyDataRequest-NB-v1590-IEs		OPTIONAL
+}
+
+RRCEarlyDataRequest-NB-v1590-IEs ::=	SEQUENCE {
+	lateNonCriticalExtension				OCTET STRING					OPTIONAL,
+	nonCriticalExtension					SEQUENCE {}					OPTIONAL
 }
 
 
diff --git a/epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn b/epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn
index 0628a8201e..6bfdc86ff1 100644
--- a/epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn
+++ b/epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V15.8.0 (2019-12)
+-- 3GPP TS 36.331 V15.9.0 (2020-03)
 --
 NBIOT-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
 
diff --git a/epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn b/epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn
index a8ba7014d4..7125883d71 100644
--- a/epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn
+++ b/epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V15.8.0 (2019-12)
+-- 3GPP TS 36.331 V15.9.0 (2020-03)
 --
 PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
 
diff --git a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
index 7103851c5a..f5bc326fd7 100644
--- a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
+++ b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
@@ -1,7 +1,7 @@
 /* packet-lte-rrc-template.c
  * Routines for Evolved Universal Terrestrial Radio Access (E-UTRA);
  * Radio Resource Control (RRC) protocol specification
- * (3GPP TS 36.331 V15.8.0 Release 15) packet dissection
+ * (3GPP TS 36.331 V15.9.0 Release 15) packet dissection
  * Copyright 2008, Vincent Helfre
  * Copyright 2009-2020, Pascal Quantin
  *