PCAP: upgrade dissector to v17.0.0

In their infinite wisdom, 3GPP succeeded to make non backward compatible
ASN.1 description
Closes #18646

8 files changed, 558 insertions, 129 deletions

diff --git a/epan/dissectors/asn1/pcap/PCAP-CommonDataTypes.asn b/epan/dissectors/asn1/pcap/PCAP-CommonDataTypes.asn
index d2f448e1c5..a8e6d15b9c 100644
--- a/epan/dissectors/asn1/pcap/PCAP-CommonDataTypes.asn
+++ b/epan/dissectors/asn1/pcap/PCAP-CommonDataTypes.asn
@@ -1,5 +1,5 @@
 --
--- 3GPP TS 25.453 V11.0.0 (2012-09)
+-- 3GPP TS 25.453 V17.0.0 (2022-04)
 --
 --9.3.5	Common Definitions
 -- **************************************************************
@@ -9,10 +9,10 @@
 -- **************************************************************
 
 PCAP-CommonDataTypes {
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
 umts-Access (20) modules (3) pcap(4) version1 (1) pcap-CommonDataTypes (3)  }
 
-DEFINITIONS AUTOMATIC TAGS ::= 
+DEFINITIONS AUTOMATIC TAGS ::=
 
 BEGIN
 
diff --git a/epan/dissectors/asn1/pcap/PCAP-Constants.asn b/epan/dissectors/asn1/pcap/PCAP-Constants.asn
index 2f72c09009..b1537ba49b 100644
--- a/epan/dissectors/asn1/pcap/PCAP-Constants.asn
+++ b/epan/dissectors/asn1/pcap/PCAP-Constants.asn
@@ -1,5 +1,5 @@
 --
--- 3GPP TS 25.453 V11.0.0 (2012-09)
+-- 3GPP TS 25.453 V17.0.0 (2022-04)
 --
 -- 9.3.6	Constant Definitions
 -- **************************************************************
@@ -8,11 +8,11 @@
 --
 -- **************************************************************
 
-PCAP-Constants { 
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
-umts-Access (20) modules (3) pcap(4) version1 (1) pcap-Constants (4) } 
+PCAP-Constants {
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
+umts-Access (20) modules (3) pcap(4) version1 (1) pcap-Constants (4) }
 
-DEFINITIONS AUTOMATIC TAGS ::= 
+DEFINITIONS AUTOMATIC TAGS ::=
 
 BEGIN
 
@@ -62,7 +62,7 @@ maxNrOfSets							INTEGER ::= 3
 maxRateMatching						INTEGER ::= 256
 maxNrOfTFs							INTEGER ::= 32
 maxTTI-count						INTEGER ::= 4
-maxTS-1								INTEGER ::= 13 
+maxTS-1								INTEGER ::= 13
 maxCCTrCH							INTEGER ::= 8
 maxTF								INTEGER ::= 32
 maxTFC								INTEGER ::= 1024
@@ -84,6 +84,11 @@ maxGANSSClockMod					INTEGER ::= 4
 maxGANSS-1							INTEGER ::= 7
 maxNrOfIRATMeasurements				INTEGER ::= 16
 maxReportedGERANCells				INTEGER ::= 6
+maxIonGridInfo						INTEGER ::= 320
+maxAddPos							INTEGER ::= 8
+maxBeacons							INTEGER ::= 64
+maxBTs								INTEGER ::= 32
+maxWLANs 							INTEGER ::= 64
 
 -- **************************************************************
 --
@@ -164,7 +169,7 @@ id-GANSS-CommonAssistanceData					ProtocolIE-ID ::= 69
 id-GANSS-GenericAssistanceDataList				ProtocolIE-ID ::= 70
 id-GANSS-MeasuredResultsList					ProtocolIE-ID ::= 71
 id-GANSS-UTRAN-TRU								ProtocolIE-ID ::= 72
-id-GANSSPositioning								ProtocolIE-ID ::= 73 
+id-GANSSPositioning								ProtocolIE-ID ::= 73
 id-GANSS-PositioningDataSet						ProtocolIE-ID ::= 74
 id-GNSS-PositioningMethod						ProtocolIE-ID ::= 75
 id-NetworkAssistedGANSSSuport					ProtocolIE-ID ::= 76
@@ -175,8 +180,8 @@ id-angleOfArrivalLCR							ProtocolIE-ID ::= 80
 id-extendedTimingAdvanceLCR						ProtocolIE-ID ::= 81
 id-additionalMeasurementInforLCR				ProtocolIE-ID ::= 82
 id-timingAdvanceLCR-R7							ProtocolIE-ID ::= 83
-id-rxTimingDeviationLCR 						ProtocolIE-ID ::= 84
-id-GPSReferenceTimeUncertainty					ProtocolIE-ID ::= 85 
+id-rxTimingDeviationLCR							ProtocolIE-ID ::= 84
+id-GPSReferenceTimeUncertainty					ProtocolIE-ID ::= 85
 id-GANSS-AddIonoModelReq						ProtocolIE-ID ::= 86
 id-GANSS-EarthOrientParaReq						ProtocolIE-ID ::= 87
 id-GANSS-Additional-Ionospheric-Model			ProtocolIE-ID ::= 88
@@ -217,7 +222,23 @@ id-GANSS-Day-Cycle								ProtocolIE-ID ::= 122
 id-ganss-Delta-T								ProtocolIE-ID ::= 123
 id-requestedCellIDGERANMeasurements				ProtocolIE-ID ::= 124
 id-CellId-IRATMeasuredResultsSets				ProtocolIE-ID ::= 125
-id-IMSI											ProtocolIE-ID ::= 126
-id-IMEI											ProtocolIE-ID ::= 127
+-- WS extension
+id-Unknown-126									ProtocolIE-ID ::= 126
+id-Unknown-127									ProtocolIE-ID ::= 127
+id-IMSI											ProtocolIE-ID ::= 128
+id-IMEI											ProtocolIE-ID ::= 129
+id-GANSS-alm-keplerianBDSAlmanac				ProtocolIE-ID ::= 130
+id-BDS-Ionospheric-Grid-Model					ProtocolIE-ID ::= 131
+id-DBDS-Correction-Information					ProtocolIE-ID ::= 132
+id-BDSIonosphericGridModel						ProtocolIE-ID ::= 133
+id-DBDSCorrection								ProtocolIE-ID ::= 134
+id-Confidence									ProtocolIE-ID ::= 135
+id-ExtraDopplerInfoExtension					ProtocolIE-ID ::= 136
+id-GANSS-Confidence								ProtocolIE-ID ::= 137
+id-GANSS-ExtraDopplerExtension					ProtocolIE-ID ::= 138
+id-Additional-PositioningDataSet				ProtocolIE-ID ::= 139
+id-Additional-PositioningMethod					ProtocolIE-ID ::= 140
+id-AddPos-MeasuredResults						ProtocolIE-ID ::= 141
+id-AddPosSupport								ProtocolIE-ID ::= 142
 
 END
diff --git a/epan/dissectors/asn1/pcap/PCAP-Containers.asn b/epan/dissectors/asn1/pcap/PCAP-Containers.asn
index fea32ba24d..f495f8af48 100644
--- a/epan/dissectors/asn1/pcap/PCAP-Containers.asn
+++ b/epan/dissectors/asn1/pcap/PCAP-Containers.asn
@@ -1,5 +1,5 @@
 --
--- 3GPP TS 25.453  V11.0.0 (2012-09)
+-- 3GPP TS 25.453 V17.0.0 (2022-04)
 --
 -- 9.3.7	Container Definitions
 -- **************************************************************
@@ -9,10 +9,10 @@
 -- **************************************************************
 
 PCAP-Containers {
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
 umts-Access (20) modules (3) pcap(4) version1 (1) pcap-Containers (5) }
 
-DEFINITIONS AUTOMATIC TAGS ::= 
+DEFINITIONS AUTOMATIC TAGS ::=
 
 BEGIN
 
@@ -95,11 +95,11 @@ WITH SYNTAX {
 --
 -- **************************************************************
 
-ProtocolIE-Container {PCAP-PROTOCOL-IES : IEsSetParam} ::= 
+ProtocolIE-Container {PCAP-PROTOCOL-IES : IEsSetParam} ::=
 	SEQUENCE (SIZE (0..maxProtocolIEs)) OF
 		ProtocolIE-Field {{IEsSetParam}}
 
-ProtocolIE-Single-Container {PCAP-PROTOCOL-IES : IEsSetParam} ::= 
+ProtocolIE-Single-Container {PCAP-PROTOCOL-IES : IEsSetParam} ::=
 	ProtocolIE-Field {{IEsSetParam}}
 
 ProtocolIE-Field {PCAP-PROTOCOL-IES : IEsSetParam} ::= SEQUENCE {
@@ -124,7 +124,7 @@ ProtocolIE-ContainerList {INTEGER : lowerBound, INTEGER : upperBound, PCAP-PROTO
 --
 -- **************************************************************
 
-ProtocolExtensionContainer {PCAP-PROTOCOL-EXTENSION : ExtensionSetParam} ::= 
+ProtocolExtensionContainer {PCAP-PROTOCOL-EXTENSION : ExtensionSetParam} ::=
 	SEQUENCE (SIZE (1..maxProtocolExtensions)) OF
 		ProtocolExtensionField {{ExtensionSetParam}}
 
@@ -140,7 +140,7 @@ ProtocolExtensionField {PCAP-PROTOCOL-EXTENSION : ExtensionSetParam} ::= SEQUENC
 --
 -- **************************************************************
 
-PrivateIE-Container {PCAP-PRIVATE-IES : IEsSetParam } ::= 
+PrivateIE-Container {PCAP-PRIVATE-IES : IEsSetParam } ::=
 	SEQUENCE (SIZE (1.. maxPrivateIEs)) OF
 		PrivateIE-Field {{IEsSetParam}}
 
diff --git a/epan/dissectors/asn1/pcap/PCAP-IEs.asn b/epan/dissectors/asn1/pcap/PCAP-IEs.asn
index 3e04f9dafe..d88e85c4cf 100644
--- a/epan/dissectors/asn1/pcap/PCAP-IEs.asn
+++ b/epan/dissectors/asn1/pcap/PCAP-IEs.asn
@@ -1,5 +1,5 @@
 --
--- 3GPP TS 25.453 V11.0.0 (2012-09)
+-- 3GPP TS 25.453 V17.0.0 (2022-04
 --
 -- 9.3.4	Information Element Definitions
 -- **************************************************************
@@ -51,6 +51,11 @@ IMPORTS
 	maxGANSS-1,
 	maxNrOfIRATMeasurements,
 	maxReportedGERANCells,
+	maxIonGridInfo,
+	maxAddPos,
+	maxBeacons,
+	maxBTs,
+	maxWLANs,
 
 
 	id-UTRAN-GPSReferenceTime,
@@ -115,7 +120,20 @@ IMPORTS
 	id-GPS-Week-Cycle,
 	id-GANSS-Day-Cycle,
 	id-ganss-Delta-T,
-	id-requestedCellIDGERANMeasurements
+	id-requestedCellIDGERANMeasurements,
+	id-GANSS-alm-keplerianBDSAlmanac,
+	id-BDS-Ionospheric-Grid-Model,
+	id-DBDS-Correction-Information,
+	id-BDSIonosphericGridModel,
+	id-DBDSCorrection,
+	id-Confidence,
+	id-ExtraDopplerInfoExtension,
+	id-GANSS-Confidence,
+	id-GANSS-ExtraDopplerExtension,
+	id-Additional-PositioningDataSet,
+	id-Additional-PositioningMethod,
+	id-AddPos-MeasuredResults,
+	id-AddPosSupport
 
 
 FROM PCAP-Constants
@@ -163,6 +181,105 @@ AdditionalMethodType ::= ENUMERATED {
 	...
 }
 
+-- **************************************************************
+--
+-- Additional Positioning Measured Results
+--
+-- **************************************************************
+
+AddPos-MeasuredResults ::= SEQUENCE (SIZE (1..maxAddPos)) OF AddPos-MeasuredResults-Element
+
+AddPos-MeasuredResults-Element ::= SEQUENCE {
+	timestamp					UTCTime																		OPTIONAL,
+	type						CHOICE {
+		barometricPressure				SEQUENCE {
+			uncompensatedBarometricPressure		BaroMeasurement,
+			iE-Extensions						ProtocolExtensionContainer	{ { BarometricPressure-ExtIEs } }	OPTIONAL,
+			...
+		},
+		wlan							SEQUENCE {
+			wlanMeasurementList					WLANMeasurementList,
+			iE-Extensions						ProtocolExtensionContainer	{ { WLANMeasurementList-ExtIEs } }	OPTIONAL,
+			...
+		},
+		bt								SEQUENCE {
+			btMeasurementList					BTMeasurementList,
+			iE-Extensions						ProtocolExtensionContainer	{ { BTMeasurementList-ExtIEs } }	OPTIONAL,
+			...
+		},
+		mbs								SEQUENCE {
+			mbsMeasurementList					MBSMeasurementList,
+			iE-Extensions						ProtocolExtensionContainer	{ { MBSMeasurementList-ExtIEs } }	OPTIONAL,
+			...
+		},
+		...
+	},
+	...
+}
+
+BarometricPressure-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+WLANMeasurementList-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+BTMeasurementList-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+MBSMeasurementList-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+WLANMeasurementList ::= SEQUENCE (SIZE (1..maxWLANs)) OF WLANMeasurementList-Element
+
+WLANMeasurementList-Element ::= SEQUENCE {
+	wlanBSSID					OCTET STRING (SIZE (6)),
+	wlanSSID					OCTET STRING (SIZE(1..32))												OPTIONAL,
+	wlanRSSI					INTEGER(-127..128)														OPTIONAL,
+	wlanRTTvalue				INTEGER(0..16777215)													OPTIONAL,
+	wlanRTTunits				ENUMERATED { microseconds,hundredsofnanoseconds, tensofnanoseconds, nanoseconds, tenthsofnanosecond, ...} OPTIONAL,
+	wlanRTTaccuracy				INTEGER(0..255)															OPTIONAL,
+	wlanAPChannelFrequency		INTEGER(0..256)															OPTIONAL,
+	wlanServingFlag				BOOLEAN																	OPTIONAL,
+	iE-Extensions				ProtocolExtensionContainer { { WLANMeasurementList-Element-ExtIEs } }	OPTIONAL,
+	...
+}
+
+WLANMeasurementList-Element-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+BTMeasurementList ::= SEQUENCE (SIZE (1..maxBTs)) OF BTMeasurementList-Element
+
+BTMeasurementList-Element ::= SEQUENCE {
+	btADDR					OCTET STRING (SIZE(6)),
+	btRSSI					INTEGER(-127..128)														OPTIONAL,
+	iE-Extensions			ProtocolExtensionContainer { { BTMeasurementList-Element-ExtIEs } }		OPTIONAL,
+	...
+}
+
+BTMeasurementList-Element-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+MBSMeasurementList ::= SEQUENCE (SIZE (1..maxBeacons)) OF MBSMeasurementList-Element
+
+MBSMeasurementList-Element ::= SEQUENCE {
+	transmitterID				INTEGER(0..32767),
+	codephase					INTEGER(0..2097151),
+	codephaseRMS				INTEGER(0..63),
+	iE-Extensions				ProtocolExtensionContainer { { MBSMeasurementList-Element-ExtIEs } }		OPTIONAL,
+	...
+}
+
+MBSMeasurementList-Element-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+BaroMeasurement ::= INTEGER(30000..115000)
 
 -- **************************************************************
 --
@@ -229,7 +346,10 @@ CauseRadioNetwork ::= ENUMERATED {
 	position-calculation-error-invalid-GANSS-measured-results,
 	position-calculation-error-AGANSS-positioning-method-not-supported,
 	ue-positioning-error-Not-enough-GANSS-Satellites,
-	ue-positioning-error-Not-Accomplished-GANSS-Timing-of-Cell-Frames
+	ue-positioning-error-Not-Accomplished-GANSS-Timing-of-Cell-Frames,
+	position-calculation-error-invalid-BDS-measured-results,
+	ue-Positioning-Error-Not-enough-BDS-Satellites,
+	position-calculation-error-A-BDS-positioning-method-not-supported
 }
 
 CauseTransport ::= ENUMERATED {
@@ -590,6 +710,7 @@ ClientType ::= ENUMERATED {
 	plmn-operator-target-ms-service-support,
 	...
 }
+
 -- **************************************************************
 --
 -- CriticalityDiagnostics
@@ -726,11 +847,11 @@ RRC ::=								INTEGER (-127..127)
 
 -- IMEI
 
-IMEI ::=	OCTET STRING (SIZE (3..8))
+IMEI ::=	OCTET STRING (SIZE (8))
 
 -- IMSI
 
-IMSI ::=	OCTET STRING (SIZE (8))
+IMSI ::=	OCTET STRING (SIZE (3..8))
 
 
 -- **************************************************************
@@ -896,7 +1017,7 @@ Extension-ReferenceTimeChoice-IE PCAP-PROTOCOL-IES ::= {
 }
 
 
-Cell-Timing ::=  SEQUENCE {
+Cell-Timing ::= SEQUENCE {
 	sfn					INTEGER (0..4095),
 	uC-ID				UC-ID,
 	iE-Extensions	ProtocolExtensionContainer { { Cell-Timing-ExtIEs } }	OPTIONAL,
@@ -937,13 +1058,14 @@ PositionDataUEbased-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 PositionData ::= SEQUENCE {
 	positioningDataDiscriminator		PositioningDataDiscriminator,
 	positioningDataSet					PositioningDataSet											OPTIONAL,
--- This IE shall be present if the PositioningDataDiscriminator IE is set to the value "0000"  --
+-- This IE shall be present if the PositioningDataDiscriminator IE is set to the value "0000"		--
 	iE-Extensions						ProtocolExtensionContainer { {PositionData-ExtIEs} } 		OPTIONAL,
 	...
 }
 
 PositionData-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-GANSS-PositioningDataSet			CRITICALITY ignore	EXTENSION GANSS-PositioningDataSet				PRESENCE optional },
+	{ ID id-GANSS-PositioningDataSet			CRITICALITY ignore	EXTENSION GANSS-PositioningDataSet			PRESENCE optional}|
+	{ ID id-Additional-PositioningDataSet		CRITICALITY ignore	EXTENSION Additional-PositioningDataSet		PRESENCE optional},
 	...
 }
 
@@ -957,6 +1079,11 @@ PositioningDataSet ::= SEQUENCE(SIZE(1..maxSet)) OF PositioningMethodAndUsage
 
 PositioningMethodAndUsage ::= OCTET STRING (SIZE(1))
 
+Additional-PositioningDataSet ::= SEQUENCE(SIZE(1..maxAddPos)) OF Additional-PositioningMethodAndUsage
+
+Additional-PositioningMethodAndUsage ::= OCTET STRING (SIZE(1))
+
+
 -- **************************************************************
 --
 -- GPS-AcquisitionAssistance:
@@ -972,8 +1099,9 @@ GPS-AcquisitionAssistance ::=	SEQUENCE {
 }
 
 GPS-AcquisitionAssistance-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
-	{ID id-UTRAN-GPSReferenceTime		CRITICALITY	ignore	EXTENSION	UTRAN-GPSReferenceTime			PRESENCE optional} |
-	{ID id-GPSReferenceTimeUncertainty	CRITICALITY	ignore	EXTENSION	GPSReferenceTimeUncertainty	PRESENCE optional} ,
+	{ID id-UTRAN-GPSReferenceTime		CRITICALITY ignore	EXTENSION UTRAN-GPSReferenceTime		PRESENCE optional}|
+	{ID id-GPSReferenceTimeUncertainty	CRITICALITY ignore	EXTENSION GPSReferenceTimeUncertainty		PRESENCE optional}|
+	{ID id-Confidence						CRITICALITY ignore	EXTENSION Confidence						PRESENCE optional},
 	...
 }
 
@@ -994,6 +1122,7 @@ AcquisitionSatInfo ::=				SEQUENCE {
 }
 
 AcquisitionSatInfo-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	{ID id-ExtraDopplerInfoExtension		CRITICALITY ignore	EXTENSION ExtraDopplerInfoExtension		PRESENCE optional},
 	...
 }
 
@@ -1008,9 +1137,23 @@ ExtraDopplerInfo-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+ExtraDopplerInfoExtension ::= SEQUENCE {
+	doppler1stOrder					INTEGER (-42..21),
+	dopplerUncertaintyExtension		DopplerUncertaintyExtension,
+	iE-Extensions						ProtocolExtensionContainer { { ExtraDopplerInfoExtension-ExtIEs } }	OPTIONAL,
+	...
+}
+
+ExtraDopplerInfoExtension-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 DopplerUncertainty ::=				ENUMERATED {
 										hz12-5, hz25, hz50, hz100, hz200, ...}
 
+DopplerUncertaintyExtension ::= ENUMERATED {
+										hz300, hz400, hz500, hz600, noInformation, ...}
+
 CodePhaseSearchWindow ::=			ENUMERATED {
 										w1023, w1, w2, w3, w4, w6, w8,
 										w12, w16, w24, w32, w48, w64,
@@ -1039,6 +1182,8 @@ AzimuthAndElevationLSB-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+Confidence ::= INTEGER(0..100)
+
 -- **************************************************************
 --
 -- GANSS Elements
@@ -1060,7 +1205,7 @@ AuxInfoGANSS-ID1-element-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 
 AuxInfoGANSS-ID3 ::= SEQUENCE (SIZE(1.. maxGANSSSat)) OF AuxInfoGANSS-ID3-element
 
-AuxInfoGANSS-ID3-element  ::= SEQUENCE {
+AuxInfoGANSS-ID3-element ::= SEQUENCE {
 	svID				INTEGER(0..63),
 	signalsAvailable	BIT STRING (SIZE(8)),
 	channelNumber		INTEGER (-7..13),
@@ -1146,7 +1291,7 @@ DGANSS-SignalInformationItem ::= SEQUENCE {
 }
 
 DGANSS-SignalInformationItem-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
-	{ID id-DGNSS-ValidityPeriod	CRITICALITY	ignore	EXTENSION	DGNSS-ValidityPeriod	PRESENCE	optional},
+	{ID id-DGNSS-ValidityPeriod		CRITICALITY ignore	EXTENSION DGNSS-ValidityPeriod		PRESENCE optional},
 	...
 }
 
@@ -1155,7 +1300,8 @@ GANSS-AddClockModels ::= CHOICE {
 	cnavClockModel			 		CNAVclockModel,
 	glonassClockModel		 		GLONASSclockModel,
 	sbasClockModel			 		SBASclockModel,
-	...
+	...,
+	bDSClockModel					BDSClockModel
 	}
 
 GANSS-AddOrbitModels ::= CHOICE {
@@ -1163,7 +1309,8 @@ GANSS-AddOrbitModels ::= CHOICE {
 	cnavKeplerianSet				NavModel-CNAVKeplerianSet,
 	glonassECEF						NavModel-GLONASSecef,
 	sbasECEF						NavModel-SBASecef,
-	...
+	...,
+	bDSKeplerianSet					NavModel-BDSKeplerianSet
 	}
 
 GANSS-Additional-Ionospheric-Model ::= SEQUENCE {
@@ -1194,6 +1341,41 @@ GANSS-Additional-UTC-Models ::= CHOICE {
 	utcModel1			UTCmodelSet1,
 	utcModel2			UTCmodelSet2,
 	utcModel3			UTCmodelSet3,
+	...,
+	utcModel4			UTCmodelSet4
+}
+
+GANSS-ALM-BDSKeplericanset ::= SEQUENCE {
+	satellite-Information-BDS-KP-List	Satellite-Information-BDS-KP-List,
+	ie-Extensions						ProtocolExtensionContainer { { GANSS-ALM-BDSKeplericanset-ExtIEs } }	OPTIONAL,
+	...
+}
+
+GANSS-ALM-BDSKeplericanset-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Satellite-Information-BDS-KP-List ::= SEQUENCE (SIZE (1..maxGANSSSatAlmanac)) OF Satellite-Information-BDS-KP-Item
+
+Satellite-Information-BDS-KP-Item ::= SEQUENCE {
+	sVID-BDS					INTEGER (0..63),
+	tOA-BDS						BIT STRING( SIZE(8) ),
+	a21-BDS						BIT STRING( SIZE(24) ),
+	e-BDS						BIT STRING( SIZE(17) ),
+	omg-lower-BDS				BIT STRING( SIZE(24) ),
+	m0-BDS						BIT STRING( SIZE(24) ),
+	omg-0-BDS					BIT STRING( SIZE(24) ),
+	omg-upper-BDS				BIT STRING( SIZE(17) ),
+	delta-i-BDS					BIT STRING( SIZE(16) ),
+	a0-BDS						BIT STRING( SIZE(11) ),
+	a1-BDS						BIT STRING( SIZE(11) ),
+-- The following IE is mandatory present if the sVID-BDS is between 0 and 29 and not needed otherwise.
+	hea-BDS						BIT STRING( SIZE(9) )					OPTIONAL,
+	ie-Extensions				ProtocolExtensionContainer { { Satellite-Information-BDS-KP-Item-ExtIEs } }	OPTIONAL,
+	...
+}
+
+Satellite-Information-BDS-KP-Item-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -1274,11 +1456,12 @@ GANSS-AlmanacModel ::= CHOICE {
 Extension-GANSS-AlmanacModel ::= ProtocolIE-Single-Container {{ Extension-GANSS-AlmanacModel-IE }}
 
 Extension-GANSS-AlmanacModel-IE PCAP-PROTOCOL-IES ::= {
-	{ ID id-GANSS-alm-keplerianNAVAlmanac			CRITICALITY		ignore		TYPE	GANSS-ALM-NAVKeplerianSet			PRESENCE	mandatory}|
-	{ ID id-GANSS-alm-keplerianReducedAlmanac		CRITICALITY		ignore		TYPE	GANSS-ALM-ReducedKeplerianSet		PRESENCE	mandatory}|
-	{ ID id-GANSS-alm-keplerianMidiAlmanac			CRITICALITY		ignore		TYPE	GANSS-ALM-MidiAlmanacSet				PRESENCE	mandatory}|
-	{ ID id-GANSS-alm-keplerianGLONASS				CRITICALITY		ignore		TYPE	GANSS-ALM-GlonassAlmanacSet			PRESENCE	mandatory}|
-	{ ID id-GANSS-alm-ecefSBASAlmanac				CRITICALITY		ignore		TYPE	GANSS-ALM-ECEFsbasAlmanacSet		PRESENCE	mandatory}
+	{ ID id-GANSS-alm-keplerianNAVAlmanac			CRITICALITY ignore	TYPE GANSS-ALM-NAVKeplerianSet			PRESENCE mandatory}|
+	{ ID id-GANSS-alm-keplerianReducedAlmanac		CRITICALITY ignore	TYPE GANSS-ALM-ReducedKeplerianSet		PRESENCE mandatory}|
+	{ ID id-GANSS-alm-keplerianMidiAlmanac			CRITICALITY ignore	TYPE GANSS-ALM-MidiAlmanacSet			PRESENCE mandatory}|
+	{ ID id-GANSS-alm-keplerianGLONASS				CRITICALITY ignore	TYPE GANSS-ALM-GlonassAlmanacSet			PRESENCE mandatory}|
+	{ ID id-GANSS-alm-ecefSBASAlmanac				CRITICALITY ignore	TYPE GANSS-ALM-ECEFsbasAlmanacSet		PRESENCE mandatory}|
+	{ ID id-GANSS-alm-keplerianBDSAlmanac			CRITICALITY ignore	TYPE GANSS-ALM-BDSKeplericanset			PRESENCE mandatory}
 }
 
 
@@ -1384,6 +1567,17 @@ GANSS-ExtraDoppler-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+GANSS-ExtraDopplerExtension ::= SEQUENCE {
+	dopplerFirstOrder				INTEGER(-42..21),
+	dopplerUncertaintyExtension	ENUMERATED{dH60,dH80,dH100,dH120,noInformation},
+	ie-Extensions					ProtocolExtensionContainer { { GANSS-ExtraDopplerExtension-ExtIEs } }	OPTIONAL,
+	...
+}
+
+GANSS-ExtraDopplerExtension-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 GANSS-GenericAssistanceDataList ::= SEQUENCE (SIZE (1..maxGANSS)) OF GANSSGenericAssistanceData
 
 GANSSGenericAssistanceData ::= SEQUENCE{
@@ -1402,11 +1596,73 @@ GANSSGenericAssistanceData ::= SEQUENCE{
 
 GANSSGenericAssistance-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-GANSS-Additional-Time-Models			CRITICALITY ignore	EXTENSION GANSS-Additional-Time-Models			PRESENCE optional }|
-	{ ID id-GANSS-Additional-Navigation-Models		CRITICALITY ignore	EXTENSION GANSS-Additional-Navigation-Models	PRESENCE optional }|
-	{ ID id-GANSS-Additional-UTC-Models				CRITICALITY ignore	EXTENSION GANSS-Additional-UTC-Models				PRESENCE optional }|
-	{ ID id-GANSS-Auxiliary-Information				CRITICALITY ignore	EXTENSION GANSS-Auxiliary-Information				PRESENCE optional }|
-	-- the following IE shall be present if 'GANSSID' in 'GANSSGenericAssistanceData' is '0' (SBAS)
-	{ ID id-GANSS-SBAS-ID							CRITICALITY ignore	EXTENSION GANSS-SBAS-ID			PRESENCE optional },
+	{ ID id-GANSS-Additional-Navigation-Models		CRITICALITY ignore	EXTENSION GANSS-Additional-Navigation-Models		PRESENCE optional }|
+	{ ID id-GANSS-Additional-UTC-Models				CRITICALITY ignore	EXTENSION GANSS-Additional-UTC-Models			PRESENCE optional }|
+	{ ID id-GANSS-Auxiliary-Information				CRITICALITY ignore	EXTENSION GANSS-Auxiliary-Information			PRESENCE optional }|
+	-- the following IE shall be present if ‘GANSSID’ in ‘GANSSGenericAssistanceData’ is ‘0’ (SBAS)
+	{ ID id-GANSS-SBAS-ID							CRITICALITY ignore	EXTENSION GANSS-SBAS-ID				PRESENCE optional }|
+	{ ID id-BDS-Ionospheric-Grid-Model				CRITICALITY ignore	EXTENSION BDS-Ionospheric-Grid-Model			PRESENCE optional }|
+	{ ID id-DBDS-Correction-Information				CRITICALITY ignore	EXTENSION DBDS-Correction-Information			PRESENCE optional },
+	...
+}
+
+BDS-Ionospheric-Grid-Model ::= SEQUENCE {
+	bDS-Reference-Time						BDS-Reference-Time,
+	bDS-Ionospheric-Grid-Information		BDS-Ionospheric-Grid-Information,
+	ie-Extensions		ProtocolExtensionContainer { { BDS-Ionospheric-Grid-Model-ExtIEs } } OPTIONAL,
+	...
+}
+
+BDS-Ionospheric-Grid-Model-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+BDS-Reference-Time ::= INTEGER(0..3570) -- by step of 30
+
+BDS-Ionospheric-Grid-Information ::= SEQUENCE(SIZE(1.. maxIonGridInfo)) OF SEQUENCE {
+	iGP-number-BDS				INTEGER (1..320),
+	vertical-Delay-BDS			BIT STRING ( SIZE(9)),
+	gIVEI-BDS					BIT STRING ( SIZE(4)),
+	ie-Extensions				ProtocolExtensionContainer { { BDS-Ionospheric-Grid-Information-ExtIEs } }	OPTIONAL,
+	...
+}
+
+BDS-Ionospheric-Grid-Information-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+DBDS-Correction-Information ::= SEQUENCE {
+	bDS-Reference-Time			BDS-Reference-Time,
+	dBDS-Information			DBDS-Information,
+	ie-Extensions				ProtocolExtensionContainer { { DBDS-Correction-Information-ExtIEs } }	OPTIONAL,
+	...
+}
+
+DBDS-Correction-Information-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+DBDS-Information ::= SEQUENCE(SIZE(1..maxSgnType)) OF SEQUENCE {
+	dBDS-Signal-ID				GANSSID					OPTIONAL,
+	dGANSS-Signal-Information	DGANSS-Signal-Information,
+	ie-Extensions				ProtocolExtensionContainer { { DBDS-Information-ExtIEs } }	OPTIONAL,
+	...
+}
+
+DBDS-Information-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+DGANSS-Signal-Information ::= SEQUENCE(SIZE(1.. maxGANSSSat)) OF SEQUENCE {
+	sat-ID-BDS					INTEGER(0..63),
+	uDREI-BDS					INTEGER(0..15),
+	rURAI-BDS					INTEGER(0..15),
+	delta-t-BDS					BIT STRING (SIZE (13)),
+	ie-Extensions				ProtocolExtensionContainer { { DGANSS-Signal-Information-ExtIEs } }	OPTIONAL,
+	...
+}
+
+DGANSS-Signal-Information-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -1457,9 +1713,9 @@ GanssCodePhaseAmbiguityExt-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 
 
 GANSS-Ionospheric-Model ::= SEQUENCE {
-	alpha-zero-ionos					BIT STRING (SIZE (12)),
-	alpha-one-ionos						BIT STRING (SIZE (12)),
-	alpha-two-ionos						BIT STRING (SIZE (12)),
+	alpha-zero-ionos					BIT STRING (SIZE (11)),
+	alpha-one-ionos						BIT STRING (SIZE (11)),
+	alpha-two-ionos						BIT STRING (SIZE (14)),
 	gANSS-IonosphereRegionalStormFlags	GANSS-IonosphereRegionalStormFlags						OPTIONAL,
 	ie-Extensions						ProtocolExtensionContainer { { GANSS-Ionospheric-Model-ExtIEs } }	OPTIONAL,
 	...
@@ -1484,8 +1740,8 @@ GANSS-IonosphereRegionalStormFlags-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 }
 
 GANSS-KeplerianParametersAlm ::= SEQUENCE {
-	t-oa								INTEGER(0..255),
-	iod-a								INTEGER(0..3),
+	t-oa								INTEGER(0..1023),
+	iod-a								INTEGER(0..15),
 	gANSS-SatelliteInformationKP		GANSS-SatelliteInformationKP,
 	ie-Extensions		 				ProtocolExtensionContainer { { GANSS-KeplerianParametersAlm-ExtIEs } }		OPTIONAL,
 	...
@@ -1617,6 +1873,7 @@ GANSS-ReferenceMeasurementInfo ::= SEQUENCE {
 }
 
 GANSS-ReferenceMeasurementInfo-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	{ID id-GANSS-Confidence		CRITICALITY ignore	EXTENSION Confidence			PRESENCE optional},
 	...
 }
 
@@ -1652,10 +1909,11 @@ GANSS-ReferenceTimeOnly-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 
 GANSS-SatelliteClockModelItem ::= SEQUENCE {
 	t-oc								BIT STRING (SIZE(14)),
-	a-i2								BIT STRING (SIZE(12)),
-	a-i1								BIT STRING (SIZE(18)),
-	a-i0								BIT STRING (SIZE(28)),
+	a-i2								BIT STRING (SIZE(6)),
+	a-i1								BIT STRING (SIZE(21)),
+	a-i0								BIT STRING (SIZE(31)),
 	t-gd								BIT STRING (SIZE(10))			OPTIONAL,
+	sisa								BIT STRING (SIZE(8)),
 	model-id							INTEGER(0..3)					OPTIONAL,
 	ie-Extensions						ProtocolExtensionContainer { { GANSS-SatelliteClockModelItem-ExtIEs } }	OPTIONAL,
 	...
@@ -1680,6 +1938,7 @@ GANSS-SatelliteInformationItem ::= SEQUENCE {
 }
 
 GANSS-SatelliteInformationItem-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	{ID id-GANSS-ExtraDopplerExtension	CRITICALITY ignore	EXTENSION GANSS-ExtraDopplerExtension		PRESENCE optional},
 	...
 }
 
@@ -1690,13 +1949,14 @@ GANSS-SatelliteInformationKPItem ::= SEQUENCE {
 	ganss-e-alm							BIT STRING (SIZE (11)),
 	ganss-delta-I-alm					BIT STRING (SIZE (11)),
 	ganss-omegadot-alm					BIT STRING (SIZE (11)),
-	ganss-svhealth-alm					BIT STRING (SIZE (4)),
-	ganss-delta-a-sqrt-alm				BIT STRING (SIZE (17)),
+	ganss-svStatusINAV-alm				BIT STRING (SIZE (4)),
+	ganss-svStatusFNAV-alm				BIT STRING (SIZE (2))			OPTIONAL,
+	ganss-delta-a-sqrt-alm				BIT STRING (SIZE (13)),
 	ganss-omegazero-alm					BIT STRING (SIZE (16)),
 	ganss-m-zero-alm					BIT STRING (SIZE (16)),
 	ganss-omega-alm						BIT STRING (SIZE (16)),
-	ganss-af-zero-alm					BIT STRING (SIZE (14)),
-	ganss-af-one-alm 					BIT STRING (SIZE (11)),
+	ganss-af-zero-alm					BIT STRING (SIZE (16)),
+	ganss-af-one-alm 					BIT STRING (SIZE (13)),
 	ie-Extensions						ProtocolExtensionContainer { { GANSS-SatelliteInformationKPItem-ExtIEs } }	OPTIONAL,
 	...
 }
@@ -1830,7 +2090,7 @@ Ganss-Sat-Info-AddNavList-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 
 GANSS-Sat-Info-Nav ::= SEQUENCE (SIZE(1..maxGANSSSat)) OF SEQUENCE {
 	satId						INTEGER(0..63),
-	svHealth					BIT STRING (SIZE(5)),
+	svHealth					BIT STRING (SIZE(9)),
 	iod							BIT STRING (SIZE(10)),
 	ganssClockModel				GANSS-Clock-Model,
 	ganssOrbitModel				GANSS-Orbit-Model,
@@ -1868,7 +2128,7 @@ GANSS-Time-Model ::= SEQUENCE {
 	ganss-t-a0							INTEGER(-2147483648..2147483647),
 	ganss-t-a1							INTEGER(-8388608..8388607)									OPTIONAL,
 	ganss-t-a2							INTEGER(-64..63)											OPTIONAL,
-	gnss-to-id							ENUMERATED{gps,...,galileo,qzss,glonass},
+	gnss-to-id							ENUMERATED{gps,...,galileo,qzss,glonass,bds},
 	ganss-wk-number						INTEGER(0..8191)											OPTIONAL,
 	ie-Extensions						ProtocolExtensionContainer { { GANSS-Time-Model-ExtIEs } }	OPTIONAL,
 	...
@@ -2035,7 +2295,7 @@ NavModel-NAVKeplerianSet-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 }
 
 NavModel-SBASecef ::= SEQUENCE {
-	-- the following IE shall be present if 'SBASclockModel' in 'GANSS-AddClockModels' is not included in 'Ganss-Sat-Info-AddNavList'
+	-- the following IE shall be present if ‘SBASclockModel’ in ‘GANSS-AddClockModels’ is not included in ‘Ganss-Sat-Info-AddNavList’
 	sbasTo					BIT STRING (SIZE (13))										OPTIONAL,
 	sbasAccuracy			BIT STRING (SIZE (4)),
 	sbasXg					BIT STRING (SIZE (30)),
@@ -2055,6 +2315,33 @@ NavModel-SBASecef-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+NavModel-BDSKeplerianSet ::= SEQUENCE {
+	uRAIndex-BDS			BIT STRING (SIZE (4)),
+	tOA-BDS					BIT STRING (SIZE (17)),
+	a1-2-BDS				BIT STRING (SIZE (32)),
+	e-BDS					BIT STRING (SIZE (32)),
+	oMG-BDS					BIT STRING (SIZE (32)),
+	dLTn-BDS				BIT STRING (SIZE (16)),
+	m0-BDS					BIT STRING (SIZE (32)),
+	oMG0-BDS				BIT STRING (SIZE (32)),
+	oMGdot-BDS				BIT STRING (SIZE (24)),
+	i0-BDS					BIT STRING (SIZE (32)),
+	iDOT-BDS				BIT STRING (SIZE (14)),
+	cuc-BDS					BIT STRING (SIZE (18)),
+	cus-BDS					BIT STRING (SIZE (18)),
+	crc-BDS					BIT STRING (SIZE (18)),
+	crs-BDS					BIT STRING (SIZE (18)),
+	cic-BDS					BIT STRING (SIZE (18)),
+	cis-BDS					BIT STRING (SIZE (18)),
+	aODE-BDS				BIT STRING (SIZE (5)),
+	ie-Extensions			ProtocolExtensionContainer { { NavModel-BDSKeplerianSet-ExtIEs } }	OPTIONAL,
+	...
+}
+
+NavModel-BDSKeplerianSet-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 SBASclockModel ::= SEQUENCE {
 	sbasTo					BIT STRING (SIZE (13)),
 	sbasAgfo				BIT STRING (SIZE (12)),
@@ -2067,6 +2354,21 @@ SBASclockModel-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+BDSClockModel ::= SEQUENCE {
+	toc-BDS				BIT STRING (SIZE (17) ),
+	a0-BDS				BIT STRING (SIZE (24) ),
+	a1-BDS				BIT STRING (SIZE (22) ),
+	a2-BDS				BIT STRING (SIZE (11) ),
+	tGD1-BDS			BIT STRING (SIZE (10) ),
+	aODC-BDS			BIT STRING (SIZE (5) ),
+	ie-Extensions		ProtocolExtensionContainer { { BDSClockModel-ExtIEs } }	OPTIONAL,
+	...
+}
+
+BDSClockModel-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 UTCmodelSet1 ::= SEQUENCE {
 	utcA0				BIT STRING (SIZE(16)),
 	utcA1				BIT STRING (SIZE(13)),
@@ -2116,6 +2418,23 @@ UTCmodelSet3-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+UTCmodelSet4 ::= SEQUENCE {
+	utca0-BDS			BIT STRING (SIZE(32)),
+	utca1-BDS			BIT STRING (SIZE(24)),
+	utcDeltatLS-BDS		BIT STRING (SIZE(8)),
+	utcWNt				BIT STRING (SIZE(8)),
+	utcDeltaTls			BIT STRING (SIZE(8)),
+	utcWNlsf-BDS		BIT STRING (SIZE(8)),
+	utcDN-BDS			BIT STRING (SIZE(8)),
+	utcDeltaTlsf-BDS	BIT STRING (SIZE(8)),
+	ie-Extensions		ProtocolExtensionContainer { { UTCmodelSet4-ExtIEs } }	OPTIONAL,
+	...
+}
+
+UTCmodelSet4-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 UTRAN-GANSSReferenceTimeDL ::= SEQUENCE {
 	utran-GANSSTimingOfCellFrames	INTEGER(0..3999999),
 	uC-ID							UC-ID																					OPTIONAL,
@@ -2428,7 +2747,7 @@ UTRAN-GPS-DriftRate ::=				ENUMERATED {
 									utran-GPSDrift25, utran-GPSDrift50, utran-GPSDrift-1,
 									utran-GPSDrift-2, utran-GPSDrift-5, utran-GPSDrift-10,
 									utran-GPSDrift-15, utran-GPSDrift-25, utran-GPSDrift-50,
-                                    ...}
+									...}
 
 -- **************************************************************
 --
@@ -2575,11 +2894,25 @@ GanssReqGenericData ::=				SEQUENCE {
 	...}
 
 GanssReqGenericData-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
-	{ID id-ganssAddNavigationModel-req		CRITICALITY	ignore	EXTENSION	GANSS-AddNavigationModel-Req	PRESENCE	optional}|
-	{ID id-ganssAddUTCModel-req				CRITICALITY	ignore	EXTENSION	GANSS-AddUTCModel-Req				PRESENCE	optional}|
-	{ID id-ganssAuxInfo-req					CRITICALITY	ignore	EXTENSION	GANSS-AuxInfo-req					PRESENCE	optional}|
-	{ID id-GANSS-SBAS-ID					CRITICALITY	ignore	EXTENSION	GANSS-SBAS-ID						PRESENCE	optional}|
-	{ID id-GANSS-AddADchoices				CRITICALITY	ignore	EXTENSION	GANSS-AddADchoices					PRESENCE	optional},
+	{ID id-ganssAddNavigationModel-req		CRITICALITY ignore	EXTENSION GANSS-AddNavigationModel-Req		PRESENCE optional}|
+	{ID id-ganssAddUTCModel-req				CRITICALITY ignore	EXTENSION GANSS-AddUTCModel-Req				PRESENCE optional}|
+	{ID id-ganssAuxInfo-req					CRITICALITY ignore	EXTENSION GANSS-AuxInfo-req					PRESENCE optional}|
+	{ID id-GANSS-SBAS-ID					CRITICALITY ignore	EXTENSION GANSS-SBAS-ID						PRESENCE optional}|
+	{ID id-GANSS-AddADchoices				CRITICALITY ignore	EXTENSION GANSS-AddADchoices				PRESENCE optional}|
+	{ID id-BDSIonosphericGridModel			CRITICALITY ignore	EXTENSION BDSIonosphericGridModel			PRESENCE optional}|
+	{ID id-DBDSCorrection					CRITICALITY ignore	EXTENSION DBDSCorrection					PRESENCE optional},
+	...
+}
+
+BDSIonosphericGridModel ::= BOOLEAN
+
+DBDSCorrection ::=	SEQUENCE {
+	dGANSSSignalBDS				BIT STRING (SIZE (8)),
+	iE-Extensions				ProtocolExtensionContainer { { DBDSCorrection-ExtIEs } }	OPTIONAL,
+	...
+}
+
+DBDSCorrection-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -2771,8 +3104,10 @@ GANSSGenericDataReq ::= SEQUENCE {
 	ganss-AddNavModelsReq				AddNavigationModelsGANSS				OPTIONAL,
 	ganss-AddUtcModelsReq				GANSS-AddUtcModelsReq					OPTIONAL,
 	ganss-AuxInfoReq					GANSS-AuxInfoReq						OPTIONAL,
-	-- the following IE shall be present if GANSSID is '0' (SBAS)
-	ganss-SBAS-ID						GANSS-SBAS-ID							OPTIONAL
+	-- the following IE shall be present if GANSSID is ‘0’ (SBAS)
+	ganss-SBAS-ID						GANSS-SBAS-ID							OPTIONAL,
+	dBDS-Corrections					DBDS-Corrections						OPTIONAL,
+	bDS-Ionospheric-Grid-Model-Request	BDS-Ionospheric-Grid-Model-Request		OPTIONAL
 }
 
 AddNavigationModelsGANSS ::= SEQUENCE {
@@ -2801,6 +3136,22 @@ AddSatelliteRelatedDataGANSS-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+BDS-Ionospheric-Grid-Model-Request ::= ENUMERATED 	{
+	requested,
+	...
+}
+
+DBDS-Corrections ::= SEQUENCE {
+	transmissionGanssTimeIndicator	TransmissionGanssTimeIndicator	OPTIONAL,
+	dGANSS-Signal					BIT STRING( SIZE (8)),
+	iE-Extensions					ProtocolExtensionContainer { { DBDS-Corrections-ExtIEs } } 	OPTIONAL,
+	...
+}
+
+DBDS-Corrections-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 GANSS-AddUtcModelsReq ::= SEQUENCE {
 	transmissionGanssTimeIndicator	TransmissionGanssTimeIndicator										OPTIONAL,
 	iE-Extensions					ProtocolExtensionContainer { { GANSS-AddUtcModelsReq-ExtIEs} }	OPTIONAL,
@@ -3329,13 +3680,17 @@ PositioningMethod ::= SEQUENCE {
 
 
 PositioningMethod-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
--- The following IE shall be present if the Selected Position Method IE value is set to "GNSS" or "OTDOA or GNSS"
-	{ ID id-GNSS-PositioningMethod	CRITICALITY ignore	EXTENSION GNSS-PositioningMethod	PRESENCE conditional },
+-- The following IE shall be present if the Selected Position Method IE value is set to "GNSS" or “OTDOA or GNSS”
+	{ ID id-GNSS-PositioningMethod			CRITICALITY ignore	EXTENSION GNSS-PositioningMethod		PRESENCE conditional}|
+-- This IE shall be present if the Selected Position Method IE value is set to “GPS and AddPos” or “OTDOA or GPS and AddPos”
+	{ ID id-Additional-PositioningMethod	CRITICALITY ignore	EXTENSION Additional-PositioningMethod	PRESENCE conditional},
 	...
 }
 
 GNSS-PositioningMethod ::= BIT STRING (SIZE(9))
 
+Additional-PositioningMethod ::= BIT STRING (SIZE(8))
+
 SelectedPositionMethod ::= ENUMERATED {
 	oTDOA,
 	gPS,
@@ -3344,7 +3699,9 @@ SelectedPositionMethod ::= ENUMERATED {
 	uTDOA,
 	...,
 	gNSS,
-	oTDOA-or-GNSS
+	oTDOA-or-GNSS,
+	gPS-and-AddPos,
+	oTDOA-or-GPS-and-AddPos
 }
 
 -- **************************************************************
@@ -3500,7 +3857,8 @@ UE-PositioningCapability ::= SEQUENCE {
 }
 
 UE-PositioningCapability-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-NetworkAssistedGANSSSuport			CRITICALITY ignore	EXTENSION NetworkAssistedGANSSSupport				PRESENCE optional },
+	{ ID id-NetworkAssistedGANSSSuport		CRITICALITY ignore	EXTENSION NetworkAssistedGANSSSupport		PRESENCE optional}|
+	{ ID id-AddPosSupport					CRITICALITY ignore	EXTENSION AddPosSupport						PRESENCE optional},
 	...
 }
 
@@ -3519,8 +3877,27 @@ NetworkAssistedGANSSSupport ::= SEQUENCE (SIZE (1..maxGANSS)) OF SEQUENCE {
 	...
 }
 
+AddPosSupport ::= SEQUENCE (SIZE (1..maxAddPos)) OF AddPosSupport-Element
+
+AddPosSupport-Element ::= SEQUENCE {
+	addPosID			ENUMERATED {
+							barometricPressure,
+							wLAN,
+							bluetooth,
+							mBS,
+							...
+						},
+	addPosMode			ENUMERATED {
+							standalone,
+							ue-assisted,
+							both,
+							...
+						},
+	...
+}
+
 NetworkAssistedGANSSSuport-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
-	-- the following IE shall be present if 'GANSSID' in 'NetworkAssistedGANSSSupport' is '0' (SBAS)
+	-- the following IE shall be present if ‘GANSSID’ in ‘NetworkAssistedGANSSSupport’ is ‘0’ (SBAS)
 	{ ID id-GANSS-SBAS-IDs					CRITICALITY ignore	EXTENSION GANSS-SBAS-IDs						PRESENCE optional }|
 	{ ID id-GANSS-Signal-IDs				CRITICALITY ignore	EXTENSION GANSS-Signal-IDs						PRESENCE optional }|
 	{ ID id-supportGANSSNonNativeADchoices	CRITICALITY ignore	EXTENSION SupportGANSSNonNativeADchoices	PRESENCE optional },
@@ -3858,6 +4235,7 @@ SFN-SFN-Drift ::= 					ENUMERATED {
 FineSFNSFN		::=	INTEGER (0..15)
 -- Range 0..0.9375 step size 0.0625
 
+
 -- **************************************************************
 --
 -- Vertical Accuracy Code
@@ -3939,7 +4317,7 @@ UTDOA-CELLDCH ::=		SEQUENCE {
 	compressedModeAssistanceData				Compressed-Mode-Assistance-Data		OPTIONAL,
 	dCH-Information								DCH-Information		OPTIONAL,
 	e-DPCH-Information							E-DPCH-Information	OPTIONAL,
-	iE-Extensions   				ProtocolExtensionContainer { { UTDOA-CELLDCH-ExtIEs} } OPTIONAL,
+	iE-Extensions								ProtocolExtensionContainer { { UTDOA-CELLDCH-ExtIEs} } OPTIONAL,
 	...
 }
 
@@ -4101,7 +4479,7 @@ TrChInfoList ::= SEQUENCE (SIZE(1..maxTrCH)) OF
 UL-TrCHInfo ::=		SEQUENCE {
 	uL-TrCHtype							UL-TrCHType,
 	tfs									TransportFormatSet,
-	iE-Extensions   					ProtocolExtensionContainer { { UL-TrCHInfo-ExtIEs} } OPTIONAL,
+	iE-Extensions						ProtocolExtensionContainer { { UL-TrCHInfo-ExtIEs} } OPTIONAL,
 	...
 }
 
@@ -4566,7 +4944,7 @@ UschParameters ::=	SEQUENCE {
 	uL-Timeslot-Information				UL-Timeslot-Information,
 	tFCS								TFCS,
 	trChInfo							TrChInfoList,
-	iE-Extensions   ProtocolExtensionContainer { { UschParameters-ExtIEs} } OPTIONAL,
+	iE-Extensions						ProtocolExtensionContainer { { UschParameters-ExtIEs} } OPTIONAL,
 	...
 }
 
diff --git a/epan/dissectors/asn1/pcap/PCAP-PDU-Contents.asn b/epan/dissectors/asn1/pcap/PCAP-PDU-Contents.asn
index a9d5b2c32b..dc759c404b 100644
--- a/epan/dissectors/asn1/pcap/PCAP-PDU-Contents.asn
+++ b/epan/dissectors/asn1/pcap/PCAP-PDU-Contents.asn
@@ -1,5 +1,5 @@
 --
--- 3GPP TS 25.453  V11.0.0 (2012-09)
+-- 3GPP TS 25.453 V17.0.0 (2022-04)
 --
 --9.3.3	PDU Definitions
 -- **************************************************************
@@ -9,10 +9,10 @@
 -- **************************************************************
 
 PCAP-PDU-Contents {
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
 umts-Access (20) modules (3) pcap(4) version1 (1) pcap-PDU-Contents (1) }
 
-DEFINITIONS AUTOMATIC TAGS ::= 
+DEFINITIONS AUTOMATIC TAGS ::=
 
 BEGIN
 
@@ -39,8 +39,8 @@ IMPORTS
 	HorizontalAccuracyCode,
 	VerticalAccuracyCode,
 	RequestType,
-	UE-PositioningCapability, 
-	UC-ID, 
+	UE-PositioningCapability,
+	UC-ID,
 	ResponseTime,
 	PositioningPriority,
 	ClientType,
@@ -71,7 +71,9 @@ IMPORTS
 	OTDOA-ReferenceCellInfoSAS-centric,
 	CellId-IRATMeasuredResultsSets,
 	IMSI,
-	IMEI
+	IMEI,
+	AddPos-MeasuredResults
+
 
 FROM PCAP-IEs
 
@@ -110,7 +112,7 @@ FROM PCAP-Containers
 	id-HorizontalAccuracyCode,
 	id-VerticalAccuracyCode,
 	id-RequestType,
-	id-UE-PositioningCapability, 
+	id-UE-PositioningCapability,
 	id-UC-id,
 	id-ResponseTime,
 	id-PositioningPriority,
@@ -143,14 +145,15 @@ FROM PCAP-Containers
 	id-OTDOA-ReferenceCellInfo,
 	id-CellId-IRATMeasuredResultsSets,
 	id-IMSI,
-	id-IMEI
+	id-IMEI,
+	id-AddPos-MeasuredResults
 
 
 FROM PCAP-Constants;
 
 -- **************************************************************
 --
--- POSITION CALCULATION REQUEST
+-- Position Calculation Request
 --
 -- **************************************************************
 
@@ -184,7 +187,7 @@ PositionCalculationRequestExtensions PCAP-PROTOCOL-EXTENSION ::= {
 
 -- **************************************************************
 --
--- POSITION CALCULATION RESPONSE
+-- Position Calculation Response
 --
 -- **************************************************************
 
@@ -208,7 +211,7 @@ PositionCalculationResponseExtensions PCAP-PROTOCOL-EXTENSION ::= {
 
 -- **************************************************************
 --
--- POSITION CALCULATION FAILURE
+-- Position Calculation Failure
 --
 -- **************************************************************
 
@@ -364,8 +367,8 @@ InformationExchangeInitiationFailure-Extensions PCAP-PROTOCOL-EXTENSION ::= {
 -- **************************************************************
 
 PositionInitiationRequest ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {PositionInitiationRequestIEs} },
-	protocolExtensions	ProtocolExtensionContainer { {PositionInitiationRequestExtensions} } 	OPTIONAL,
+	protocolIEs			ProtocolIE-Container		{ {PositionInitiationRequestIEs} },
+	protocolExtensions	ProtocolExtensionContainer	{ {PositionInitiationRequestExtensions} } 	OPTIONAL,
 	...
 }
 
@@ -444,8 +447,8 @@ PositionInitiationFailureExtensions PCAP-PROTOCOL-EXTENSION ::= {
 -- **************************************************************
 
 PositionActivationRequest ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {PositionActivationRequestIEs} },
-	protocolExtensions	ProtocolExtensionContainer { {PositionActivationRequestExtensions} } OPTIONAL,
+	protocolIEs			ProtocolIE-Container		{ {PositionActivationRequestIEs} },
+	protocolExtensions	ProtocolExtensionContainer	{ {PositionActivationRequestExtensions} } OPTIONAL,
 	...
 }
 
@@ -460,7 +463,7 @@ PositionActivationRequestIEs PCAP-PROTOCOL-IES ::= {
 	...
 }
 
-PositionActivationRequestExtensions PCAP-PROTOCOL-EXTENSION ::= { 
+PositionActivationRequestExtensions PCAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-IncludeVelocity				CRITICALITY ignore	EXTENSION IncludeVelocity				PRESENCE optional } |
 	{ ID id-AmountOfReporting			CRITICALITY ignore	EXTENSION AmountOfReporting				PRESENCE optional } |
 	{ ID id-CellIDPositioning			CRITICALITY ignore	EXTENSION CellIDPositioning				PRESENCE optional }|
@@ -472,18 +475,18 @@ PositionActivationRequestExtensions PCAP-PROTOCOL-EXTENSION ::= {
 -- **************************************************************
 --
 -- POSITION ACTIVATION RESPONSE
--- 
+--
 -- **************************************************************
 
 PositionActivationResponse ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {PositionActivationResponseIEs} },
-	protocolExtensions	ProtocolExtensionContainer { {PositionActivationResponseExtensions} } 	OPTIONAL,
+	protocolIEs			ProtocolIE-Container		{ {PositionActivationResponseIEs} },
+	protocolExtensions	ProtocolExtensionContainer	{ {PositionActivationResponseExtensions} } 	OPTIONAL,
 	...
 }
 
 PositionActivationResponseIEs PCAP-PROTOCOL-IES ::= {
 	{ ID id-UE-PositionEstimateInfo			CRITICALITY ignore	TYPE UE-PositionEstimateInfo		PRESENCE optional } |
-	{ ID id-GPS-MeasuredResultsList			CRITICALITY reject	TYPE MeasuredResultsList			PRESENCE optional } | 
+	{ ID id-GPS-MeasuredResultsList			CRITICALITY reject	TYPE MeasuredResultsList			PRESENCE optional } |
 	{ ID id-CellId-MeasuredResultsSets		CRITICALITY reject	TYPE CellId-MeasuredResultsSets		PRESENCE optional } |
 	{ ID id-OTDOA-MeasuredResultsSets		CRITICALITY reject	TYPE OTDOA-MeasuredResultsSets		PRESENCE optional } |
 	{ ID id-UTDOA-Group						CRITICALITY reject	TYPE UTDOA-Group					PRESENCE optional },
@@ -491,13 +494,14 @@ PositionActivationResponseIEs PCAP-PROTOCOL-IES ::= {
 }
 
 PositionActivationResponseExtensions PCAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-VelocityEstimate						CRITICALITY ignore	EXTENSION VelocityEstimate							PRESENCE optional } |
-	{ ID id-MeasInstructionsUsed					CRITICALITY ignore	EXTENSION MeasInstructionsUsed						PRESENCE optional } |
-	{ ID id-GANSS-MeasuredResultsList				CRITICALITY reject	EXTENSION GANSS-MeasuredResultsList				PRESENCE optional } |
-	{ ID id-AdditionalGPSAssistDataRequired			CRITICALITY ignore	EXTENSION AdditionalGPSAssistDataRequired		PRESENCE optional } |
-	{ ID id-AdditionalGanssAssistDataRequired		CRITICALITY ignore	EXTENSION AdditionalGanssAssistDataRequired		PRESENCE optional } |
-	{ ID id-OTDOA-ReferenceCellInfo					CRITICALITY reject	EXTENSION OTDOA-ReferenceCellInfoSAS-centric	PRESENCE optional } |
-	{ ID id-CellId-IRATMeasuredResultsSets			CRITICALITY ignore	EXTENSION CellId-IRATMeasuredResultsSets			PRESENCE optional },
+	{ ID id-VelocityEstimate					CRITICALITY ignore	EXTENSION VelocityEstimate					PRESENCE optional}|
+	{ ID id-MeasInstructionsUsed				CRITICALITY ignore	EXTENSION MeasInstructionsUsed			PRESENCE optional}|
+	{ ID id-GANSS-MeasuredResultsList			CRITICALITY reject	EXTENSION GANSS-MeasuredResultsList			PRESENCE optional}|
+	{ ID id-AdditionalGPSAssistDataRequired		CRITICALITY ignore	EXTENSION AdditionalGPSAssistDataRequired		PRESENCE optional}|
+	{ ID id-AdditionalGanssAssistDataRequired	CRITICALITY ignore	EXTENSION AdditionalGanssAssistDataRequired		PRESENCE optional}|
+	{ ID id-OTDOA-ReferenceCellInfo				CRITICALITY reject	EXTENSION OTDOA-ReferenceCellInfoSAS-centric		PRESENCE optional}|
+	{ ID id-CellId-IRATMeasuredResultsSets		CRITICALITY ignore	EXTENSION CellId-IRATMeasuredResultsSets		PRESENCE optional}|
+	{ ID id-AddPos-MeasuredResults				CRITICALITY reject	EXTENSION AddPos-MeasuredResults			PRESENCE optional},
 	...
 }
 
@@ -509,8 +513,8 @@ PositionActivationResponseExtensions PCAP-PROTOCOL-EXTENSION ::= {
 -- **************************************************************
 
 PositionActivationFailure ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {PositionActivationFailureIEs} },
-	protocolExtensions	ProtocolExtensionContainer { {PositionActivationFailureExtensions} } 	OPTIONAL,
+	protocolIEs			ProtocolIE-Container		{ {PositionActivationFailureIEs} },
+	protocolExtensions	ProtocolExtensionContainer	{ {PositionActivationFailureExtensions} } 	OPTIONAL,
 	...
 }
 
@@ -611,7 +615,7 @@ InformationExchangeFailureIndication-Extensions PCAP-PROTOCOL-EXTENSION ::= {
 
 -- **************************************************************
 --
--- ERROR INDICATION
+-- Error Indication
 --
 -- **************************************************************
 
@@ -638,8 +642,8 @@ ErrorIndicationExtensions PCAP-PROTOCOL-EXTENSION ::= {
 -- **************************************************************
 
 PositionParameterModification ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {PositionParameterModificationIEs} },
-	protocolExtensions	ProtocolExtensionContainer { {PositionParameterModificationExtensions} } 	OPTIONAL,
+	protocolIEs			ProtocolIE-Container		{ {PositionParameterModificationIEs} },
+	protocolExtensions	ProtocolExtensionContainer	{ {PositionParameterModificationExtensions} } 	OPTIONAL,
 	...
 }
 
@@ -661,7 +665,7 @@ PositionParameterModificationExtensions PCAP-PROTOCOL-EXTENSION ::= {
 -- **************************************************************
 
 PrivateMessage ::= SEQUENCE {
-	privateIEs		PrivateIE-Container  {{PrivateMessage-IEs}},
+	privateIEs		PrivateIE-Container	{{PrivateMessage-IEs}},
 	...
 }
 
@@ -676,8 +680,8 @@ PrivateMessage-IEs PCAP-PRIVATE-IES ::= {
 -- **************************************************************
 
 Abort ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {AbortIEs} },
-	protocolExtensions	ProtocolExtensionContainer { {AbortExtensions} } 	OPTIONAL,
+	protocolIEs			ProtocolIE-Container		{ {AbortIEs} },
+	protocolExtensions	ProtocolExtensionContainer	{ {AbortExtensions} } 	OPTIONAL,
 	...
 }
 
@@ -686,7 +690,7 @@ AbortIEs PCAP-PROTOCOL-IES ::= {
 	...
 }
 
-AbortExtensions PCAP-PROTOCOL-EXTENSION ::= { 
+AbortExtensions PCAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -707,7 +711,7 @@ PositionPeriodicReport ::= SEQUENCE {
 PositionPeriodicReport-IEs PCAP-PROTOCOL-IES ::= {
 	{ ID id-UE-PositionEstimateInfo			CRITICALITY ignore	TYPE UE-PositionEstimateInfo		PRESENCE optional } |
 	{ ID id-VelocityEstimate				CRITICALITY ignore	TYPE VelocityEstimate				PRESENCE optional } |
-	{ ID id-GPS-MeasuredResultsList			CRITICALITY ignore	TYPE MeasuredResultsList			PRESENCE optional } | 
+	{ ID id-GPS-MeasuredResultsList			CRITICALITY ignore	TYPE MeasuredResultsList			PRESENCE optional } |
 	{ ID id-CellId-MeasuredResultsSets		CRITICALITY ignore	TYPE CellId-MeasuredResultsSets		PRESENCE optional } |
 	{ ID id-OTDOA-MeasuredResultsSets		CRITICALITY ignore	TYPE OTDOA-MeasuredResultsSets		PRESENCE optional } |
 	{ ID id-Cause							CRITICALITY ignore	TYPE Cause							PRESENCE optional } ,
@@ -715,11 +719,12 @@ PositionPeriodicReport-IEs PCAP-PROTOCOL-IES ::= {
 }
 
 PositionPeriodicReport-Extensions PCAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-GANSS-MeasuredResultsList				CRITICALITY ignore	EXTENSION GANSS-MeasuredResultsList				PRESENCE optional } |
-	{ ID id-AdditionalGPSAssistDataRequired			CRITICALITY ignore	EXTENSION AdditionalGPSAssistDataRequired		PRESENCE optional } |
-	{ ID id-AdditionalGanssAssistDataRequired		CRITICALITY ignore	EXTENSION AdditionalGanssAssistDataRequired		PRESENCE optional } |
-	{ ID id-OTDOA-ReferenceCellInfo					CRITICALITY reject	EXTENSION OTDOA-ReferenceCellInfoSAS-centric	PRESENCE optional } |
-	{ ID id-CellId-IRATMeasuredResultsSets			CRITICALITY ignore	EXTENSION CellId-IRATMeasuredResultsSets			PRESENCE optional },
+	{ ID id-GANSS-MeasuredResultsList				CRITICALITY ignore	EXTENSION GANSS-MeasuredResultsList		PRESENCE optional}|
+	{ ID id-AdditionalGPSAssistDataRequired			CRITICALITY ignore	EXTENSION AdditionalGPSAssistDataRequired	PRESENCE optional}|
+	{ ID id-AdditionalGanssAssistDataRequired		CRITICALITY ignore	EXTENSION AdditionalGanssAssistDataRequired	PRESENCE optional}|
+	{ ID id-OTDOA-ReferenceCellInfo					CRITICALITY reject	EXTENSION OTDOA-ReferenceCellInfoSAS-centric	PRESENCE optional}|
+	{ ID id-CellId-IRATMeasuredResultsSets			CRITICALITY ignore	EXTENSION CellId-IRATMeasuredResultsSets		PRESENCE optional}|
+	{ ID id-AddPos-MeasuredResults					CRITICALITY ignore	EXTENSION AddPos-MeasuredResults			PRESENCE optional},
 	...
 }
 
@@ -730,8 +735,8 @@ PositionPeriodicReport-Extensions PCAP-PROTOCOL-EXTENSION ::= {
 -- **************************************************************
 
 PositionPeriodicResult ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       {{PositionPeriodicResult-IEs}},
-	protocolExtensions	ProtocolExtensionContainer {{PositionPeriodicResult-Extensions}} 	OPTIONAL,
+	protocolIEs			ProtocolIE-Container		{{PositionPeriodicResult-IEs}},
+	protocolExtensions	ProtocolExtensionContainer	{{PositionPeriodicResult-Extensions}} 	OPTIONAL,
 	...
 }
 
@@ -755,8 +760,8 @@ PositionPeriodicResult-Extensions PCAP-PROTOCOL-EXTENSION ::= {
 -- **************************************************************
 
 PositionPeriodicTermination ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       {{PositionPeriodicTermination-IEs}},
-	protocolExtensions	ProtocolExtensionContainer {{PositionPeriodicTermination-Extensions}} 	OPTIONAL,
+	protocolIEs			ProtocolIE-Container		{{PositionPeriodicTermination-IEs}},
+	protocolExtensions	ProtocolExtensionContainer	{{PositionPeriodicTermination-Extensions}} 	OPTIONAL,
 	...
 }
 
@@ -765,7 +770,7 @@ PositionPeriodicTermination-IEs PCAP-PROTOCOL-IES ::= {
 	...
 }
 
-PositionPeriodicTermination-Extensions PCAP-PROTOCOL-EXTENSION ::= { 
+PositionPeriodicTermination-Extensions PCAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 END
diff --git a/epan/dissectors/asn1/pcap/PCAP-PDU-Descriptions.asn b/epan/dissectors/asn1/pcap/PCAP-PDU-Descriptions.asn
index f67bdd2817..b9fb0c4af1 100644
--- a/epan/dissectors/asn1/pcap/PCAP-PDU-Descriptions.asn
+++ b/epan/dissectors/asn1/pcap/PCAP-PDU-Descriptions.asn
@@ -1,5 +1,5 @@
 --
--- 3GPP TS 25.453 V11.0.0 (2012-09)
+-- 3GPP TS 25.453 V17.0.0 (2022-04)
 --
 -- 9.3.2	Elementary Procedure Definitions
 -- **************************************************************
@@ -8,11 +8,11 @@
 --
 -- **************************************************************
 
-PCAP-PDU-Descriptions { 
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
+PCAP-PDU-Descriptions {
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
 umts-Access (20) modules (3) pcap(4) version1 (1) pcap-PDU-Descriptions (0)}
 
-DEFINITIONS AUTOMATIC TAGS ::= 
+DEFINITIONS AUTOMATIC TAGS ::=
 
 BEGIN
 
diff --git a/epan/dissectors/asn1/pcap/packet-pcap-template.c b/epan/dissectors/asn1/pcap/packet-pcap-template.c
index 120e63fbf7..535423eafc 100644
--- a/epan/dissectors/asn1/pcap/packet-pcap-template.c
+++ b/epan/dissectors/asn1/pcap/packet-pcap-template.c
@@ -11,7 +11,7 @@
  *
  * Based on the RANAP dissector
  *
- * References: ETSI TS 125 453 V7.9.0 (2008-02)
+ * References: ETSI TS 125 453 V17.0.0 (2022-04)
  */
 
 #include "config.h"
diff --git a/epan/dissectors/asn1/pcap/pcap.cnf b/epan/dissectors/asn1/pcap/pcap.cnf
index c5c99a0049..346471b0e8 100644
--- a/epan/dissectors/asn1/pcap/pcap.cnf
+++ b/epan/dissectors/asn1/pcap/pcap.cnf
@@ -274,6 +274,19 @@ id-requestedCellIDGERANMeasurements				ProtocolIE-ID
 id-CellId-IRATMeasuredResultsSets				ProtocolIE-ID
 id-IMSI											ProtocolIE-ID
 id-IMEI											ProtocolIE-ID
+id-GANSS-alm-keplerianBDSAlmanac				ProtocolIE-ID
+id-BDS-Ionospheric-Grid-Model					ProtocolIE-ID
+id-DBDS-Correction-Information					ProtocolIE-ID
+id-BDSIonosphericGridModel						ProtocolIE-ID
+id-DBDSCorrection								ProtocolIE-ID
+id-Confidence									ProtocolIE-ID
+id-ExtraDopplerInfoExtension					ProtocolIE-ID
+id-GANSS-Confidence								ProtocolIE-ID
+id-GANSS-ExtraDopplerExtension					ProtocolIE-ID
+id-Additional-PositioningDataSet				ProtocolIE-ID
+id-Additional-PositioningMethod					ProtocolIE-ID
+id-AddPos-MeasuredResults						ProtocolIE-ID
+id-AddPosSupport								ProtocolIE-ID
 
 #.END
 
@@ -316,6 +329,7 @@ UE-PositionEstimateInfo							N pcap.ies id-UE-PositionEstimateInfo
 OTDOA-MeasuredResultsSets						N pcap.ies id-OTDOA-MeasuredResultsSets
 PeriodicPosCalcInfo								N pcap.ies id-PeriodicPosCalcInfo
 PeriodicTerminationCause						N pcap.ies id-PeriodicTerminationCause
+GANSS-ALM-BDSKeplericanset						N pcap.ies id-GANSS-alm-keplerianBDSAlmanac
 
 #PCAP-PROTOCOL-EXTENSION
 CellId-MeasuredResultsSets						N pcap.extension id-CellId-MeasuredResultsSets
@@ -396,7 +410,18 @@ RequestedCellIDGERANMeasurements				N pcap.extension id-requestedCellIDGERANMeas
 CellId-IRATMeasuredResultsSets					N pcap.extension id-CellId-IRATMeasuredResultsSets
 IMSI											N pcap.extension id-IMSI
 IMEI											N pcap.extension id-IMEI
-
+BDS-Ionospheric-Grid-Model					N pcap.extension id-BDS-Ionospheric-Grid-Model
+DBDS-Correction-Information					N pcap.extension id-DBDS-Correction-Information
+BDSIonosphericGridModel						N pcap.extension id-BDSIonosphericGridModel
+DBDSCorrection							N pcap.extension id-DBDSCorrection
+Confidence							N pcap.extension id-Confidence
+ExtraDopplerInfoExtension					N pcap.extension id-ExtraDopplerInfoExtension
+Confidence							N pcap.extension id-GANSS-Confidence
+GANSS-ExtraDopplerExtension					N pcap.extension id-GANSS-ExtraDopplerExtension
+Additional-PositioningDataSet					N pcap.extension id-Additional-PositioningDataSet
+Additional-PositioningMethod					N pcap.extension id-Additional-PositioningMethod
+AddPos-MeasuredResults						N pcap.extension id-AddPos-MeasuredResults
+AddPosSupport							N pcap.extension id-AddPosSupport
 
 #PCAP-ELEMENTARY-PROCEDURE