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

NR RRC: fix dissection of MeasTriggerQuantityOffset element 

(cherry picked from commit aa5df68171)

Conflicts:
	epan/dissectors/packet-nr-rrc.c
This commit is contained in:
Pascal Quantin 2021-07-04 12:03:45 +02:00
parent bb4c32b75e
commit 9b21140c8e
3 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
View File

@ -1149,13 +1149,13 @@ SINR-RangeEUTRA DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_SINR_RangeEUTRA_fmt)
MsgA-PUSCH-Config-r16/msgA-DeltaPreamble-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
#.TYPE_ATTR
MeasTriggerQuantityOffset/rsrp DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
MeasTriggerQuantityOffset/rsrp DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_MeasTriggerQuantityOffset_fmt)
#.TYPE_ATTR
MeasTriggerQuantityOffset/rsrq DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
MeasTriggerQuantityOffset/rsrq DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_MeasTriggerQuantityOffset_fmt)
#.TYPE_ATTR
MeasTriggerQuantityOffset/sinr DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
MeasTriggerQuantityOffset/sinr DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_MeasTriggerQuantityOffset_fmt)
#.TYPE_ATTR
ReselectionThreshold DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_ReselectionThreshold_fmt)

8
epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c
View File

@ -509,6 +509,14 @@ nr_rrc_SRS_RSRP_r16_fmt(gchar *s, guint32 v)
}
}
static void
nr_rrc_MeasTriggerQuantityOffset_fmt(gchar *s, guint32 v)
{
gint32 d = (gint32)v;
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB (%d)", (float)d/2, d);
}
#include "packet-nr-rrc-fn.c"
int

22
epan/dissectors/packet-nr-rrc.c
View File

@ -9004,6 +9004,14 @@ nr_rrc_SRS_RSRP_r16_fmt(gchar *s, guint32 v)
}
}
static void
nr_rrc_MeasTriggerQuantityOffset_fmt(gchar *s, guint32 v)
{
gint32 d = (gint32)v;
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB (%d)", (float)d/2, d);
}
/*--- Included file: packet-nr-rrc-fn.c ---*/
#line 1 "./asn1/nr-rrc/packet-nr-rrc-fn.c"
@ -86262,7 +86270,7 @@ static int dissect_UECapabilityEnquiry_v1560_IEs_PDU(tvbuff_t *tvb _U_, packet_i
/*--- End of included file: packet-nr-rrc-fn.c ---*/
#line 513 "./asn1/nr-rrc/packet-nr-rrc-template.c"
#line 521 "./asn1/nr-rrc/packet-nr-rrc-template.c"
int
dissect_nr_rrc_nr_RLF_Report_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
@ -99503,15 +99511,15 @@ proto_register_nr_rrc(void) {
NULL, HFILL }},
{ &hf_nr_rrc_rsrp_02,
{ "rsrp", "nr-rrc.rsrp",
FT_INT32, BASE_DEC|BASE_UNIT_STRING, &units_dbm, 0,
FT_INT32, BASE_CUSTOM, CF_FUNC(nr_rrc_MeasTriggerQuantityOffset_fmt), 0,
"INTEGER_M30_30", HFILL }},
{ &hf_nr_rrc_rsrq_02,
{ "rsrq", "nr-rrc.rsrq",
FT_INT32, BASE_DEC|BASE_UNIT_STRING, &units_decibels, 0,
FT_INT32, BASE_CUSTOM, CF_FUNC(nr_rrc_MeasTriggerQuantityOffset_fmt), 0,
"INTEGER_M30_30", HFILL }},
{ &hf_nr_rrc_sinr_02,
{ "sinr", "nr-rrc.sinr",
FT_INT32, BASE_DEC|BASE_UNIT_STRING, &units_decibels, 0,
FT_INT32, BASE_CUSTOM, CF_FUNC(nr_rrc_MeasTriggerQuantityOffset_fmt), 0,
"INTEGER_M30_30", HFILL }},
{ &hf_nr_rrc_rsrp_03,
{ "rsrp", "nr-rrc.rsrp",
@ -109643,7 +109651,7 @@ proto_register_nr_rrc(void) {
"T_lowSE_64QAM_MCS_TableSidelink_r16_01", HFILL }},
/*--- End of included file: packet-nr-rrc-hfarr.c ---*/
#line 545 "./asn1/nr-rrc/packet-nr-rrc-template.c"
#line 553 "./asn1/nr-rrc/packet-nr-rrc-template.c"
{ &hf_nr_rrc_serialNumber_gs,
{ "Geographical Scope", "nr-rrc.serialNumber.gs",
@ -112131,7 +112139,7 @@ proto_register_nr_rrc(void) {
&ett_nr_rrc_T_fr2_r16_02,
/*--- End of included file: packet-nr-rrc-ettarr.c ---*/
#line 683 "./asn1/nr-rrc/packet-nr-rrc-template.c"
#line 691 "./asn1/nr-rrc/packet-nr-rrc-template.c"
&ett_nr_rrc_DedicatedNAS_Message,
&ett_nr_rrc_targetRAT_MessageContainer,
&ett_nr_rrc_nas_Container,
@ -112217,7 +112225,7 @@ proto_register_nr_rrc(void) {
/*--- End of included file: packet-nr-rrc-dis-reg.c ---*/
#line 748 "./asn1/nr-rrc/packet-nr-rrc-template.c"
#line 756 "./asn1/nr-rrc/packet-nr-rrc-template.c"
nr_rrc_etws_cmas_dcs_hash = wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(),
g_direct_hash, g_direct_equal);