osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

LPP: upgrade dissector to v16.6.0

This commit is contained in:
Pascal Quantin 2021-09-29 09:44:30 +02:00 committed by Wireshark GitLab Utility
parent e9ac4d3900
commit 4010502a82
5 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/lpp/LPP-Broadcast-Definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 37.355 V16.5.0 (2021-06)
-- 3GPP TS 37.355 V16.6.0 (2021-09)
LPP-Broadcast-Definitions

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

@ -1,4 +1,4 @@
-- 3GPP TS 37.355 V16.5.0 (2021-06)
-- 3GPP TS 37.355 V16.6.0 (2021-09)
LPP-PDU-Definitions {
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
@ -887,10 +887,13 @@ NR-DL-PRS-AssistanceDataPerTRP-r16 ::= SEQUENCE {
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
nr-DL-PRS-ExpectedRSTD-Uncertainty-r16
INTEGER (0..246),
nr-DL-PRS-Info-r16 NR-DL-PRS-Info-r16,
...
...,
[[
prs-OnlyTP-r16 ENUMERATED { true } OPTIONAL -- Need ON
]]
}
NR-DL-PRS-PositioningFrequencyLayer-r16 ::= SEQUENCE {
@ -1266,15 +1269,15 @@ NR-SelectedDL-PRS-PerFreq-r16 ::= SEQUENCE {
nr-SelectedDL-PRS-FrequencyLayerIndex-r16 INTEGER (0..nrMaxFreqLayers-1-r16),
nr-SelectedDL-PRS-IndexListPerFreq-r16 SEQUENCE (SIZE (1..nrMaxTRPsPerFreq-r16)) OF
NR-SelectedDL-PRS-IndexPerTRP-r16
OPTIONAL, --Need ON
OPTIONAL, --Need OP
...
}
NR-SelectedDL-PRS-IndexPerTRP-r16 ::= SEQUENCE {
nr-SelectedTRP-Index-r16 INTEGER (0..nrMaxTRPsPerFreq-1-r16),
dl-SelectedPRS-ResourceSetIndexList-r16 SEQUENCE (SIZE (1..nrMaxSetsPerTrpPerFreqLayer-r16)) OF
DL-SelectedPRS-ResourceSetIndex-r16
OPTIONAL, --Need ON
dl-SelectedPRS-ResourceSetIndexList-r16 SEQUENCE (SIZE (1..nrMaxSetsPerTrpPerFreqLayer-r16))
OF DL-SelectedPRS-ResourceSetIndex-r16
OPTIONAL, --Need OP
...
}
@ -1282,7 +1285,7 @@ DL-SelectedPRS-ResourceSetIndex-r16 ::= SEQUENCE {
nr-DL-SelectedPRS-ResourceSetIndex-r16 INTEGER (0..nrMaxSetsPerTrpPerFreqLayer-1-r16),
dl-SelectedPRS-ResourceIndexList-r16 SEQUENCE (SIZE (1..nrMaxResourcesPerSet-r16)) OF
DL-SelectedPRS-ResourceIndex-r16
OPTIONAL --Need ON
OPTIONAL --Need OP
}
DL-SelectedPRS-ResourceIndex-r16 ::= SEQUENCE {

2
epan/dissectors/asn1/lpp/lpp.cnf
View File

@ -1,6 +1,6 @@
# lpp.cnf
# lpp conformation file
# Copyright 2011-2020 Pascal Quantin
# Copyright 2011-2021 Pascal Quantin
#.OPT
PER

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

@ -8,7 +8,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* Ref 3GPP TS 37.355 version 16.5.0 Release 16
* Ref 3GPP TS 37.355 version 16.6.0 Release 16
* http://www.3gpp.org
*/

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

@ -16,7 +16,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* Ref 3GPP TS 37.355 version 16.5.0 Release 16
* Ref 3GPP TS 37.355 version 16.6.0 Release 16
* http://www.3gpp.org
*/
@ -412,6 +412,7 @@ static int hf_lpp_nr_DL_PRS_SFN0_Offset_r16 = -1; /* NR_DL_PRS_SFN0_Offset_r16
static int hf_lpp_nr_DL_PRS_ExpectedRSTD_r16 = -1; /* INTEGER_M3841_3841 */
static int hf_lpp_nr_DL_PRS_ExpectedRSTD_Uncertainty_r16 = -1; /* INTEGER_0_246 */
static int hf_lpp_nr_DL_PRS_Info_r16 = -1; /* NR_DL_PRS_Info_r16 */
static int hf_lpp_prs_OnlyTP_r16 = -1; /* T_prs_OnlyTP_r16 */
static int hf_lpp_dl_PRS_SubcarrierSpacing_r16 = -1; /* T_dl_PRS_SubcarrierSpacing_r16 */
static int hf_lpp_dl_PRS_ResourceBandwidth_r16 = -1; /* INTEGER_1_63 */
static int hf_lpp_dl_PRS_StartPRB_r16 = -1; /* INTEGER_0_2176 */
@ -19531,6 +19532,34 @@ dissect_lpp_NR_DL_PRS_Info_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
}
static const value_string lpp_T_prs_OnlyTP_r16_vals[] = {
{ 0, "true" },
{ 0, NULL }
};
static int
dissect_lpp_T_prs_OnlyTP_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,
1, NULL, FALSE, 0, NULL);
return offset;
}
static const per_sequence_t NR_DL_PRS_AssistanceDataPerTRP_r16_eag_1_sequence[] = {
{ &hf_lpp_prs_OnlyTP_r16 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lpp_T_prs_OnlyTP_r16 },
{ NULL, 0, 0, NULL }
};
static int
dissect_lpp_NR_DL_PRS_AssistanceDataPerTRP_r16_eag_1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence_eag(tvb, offset, actx, tree, NR_DL_PRS_AssistanceDataPerTRP_r16_eag_1_sequence);
return offset;
}
static const per_sequence_t NR_DL_PRS_AssistanceDataPerTRP_r16_sequence[] = {
{ &hf_lpp_dl_PRS_ID_r16 , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_INTEGER_0_255 },
{ &hf_lpp_nr_PhysCellID_r16, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_NR_PhysCellID_r16 },
@ -19540,6 +19569,7 @@ static const per_sequence_t NR_DL_PRS_AssistanceDataPerTRP_r16_sequence[] = {
{ &hf_lpp_nr_DL_PRS_ExpectedRSTD_r16, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_INTEGER_M3841_3841 },
{ &hf_lpp_nr_DL_PRS_ExpectedRSTD_Uncertainty_r16, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_INTEGER_0_246 },
{ &hf_lpp_nr_DL_PRS_Info_r16, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_NR_DL_PRS_Info_r16 },
{ &dummy_hf_lpp_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_NR_DL_PRS_AssistanceDataPerTRP_r16_eag_1 },
{ NULL, 0, 0, NULL }
};
@ -28006,6 +28036,10 @@ void proto_register_lpp(void) {
{ "nr-DL-PRS-Info-r16", "lpp.nr_DL_PRS_Info_r16_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_lpp_prs_OnlyTP_r16,
{ "prs-OnlyTP-r16", "lpp.prs_OnlyTP_r16",
FT_UINT32, BASE_DEC, VALS(lpp_T_prs_OnlyTP_r16_vals), 0,
NULL, HFILL }},
{ &hf_lpp_dl_PRS_SubcarrierSpacing_r16,
{ "dl-PRS-SubcarrierSpacing-r16", "lpp.dl_PRS_SubcarrierSpacing_r16",
FT_UINT32, BASE_DEC, VALS(lpp_T_dl_PRS_SubcarrierSpacing_r16_vals), 0,