LTE RRC: upgrade dissector to v17.3.0

9 files changed, 96 insertions, 76 deletions

diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
index 59913c9d8e..ba4f5fa9ec 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 V17.2.0 (2022-09)
+-- 3GPP TS 36.331 V17.3.0 (2022-12)
 
 EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
 
@@ -126,7 +126,7 @@ HandoverPreparationInformation-r8-IEs ::= SEQUENCE {
 HandoverPreparationInformation-v920-IEs	::= SEQUENCE {
 	ue-ConfigRelease-r9					ENUMERATED {
 										rel9, rel10, rel11, rel12, v10j0, v11e0,
-										v1280, rel13, ..., rel14, rel15, rel16}		OPTIONAL,	-- Cond HO2
+										v1280, rel13, ..., rel14, rel15, rel16, rel17}		OPTIONAL,	-- Cond HO2
 	nonCriticalExtension				HandoverPreparationInformation-v9d0-IEs		OPTIONAL
 }
 
@@ -204,12 +204,12 @@ HandoverPreparationInformation-v1610-IEs ::= SEQUENCE {
 }
 
 HandoverPreparationInformation-v1620-IEs ::= SEQUENCE {
-	as-Context-v1620			AS-Context-v1620						OPTIONAL, 	--Cond HO2
+	as-Context-v1620			AS-Context-v1620						OPTIONAL,	--Cond HO2
 	nonCriticalExtension		HandoverPreparationInformation-v1630-IEs	OPTIONAL
 }
 
 HandoverPreparationInformation-v1630-IEs ::= SEQUENCE {
-	as-Context-v1630			AS-Context-v1630						OPTIONAL, 	--Cond HO2
+	as-Context-v1630			AS-Context-v1630						OPTIONAL,	--Cond HO2
 	nonCriticalExtension		HandoverPreparationInformation-v1700-IEs		OPTIONAL
 }
 
diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn
index 7073b8928e..e9c1814915 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 V17.2.0 (2022-09)
+-- 3GPP TS 36.331 V17.3.0 (2022-12)
 
 EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
 
@@ -724,7 +724,7 @@ MasterInformationBlock ::=			SEQUENCE {
 	schedulingInfoSIB1-BR-r13			INTEGER (0..31),
 	systemInfoUnchanged-BR-r15			BOOLEAN,
 	partEARFCN-17					CHOICE {
-		spare 							BIT STRING (SIZE (2)),
+		spare							BIT STRING (SIZE (2)),
 		earfcn-LSB						BIT STRING (SIZE (2))
 	},
 	spare								BIT STRING (SIZE (1))
@@ -803,7 +803,7 @@ MBMSInterestIndication-v1310-IEs ::=	SEQUENCE {
 	nonCriticalExtension				MBMSInterestIndication-v1540-IEs		OPTIONAL
 }
 
-MBMSInterestIndication-v1540-IEs ::=	 SEQUENCE {
+MBMSInterestIndication-v1540-IEs ::=	SEQUENCE {
 	mbms-ROM-InfoList-r15			SEQUENCE (SIZE(1..maxMBMS-ServiceListPerUE-r13)) OF MBMS-ROM-Info-r15																	OPTIONAL,
 	nonCriticalExtension				MBMSInterestIndication-v1610-IEs	OPTIONAL
 }
@@ -882,7 +882,7 @@ FailureReportMCG-r16 ::=					SEQUENCE {
 	measResultFreqListEUTRA-r16					MeasResultList3EUTRA-r15			OPTIONAL,
 	measResultFreqListNR-r16					MeasResultFreqListFailNR-r15		OPTIONAL,
 	measResultFreqListGERAN-r16					MeasResultList2GERAN-r10			OPTIONAL,
-	measResultFreqListUTRA-r16					MeasResultList2UTRA-r9 				OPTIONAL,
+	measResultFreqListUTRA-r16					MeasResultList2UTRA-r9				OPTIONAL,
 	measResultSCG-r16							OCTET STRING						OPTIONAL,
 	...
 }
@@ -1142,7 +1142,7 @@ PURConfigurationRequest-r16-IEs ::=	SEQUENCE {
 		pur-ReleaseRequest					NULL,
 		pur-SetupRequest					SEQUENCE {
 			requestedNumOccasions-r16			ENUMERATED {one, infinite},
-			requestedPeriodicityAndOffset-r16	PUR-PeriodicityAndOffset-r16 	OPTIONAL,
+			requestedPeriodicityAndOffset-r16	PUR-PeriodicityAndOffset-r16	OPTIONAL,
 			requestedTBS-r16					ENUMERATED {b328, b344, b376, b392, b408,
 													b424, b440, b456, b472, b488, b504, b536,
 													b568, b584, b616, b648, b680, b712, b744,
@@ -1459,7 +1459,7 @@ SCellToAddMod-r16 ::=			SEQUENCE {
 	radioResourceConfigDedicatedSCell-r16	RadioResourceConfigDedicatedSCell-r10	OPTIONAL,	-- Cond SCellAdd2
 	antennaInfoDedicatedSCell-r16		AntennaInfoDedicated-v10i0	OPTIONAL,	-- Need ON
 	srs-SwitchFromServCellIndex-r16			INTEGER (0.. 31) OPTIONAL,	-- Need ON
-	sCellState-r16							ENUMERATED {activated, dormant}	OPTIONAL, 	-- Need ON
+	sCellState-r16							ENUMERATED {activated, dormant}	OPTIONAL,	-- Need ON
 	...
 }
 
@@ -1905,7 +1905,7 @@ RRCConnectionRelease-v15b0-IEs ::=	SEQUENCE {
 
 RRCConnectionRelease-v1610-IEs ::=	SEQUENCE {
 	fullI-RNTI-r16						I-RNTI-r15					OPTIONAL, -- Need OR
-	shortI-RNTI-r16					ShortI-RNTI-r15 				OPTIONAL, -- Need OR
+	shortI-RNTI-r16					ShortI-RNTI-r15				OPTIONAL, -- Need OR
 	pur-Config-r16						CHOICE {release NULL, setup PUR-Config-r16}	OPTIONAL, -- Need ON
 	rrc-InactiveConfig-v1610			RRC-InactiveConfig-v1610	OPTIONAL,  -- Cond BLCE-IDLEeDRX
 	releaseIdleMeasConfig-r16			ENUMERATED {true}			OPTIONAL, -- Need ON
@@ -2590,7 +2590,7 @@ FailureReportSCG-NR-r15 ::=		SEQUENCE {
 		failureType-v1610				ENUMERATED {t312-Expiry, scg-lbtFailure,
 											beamFailureRecoveryFailure, bh-RLF-r16,
 											beamFailure-r17,
- 													spare3, spare2, spare1}	OPTIONAL
+													spare3, spare2, spare1}	OPTIONAL
 	]]
 }
 
@@ -3661,7 +3661,7 @@ RACH-Report-r16 ::=					SEQUENCE {
 }
 
 RACH-Report-v1610 ::=	SEQUENCE {
-	initialCEL-r16 					INTEGER (0..3),
+	initialCEL-r16						INTEGER (0..3),
 	edt-Fallback-r16					BOOLEAN
 }
 
@@ -5439,14 +5439,14 @@ SystemInformationBlockType29-r16 ::= SEQUENCE {
 
 SystemInformationBlockType30-r17 ::=	SEQUENCE {
 	commonPLMNsWithDisasterCondition-r17	SEQUENCE (SIZE (1..maxPLMN-r11)) OF PLMN-Identity					OPTIONAL,	-- Need OR
-	applicableDisasterInfoList-r17			SEQUENCE (SIZE (1..maxPLMN-r11)) OF ApplicableDisasterInfo-r17		OPTIONAL, 	-- Need OR
+	applicableDisasterInfoList-r17			SEQUENCE (SIZE (1..maxPLMN-r11)) OF ApplicableDisasterInfo-r17		OPTIONAL,	-- Need OR
 	lateNonCriticalExtension	OCTET STRING	OPTIONAL,
 	...
 }
 
 ApplicableDisasterInfo-r17	::= CHOICE {
 	noDisasterRoaming-r17				NULL,
-	disasterRoamingFromAnyPLMN-r17	NULL,
+	disasterRelatedIndication-r17	NULL,
 	commonPLMNs-r17					NULL,
 	dedicatedPLMNs-r17					SEQUENCE (SIZE (1..maxPLMN-r11)) OF PLMN-Identity
 }
@@ -5458,7 +5458,7 @@ SystemInformationBlockType31-r17 ::= SEQUENCE {
 	...
 }
 
-ServingSatelliteInfo-r17 ::= 	SEQUENCE {
+ServingSatelliteInfo-r17 ::=	SEQUENCE {
 	ephemerisInfo-r17			CHOICE {
 		stateVectors				EphemerisStateVectors-r17,
 		orbitalParameters			EphemerisOrbitalParameters-r17
@@ -5475,7 +5475,7 @@ ServingSatelliteInfo-r17 ::= 	SEQUENCE {
 		startSubFrame-r17				INTEGER (0..9)
 	}																OPTIONAL,	-- Need OP
 	k-Offset-r17					INTEGER (0..1023),
-	k-Mac-r17						INTEGER (1..512) 				OPTIONAL,	-- Need OP
+	k-Mac-r17						INTEGER (1..512)				OPTIONAL,	-- Need OP
 	...
 }
 
@@ -5486,22 +5486,22 @@ SystemInformationBlockType32-r17 ::= SEQUENCE {
 	...
 }
 
-SatelliteInfoList-r17 ::= 	SEQUENCE (SIZE (1..maxSat-r17)) OF SatelliteInfo-r17
+SatelliteInfoList-r17 ::=	SEQUENCE (SIZE (1..maxSat-r17)) OF SatelliteInfo-r17
 
-SatelliteInfo-r17 ::= 		SEQUENCE {
+SatelliteInfo-r17 ::=			SEQUENCE {
 	satelliteId-r17				INTEGER (0..255),
 	serviceInfo-r17				SEQUENCE {
 		tle-EphemerisParameters-r17	TLE-EphemerisParameters-r17	OPTIONAL,	-- Need OR
 		t-ServiceStart-r17				TimeOffsetUTC-r17				OPTIONAL	-- Need OR
 		},
 	footprintInfo-r17			SEQUENCE {
-		referencePoint-r17 		SEQUENCE {
-			longitude-r17 				INTEGER (-131072..131071),
-			latitude-r17 				INTEGER (-131072..131071)
+		referencePoint-r17			SEQUENCE {
+			longitude-r17				INTEGER (-131072..131071),
+			latitude-r17				INTEGER (-131072..131071)
 		} OPTIONAL,	-- Need OR
 		elevationAngles-r17		SEQUENCE {
 			elevationAngleRight-r17	INTEGER (-14..14),
-			elevationAngleLeft-r17	INTEGER (-14..14) 				OPTIONAL	-- Need OP
+			elevationAngleLeft-r17	INTEGER (-14..14)				OPTIONAL	-- Need OP
 		} OPTIONAL,	-- Need OR
 		radius-r17					INTEGER (1..256)					OPTIONAL	-- Need OR
 	}
@@ -5984,6 +5984,11 @@ CQI-ShortConfigSCell-r15 ::= CHOICE {
 	}
 }
 
+CQI-ReportPeriodicSCell-v1730 ::= SEQUENCE {
+	cqi-pmi-ConfigIndex2Dormant-r17		INTEGER (0..1023),
+	ri-ConfigIndex2Dormant-r17			INTEGER (0..1023)		OPTIONAL		-- Need OR
+}
+
 CRI-ReportConfig-r13 ::=			CHOICE {
 	release								NULL,
 	setup								SEQUENCE {
@@ -6483,7 +6488,7 @@ GWUS-Config-r16 ::=				SEQUENCE {
 	resourceConfigDRX-r16			GWUS-ResourceConfig-r16,
 	resourceConfig-eDRX-Short-r16	GWUS-ResourceConfig-r16			OPTIONAL,	-- Need OP
 	resourceConfig-eDRX-Long-r16	GWUS-ResourceConfig-r16			OPTIONAL,	-- Cond TimeOffset
-	probThreshList-r16				GWUS-ProbThreshList-r16		OPTIONAL, 	-- Cond ProbabilityBased
+	probThreshList-r16				GWUS-ProbThreshList-r16		OPTIONAL,	-- Cond ProbabilityBased
 	groupNarrowBandList-r16			GWUS-GroupNarrowBandList-r16	OPTIONAL -- Need OR
 }
 
@@ -6511,7 +6516,7 @@ GWUS-GroupsForServiceList-r16 ::=	SEQUENCE (SIZE (1..maxGWUS-ProbThresholds-r16)
 
 GWUS-GroupNarrowBandList-r16 ::=	SEQUENCE (SIZE (1..maxAvailNarrowBands-r13)) OF BOOLEAN
 
-GWUS-NumGroupsList-r16 ::= 		SEQUENCE (SIZE (1..maxGWUS-Resources-r16)) OF GWUS-NumGroups-r16
+GWUS-NumGroupsList-r16 ::=		SEQUENCE (SIZE (1..maxGWUS-Resources-r16)) OF GWUS-NumGroups-r16
 
 GWUS-ProbThreshList-r16 ::=		SEQUENCE (SIZE (1..maxGWUS-ProbThresholds-r16)) OF GWUS-PagingProbThresh-r16
 
@@ -6704,12 +6709,12 @@ MAC-MainConfig ::=					SEQUENCE {
 					rf128, rf320, rf640, rf1280, rf2560,
 					rf5120, rf10240, spare3, spare2, spare1}			OPTIONAL	-- Need OR
 			}
-		}																 OPTIONAL	-- Need ON
+		}																OPTIONAL	-- Need ON
 	]],
 	[[	ce-ETWS-CMAS-RxInConn-r16				ENUMERATED {true}		OPTIONAL	-- Need OR
 	]],
 	[[	offsetThresholdTA-r17					CHOICE {release NULL, setup OffsetThresholdTA-r17}
-																OPTIONAL, 	-- Need ON
+																OPTIONAL,	-- Need ON
 		sr-ProhibitTimerOffset-r17				CHOICE {release NULL, setup SR-ProhibitTimerOffset-r17}
 															OPTIONAL -- Need ON
 	]]
@@ -7543,6 +7548,10 @@ PhysicalConfigDedicatedSCell-v13c0 ::=	SEQUENCE {
 	}
 }
 
+PhysicalConfigDedicatedSCell-v1730 ::=	SEQUENCE {
+	cqi-ReportPeriodicSCell-v1730		CHOICE {release NULL, setup CQI-ReportPeriodicSCell-v1730}
+}
+
 CFI-Config-r15	::= SEQUENCE {
 	cfi-SubframeNonMBSFN-r15		INTEGER (1..4)						OPTIONAL,	 -- Need ON
 	cfi-SlotSubslotNonMBSFN-r15		INTEGER (1..3)					OPTIONAL,	 -- Need ON
@@ -8590,7 +8599,7 @@ RadioResourceConfigCommonSCell-r10 ::=	SEQUENCE {
 	[[	uplinkPowerControlCommonSCell-v1530	UplinkPowerControlCommon-v1530		OPTIONAL -- Need ON
 	]],
 	[[	highSpeedEnhMeasFlagSCell-r16			BOOLEAN						OPTIONAL -- Need ON
-    ]]
+	]]
 }
 
 RadioResourceConfigCommonSCell-v10l0 ::=	SEQUENCE {
@@ -8792,6 +8801,8 @@ RadioResourceConfigDedicatedSCell-r10 ::=	SEQUENCE {
 	[[	crs-IntfMitigEnabled-r15			BOOLEAN						OPTIONAL,	-- Need ON
 		neighCellsCRS-Info-r15				NeighCellsCRS-Info-r15		OPTIONAL,	-- Need ON
 		sps-Config-v1530					SPS-Config-v1530			OPTIONAL	-- Need ON
+	]],
+	[[	physicalConfigDedicatedSCell-v1730	PhysicalConfigDedicatedSCell-v1730	OPTIONAL -- Cond CQI-ReportPeriodicSCell
 	]]
 }
 
@@ -10426,7 +10437,7 @@ EphemerisOrbitalParameters-r17 ::= SEQUENCE {
 }
 
 
-EphemerisStateVectors-r17 ::= 	SEQUENCE {
+EphemerisStateVectors-r17 ::=	SEQUENCE {
 	positionX-r17					PositionStateVector-r17,
 	positionY-r17					PositionStateVector-r17,
 	positionZ-r17					PositionStateVector-r17,
@@ -11231,7 +11242,7 @@ CellsToAddMod ::=	SEQUENCE {
 	cellIndividualOffset				Q-OffsetRange
 }
 
-CellsToAddMod-v1610 ::= 		SEQUENCE {
+CellsToAddMod-v1610 ::=		SEQUENCE {
 	rss-MeasPowerBias-r16			RSS-MeasPowerBias-r16
 }
 
@@ -12641,7 +12652,7 @@ CandidateServingFreqListNR-r15 ::= SEQUENCE (SIZE (1..maxFreqIDC-r11)) OF ARFCN-
 SCG-DeactivationPreferenceConfig-r17 ::= SEQUENCE {
 	scg-DeactivationPreferenceProhibitTimer-r17
 							ENUMERATED {s0, s1, s2, s4, s8, s10, s20, s30,
-										 s60, s120, s180, s240, s300, s600, s900, s1800}
+										s60, s120, s180, s240, s300, s600, s900, s1800}
 }
 
 
@@ -13137,7 +13148,7 @@ UE-EUTRA-Capability-v1610-IEs ::= SEQUENCE {
 	pdcp-Parameters-v1610					PDCP-Parameters-v1610						OPTIONAL,
 	mac-Parameters-v1610					MAC-Parameters-v1610						OPTIONAL,
 	phyLayerParameters-v1610				PhyLayerParameters-v1610					OPTIONAL,
-	measParameters-v1610 					MeasParameters-v1610 						OPTIONAL,
+	measParameters-v1610					MeasParameters-v1610						OPTIONAL,
 	pur-Parameters-r16						PUR-Parameters-r16							OPTIONAL,
 	eutra-5GC-Parameters-v1610				EUTRA-5GC-Parameters-v1610					OPTIONAL,
 	otherParameters-v1610					Other-Parameters-v1610						OPTIONAL,
@@ -13199,6 +13210,11 @@ UE-EUTRA-Capability-v1710-IEs ::= SEQUENCE {
 
 UE-EUTRA-Capability-v1720-IEs ::= SEQUENCE {
 	ntn-Parameters-v1720						NTN-Parameters-v1720,
+	nonCriticalExtension						UE-EUTRA-Capability-v1730-IEs		OPTIONAL
+}
+
+UE-EUTRA-Capability-v1730-IEs ::= SEQUENCE {
+	phyLayerParameters-v1730					PhyLayerParameters-v1730,
 	nonCriticalExtension						SEQUENCE {}							OPTIONAL
 }
 
@@ -13460,7 +13476,7 @@ PDCP-Parameters-v1610 ::=			SEQUENCE {
 	pdcp-VersionChangeWithoutHO-r16		ENUMERATED {supported}		OPTIONAL,
 	ehc-r16								ENUMERATED {supported}		OPTIONAL,
 	continueEHC-Context-r16				ENUMERATED {supported}		OPTIONAL,
-		maxNumberEHC-Contexts-r16 			ENUMERATED {cs2, cs4, cs8, cs16, cs32, cs64, cs128, cs256,
+		maxNumberEHC-Contexts-r16			ENUMERATED {cs2, cs4, cs8, cs16, cs32, cs64, cs128, cs256,
 														cs512, cs1024, cs2048, cs4096, cs8192, cs16384,
 														cs32768, cs65536}	OPTIONAL,
 	jointEHC-ROHC-Config-r16			ENUMERATED {supported}		OPTIONAL
@@ -13705,7 +13721,7 @@ PhyLayerParameters-v1610 ::=			SEQUENCE {
 		mpdcch-InLteControlRegionCE-ModeB-r16		ENUMERATED {supported}			OPTIONAL,
 		pdsch-InLteControlRegionCE-ModeA-r16		ENUMERATED {supported}			OPTIONAL,
 		pdsch-InLteControlRegionCE-ModeB-r16		ENUMERATED {supported}			OPTIONAL,
-		multiTB-Parameters-r16						CE-MultiTB-Parameters-r16 		OPTIONAL,
+		multiTB-Parameters-r16						CE-MultiTB-Parameters-r16		OPTIONAL,
 		resourceResvParameters-r16					CE-ResourceResvParameters-r16	OPTIONAL
 	}	OPTIONAL,
 	widebandPRG-Slot-r16				ENUMERATED {supported}			OPTIONAL,
@@ -13728,6 +13744,10 @@ PhyLayerParameters-v1700 ::=	SEQUENCE {
 	}	OPTIONAL
 }
 
+PhyLayerParameters-v1730 ::=	SEQUENCE {
+	csi-SubframeSet2ForDormantSCell-r17	ENUMERATED {supported}			OPTIONAL
+}
+
 MIMO-UE-Parameters-r13 ::=				SEQUENCE {
 	parametersTM9-r13						MIMO-UE-ParametersPerTM-r13		OPTIONAL,
 	parametersTM10-r13						MIMO-UE-ParametersPerTM-r13		OPTIONAL,
@@ -14342,7 +14362,7 @@ BandParameters-v1530 ::=	SEQUENCE {
 	stti-SPT-BandParameters-r15					STTI-SPT-BandParameters-r15	OPTIONAL
 }
 
-BandParameters-v1610 ::= 	SEQUENCE {
+BandParameters-v1610 ::=	SEQUENCE {
 	intraFreqDAPS-r16		SEQUENCE {
 		intraFreqAsyncDAPS-r16					ENUMERATED {supported}		OPTIONAL,
 		dummy									ENUMERATED {supported}		OPTIONAL,
@@ -14999,7 +15019,7 @@ Other-Parameters-v1650 ::=		SEQUENCE {
 	mpsPriorityIndication-r16			ENUMERATED {supported}		OPTIONAL
 }
 
-Other-Parameters-v1690 ::= 		SEQUENCE {
+Other-Parameters-v1690 ::=		SEQUENCE {
 	ul-RRC-Segmentation-r16			ENUMERATED {supported}			OPTIONAL
 }
 
@@ -15098,25 +15118,25 @@ CE-MultiTB-Parameters-r16 ::=	SEQUENCE {
 	pdsch-MultiTB-CE-ModeB-r16			ENUMERATED {supported}			OPTIONAL,
 	pusch-MultiTB-CE-ModeA-r16			ENUMERATED {supported}			OPTIONAL,
 	pusch-MultiTB-CE-ModeB-r16			ENUMERATED {supported}			OPTIONAL,
-	ce-MultiTB-64QAM-r16 				ENUMERATED {supported}			OPTIONAL,
-	ce-MultiTB-EarlyTermination-r16 	ENUMERATED {supported}			OPTIONAL,
+	ce-MultiTB-64QAM-r16				ENUMERATED {supported}			OPTIONAL,
+	ce-MultiTB-EarlyTermination-r16	ENUMERATED {supported}			OPTIONAL,
 	ce-MultiTB-FrequencyHopping-r16		ENUMERATED {supported}			OPTIONAL,
 	ce-MultiTB-HARQ-AckBundling-r16		ENUMERATED {supported}			OPTIONAL,
 	ce-MultiTB-Interleaving-r16			ENUMERATED {supported}			OPTIONAL,
-	ce-MultiTB-SubPRB-r16 				ENUMERATED {supported}			OPTIONAL
+	ce-MultiTB-SubPRB-r16					ENUMERATED {supported}			OPTIONAL
 }
 
 CE-ResourceResvParameters-r16 ::=	SEQUENCE {
-	subframeResourceResvDL-CE-ModeA-r16 	ENUMERATED {supported}			OPTIONAL,
-	subframeResourceResvDL-CE-ModeB-r16 	ENUMERATED {supported}			OPTIONAL,
-	subframeResourceResvUL-CE-ModeA-r16 	ENUMERATED {supported}			OPTIONAL,
-	subframeResourceResvUL-CE-ModeB-r16 	ENUMERATED {supported}			OPTIONAL,
-	slotSymbolResourceResvDL-CE-ModeA-r16 	ENUMERATED {supported}			OPTIONAL,
-	slotSymbolResourceResvDL-CE-ModeB-r16 	ENUMERATED {supported}			OPTIONAL,
-	slotSymbolResourceResvUL-CE-ModeA-r16 	ENUMERATED {supported}			OPTIONAL,
-	slotSymbolResourceResvUL-CE-ModeB-r16 	ENUMERATED {supported}			OPTIONAL,
-	subcarrierPuncturingCE-ModeA-r16 		ENUMERATED {supported}			OPTIONAL,
-	subcarrierPuncturingCE-ModeB-r16 		ENUMERATED {supported}			OPTIONAL
+	subframeResourceResvDL-CE-ModeA-r16	ENUMERATED {supported}			OPTIONAL,
+	subframeResourceResvDL-CE-ModeB-r16	ENUMERATED {supported}			OPTIONAL,
+	subframeResourceResvUL-CE-ModeA-r16	ENUMERATED {supported}			OPTIONAL,
+	subframeResourceResvUL-CE-ModeB-r16	ENUMERATED {supported}			OPTIONAL,
+	slotSymbolResourceResvDL-CE-ModeA-r16	ENUMERATED {supported}			OPTIONAL,
+	slotSymbolResourceResvDL-CE-ModeB-r16	ENUMERATED {supported}			OPTIONAL,
+	slotSymbolResourceResvUL-CE-ModeA-r16	ENUMERATED {supported}			OPTIONAL,
+	slotSymbolResourceResvUL-CE-ModeB-r16	ENUMERATED {supported}			OPTIONAL,
+	subcarrierPuncturingCE-ModeA-r16			ENUMERATED {supported}			OPTIONAL,
+	subcarrierPuncturingCE-ModeB-r16			ENUMERATED {supported}			OPTIONAL
 }
 
 LAA-Parameters-r13 ::=				SEQUENCE {
diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn
index b242e75b1c..41f13e30d7 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 V17.2.0 (2022-09)
+-- 3GPP TS 36.331 V17.3.0 (2022-12)
 
 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 45d1ee86ca..588150d311 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 V17.2.0 (2022-09)
+-- 3GPP TS 36.331 V17.3.0 (2022-12)
 
 EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
 
@@ -74,7 +74,7 @@ FROM EUTRA-RRC-Definitions;
 
 
 VarConditionalReconfiguration ::= SEQUENCE {
-    -- Conditional reconfigurations list
+	 -- Conditional reconfigurations list
 	condReconfigurationList-r16			CondReconfigurationToAddModList-r16
 	OPTIONAL
 }
diff --git a/epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn b/epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn
index 465c066363..2b37f31a9c 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 V17.2.0 (2022-09)
+-- 3GPP TS 36.331 V17.3.0 (2022-12)
 
 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 736495798c..a40577f2e4 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 V17.2.0 (2022-09)
+-- 3GPP TS 36.331 V17.3.0 (2022-12)
 
 NBIOT-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
 
@@ -244,7 +244,7 @@ MasterInformationBlock-NB ::=	SEQUENCE {
 	additionalTransmissionSIB1-r15	BOOLEAN,
 	ab-Enabled-5GC-r16				BOOLEAN,
 	partEARFCN-17					CHOICE {
-		spare 							BIT STRING (SIZE (2)),
+		spare							BIT STRING (SIZE (2)),
 		earfcn-LSB						BIT STRING (SIZE (2))
 	},
 	spare							BIT STRING (SIZE (6))
@@ -341,7 +341,7 @@ Paging-NB ::=						SEQUENCE {
 
 Paging-NB-v1610-IEs	::=				SEQUENCE {
 	pagingRecordList-v1610				PagingRecordList-NB-v1610		OPTIONAL,	-- Need ON
-	nonCriticalExtension 				SEQUENCE {}						OPTIONAL
+	nonCriticalExtension				SEQUENCE {}						OPTIONAL
 }
 
 PagingRecordList-NB-r13 ::=			SEQUENCE (SIZE (1..maxPageRec)) OF PagingRecord-NB-r13
@@ -587,7 +587,7 @@ RRCConnectionRelease-NB-v1550-IEs ::=	SEQUENCE {
 }
 
 RRCConnectionRelease-NB-v15b0-IEs ::=	SEQUENCE {
-	noLastCellUpdate-r15					ENUMERATED {true} 		OPTIONAL,	-- Need OP
+	noLastCellUpdate-r15					ENUMERATED {true}		OPTIONAL,	-- Need OP
 	nonCriticalExtension					RRCConnectionRelease-NB-v1610-IEs		OPTIONAL
 }
 
@@ -1671,7 +1671,7 @@ CarrierFreq-NB-r13 ::=		SEQUENCE {
 	carrierFreq-r13				ARFCN-ValueEUTRA-r9,
 	carrierFreqOffset-r13		ENUMERATED {
 									v-10, v-9, v-8,	v-7, v-6, v-5, v-4, v-3, v-2, v-1, v-0dot5,
-									 v0, v1, v2, v3, v4, v5, v6, v7, v8, v9
+									v0, v1, v2, v3, v4, v5, v6, v7, v8, v9
 									}	OPTIONAL	-- Need ON
 }
 
@@ -1734,7 +1734,7 @@ DL-GapConfig-NB-v1530	::=	SEQUENCE {
 }
 
 
-GWUS-Config-NB-r16 ::= 			SEQUENCE {
+GWUS-Config-NB-r16 ::=			SEQUENCE {
 	groupAlternation-r16			ENUMERATED {true}			OPTIONAL, -- Need OR
 	commonSequence-r16				ENUMERATED {g0, g126}		OPTIONAL, -- Need OR
 	timeParameters-r16				WUS-Config-NB-r15			OPTIONAL, -- Cond noWUSr15
@@ -1745,22 +1745,22 @@ GWUS-Config-NB-r16 ::= 			SEQUENCE {
 	...
 }
 
-GWUS-ResourceConfig-NB-r16 ::= 	SEQUENCE {
+GWUS-ResourceConfig-NB-r16 ::=	SEQUENCE {
 	resourcePosition-r16			ENUMERATED {primary, secondary},
-	numGroupsList-r16				GWUS-NumGroupsList-NB-r16			OPTIONAL, 	-- Need OP
+	numGroupsList-r16				GWUS-NumGroupsList-NB-r16			OPTIONAL,	-- Need OP
 	groupsForServiceList-r16		GWUS-GroupsForServiceList-NB-r16
-															OPTIONAL 	-- Cond probabilityBased
+															OPTIONAL	-- Cond probabilityBased
 }
 
-GWUS-ProbThreshList-NB-r16 ::= 			SEQUENCE (SIZE (1..maxGWUS-ProbThresholds-NB-r16)) OF
+GWUS-ProbThreshList-NB-r16 ::=			SEQUENCE (SIZE (1..maxGWUS-ProbThresholds-NB-r16)) OF
 											GWUS-Paging-ProbThresh-NB-r16
 
-GWUS-Paging-ProbThresh-NB-r16 ::= 		ENUMERATED {p20, p30, p40, p50, p60, p70, p80, p90}
+GWUS-Paging-ProbThresh-NB-r16 ::=		ENUMERATED {p20, p30, p40, p50, p60, p70, p80, p90}
 
-GWUS-NumGroupsList-NB-r16 ::= 			SEQUENCE (SIZE (1..maxGWUS-Resources-NB-r16)) OF
+GWUS-NumGroupsList-NB-r16 ::=				SEQUENCE (SIZE (1..maxGWUS-Resources-NB-r16)) OF
 											GWUS-NumGroups-NB-r16
 
-GWUS-NumGroups-NB-r16 ::= 				ENUMERATED {n1, n2, n4, n8}
+GWUS-NumGroups-NB-r16 ::=					ENUMERATED {n1, n2, n4, n8}
 
 GWUS-GroupsForServiceList-NB-r16 ::=	SEQUENCE (SIZE (1..maxGWUS-ProbThresholds-NB-r16)) OF
 											INTEGER (1..maxGWUS-Groups-1-NB-r16)
@@ -1860,7 +1860,7 @@ NPDSCH-ConfigCommon-NB-r13 ::=	SEQUENCE {
 }
 
 NPDSCH-ConfigDedicated-NB-r16 ::=	SEQUENCE {
-	npdsch-MultiTB-Config-r16			NPDSCH-MultiTB-Config-NB-r16	 OPTIONAL	-- Cond twoHARQ
+	npdsch-MultiTB-Config-r16			NPDSCH-MultiTB-Config-NB-r16	OPTIONAL	-- Cond twoHARQ
 }
 
 NPDSCH-MultiTB-Config-NB-r16 ::=	SEQUENCE {
@@ -2018,7 +2018,7 @@ NPRACH-ParametersListTDD-NB-v1550 ::=	SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB
 NPRACH-ParametersTDD-NB-v1550 ::=	SEQUENCE {
 	maxNumPreambleAttemptCE-v1550			ENUMERATED {n3, n4, n5, n6, n7, n8, n10, spare1},
 	numRepetitionsPerPreambleAttempt-v1550	ENUMERATED {n1, n2, n4, n8, n16, n32, n64, n128,
-															 n256, n512, n1024}
+															n256, n512, n1024}
 }
 
 NPRACH-ParametersListFmt2-NB-r15 ::=	SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF NPRACH-ParametersFmt2-NB-r15
@@ -2057,11 +2057,11 @@ NPRACH-ParametersFmt2-NB-r15 ::=		SEQUENCE {
 }
 
 NPRACH-TxDurationFmt01-NB-r17 ::=	SEQUENCE {
-	nprach-TxDurationFmt01-r17		ENUMERATED {v2dot4, v4dot4, v8dot4, v16dot4, v32dot4, v64dot4}
+	nprach-TxDurationFmt01-r17		ENUMERATED {n2, n4, n8, n16, n32, n64}
 }
 
 NPRACH-TxDurationFmt2-NB-r17 ::=	SEQUENCE {
-	nprach-TxDurationFmt2-r17		ENUMERATED {v1dot6, v2dot6, v4dot6, v8dot6, v16dot6}
+	nprach-TxDurationFmt2-r17		ENUMERATED {n1, n2, n4, n8, n16}
 }
 
 RSRP-ThresholdsNPRACH-InfoList-NB-r13 ::= SEQUENCE (SIZE(1..2)) OF RSRP-Range
@@ -2243,7 +2243,7 @@ NRSRP-ChangeThresh-NB-r16 ::= ENUMERATED {dB4, dB6, dB8, dB10, dB14, dB18, dB22,
 PUR-ConfigID-NB-r16 ::= BIT STRING (SIZE(20))
 
 
-PUR-PeriodicityAndOffset-NB-r16 ::= 	CHOICE {
+PUR-PeriodicityAndOffset-NB-r16 ::=	CHOICE {
 	periodicity8		INTEGER (1..7),
 	periodicity16		INTEGER (1..15),
 	periodicity32		INTEGER (1..31),
@@ -2552,7 +2552,7 @@ SR-SPS-BSR-Config-NB-r15	 ::= CHOICE {
 	}
 }
 
-SR-ProhibitTimerOffset-NB-r17 ::= 	ENUMERATED {
+SR-ProhibitTimerOffset-NB-r17 ::=	ENUMERATED {
 										ms90, ms180, ms270, ms360, ms450, ms540, ms1080, spare}
 
 
diff --git a/epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn b/epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn
index b81e2f0367..1ef73a0692 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 V17.2.0 (2022-09)
+-- 3GPP TS 36.331 V17.3.0 (2022-12)
 
 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 599f6f8335..a2d9702f92 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 V17.2.0 (2022-09)
+-- 3GPP TS 36.331 V17.3.0 (2022-12)
 
 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 bf3bc2acc9..9dbeb35fa0 100644
--- a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
+++ b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
@@ -1,9 +1,9 @@
 /* packet-lte-rrc-template.c
  * Routines for Evolved Universal Terrestrial Radio Access (E-UTRA);
  * Radio Resource Control (RRC) protocol specification
- * (3GPP TS 36.331 V17.2.0 Release 17) packet dissection
+ * (3GPP TS 36.331 V17.3.0 Release 17) packet dissection
  * Copyright 2008, Vincent Helfre
- * Copyright 2009-2022, Pascal Quantin
+ * Copyright 2009-2023, Pascal Quantin
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>