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

LPP: upgrade dissector to v16.3.0

This commit is contained in:
Pascal Quantin 2021-01-07 11:52:17 +01:00 committed by Wireshark GitLab Utility
parent 6fb9455327
commit 15b574de49
8 changed files with 88 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/asn1/lpp/CMakeLists.txt
View File

@ -19,7 +19,8 @@ set( EXT_ASN_FILE_LIST
)
set( ASN_FILE_LIST
LPP.asn
LPP-PDU-Definitions.asn
LPP-Broadcast-Definitions.asn
)
set( EXTRA_DIST

61
epan/dissectors/asn1/lpp/LPP-Broadcast-Definitions.asn Normal file
View File

@ -0,0 +1,61 @@
-- 3GPP TS 37.355 V16.3.0 (2020-12)
LPP-Broadcast-Definitions
DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
IMPORTS
OTDOA-ReferenceCellInfo,
OTDOA-NeighbourCellInfoList,
NR-TRP-LocationInfo-r16,
NR-DL-PRS-BeamInfo-r16,
NR-RTD-Info-r16
FROM LPP-PDU-Definitions;
AssistanceDataSIBelement-r15 ::= SEQUENCE {
valueTag-r15 INTEGER (0..63) OPTIONAL,
expirationTime-r15 UTCTime OPTIONAL,
cipheringKeyData-r15 CipheringKeyData-r15 OPTIONAL,
segmentationInfo-r15 SegmentationInfo-r15 OPTIONAL,
assistanceDataElement-r15 OCTET STRING,
...
}
CipheringKeyData-r15 ::= SEQUENCE {
cipherSetID-r15 INTEGER (0..65535),
d0-r15 BIT STRING (SIZE (1..128)),
...
}
SegmentationInfo-r15 ::= SEQUENCE {
segmentationOption-r15 ENUMERATED {pseudo-seg, octet-string-seg},
assistanceDataSegmentType-r15 ENUMERATED {notLastSegment, lastSegment},
assistanceDataSegmentNumber-r15 INTEGER (0..63),
...
}
OTDOA-UE-Assisted-r15 ::= SEQUENCE {
otdoa-ReferenceCellInfo-r15 OTDOA-ReferenceCellInfo,
otdoa-NeighbourCellInfo-r15 OTDOA-NeighbourCellInfoList,
...
}
NR-UEB-TRP-LocationData-r16 ::= SEQUENCE {
nr-trp-LocationInfo-r16 NR-TRP-LocationInfo-r16,
nr-dl-prs-BeamInfo-r16 NR-DL-PRS-BeamInfo-r16 OPTIONAL, -- Need ON
...
}
NR-UEB-TRP-RTD-Info-r16 ::= SEQUENCE {
nr-rtd-Info-r16 NR-RTD-Info-r16,
...
}
END

58
epan/dissectors/asn1/lpp/LPP.asn → epan/dissectors/asn1/lpp/LPP-PDU-Definitions.asn
View File

@ -1,5 +1,4 @@
-- 3GPP TS 37.355 V16.2.0 (2020-09)
-- 3GPP TS 37.355 V16.3.0 (2020-12)
LPP-PDU-Definitions {
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
@ -881,7 +880,7 @@ NR-DL-PRS-AssistanceDataPerTRP-r16 ::= SEQUENCE {
dl-PRS-ID-r16 INTEGER (0..255),
nr-PhysCellID-r16 NR-PhysCellID-r16 OPTIONAL, -- Need ON
nr-CellGlobalID-r16 NCGI-r15 OPTIONAL, -- Need ON
nr-ARFCN-r16 ARFCN-ValueNR-r15 OPTIONAL, -- Cond NotSameAsRefServ
nr-ARFCN-r16 ARFCN-ValueNR-r15 OPTIONAL, -- Need ON
nr-DL-PRS-SFN0-Offset-r16 NR-DL-PRS-SFN0-Offset-r16,
nr-DL-PRS-ExpectedRSTD-r16 INTEGER (-3841..3841),
nr-DL-PRS-ExpectedRSTD-Uncertainty-r16
@ -916,7 +915,7 @@ NR-DL-PRS-BeamInfoPerTRP-r16 ::= SEQUENCE {
dl-PRS-ID-r16 INTEGER (0..255),
nr-PhysCellID-r16 NR-PhysCellID-r16 OPTIONAL, -- Need ON
nr-CellGlobalID-r16 NCGI-r15 OPTIONAL, -- Need ON
nr-ARFCN-r16 ARFCN-ValueNR-r15 OPTIONAL, -- Cond NotSameAsRefServ
nr-ARFCN-r16 ARFCN-ValueNR-r15 OPTIONAL, -- Need ON
associated-DL-PRS-ID-r16 INTEGER (0..255) OPTIONAL,
lcs-GCS-TranslationParameter-r16 LCS-GCS-TranslationParameter-r16
OPTIONAL, -- Need OP
@ -1125,7 +1124,7 @@ PRS-ProcessingCapabilityPerBand-r16 ::= SEQUENCE {
},
dl-PRS-BufferType-r16 ENUMERATED {type1, type2, ...},
durationOfPRS-Processing-r16 SEQUENCE {
durationOfPRS-ProcessingSysmbols-r16 ENUMERATED {nDot125, nDot25, nDot5, n1,
durationOfPRS-ProcessingSymbols-r16 ENUMERATED {nDot125, nDot25, nDot5, n1,
n2, n4, n6, n8, n12, n16, n20, n25,
n30, n32, n35, n40, n45, n50},
durationOfPRS-ProcessingSymbolsInEveryTms-r16
@ -1309,7 +1308,7 @@ NR-TimeStamp-r16 ::= SEQUENCE {
dl-PRS-ID-r16 INTEGER (0..255),
nr-PhysCellID-r16 NR-PhysCellID-r16 OPTIONAL, -- Need ON
nr-CellGlobalID-r16 NCGI-r15 OPTIONAL, -- Need ON
nr-ARFCN-r16 ARFCN-ValueNR-r15 OPTIONAL, -- Cond NotSameAsRefServ
nr-ARFCN-r16 ARFCN-ValueNR-r15 OPTIONAL, -- Need ON
nr-SFN-r16 INTEGER (0..1023),
nr-Slot-r16 CHOICE {
scs15-r16 INTEGER (0..9),
@ -1342,7 +1341,7 @@ TRP-LocationInfoElement-r16 ::= SEQUENCE {
dl-PRS-ID-r16 INTEGER (0..255),
nr-PhysCellID-r16 NR-PhysCellID-r16 OPTIONAL, -- Need ON
nr-CellGlobalID-r16 NCGI-r15 OPTIONAL, -- Need ON
nr-ARFCN-r16 ARFCN-ValueNR-r15 OPTIONAL, -- Cond NotSameAsRefServ
nr-ARFCN-r16 ARFCN-ValueNR-r15 OPTIONAL, -- Need ON
associated-DL-PRS-ID-r16 INTEGER (0..255) OPTIONAL,
trp-Location-r16 RelativeLocation-r16 OPTIONAL, -- Need OP
trp-DL-PRS-ResourceSets-r16 SEQUENCE (SIZE(1..nrMaxSetsPerTrp-r16)) OF
@ -4028,7 +4027,7 @@ GNSS-GenericAssistanceDataSupport ::=
GNSS-GenericAssistDataSupportElement ::= SEQUENCE {
gnss-ID GNSS-ID,
sbas-ID SBAS-ID OPTIONAL, -- Cond GNSS-ID-SBAS
sbas-ID SBAS-ID OPTIONAL, -- Cond GNSS‑ID‑SBAS
gnss-TimeModelsSupport GNSS-TimeModelListSupport
OPTIONAL, -- Cond TimeModSup
gnss-DifferentialCorrectionsSupport GNSS-DifferentialCorrectionsSupport
@ -5730,48 +5729,5 @@ maxBandComb-r16 INTEGER ::= 1024
nrMaxConfiguredBands-r16 INTEGER ::= 16
AssistanceDataSIBelement-r15 ::= SEQUENCE {
valueTag-r15 INTEGER (0..63) OPTIONAL,
expirationTime-r15 UTCTime OPTIONAL,
cipheringKeyData-r15 CipheringKeyData-r15 OPTIONAL,
segmentationInfo-r15 SegmentationInfo-r15 OPTIONAL,
assistanceDataElement-r15 OCTET STRING,
...
}
CipheringKeyData-r15 ::= SEQUENCE {
cipherSetID-r15 INTEGER (0..65535),
d0-r15 BIT STRING (SIZE (1..128)),
...
}
SegmentationInfo-r15 ::= SEQUENCE {
segmentationOption-r15 ENUMERATED {pseudo-seg, octet-string-seg},
assistanceDataSegmentType-r15 ENUMERATED {notLastSegment, lastSegment},
assistanceDataSegmentNumber-r15 INTEGER (0..63),
...
}
OTDOA-UE-Assisted-r15 ::= SEQUENCE {
otdoa-ReferenceCellInfo-r15 OTDOA-ReferenceCellInfo,
otdoa-NeighbourCellInfo-r15 OTDOA-NeighbourCellInfoList,
...
}
NR-UEB-TRP-LocationData-r16 ::= SEQUENCE {
nr-trp-LocationInfo-r16 NR-TRP-LocationInfo-r16,
nr-dl-prs-BeamInfo-r16 NR-DL-PRS-BeamInfo-r16 OPTIONAL, -- Need ON
...
}
NR-UEB-TRP-RTD-Info-r16 ::= SEQUENCE {
nr-rtd-Info-r16 NR-RTD-Info-r16,
...
}
END

4
epan/dissectors/asn1/lpp/packet-lpp-template.c
View File

@ -1,6 +1,6 @@
/* packet-lpp.c
* Routines for 3GPP LTE Positioning Protocol (LPP) packet dissection
* Copyright 2011-2019 Pascal Quantin <pascal@wireshark.org>
* Copyright 2011-2021 Pascal Quantin <pascal@wireshark.org>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -8,7 +8,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* Ref 3GPP TS 37.355 version 16.2.0 Release 16
* Ref 3GPP TS 37.355 version 16.3.0 Release 16
* http://www.3gpp.org
*/

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

@ -1,6 +1,6 @@
/* packet-lpp.h
* Routines for 3GPP LTE Positioning Protocol (LPP) packet dissection
* Copyright 2011-2019 Pascal Quantin <pascal@wireshark.org>
* Copyright 2011-2021 Pascal Quantin <pascal@wireshark.org>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -8,8 +8,6 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* Ref 3GPP TS 37.355 version 16.2.0 Release 16
* http://www.3gpp.org
*/
#ifndef PACKET_LPP_H

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

@ -1,14 +1,14 @@
/* Do not modify this file. Changes will be overwritten. */
/* Generated automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-lpp.c */
/* asn2wrs.py -p lpp -c ./lpp.cnf -s ./packet-lpp-template -D . -O ../.. LPP.asn */
/* asn2wrs.py -p lpp -c ./lpp.cnf -s ./packet-lpp-template -D . -O ../.. LPP-PDU-Definitions.asn LPP-Broadcast-Definitions.asn */
/* Input file: packet-lpp-template.c */
#line 1 "./asn1/lpp/packet-lpp-template.c"
/* packet-lpp.c
* Routines for 3GPP LTE Positioning Protocol (LPP) packet dissection
* Copyright 2011-2019 Pascal Quantin <pascal@wireshark.org>
* Copyright 2011-2021 Pascal Quantin <pascal@wireshark.org>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -16,7 +16,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* Ref 3GPP TS 37.355 version 16.2.0 Release 16
* Ref 3GPP TS 37.355 version 16.3.0 Release 16
* http://www.3gpp.org
*/
@ -510,7 +510,7 @@ static int hf_lpp_fr1 = -1; /* T_fr1 */
static int hf_lpp_fr2 = -1; /* T_fr2 */
static int hf_lpp_dl_PRS_BufferType_r16 = -1; /* T_dl_PRS_BufferType_r16 */
static int hf_lpp_durationOfPRS_Processing_r16 = -1; /* T_durationOfPRS_Processing_r16 */
static int hf_lpp_durationOfPRS_ProcessingSysmbols_r16 = -1; /* T_durationOfPRS_ProcessingSysmbols_r16 */
static int hf_lpp_durationOfPRS_ProcessingSymbols_r16 = -1; /* T_durationOfPRS_ProcessingSymbols_r16 */
static int hf_lpp_durationOfPRS_ProcessingSymbolsInEveryTms_r16 = -1; /* T_durationOfPRS_ProcessingSymbolsInEveryTms_r16 */
static int hf_lpp_maxNumOfDL_PRS_ResProcessedPerSlot_r16 = -1; /* T_maxNumOfDL_PRS_ResProcessedPerSlot_r16 */
static int hf_lpp_scs15_r16_01 = -1; /* T_scs15_r16_01 */
@ -8530,7 +8530,7 @@ dissect_lpp_T_dl_PRS_BufferType_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
}
static const value_string lpp_T_durationOfPRS_ProcessingSysmbols_r16_vals[] = {
static const value_string lpp_T_durationOfPRS_ProcessingSymbols_r16_vals[] = {
{ 0, "nDot125" },
{ 1, "nDot25" },
{ 2, "nDot5" },
@ -8554,7 +8554,7 @@ static const value_string lpp_T_durationOfPRS_ProcessingSysmbols_r16_vals[] = {
static int
dissect_lpp_T_durationOfPRS_ProcessingSysmbols_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
dissect_lpp_T_durationOfPRS_ProcessingSymbols_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
18, NULL, FALSE, 0, NULL);
@ -8587,7 +8587,7 @@ dissect_lpp_T_durationOfPRS_ProcessingSymbolsInEveryTms_r16(tvbuff_t *tvb _U_, i
static const per_sequence_t T_durationOfPRS_Processing_r16_sequence[] = {
{ &hf_lpp_durationOfPRS_ProcessingSysmbols_r16, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_T_durationOfPRS_ProcessingSysmbols_r16 },
{ &hf_lpp_durationOfPRS_ProcessingSymbols_r16, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_T_durationOfPRS_ProcessingSymbols_r16 },
{ &hf_lpp_durationOfPRS_ProcessingSymbolsInEveryTms_r16, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_T_durationOfPRS_ProcessingSymbolsInEveryTms_r16 },
{ NULL, 0, 0, NULL }
};
@ -28398,9 +28398,9 @@ void proto_register_lpp(void) {
{ "durationOfPRS-Processing-r16", "lpp.durationOfPRS_Processing_r16_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_lpp_durationOfPRS_ProcessingSysmbols_r16,
{ "durationOfPRS-ProcessingSysmbols-r16", "lpp.durationOfPRS_ProcessingSysmbols_r16",
FT_UINT32, BASE_DEC, VALS(lpp_T_durationOfPRS_ProcessingSysmbols_r16_vals), 0,
{ &hf_lpp_durationOfPRS_ProcessingSymbols_r16,
{ "durationOfPRS-ProcessingSymbols-r16", "lpp.durationOfPRS_ProcessingSymbols_r16",
FT_UINT32, BASE_DEC, VALS(lpp_T_durationOfPRS_ProcessingSymbols_r16_vals), 0,
NULL, HFILL }},
{ &hf_lpp_durationOfPRS_ProcessingSymbolsInEveryTms_r16,
{ "durationOfPRS-ProcessingSymbolsInEveryTms-r16", "lpp.durationOfPRS_ProcessingSymbolsInEveryTms_r16",

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

@ -1,14 +1,14 @@
/* Do not modify this file. Changes will be overwritten. */
/* Generated automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-lpp.h */
/* asn2wrs.py -p lpp -c ./lpp.cnf -s ./packet-lpp-template -D . -O ../.. LPP.asn */
/* asn2wrs.py -p lpp -c ./lpp.cnf -s ./packet-lpp-template -D . -O ../.. LPP-PDU-Definitions.asn LPP-Broadcast-Definitions.asn */
/* Input file: packet-lpp-template.h */
#line 1 "./asn1/lpp/packet-lpp-template.h"
/* packet-lpp.h
* Routines for 3GPP LTE Positioning Protocol (LPP) packet dissection
* Copyright 2011-2019 Pascal Quantin <pascal@wireshark.org>
* Copyright 2011-2021 Pascal Quantin <pascal@wireshark.org>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -16,8 +16,6 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* Ref 3GPP TS 37.355 version 16.2.0 Release 16
* http://www.3gpp.org
*/
#ifndef PACKET_LPP_H
@ -110,6 +108,6 @@ int dissect_lpp_Sensor_MotionInformation_r15_PDU(tvbuff_t *tvb _U_, packet_info
int dissect_lpp_DisplacementTimeStamp_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
/*--- End of included file: packet-lpp-exp.h ---*/
#line 64 "./asn1/lpp/packet-lpp-template.h"
#line 62 "./asn1/lpp/packet-lpp-template.h"
#endif /* PACKET_LPP_H */

4
tools/extract_asn1_from_spec.pl
View File

@ -58,8 +58,8 @@ sub extract_asn1 {
$is_asn1 = 0;
}
if(($file_name_found == 0) && ($line =~ m/ LPP-PDU-Definitions/)){
$output_file_name = "LPP.asn";
if(($file_name_found == 0) && ($line =~ m/^LPP-Broadcast-Definitions/)){
$output_file_name = "LPP-Broadcast-Definitions.asn";
print "generating $output_file_name\n";
open(OUTPUT_FILE, "> $output_file_name") or die "Can not open file $output_file_name";
$file_name_found = 1;