osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

LPP: upgrade dissector to v12.3.0 

Change-Id: Ibc2aa3127efcfbae33e6f3729d0e1e427db1c0fe
Reviewed-on: https://code.wireshark.org/review/6959
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2015-02-04 22:35:24 +01:00
parent 40d06bd6ea
commit 86d24b0486
6 changed files with 2747 additions and 550 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

400
asn1/lpp/LPP.asn
View File

@ -1,8 +1,8 @@
-- 3GPP TS 36.355 V11.6.0 (2014-06)
-- 3GPP TS 36.355 V12.3.0 (2014-12)
--
LPP-PDU-Definitions {
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
eps-Access (21) modules (3) lpp (7) version1 (1) lpp-PDU-Definitions (1) }
DEFINITIONS AUTOMATIC TAGS ::=
@ -215,11 +215,11 @@ AccessTypes ::= SEQUENCE {
}
ARFCN-ValueEUTRA ::= INTEGER (0..maxEARFCN)
ARFCN-ValueEUTRA ::= INTEGER (0..maxEARFCN)
ARFCN-ValueEUTRA-v9a0 ::= INTEGER (maxEARFCN-Plus1..maxEARFCN2)
maxEARFCN INTEGER ::= 65535 -- Maximum value of EUTRA carrier frequency
maxEARFCN INTEGER ::= 65535 -- Maximum value of EUTRA carrier frequency
maxEARFCN-Plus1 INTEGER ::= 65536 -- Lowest value extended EARFCN range
@ -340,7 +340,7 @@ EPDU-ID ::= INTEGER (1..256)
EPDU-Name ::= VisibleString (SIZE (1..32))
EPDU-Body ::= OCTET STRING
EPDU-Body ::= OCTET STRING
HorizontalVelocity ::= SEQUENCE {
@ -448,7 +448,7 @@ CommonIEsRequestLocationInformation ::= SEQUENCE {
LocationInformationType ::= ENUMERATED {
locationEstimateRequired,
locationMeasurementsRequired,
locationEstimatePreferred,
locationEstimatePreferred,
locationMeasurementsPreferred,
...
}
@ -483,9 +483,9 @@ QoS ::= SEQUENCE {
verticalCoordinateRequest BOOLEAN,
verticalAccuracy VerticalAccuracy OPTIONAL, -- Need ON
responseTime ResponseTime OPTIONAL, -- Need ON
velocityRequest BOOLEAN,
velocityRequest BOOLEAN,
...
}
}
HorizontalAccuracy ::= SEQUENCE {
accuracy INTEGER(0..127),
@ -494,14 +494,16 @@ HorizontalAccuracy ::= SEQUENCE {
}
VerticalAccuracy ::= SEQUENCE {
accuracy INTEGER(0..127),
accuracy INTEGER(0..127),
confidence INTEGER(0..100),
...
}
ResponseTime ::= SEQUENCE {
time INTEGER (1..128),
...
time INTEGER (1..128),
...,
[[ responseTimeEarlyFix-r12 INTEGER (1..128) OPTIONAL -- Need ON
]]
}
Environment ::= ENUMERATED {
@ -516,7 +518,9 @@ CommonIEsProvideLocationInformation ::= SEQUENCE {
locationEstimate LocationCoordinates OPTIONAL,
velocityEstimate Velocity OPTIONAL,
locationError LocationError OPTIONAL,
...
...,
[[ earlyFixReport-r12 EarlyFixReport-r12 OPTIONAL
]]
}
LocationCoordinates ::= CHOICE {
@ -548,11 +552,16 @@ LocationError ::= SEQUENCE {
LocationFailureCause ::= ENUMERATED {
undefined,
requestedMethodNotSupported,
positionMethodFailure,
positionMethodFailure,
periodicLocationMeasurementsNotAvailable,
...
}
EarlyFixReport-r12 ::= ENUMERATED {
noMoreMessages,
moreMessagesOnTheWay
}
CommonIEsAbort ::= SEQUENCE {
abortCause ENUMERATED {
@ -568,7 +577,7 @@ CommonIEsAbort ::= SEQUENCE {
CommonIEsError ::= SEQUENCE {
errorCause ENUMERATED {
undefined,
lppMessageHeaderError,
lppMessageHeaderError,
lppMessageBodyError,
epduError,
incorrectDataValue,
@ -621,7 +630,7 @@ OTDOA-NeighbourCellInfoElement ::= SEQUENCE {
physCellId INTEGER (0..503),
cellGlobalId ECGI OPTIONAL, -- Need ON
earfcn ARFCN-ValueEUTRA OPTIONAL, -- Cond NotSameAsRef0
cpLength ENUMERATED {normal, extended, ...}
cpLength ENUMERATED {normal, extended, ...}
OPTIONAL, -- Cond NotSameAsRef1
prsInfo PRS-Info OPTIONAL, -- Cond NotSameAsRef2
antennaPortConfig ENUMERATED {ports-1-or-2, ports-4, ...}
@ -781,19 +790,24 @@ GNSS-GenericAssistDataElement ::= SEQUENCE {
gnss-Almanac GNSS-Almanac OPTIONAL, -- Need ON
gnss-UTC-Model GNSS-UTC-Model OPTIONAL, -- Need ON
gnss-AuxiliaryInformation GNSS-AuxiliaryInformation OPTIONAL, -- Need ON
...
...,
[[
bds-DifferentialCorrections-r12
BDS-DifferentialCorrections-r12 OPTIONAL, -- Cond GNSS-ID-BDS
bds-GridModel-r12 BDS-GridModelParameter-r12 OPTIONAL -- Cond GNSS-ID-BDS
]]
}
GNSS-ReferenceTime ::= SEQUENCE {
gnss-SystemTime GNSS-SystemTime,
referenceTimeUnc INTEGER (0..127) OPTIONAL, -- Cond noFTA
gnss-ReferenceTimeForCells SEQUENCE (SIZE (1..16)) OF
gnss-ReferenceTimeForCells SEQUENCE (SIZE (1..16)) OF
GNSS-ReferenceTimeForOneCell OPTIONAL, -- Need ON
...
}
GNSS-ReferenceTimeForOneCell ::= SEQUENCE {
GNSS-ReferenceTimeForOneCell ::= SEQUENCE {
networkTime NetworkTime,
referenceTimeUnc INTEGER (0..127),
bsAlign ENUMERATED {true} OPTIONAL,
@ -828,13 +842,13 @@ NetworkTime ::= SEQUENCE {
secondsFromFrameStructureStart INTEGER(0..12533),
fractionalSecondsFromFrameStructureStart INTEGER(0..3999999),
frameDrift INTEGER (-64..63) OPTIONAL, -- Cond GNSSsynch
cellID CHOICE {
cellID CHOICE {
eUTRA SEQUENCE {
physCellId INTEGER (0..503),
cellGlobalIdEUTRA CellGlobalIdEUTRA-AndUTRA OPTIONAL, -- Need ON
earfcn ARFCN-ValueEUTRA,
...,
[[ earfcn-v9a0 ARFCN-ValueEUTRA-v9a0 OPTIONAL -- Cond EARFCN-max
[[ earfcn-v9a0 ARFCN-ValueEUTRA-v9a0 OPTIONAL -- Cond EARFCN-max
]]
},
uTRA SEQUENCE {
@ -892,9 +906,9 @@ KlobucharModelParameter ::= SEQUENCE {
NeQuickModelParameter ::= SEQUENCE {
ai0 INTEGER (0..4095),
ai1 INTEGER (0..4095),
ai2 INTEGER (0..4095),
ai0 INTEGER (0..2047),
ai1 INTEGER (-1024..1023),
ai2 INTEGER (-8192..8191),
ionoStormFlag1 INTEGER (0..1) OPTIONAL, -- Need OP
ionoStormFlag2 INTEGER (0..1) OPTIONAL, -- Need OP
ionoStormFlag3 INTEGER (0..1) OPTIONAL, -- Need OP
@ -939,7 +953,7 @@ GNSS-DifferentialCorrections ::= SEQUENCE {
DGNSS-SgnTypeList ::= SEQUENCE (SIZE (1..3)) OF DGNSS-SgnTypeElement
DGNSS-SgnTypeElement ::= SEQUENCE {
gnss-SignalID GNSS-SignalID,
gnss-SignalID GNSS-SignalID,
gnss-StatusHealth INTEGER (0..7),
dgnss-SatList DGNSS-SatList,
...
@ -950,17 +964,17 @@ DGNSS-SatList ::= SEQUENCE (SIZE (1..64)) OF DGNSS-CorrectionsElement
DGNSS-CorrectionsElement ::= SEQUENCE {
svID SV-ID,
iod BIT STRING (SIZE(11)),
udre INTEGER (0..3),
udre INTEGER (0..3),
pseudoRangeCor INTEGER (-2047..2047),
rangeRateCor INTEGER (-127..127),
udreGrowthRate INTEGER (0..7) OPTIONAL, -- Need ON
udreValidityTime INTEGER (0..7) OPTIONAL, -- Need ON
udreValidityTime INTEGER (0..7) OPTIONAL, -- Need ON
...
}
GNSS-NavigationModel ::= SEQUENCE {
nonBroadcastIndFlag INTEGER (0..1),
nonBroadcastIndFlag INTEGER (0..1),
gnss-SatelliteList GNSS-NavModelSatelliteList,
...
}
@ -969,11 +983,13 @@ GNSS-NavModelSatelliteList ::= SEQUENCE (SIZE(1..64)) OF GNSS-NavModelSatelliteE
GNSS-NavModelSatelliteElement ::= SEQUENCE {
svID SV-ID,
svHealth BIT STRING (SIZE(8)),
iod BIT STRING (SIZE(11)),
svHealth BIT STRING (SIZE(8)),
iod BIT STRING (SIZE(11)),
gnss-ClockModel GNSS-ClockModel,
gnss-OrbitModel GNSS-OrbitModel,
...
...,
[[ svHealthExt-v12xy BIT STRING (SIZE(4)) OPTIONAL -- Need ON
]]
}
GNSS-ClockModel ::= CHOICE {
@ -982,8 +998,9 @@ GNSS-ClockModel ::= CHOICE {
cnav-ClockModel CNAV-ClockModel, -- Model-3
glonass-ClockModel GLONASS-ClockModel, -- Model-4
sbas-ClockModel SBAS-ClockModel, -- Model-5
...
}
...,
bds-ClockModel-r12 BDS-ClockModel-r12 -- Model-6
}
GNSS-OrbitModel ::= CHOICE {
keplerianSet NavModelKeplerianSet, -- Model-1
@ -991,21 +1008,23 @@ GNSS-OrbitModel ::= CHOICE {
cnav-KeplerianSet NavModelCNAV-KeplerianSet, -- Model-3
glonass-ECEF NavModel-GLONASS-ECEF, -- Model-4
sbas-ECEF NavModel-SBAS-ECEF, -- Model-5
...
...,
bds-KeplerianSet-r12 NavModel-BDS-KeplerianSet-r12 -- Model-6
}
StandardClockModelList ::= SEQUENCE (SIZE(1..2)) OF StandardClockModelElement
StandardClockModelElement ::= SEQUENCE {
stanClockToc INTEGER (0..16383),
stanClockAF2 INTEGER (-2048..2047),
stanClockAF1 INTEGER (-131072..131071),
stanClockAF0 INTEGER (-134217728..134217727),
stanClockTgd INTEGER (-512..511) OPTIONAL, -- Need ON
stanModelID INTEGER (0..1) OPTIONAL, -- Need ON
...
}
stanClockToc INTEGER (0..16383),
stanClockAF2 INTEGER (-32..31),
stanClockAF1 INTEGER (-1048576..1048575),
stanClockAF0 INTEGER (-1073741824..1073741823),
stanClockTgd INTEGER (-512..511) OPTIONAL, -- Need ON
sisa INTEGER (0..255),
stanModelID INTEGER (0..1) OPTIONAL, -- Need ON
...
}
NAV-ClockModel ::= SEQUENCE {
@ -1054,8 +1073,19 @@ SBAS-ClockModel ::= SEQUENCE {
}
BDS-ClockModel-r12 ::= SEQUENCE {
bdsAODC-r12 INTEGER (0..31),
bdsToc-r12 INTEGER (0..131071),
bdsA0-r12 INTEGER (-8388608..8388607),
bdsA1-r12 INTEGER (-2097152..2097151),
bdsA2-r12 INTEGER (-1024..1023),
bdsTgd1-r12 INTEGER (-512..511),
...
}
NavModelKeplerianSet ::= SEQUENCE {
keplerToe INTEGER (0 .. 16383),
keplerToe INTEGER (0 .. 16383),
keplerW INTEGER (-2147483648..2147483647),
keplerDeltaN INTEGER (-32768..32767),
keplerM0 INTEGER (-2147483648..2147483647),
@ -1167,7 +1197,30 @@ NavModel-SBAS-ECEF ::= SEQUENCE {
}
GNSS-RealTimeIntegrity ::= SEQUENCE {
NavModel-BDS-KeplerianSet-r12 ::= SEQUENCE {
bdsAODE-r12 INTEGER (0..31),
bdsURAI-r12 INTEGER (0..15),
bdsToe-r12 INTEGER (0..131071),
bdsAPowerHalf-r12 INTEGER (0..4294967295),
bdsE-r12 INTEGER (0..4294967295),
bdsW-r12 INTEGER (-2147483648..2147483647),
bdsDeltaN-r12 INTEGER (-32768..32767),
bdsM0-r12 INTEGER (-2147483648..2147483647),
bdsOmega0-r12 INTEGER (-2147483648..2147483647),
bdsOmegaDot-r12 INTEGER (-8388608..8388607),
bdsI0-r12 INTEGER (-2147483648..2147483647),
bdsIDot-r12 INTEGER (-8192..8191),
bdsCuc-r12 INTEGER (-131072..131071),
bdsCus-r12 INTEGER (-131072..131071),
bdsCrc-r12 INTEGER (-131072..131071),
bdsCrs-r12 INTEGER (-131072..131071),
bdsCic-r12 INTEGER (-131072..131071),
bdsCis-r12 INTEGER (-131072..131071),
...
}
GNSS-RealTimeIntegrity ::= SEQUENCE {
gnss-BadSignalList GNSS-BadSignalList,
...
}
@ -1175,7 +1228,7 @@ GNSS-RealTimeIntegrity ::= SEQUENCE {
GNSS-BadSignalList ::= SEQUENCE (SIZE(1..64)) OF BadSignalElement
BadSignalElement ::= SEQUENCE {
badSVID SV-ID,
badSVID SV-ID,
badSignalID GNSS-SignalIDs OPTIONAL, -- Need OP
...
}
@ -1223,10 +1276,10 @@ GNSS-AcquisitionAssistElement ::= SEQUENCE {
intCodePhase INTEGER (0..127),
codePhaseSearchWindow INTEGER (0..31),
azimuth INTEGER (0..511),
elevation INTEGER (0..127),
elevation INTEGER (0..127),
...,
codePhase1023 BOOLEAN OPTIONAL, -- Need OP
dopplerUncertaintyExt-r10 ENUMERATED { d60,
dopplerUncertaintyExt-r10 ENUMERATED { d60,
d80,
d100,
d120,
@ -1235,39 +1288,44 @@ GNSS-AcquisitionAssistElement ::= SEQUENCE {
GNSS-Almanac ::= SEQUENCE {
weekNumber INTEGER (0..255) OPTIONAL, -- Need ON
weekNumber INTEGER (0..255) OPTIONAL, -- Need ON
toa INTEGER (0..255) OPTIONAL, -- Need ON
ioda INTEGER (0..3) OPTIONAL, -- Need ON
completeAlmanacProvided BOOLEAN,
gnss-AlmanacList GNSS-AlmanacList,
...
...,
[[ toa-ext-v12xy INTEGER (256..1023) OPTIONAL, -- Need ON
ioda-ext-v12xy INTEGER (4..15) OPTIONAL -- Need ON
]]
}
GNSS-AlmanacList ::= SEQUENCE (SIZE(1..64)) OF GNSS-AlmanacElement
GNSS-AlmanacElement ::= CHOICE {
keplerianAlmanacSet AlmanacKeplerianSet, -- Model-1
keplerianNAV-Almanac AlmanacNAV-KeplerianSet, -- Model-2
keplerianReducedAlmanac AlmanacReducedKeplerianSet, -- Model-3
keplerianMidiAlmanac AlmanacMidiAlmanacSet, -- Model-4
keplerianGLONASS AlmanacGLONASS-AlmanacSet, -- Model-5
ecef-SBAS-Almanac AlmanacECEF-SBAS-AlmanacSet,-- Model-6
...
keplerianAlmanacSet AlmanacKeplerianSet, -- Model-1
keplerianNAV-Almanac AlmanacNAV-KeplerianSet, -- Model-2
keplerianReducedAlmanac AlmanacReducedKeplerianSet, -- Model-3
keplerianMidiAlmanac AlmanacMidiAlmanacSet, -- Model-4
keplerianGLONASS AlmanacGLONASS-AlmanacSet, -- Model-5
ecef-SBAS-Almanac AlmanacECEF-SBAS-AlmanacSet,-- Model-6
...,
keplerianBDS-Almanac-r12 AlmanacBDS-AlmanacSet-r12 -- Model-7
}
AlmanacKeplerianSet ::= SEQUENCE {
svID SV-ID,
kepAlmanacE INTEGER (0..2047),
kepAlmanacE INTEGER (0..2047),
kepAlmanacDeltaI INTEGER (-1024..1023),
kepAlmanacOmegaDot INTEGER (-1024..1023),
kepSVHealth INTEGER (0..15),
kepAlmanacAPowerHalf INTEGER (-65536..65535),
kepSV-StatusINAV BIT STRING (SIZE (4)),
kepSV-StatusFNAV BIT STRING (SIZE (2)) OPTIONAL, -- Need ON
kepAlmanacAPowerHalf INTEGER (-4096..4095),
kepAlmanacOmega0 INTEGER (-32768..32767),
kepAlmanacW INTEGER (-32768..32767),
kepAlmanacM0 INTEGER (-32768..32767),
kepAlmanacAF0 INTEGER (-8192..8191),
kepAlmanacAF1 INTEGER (-1024..1023),
kepAlmanacAF0 INTEGER (-32768..32767),
kepAlmanacAF1 INTEGER (-4096..4095),
...
}
@ -1351,15 +1409,33 @@ AlmanacECEF-SBAS-AlmanacSet ::= SEQUENCE {
}
GNSS-UTC-Model ::= CHOICE {
utcModel1 UTC-ModelSet1, -- Model-1
utcModel2 UTC-ModelSet2, -- Model-2
utcModel3 UTC-ModelSet3, -- Model-3
utcModel4 UTC-ModelSet4, -- Model-4
AlmanacBDS-AlmanacSet-r12 ::= SEQUENCE {
svID SV-ID,
bdsAlmToa-r12 INTEGER (0..255) OPTIONAL, -- Cond NotSameForAllSV
bdsAlmSqrtA-r12 INTEGER (0..16777215),
bdsAlmE-r12 INTEGER (0..131071),
bdsAlmW-r12 INTEGER (-8388608..8388607),
bdsAlmM0-r12 INTEGER (-8388608..8388607),
bdsAlmOmega0-r12 INTEGER (-8388608..8388607),
bdsAlmOmegaDot-r12 INTEGER (-65536..65535),
bdsAlmDeltaI-r12 INTEGER (-32768..32767),
bdsAlmA0-r12 INTEGER (-1024..1023),
bdsAlmA1-r12 INTEGER (-1024..1023),
bdsSvHealth-r12 BIT STRING (SIZE(9)) OPTIONAL, -- Cond SV-ID
...
}
GNSS-UTC-Model ::= CHOICE {
utcModel1 UTC-ModelSet1, -- Model-1
utcModel2 UTC-ModelSet2, -- Model-2
utcModel3 UTC-ModelSet3, -- Model-3
utcModel4 UTC-ModelSet4, -- Model-4
...,
utcModel5-r12 UTC-ModelSet5-r12 -- Model-5
}
UTC-ModelSet1 ::= SEQUENCE {
gnss-Utc-A1 INTEGER (-8388608..8388607),
gnss-Utc-A0 INTEGER (-2147483648..2147483647),
@ -1411,6 +1487,17 @@ UTC-ModelSet4 ::= SEQUENCE {
}
UTC-ModelSet5-r12 ::= SEQUENCE {
utcA0-r12 INTEGER (-2147483648..2147483647),
utcA1-r12 INTEGER (-8388608..8388607),
utcDeltaTls-r12 INTEGER (-128..127),
utcWNlsf-r12 INTEGER (0..255),
utcDN-r12 INTEGER (0..255),
utcDeltaTlsf-r12 INTEGER (-128..127),
...
}
GNSS-AuxiliaryInformation ::= CHOICE {
gnss-ID-GPS GNSS-ID-GPS,
gnss-ID-GLONASS GNSS-ID-GLONASS,
@ -1432,7 +1519,48 @@ GNSS-ID-GLONASS-SatElement ::= SEQUENCE {
signalsAvailable GNSS-SignalIDs,
channelNumber INTEGER (-7..13) OPTIONAL, -- Cond FDMA
...
}
}
BDS-DifferentialCorrections-r12 ::= SEQUENCE {
dbds-RefTime-r12 INTEGER (0..3599),
bds-SgnTypeList-r12 BDS-SgnTypeList-r12,
...
}
BDS-SgnTypeList-r12 ::= SEQUENCE (SIZE (1..3)) OF BDS-SgnTypeElement-r12
BDS-SgnTypeElement-r12 ::= SEQUENCE {
gnss-SignalID GNSS-SignalID OPTIONAL, -- Need ON
dbds-CorrectionList-r12 DBDS-CorrectionList-r12,
...
}
DBDS-CorrectionList-r12 ::= SEQUENCE (SIZE (1..64)) OF DBDS-CorrectionElement-r12
DBDS-CorrectionElement-r12 ::= SEQUENCE {
svID SV-ID,
bds-UDREI-r12 INTEGER (0..15),
bds-RURAI-r12 INTEGER (0..15),
bds-ECC-DeltaT-r12 INTEGER (-4096..4095),
...
}
BDS-GridModelParameter-r12 ::= SEQUENCE {
bds-RefTime-r12 INTEGER (0..3599),
gridIonList-r12 GridIonList-r12,
...
}
GridIonList-r12 ::= SEQUENCE (SIZE (1..320)) OF GridIonElement-r12
GridIonElement-r12 ::= SEQUENCE {
igp-ID-r12 INTEGER (1..320),
dt-r12 INTEGER (0..511),
givei-r12 INTEGER (0..15) ,
...
}
A-GNSS-RequestAssistanceData ::= SEQUENCE {
@ -1443,13 +1571,13 @@ A-GNSS-RequestAssistanceData ::= SEQUENCE {
GNSS-CommonAssistDataReq ::= SEQUENCE {
gnss-ReferenceTimeReq GNSS-ReferenceTimeReq
gnss-ReferenceTimeReq GNSS-ReferenceTimeReq
OPTIONAL, -- Cond RefTimeReq
gnss-ReferenceLocationReq GNSS-ReferenceLocationReq
gnss-ReferenceLocationReq GNSS-ReferenceLocationReq
OPTIONAL, -- Cond RefLocReq
gnss-IonosphericModelReq GNSS-IonosphericModelReq
gnss-IonosphericModelReq GNSS-IonosphericModelReq
OPTIONAL, -- Cond IonoModReq
gnss-EarthOrientationParametersReq GNSS-EarthOrientationParametersReq
gnss-EarthOrientationParametersReq GNSS-EarthOrientationParametersReq
OPTIONAL, -- Cond EOPReq
...
}
@ -1469,14 +1597,20 @@ GNSS-GenericAssistDataReqElement ::= SEQUENCE {
gnss-AlmanacReq GNSS-AlmanacReq OPTIONAL, -- Cond AlmanacReq
gnss-UTCModelReq GNSS-UTC-ModelReq OPTIONAL, -- Cond UTCModReq
gnss-AuxiliaryInformationReq GNSS-AuxiliaryInformationReq OPTIONAL, -- Cond AuxInfoReq
...
...,
[[
bds-DifferentialCorrectionsReq-r12
BDS-DifferentialCorrectionsReq-r12
OPTIONAL, -- Cond DBDS-Req
bds-GridModelReq-r12 BDS-GridModelReq-r12 OPTIONAL -- Cond BDS-GridModReq
]]
}
GNSS-ReferenceTimeReq ::= SEQUENCE {
gnss-TimeReqPrefList SEQUENCE (SIZE (1..8)) OF GNSS-ID,
gps-TOW-assistReq BOOLEAN OPTIONAL, -- Cond gps
notOfLeapSecReq BOOLEAN OPTIONAL, -- Cond glonass
gnss-TimeReqPrefList SEQUENCE (SIZE (1..8)) OF GNSS-ID,
gps-TOW-assistReq BOOLEAN OPTIONAL, -- Cond gps
notOfLeapSecReq BOOLEAN OPTIONAL, -- Cond glonass
...
}
@ -1521,7 +1655,7 @@ GNSS-NavigationModelReq ::= CHOICE {
}
StoredNavListInfo ::= SEQUENCE {
StoredNavListInfo ::= SEQUENCE {
gnss-WeekOrDay INTEGER (0..4095),
gnss-Toe INTEGER (0..255),
t-toeLimit INTEGER (0..15),
@ -1533,16 +1667,16 @@ SatListRelatedDataList ::= SEQUENCE (SIZE (1..64)) OF SatListRelatedDataElement
SatListRelatedDataElement ::= SEQUENCE {
svID SV-ID,
iod BIT STRING (SIZE(11)),
clockModelID INTEGER (1..8) OPTIONAL,
orbitModelID INTEGER (1..8) OPTIONAL,
...
iod BIT STRING (SIZE(11)),
clockModelID INTEGER (1..8) OPTIONAL,
orbitModelID INTEGER (1..8) OPTIONAL,
...
}
ReqNavListInfo ::= SEQUENCE {
ReqNavListInfo ::= SEQUENCE {
svReqList BIT STRING (SIZE (64)),
clockModelID-PrefList SEQUENCE (SIZE (1..8)) OF INTEGER (1..8) OPTIONAL,
orbitModelID-PrefList SEQUENCE (SIZE (1..8)) OF INTEGER (1..8) OPTIONAL,
clockModelID-PrefList SEQUENCE (SIZE (1..8)) OF INTEGER (1..8) OPTIONAL,
orbitModelID-PrefList SEQUENCE (SIZE (1..8)) OF INTEGER (1..8) OPTIONAL,
addNavparamReq BOOLEAN OPTIONAL, -- Cond orbitModelID-2
...
}
@ -1559,7 +1693,7 @@ GNSS-DataBitAssistanceReq ::= SEQUENCE {
gnss-TOD-FracReq INTEGER (0..999) OPTIONAL,
dataBitInterval INTEGER (0..15),
gnss-SignalType GNSS-SignalIDs,
gnss-DataBitsReq GNSS-DataBitsReqSatList OPTIONAL,
gnss-DataBitsReq GNSS-DataBitsReqSatList OPTIONAL,
...
}
@ -1594,6 +1728,17 @@ GNSS-AuxiliaryInformationReq ::= SEQUENCE {
}
BDS-DifferentialCorrectionsReq-r12 ::= SEQUENCE {
dgnss-SignalsReq GNSS-SignalIDs,
...
}
BDS-GridModelReq-r12 ::= SEQUENCE {
...
}
A-GNSS-ProvideLocationInformation ::= SEQUENCE {
gnss-SignalMeasurementInformation GNSS-SignalMeasurementInformation OPTIONAL,
gnss-LocationInformation GNSS-LocationInformation OPTIONAL,
@ -1611,8 +1756,8 @@ GNSS-SignalMeasurementInformation ::= SEQUENCE {
MeasurementReferenceTime ::= SEQUENCE {
gnss-TOD-msec INTEGER (0..3599999),
gnss-TOD-frac INTEGER (0..3999) OPTIONAL,
gnss-TOD-unc INTEGER (0..127) OPTIONAL,
gnss-TOD-frac INTEGER (0..3999) OPTIONAL,
gnss-TOD-unc INTEGER (0..127) OPTIONAL,
gnss-TimeID GNSS-ID,
networkTime CHOICE {
eUTRA SEQUENCE {
@ -1650,7 +1795,7 @@ MeasurementReferenceTime ::= SEQUENCE {
...
},
...
} OPTIONAL,
} OPTIONAL,
...
}
@ -1678,10 +1823,10 @@ GNSS-SatMeasElement ::= SEQUENCE {
svID SV-ID,
cNo INTEGER (0..63),
mpathDet ENUMERATED {notMeasured (0), low (1), medium (2), high (3), ...},
carrierQualityInd INTEGER (0..3) OPTIONAL,
carrierQualityInd INTEGER (0..3) OPTIONAL,
codePhase INTEGER (0..2097151),
integerCodePhase INTEGER (0..127) OPTIONAL,
codePhaseRMSError INTEGER (0..63),
codePhaseRMSError INTEGER (0..63),
doppler INTEGER (-32768..32767) OPTIONAL,
adr INTEGER (0..33554431) OPTIONAL,
...
@ -1690,7 +1835,7 @@ GNSS-SatMeasElement ::= SEQUENCE {
GNSS-LocationInformation ::= SEQUENCE {
measurementReferenceTime MeasurementReferenceTime,
agnss-List GNSS-ID-Bitmap,
agnss-List GNSS-ID-Bitmap,
...
}
@ -1702,7 +1847,7 @@ A-GNSS-RequestLocationInformation ::= SEQUENCE {
GNSS-PositioningInstructions ::= SEQUENCE {
gnss-Methods GNSS-ID-Bitmap,
gnss-Methods GNSS-ID-Bitmap,
fineTimeAssistanceMeasReq BOOLEAN,
adrMeasReq BOOLEAN,
multiFreqMeasReq BOOLEAN,
@ -1724,7 +1869,7 @@ GNSS-SupportList ::= SEQUENCE (SIZE(1..16)) OF GNSS-SupportElement
GNSS-SupportElement ::= SEQUENCE {
gnss-ID GNSS-ID,
sbas-IDs SBAS-IDs OPTIONAL, -- Cond GNSS-ID-SBAS
agnss-Modes PositioningModes,
agnss-Modes PositioningModes,
gnss-Signals GNSS-SignalIDs,
fta-MeasSupport SEQUENCE {
cellTime AccessTypes,
@ -1737,7 +1882,7 @@ GNSS-SupportElement ::= SEQUENCE {
}
AssistanceDataSupportList ::= SEQUENCE {
gnss-CommonAssistanceDataSupport GNSS-CommonAssistanceDataSupport,
gnss-CommonAssistanceDataSupport GNSS-CommonAssistanceDataSupport,
gnss-GenericAssistanceDataSupport GNSS-GenericAssistanceDataSupport,
...
}
@ -1745,13 +1890,13 @@ AssistanceDataSupportList ::= SEQUENCE {
GNSS-CommonAssistanceDataSupport ::= SEQUENCE {
gnss-ReferenceTimeSupport GNSS-ReferenceTimeSupport
gnss-ReferenceTimeSupport GNSS-ReferenceTimeSupport
OPTIONAL, -- Cond RefTimeSup
gnss-ReferenceLocationSupport GNSS-ReferenceLocationSupport
gnss-ReferenceLocationSupport GNSS-ReferenceLocationSupport
OPTIONAL, -- Cond RefLocSup
gnss-IonosphericModelSupport GNSS-IonosphericModelSupport
gnss-IonosphericModelSupport GNSS-IonosphericModelSupport
OPTIONAL, -- Cond IonoModSup
gnss-EarthOrientationParametersSupport GNSS-EarthOrientationParametersSupport
gnss-EarthOrientationParametersSupport GNSS-EarthOrientationParametersSupport
OPTIONAL, -- Cond EOPSup
...
}
@ -1781,12 +1926,12 @@ GNSS-EarthOrientationParametersSupport ::= SEQUENCE {
}
GNSS-GenericAssistanceDataSupport ::=
GNSS-GenericAssistanceDataSupport ::=
SEQUENCE (SIZE (1..16)) OF GNSS-GenericAssistDataSupportElement
GNSS-GenericAssistDataSupportElement ::= SEQUENCE {
gnss-ID GNSS-ID,
sbas-ID SBAS-ID OPTIONAL, -- Cond GNSS-ID-SBAS
sbas-ID SBAS-ID OPTIONAL, -- Cond GNSSIDSBAS
gnss-TimeModelsSupport GNSS-TimeModelListSupport
OPTIONAL, -- Cond TimeModSup
gnss-DifferentialCorrectionsSupport GNSS-DifferentialCorrectionsSupport
@ -1805,7 +1950,14 @@ GNSS-GenericAssistDataSupportElement ::= SEQUENCE {
OPTIONAL, -- Cond UTCModSup
gnss-AuxiliaryInformationSupport GNSS-AuxiliaryInformationSupport
OPTIONAL, -- Cond AuxInfoSup
...
...,
[[
bds-DifferentialCorrectionsSupport-r12
BDS-DifferentialCorrectionsSupport-r12
OPTIONAL, -- Cond DBDS-Sup
bds-GridModelSupport-r12 BDS-GridModelSupport-r12
OPTIONAL -- Cond BDS-GridModSup
]]
}
@ -1826,12 +1978,14 @@ GNSS-NavigationModelSupport ::= SEQUENCE {
model-2 (1),
model-3 (2),
model-4 (3),
model-5 (4) } (SIZE (1..8)) OPTIONAL,
model-5 (4),
model-6 (5) } (SIZE (1..8)) OPTIONAL,
orbitModel BIT STRING { model-1 (0),
model-2 (1),
model-3 (2),
model-4 (3),
model-5 (4) } (SIZE (1..8)) OPTIONAL,
model-5 (4),
model-6 (5) } (SIZE (1..8)) OPTIONAL,
...
}
@ -1859,7 +2013,8 @@ GNSS-AlmanacSupport ::= SEQUENCE {
model-3 (2),
model-4 (3),
model-5 (4),
model-6 (5) } (SIZE (1..8)) OPTIONAL,
model-6 (5),
model-7 (6) } (SIZE (1..8)) OPTIONAL,
...
}
@ -1868,7 +2023,8 @@ GNSS-UTC-ModelSupport ::= SEQUENCE {
utc-Model BIT STRING { model-1 (0),
model-2 (1),
model-3 (2),
model-4 (3) } (SIZE (1..8)) OPTIONAL,
model-4 (3),
model-5 (4) } (SIZE (1..8)) OPTIONAL,
...
}
@ -1878,6 +2034,17 @@ GNSS-AuxiliaryInformationSupport ::= SEQUENCE {
}
BDS-DifferentialCorrectionsSupport-r12 ::= SEQUENCE {
gnssSignalIDs GNSS-SignalIDs,
...
}
BDS-GridModelSupport-r12 ::= SEQUENCE {
...
}
A-GNSS-RequestCapabilities ::= SEQUENCE {
gnss-SupportListReq BOOLEAN,
assistanceDataSupportListReq BOOLEAN,
@ -1894,7 +2061,7 @@ A-GNSS-Error ::= CHOICE {
GNSS-LocationServerErrorCauses ::= SEQUENCE {
cause ENUMERATED {
cause ENUMERATED {
undefined,
undeliveredAssistanceDataIsNotSupportedByServer,
undeliveredAssistanceDataIsSupportedButCurrentlyNotAvailableByServer, undeliveredAssistanceDataIsPartlyNotSupportedAndPartlyNotAvailableByServer,
@ -1906,7 +2073,7 @@ GNSS-LocationServerErrorCauses ::= SEQUENCE {
GNSS-TargetDeviceErrorCauses ::= SEQUENCE {
cause ENUMERATED { undefined,
thereWereNotEnoughSatellitesReceived,
thereWereNotEnoughSatellitesReceived,
assistanceDataMissing,
notAllRequestedMeasurementsPossible,
...
@ -1919,41 +2086,42 @@ GNSS-TargetDeviceErrorCauses ::= SEQUENCE {
GNSS-ID ::= SEQUENCE {
gnss-id ENUMERATED{ gps, sbas, qzss, galileo, glonass, ...},
gnss-id ENUMERATED{ gps, sbas, qzss, galileo, glonass, ..., bds },
...
}
GNSS-ID-Bitmap ::= SEQUENCE {
gnss-ids BIT STRING { gps (0),
gnss-ids BIT STRING { gps (0),
sbas (1),
qzss (2),
galileo (3),
glonass (4) } (SIZE (1..16)),
glonass (4),
bds (5) } (SIZE (1..16)),
...
}
GNSS-SignalID ::= SEQUENCE {
GNSS-SignalID ::= SEQUENCE {
gnss-SignalID INTEGER (0 .. 7),
...
}
GNSS-SignalIDs ::= SEQUENCE {
GNSS-SignalIDs ::= SEQUENCE {
gnss-SignalIDs BIT STRING (SIZE(8)),
...
}
SBAS-ID ::= SEQUENCE {
SBAS-ID ::= SEQUENCE {
sbas-id ENUMERATED { waas, egnos, msas, gagan, ...},
...
}
SBAS-IDs ::= SEQUENCE {
sbas-IDs BIT STRING { waas (0),
SBAS-IDs ::= SEQUENCE {
sbas-IDs BIT STRING { waas (0),
egnos (1),
msas (2),
gagan (3) } (SIZE (1..8)),
@ -1961,7 +2129,7 @@ SBAS-IDs ::= SEQUENCE {
}
SV-ID ::= SEQUENCE {
SV-ID ::= SEQUENCE {
satellite-id INTEGER(0..63),
...
}
@ -1992,7 +2160,7 @@ MeasuredResultsElement ::= SEQUENCE {
rsrq-Result INTEGER (0..34) OPTIONAL,
ue-RxTxTimeDiff INTEGER (0..4095) OPTIONAL,
...,
[[ arfcnEUTRA-v9a0 ARFCN-ValueEUTRA-v9a0 OPTIONAL -- Cond EARFCN-max
[[ arfcnEUTRA-v9a0 ARFCN-ValueEUTRA-v9a0 OPTIONAL -- Cond EARFCN-max
]]
}
@ -2026,7 +2194,7 @@ ECID-Error ::= CHOICE {
ECID-LocationServerErrorCauses ::= SEQUENCE {
cause ENUMERATED { undefined,
cause ENUMERATED { undefined,
...
},
...

264
asn1/lpp/lpp.cnf
View File

@ -53,6 +53,9 @@ EllipsoidPointWithUncertaintyEllipse
Polygon
#.END
#.MAKE_ENUM
GNSS-ID/gnss-id TYPE_PREFIX UPPER_CASE
#.FN_HDR RequestCapabilities
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Request Capabilities");
@ -296,6 +299,9 @@ VerticalAccuracy/confidence DISPLAY=BASE_CUSTOM STRINGS=&lpp_confidence_fmt
#.FN_FTR ResponseTime/time
proto_item_append_text(actx->created_item, " s");
#.FN_FTR ResponseTime/eag_1/responseTimeEarlyFix-r12
proto_item_append_text(actx->created_item, " s");
#.TYPE_ATTR
OTDOA-NeighbourCellInfoElement/expectedRSTD DISPLAY=BASE_CUSTOM STRINGS=&lpp_expectedRSTD_fmt
@ -484,6 +490,18 @@ DGNSS-CorrectionsElement/udreGrowthRate STRINGS=VALS(lpp_udreGrowthRate_vals)
#.TYPE_ATTR
DGNSS-CorrectionsElement/udreValidityTime STRINGS=VALS(lpp_udreValidityTime_vals)
#.FN_BODY GNSS-NavModelSatelliteElement/eag_1/svHealthExt-v12xy VAL_PTR = &svHealthExt_tvb
tvbuff_t *svHealthExt_tvb = NULL;
proto_tree *subtree;
%(DEFAULT_BODY)s
#.FN_FTR GNSS-NavModelSatelliteElement/eag_1/svHealthExt-v12xy
if (svHealthExt_tvb) {
subtree = proto_item_add_subtree(actx->created_item, ett_lpp_svHealthExt_v12xy);
proto_tree_add_bits_item(subtree, hf_lpp_svHealthExt_v12xy_e5bhs, svHealthExt_tvb, 0, 2, ENC_BIG_ENDIAN);
proto_tree_add_bits_item(subtree, hf_lpp_svHealthExt_v12xy_e1_bhs, svHealthExt_tvb, 2, 2, ENC_BIG_ENDIAN);
}
#.TYPE_ATTR
StandardClockModelElement/stanClockToc DISPLAY=BASE_CUSTOM STRINGS=&lpp_stanClockToc_fmt
@ -499,6 +517,9 @@ StandardClockModelElement/stanClockAF0 DISPLAY=BASE_CUSTOM STRINGS=&lpp_stanCloc
#.TYPE_ATTR
StandardClockModelElement/stanClockTgd DISPLAY=BASE_CUSTOM STRINGS=&lpp_stanClockTgd_fmt
#.TYPE_ATTR
StandardClockModelElement/sisa DISPLAY=BASE_CUSTOM STRINGS=&lpp_sisa_fmt
#.TYPE_ATTR
StandardClockModelElement/stanModelID STRINGS=VALS(lpp_stanModelID_vals)
@ -571,6 +592,24 @@ SBAS-ClockModel/sbasAgfo DISPLAY=BASE_CUSTOM STRINGS=&lpp_sbasAgfo_fmt
#.TYPE_ATTR
SBAS-ClockModel/sbasAgf1 DISPLAY=BASE_CUSTOM STRINGS=&lpp_sbasAgf1_fmt
#.TYPE_ATTR
BDS-ClockModel-r12/bdsAODC-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsAODC_AODE_r12_fmt
#.TYPE_ATTR
BDS-ClockModel-r12/bdsToc-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsToc_Toe_r12_fmt
#.TYPE_ATTR
BDS-ClockModel-r12/bdsA0-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsA0_r12_fmt
#.TYPE_ATTR
BDS-ClockModel-r12/bdsA1-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsA1_r12_fmt
#.TYPE_ATTR
BDS-ClockModel-r12/bdsA2-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsA2_r12_fmt
#.TYPE_ATTR
BDS-ClockModel-r12/bdsTgd1-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsTgd1_r12_fmt
#.TYPE_ATTR
NavModelKeplerianSet/keplerToe DISPLAY=BASE_CUSTOM STRINGS=&lpp_keplerToe_fmt
@ -690,7 +729,7 @@ NavModelCNAV-KeplerianSet/cnavDeltaNoDot DISPLAY=BASE_CUSTOM STRINGS=&lpp_cnavDe
#.FN_FTR NavModelCNAV-KeplerianSet/cnavMo
PROTO_ITEM_SET_HIDDEN(actx->created_item);
actx->created_item = proto_tree_add_int64_format_value(tree, hf_index, tvb, curr_offset>>3, (offset+7-curr_offset)>>3,
cnavMo, "%e semi-circles (%"G_GINT64_MODIFIER"d)",
cnavMo, "%g semi-circles (%"G_GINT64_MODIFIER"d)",
(double)cnavMo*pow(2, -32), cnavMo);
#.FN_BODY NavModelCNAV-KeplerianSet/cnavE VAL_PTR=&cnavE
@ -701,7 +740,7 @@ NavModelCNAV-KeplerianSet/cnavDeltaNoDot DISPLAY=BASE_CUSTOM STRINGS=&lpp_cnavDe
#.FN_FTR NavModelCNAV-KeplerianSet/cnavE
PROTO_ITEM_SET_HIDDEN(actx->created_item);
actx->created_item = proto_tree_add_uint64_format_value(tree, hf_index, tvb, curr_offset>>3, (offset+7-curr_offset)>>3,
cnavE, "%e (%"G_GINT64_MODIFIER"u)",
cnavE, "%g (%"G_GINT64_MODIFIER"u)",
(double)cnavE*pow(2, -34), cnavE);
#.FN_BODY NavModelCNAV-KeplerianSet/cnavOmega VAL_PTR=&cnavOmega
@ -712,7 +751,7 @@ NavModelCNAV-KeplerianSet/cnavDeltaNoDot DISPLAY=BASE_CUSTOM STRINGS=&lpp_cnavDe
#.FN_FTR NavModelCNAV-KeplerianSet/cnavOmega
PROTO_ITEM_SET_HIDDEN(actx->created_item);
actx->created_item = proto_tree_add_int64_format_value(tree, hf_index, tvb, curr_offset>>3, (offset+7-curr_offset)>>3,
cnavOmega, "%e semi-circles (%"G_GINT64_MODIFIER"d)",
cnavOmega, "%g semi-circles (%"G_GINT64_MODIFIER"d)",
(double)cnavOmega*pow(2, -32), cnavOmega);
#.FN_BODY NavModelCNAV-KeplerianSet/cnavOMEGA0 VAL_PTR=&cnavOMEGA0
@ -723,7 +762,7 @@ NavModelCNAV-KeplerianSet/cnavDeltaNoDot DISPLAY=BASE_CUSTOM STRINGS=&lpp_cnavDe
#.FN_FTR NavModelCNAV-KeplerianSet/cnavOMEGA0
PROTO_ITEM_SET_HIDDEN(actx->created_item);
actx->created_item = proto_tree_add_int64_format_value(tree, hf_index, tvb, curr_offset>>3, (offset+7-curr_offset)>>3,
cnavOMEGA0, "%e semi-circles (%"G_GINT64_MODIFIER"d)",
cnavOMEGA0, "%g semi-circles (%"G_GINT64_MODIFIER"d)",
(double)cnavOMEGA0*pow(2, -32), cnavOMEGA0);
#.TYPE_ATTR
@ -737,7 +776,7 @@ NavModelCNAV-KeplerianSet/cnavDeltaOmegaDot DISPLAY=BASE_CUSTOM STRINGS=&lpp_cna
#.FN_FTR NavModelCNAV-KeplerianSet/cnavIo
PROTO_ITEM_SET_HIDDEN(actx->created_item);
actx->created_item = proto_tree_add_int64_format_value(tree, hf_index, tvb, curr_offset>>3, (offset+7-curr_offset)>>3,
cnavIo, "%e semi-circles (%"G_GINT64_MODIFIER"d)",
cnavIo, "%g semi-circles (%"G_GINT64_MODIFIER"d)",
(double)cnavIo*pow(2, -32), cnavIo);
#.TYPE_ATTR
@ -834,6 +873,60 @@ NavModel-SBAS-ECEF/sbasYgDotDot DISPLAY=BASE_CUSTOM STRINGS=&lpp_sbasXgDotDot_Yg
#.TYPE_ATTR
NavModel-SBAS-ECEF/sbasZgDotDot DISPLAY=BASE_CUSTOM STRINGS=&lpp_sbasZgDotDot_fmt
#.TYPE_ATTR
NavModel-BDS-KeplerianSet-r12/bdsAODE-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsAODC_AODE_r12_fmt
#.FN_FTR NavModel-BDS-KeplerianSet-r12/bdsURAI-r12
proto_item_append_text(actx->created_item, " m");
#.TYPE_ATTR
NavModel-BDS-KeplerianSet-r12/bdsToe-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsToc_Toe_r12_fmt
#.TYPE_ATTR
NavModel-BDS-KeplerianSet-r12/bdsAPowerHalf-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsAPowerHalf_r12_fmt
#.TYPE_ATTR
NavModel-BDS-KeplerianSet-r12/bdsE-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsE_r12_fmt
#.TYPE_ATTR
NavModel-BDS-KeplerianSet-r12/bdsW-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsW_M0_Omega0_I0_r12_fmt
#.TYPE_ATTR
NavModel-BDS-KeplerianSet-r12/bdsDeltaN-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsDeltaN_OmegaDot_IDot_r12_fmt
#.TYPE_ATTR
NavModel-BDS-KeplerianSet-r12/bdsM0-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsW_M0_Omega0_I0_r12_fmt
#.TYPE_ATTR
NavModel-BDS-KeplerianSet-r12/bdsOmega0-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsW_M0_Omega0_I0_r12_fmt
#.TYPE_ATTR
NavModel-BDS-KeplerianSet-r12/bdsOmegaDot-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsDeltaN_OmegaDot_IDot_r12_fmt
#.TYPE_ATTR
NavModel-BDS-KeplerianSet-r12/bdsI0-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsW_M0_Omega0_I0_r12_fmt
#.TYPE_ATTR
NavModel-BDS-KeplerianSet-r12/bdsIDot-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsDeltaN_OmegaDot_IDot_r12_fmt
#.TYPE_ATTR
NavModel-BDS-KeplerianSet-r12/bdsCuc-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsCuc_Cus_Cic_Cis_r12_fmt
#.TYPE_ATTR
NavModel-BDS-KeplerianSet-r12/bdsCus-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsCuc_Cus_Cic_Cis_r12_fmt
#.TYPE_ATTR
NavModel-BDS-KeplerianSet-r12/bdsCrc-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsCrc_Crs_r12_fmt
#.TYPE_ATTR
NavModel-BDS-KeplerianSet-r12/bdsCrs-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsCrc_Crs_r12_fmt
#.TYPE_ATTR
NavModel-BDS-KeplerianSet-r12/bdsCic-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsCuc_Cus_Cic_Cis_r12_fmt
#.TYPE_ATTR
NavModel-BDS-KeplerianSet-r12/bdsCis-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsCuc_Cus_Cic_Cis_r12_fmt
#.FN_FTR GNSS-DataBitAssistance/gnss-TOD
proto_item_append_text(actx->created_item, " s");
@ -867,8 +960,29 @@ GNSS-AcquisitionAssistElement/azimuth DISPLAY=BASE_CUSTOM STRINGS=&lpp_azimuth_e
#.TYPE_ATTR
GNSS-AcquisitionAssistElement/elevation DISPLAY=BASE_CUSTOM STRINGS=&lpp_azimuth_elevation_fmt
#.TYPE_ATTR
GNSS-Almanac/toa DISPLAY=BASE_CUSTOM STRINGS=&lpp_toa_fmt
#.FN_BODY GNSS-Almanac/toa VAL_PTR = &toa
guint32 toa, val;
int len, old_offset = offset;
T_GNSS_ID_enum gnss_id = (T_GNSS_ID_enum)GPOINTER_TO_UINT(actx->private_data);
%(DEFAULT_BODY)s
#.FN_FTR GNSS-Almanac/toa
len = (offset-old_offset) >> 3 ? (offset-old_offset) >> 3 : 1;
val = (gnss_id == T_GNSS_ID_GALILEO) ? 600*toa : 4096*toa;
actx->created_item = proto_tree_add_uint_format_value(tree, hf_lpp_toa, tvb, old_offset, len,
toa, "%u s (%u)", val, toa);
#.FN_BODY GNSS-Almanac/eag_1/toa-ext-v12xy VAL_PTR = &toa_ext
guint32 toa_ext, val;
int len, old_offset = offset;
T_GNSS_ID_enum gnss_id = (T_GNSS_ID_enum)GPOINTER_TO_UINT(actx->private_data);
%(DEFAULT_BODY)s
#.FN_FTR GNSS-Almanac/eag_1/toa-ext-v12xy
len = (offset-old_offset) >> 3 ? (offset-old_offset) >> 3 : 1;
val = (gnss_id == T_GNSS_ID_GALILEO) ? 600*toa_ext : 4096*toa_ext;
actx->created_item = proto_tree_add_uint_format_value(tree, hf_lpp_toa_ext_v12xy, tvb, old_offset, len,
toa_ext, "%u s (%u)", val, toa_ext);
#.TYPE_ATTR
AlmanacKeplerianSet/kepAlmanacE DISPLAY=BASE_CUSTOM STRINGS=&lpp_kepAlmanacE_fmt
@ -879,6 +993,29 @@ AlmanacKeplerianSet/kepAlmanacDeltaI DISPLAY=BASE_CUSTOM STRINGS=&lpp_kepAlmanac
#.TYPE_ATTR
AlmanacKeplerianSet/kepAlmanacOmegaDot DISPLAY=BASE_CUSTOM STRINGS=&lpp_kepAlmanacOmegaDot_fmt
#.FN_BODY AlmanacKeplerianSet/kepSV-StatusINAV VAL_PTR = &statusINAV_tvb
tvbuff_t *statusINAV_tvb = NULL;
proto_tree *subtree;
%(DEFAULT_BODY)s
#.FN_FTR AlmanacKeplerianSet/kepSV-StatusINAV
if (statusINAV_tvb) {
subtree = proto_item_add_subtree(actx->created_item, ett_kepSV_StatusINAV);
proto_tree_add_bits_item(subtree, hf_lpp_kepSV_StatusINAV_e5bhs, statusINAV_tvb, 0, 2, ENC_BIG_ENDIAN);
proto_tree_add_bits_item(subtree, hf_lpp_kepSV_StatusINAV_e1_bhs, statusINAV_tvb, 2, 2, ENC_BIG_ENDIAN);
}
#.FN_BODY AlmanacKeplerianSet/kepSV-StatusFNAV VAL_PTR = &statusFNAV_tvb
tvbuff_t *statusFNAV_tvb = NULL;
proto_tree *subtree;
%(DEFAULT_BODY)s
#.FN_FTR AlmanacKeplerianSet/kepSV-StatusFNAV
if (statusFNAV_tvb) {
subtree = proto_item_add_subtree(actx->created_item, ett_kepSV_StatusFNAV);
proto_tree_add_bits_item(subtree, hf_lpp_kepSV_StatusFNAV_e5ahs, statusFNAV_tvb, 0, 2, ENC_BIG_ENDIAN);
}
#.TYPE_ATTR
AlmanacKeplerianSet/kepAlmanacAPowerHalf DISPLAY=BASE_CUSTOM STRINGS=&lpp_kepAlmanacAPowerHalf_fmt
@ -1005,6 +1142,60 @@ AlmanacECEF-SBAS-AlmanacSet/sbasAlmZgDot DISPLAY=BASE_CUSTOM STRINGS=&lpp_sbasAl
#.TYPE_ATTR
AlmanacECEF-SBAS-AlmanacSet/sbasAlmTo DISPLAY=BASE_CUSTOM STRINGS=&lpp_sbasAlmTo_fmt
#.TYPE_ATTR
AlmanacBDS-AlmanacSet-r12/bdsAlmToa-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsAlmToa_r12_fmt
#.TYPE_ATTR
AlmanacBDS-AlmanacSet-r12/bdsAlmSqrtA-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsAlmSqrtA_r12_fmt
#.TYPE_ATTR
AlmanacBDS-AlmanacSet-r12/bdsAlmE-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsAlmE_r12_fmt
#.TYPE_ATTR
AlmanacBDS-AlmanacSet-r12/bdsAlmW-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsAlmW_M0_Omega0_r12_fmt
#.TYPE_ATTR
AlmanacBDS-AlmanacSet-r12/bdsAlmM0-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsAlmW_M0_Omega0_r12_fmt
#.TYPE_ATTR
AlmanacBDS-AlmanacSet-r12/bdsAlmOmega0-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsAlmW_M0_Omega0_r12_fmt
#.TYPE_ATTR
AlmanacBDS-AlmanacSet-r12/bdsAlmOmegaDot-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsAlmOmegaDot_r12_fmt
#.TYPE_ATTR
AlmanacBDS-AlmanacSet-r12/bdsAlmDeltaI-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsAlmDeltaI_r12_fmt
#.TYPE_ATTR
AlmanacBDS-AlmanacSet-r12/bdsAlmA0-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsAlmA0_r12_fmt
#.TYPE_ATTR
AlmanacBDS-AlmanacSet-r12/bdsAlmA1-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bdsAlmA1_r12_fmt
#.FN_BODY AlmanacBDS-AlmanacSet-r12/bdsSvHealth-r12 VAL_PTR = &bdsSvHealth_tvb
tvbuff_t *bdsSvHealth_tvb = NULL;
proto_tree *subtree;
%(DEFAULT_BODY)s
#.FN_FTR AlmanacBDS-AlmanacSet-r12/bdsSvHealth-r12
if (bdsSvHealth_tvb) {
guint16 bits;
subtree = proto_item_add_subtree(actx->created_item, ett_lpp_bdsSvHealth_r12);
bits = tvb_get_bits16(bdsSvHealth_tvb, 0, 9,ENC_BIG_ENDIAN);
if (bits == 0x1ff) {
proto_tree_add_boolean_bits_format_value(subtree, hf_lpp_bdsSvHealth_r12_sat_clock, bdsSvHealth_tvb, 0, 1, 1,
"Satellite is in failure or permanently shut off (1)");
} else if (bits == 0x100) {
proto_tree_add_boolean_bits_format_value(subtree, hf_lpp_bdsSvHealth_r12_sat_clock, bdsSvHealth_tvb, 0, 1, 1,
"Satellite clock is unavailable (1)");
} else {
proto_tree_add_bits_item(subtree, hf_lpp_bdsSvHealth_r12_sat_clock, bdsSvHealth_tvb, 0, 1, ENC_BIG_ENDIAN);
proto_tree_add_bits_item(subtree, hf_lpp_bdsSvHealth_r12_b1i, bdsSvHealth_tvb, 1, 1, ENC_BIG_ENDIAN);
proto_tree_add_bits_item(subtree, hf_lpp_bdsSvHealth_r12_b2i, bdsSvHealth_tvb, 2, 1, ENC_BIG_ENDIAN);
proto_tree_add_bits_item(subtree, hf_lpp_bdsSvHealth_r12_nav, bdsSvHealth_tvb, 7, 1, ENC_BIG_ENDIAN);
}
}
#.TYPE_ATTR
UTC-ModelSet1/gnss-Utc-A1 DISPLAY=BASE_CUSTOM STRINGS=&lpp_gnss_Utc_A1_fmt
@ -1107,6 +1298,45 @@ UTC-ModelSet4/utcTot DISPLAY=BASE_CUSTOM STRINGS=&lpp_gnss_Utc_Tot_fmt
#.TYPE_ATTR
UTC-ModelSet4/utcStandardID TYPE=FT_UINT8 DISPLAY=BASE_DEC STRINGS=VALS(lpp_utcStandardID_vals)
#.TYPE_ATTR
UTC-ModelSet5-r12/utcA0-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_gnss_Utc_A0_fmt
#.TYPE_ATTR
UTC-ModelSet5-r12/utcA1-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_gnss_Utc_A1_fmt
#.FN_FTR UTC-ModelSet5-r12/utcDeltaTls-r12
proto_item_append_text(actx->created_item, " s");
#.FN_FTR UTC-ModelSet5-r12/utcWNlsf-r12
proto_item_append_text(actx->created_item, " weeks");
#.FN_FTR UTC-ModelSet5-r12/utcDN-r12
proto_item_append_text(actx->created_item, " days");
#.FN_FTR UTC-ModelSet5-r12/utcDeltaTlsf-r12
proto_item_append_text(actx->created_item, " s");
#.FN_FTR BDS-DifferentialCorrections-r12/dbds-RefTime-r12
proto_item_append_text(actx->created_item, " s");
#.TYPE_ATTR
DBDS-CorrectionElement-r12/bds-UDREI-r12 TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=&lpp_bds_UDREI_vals_ext
#.TYPE_ATTR
DBDS-CorrectionElement-r12/bds-RURAI-r12 TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=&lpp_bds_RURAI_vals_ext
#.TYPE_ATTR
DBDS-CorrectionElement-r12/bds-ECC-DeltaT-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bds_ECC_DeltaT_r12_fmt
#.FN_FTR BDS-GridModelParameter-r12/bds-RefTime-r12
proto_item_append_text(actx->created_item, " s");
#.TYPE_ATTR
GridIonElement-r12/dt-r12 DISPLAY=BASE_CUSTOM STRINGS=&lpp_bds_GridIonElement_dt_r12_fmt
#.TYPE_ATTR
GridIonElement-r12/givei-r12 TYPE=FT_UINT8 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=&lpp_bds_givei_vals_ext
#.FN_FTR StoredNavListInfo/gnss-WeekOrDay
proto_item_append_text(actx->created_item, " (days for glonass, weeks otherwise)");
@ -1202,6 +1432,9 @@ GNSS-SatMeasElement/adr DISPLAY=BASE_CUSTOM STRINGS=&lpp_adr_fmt
if (len >= 5) {
proto_tree_add_item(subtree, hf_lpp_T_clockModel_model_5, clockModel_tvb, 0, 1, ENC_BIG_ENDIAN);
}
if (len >= 6) {
proto_tree_add_item(subtree, hf_lpp_T_clockModel_model_6, clockModel_tvb, 0, 1, ENC_BIG_ENDIAN);
}
}
#.FN_BODY GNSS-NavigationModelSupport/orbitModel VAL_PTR = &orbitModel_tvb LEN_PTR = &len
@ -1228,6 +1461,9 @@ GNSS-SatMeasElement/adr DISPLAY=BASE_CUSTOM STRINGS=&lpp_adr_fmt
if (len >= 5) {
proto_tree_add_item(subtree, hf_lpp_T_orbitModel_model_5, orbitModel_tvb, 0, 1, ENC_BIG_ENDIAN);
}
if (len >= 6) {
proto_tree_add_item(subtree, hf_lpp_T_orbitModel_model_6, orbitModel_tvb, 0, 1, ENC_BIG_ENDIAN);
}
}
#.FN_BODY GNSS-AlmanacSupport/almanacModel VAL_PTR = &almanacModel_tvb LEN_PTR = &len
@ -1257,6 +1493,9 @@ GNSS-SatMeasElement/adr DISPLAY=BASE_CUSTOM STRINGS=&lpp_adr_fmt
if (len >= 6) {
proto_tree_add_item(subtree, hf_lpp_T_almanacModel_model_6, almanacModel_tvb, 0, 1, ENC_BIG_ENDIAN);
}
if (len >= 7) {
proto_tree_add_item(subtree, hf_lpp_T_almanacModel_model_7, almanacModel_tvb, 0, 1, ENC_BIG_ENDIAN);
}
}
#.FN_BODY GNSS-UTC-ModelSupport/utc-Model VAL_PTR = &utc_Model_tvb LEN_PTR = &len
@ -1280,8 +1519,16 @@ GNSS-SatMeasElement/adr DISPLAY=BASE_CUSTOM STRINGS=&lpp_adr_fmt
if (len >= 4) {
proto_tree_add_item(subtree, hf_lpp_T_utc_Model_model_4, utc_Model_tvb, 0, 1, ENC_BIG_ENDIAN);
}
if (len >= 5) {
proto_tree_add_item(subtree, hf_lpp_T_utc_Model_model_5, utc_Model_tvb, 0, 1, ENC_BIG_ENDIAN);
}
}
#.FN_BODY GNSS-ID/gnss-id VAL_PTR = &gnss_id
guint32 gnss_id;
%(DEFAULT_BODY)s
actx->private_data = GUINT_TO_POINTER(gnss_id);
#.FN_BODY GNSS-ID-Bitmap/gnss-ids VAL_PTR = &gnss_ids_tvb LEN_PTR = &len
tvbuff_t *gnss_ids_tvb = NULL;
int len;
@ -1306,6 +1553,9 @@ GNSS-SatMeasElement/adr DISPLAY=BASE_CUSTOM STRINGS=&lpp_adr_fmt
if (len >= 5) {
proto_tree_add_item(subtree, hf_lpp_T_gnss_ids_glonass, gnss_ids_tvb, 0, 1, ENC_BIG_ENDIAN);
}
if (len >= 6) {
proto_tree_add_item(subtree, hf_lpp_T_gnss_ids_bds, gnss_ids_tvb, 0, 1, ENC_BIG_ENDIAN);
}
}
#.FN_BODY SBAS-IDs/sbas-IDs VAL_PTR = &sbas_IDs_tvb LEN_PTR = &len

528
asn1/lpp/packet-lpp-template.c
View File

File diff suppressed because it is too large Load Diff

4
asn1/lpp/packet-lpp-template.h
View File

@ -1,6 +1,6 @@
/* packet-lpp.h
* Routines for 3GPP LTE Positioning Protocol (LLP) packet dissection
* Copyright 2011, Pascal Quantin <pascal.quantin@gmail.com>
* Copyright 2011-2015 Pascal Quantin <pascal.quantin@gmail.com>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -20,7 +20,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 36.355 version 11.6.0 Release 11
* Ref 3GPP TS 36.355 version 12.3.0 Release 12
* http://www.3gpp.org
*/

2097
epan/dissectors/packet-lpp.c
View File

File diff suppressed because it is too large Load Diff

4
epan/dissectors/packet-lpp.h
View File

@ -8,7 +8,7 @@
#line 1 "../../asn1/lpp/packet-lpp-template.h"
/* packet-lpp.h
* Routines for 3GPP LTE Positioning Protocol (LLP) packet dissection
* Copyright 2011, Pascal Quantin <pascal.quantin@gmail.com>
* Copyright 2011-2015 Pascal Quantin <pascal.quantin@gmail.com>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -28,7 +28,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 36.355 version 11.6.0 Release 11
* Ref 3GPP TS 36.355 version 12.3.0 Release 12
* http://www.3gpp.org
*/