diff options
| author | Pascal Quantin <pascal@wireshark.org> | 2020-03-19 15:12:01 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal@wireshark.org> | 2020-03-19 14:34:31 +0000 |
| commit | dd4125954800cf5a62aabdc33a208f1102648b51 (patch) | |
| tree | 2168b405f64fc2bcb2c3fe7d65b3b325abd4a932 | |
| parent | 8a959eff088fe4123ea93e491c969a3b8c51b896 (diff) | |
NR RRC: fix dissection of q-RxLevMin parameter
Change-Id: Ia8aa965e19d7ad55d7197cb636b203140abfba5b
Reviewed-on: https://code.wireshark.org/review/36501
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
| -rw-r--r-- | epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-nr-rrc.c | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c index 2876ac62d6..63ab443323 100644 --- a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c +++ b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c @@ -162,7 +162,9 @@ nr_rrc_call_dissector(dissector_handle_t handle, tvbuff_t *tvb, packet_info *pin static void nr_rrc_q_RxLevMin_fmt(gchar *s, guint32 v) { - g_snprintf(s, ITEM_LABEL_LENGTH, "%u dB (%u)", 2*v, v); + gint32 d = (gint32)v; + + g_snprintf(s, ITEM_LABEL_LENGTH, "%d dB (%d)", 2*d, d); } static const value_string nr_rrc_serialNumber_gs_vals[] = { diff --git a/epan/dissectors/packet-nr-rrc.c b/epan/dissectors/packet-nr-rrc.c index 4aa7760b4e..be48ef069d 100644 --- a/epan/dissectors/packet-nr-rrc.c +++ b/epan/dissectors/packet-nr-rrc.c @@ -4598,7 +4598,9 @@ nr_rrc_call_dissector(dissector_handle_t handle, tvbuff_t *tvb, packet_info *pin static void nr_rrc_q_RxLevMin_fmt(gchar *s, guint32 v) { - g_snprintf(s, ITEM_LABEL_LENGTH, "%u dB (%u)", 2*v, v); + gint32 d = (gint32)v; + + g_snprintf(s, ITEM_LABEL_LENGTH, "%d dB (%d)", 2*d, d); } static const value_string nr_rrc_serialNumber_gs_vals[] = { @@ -44430,7 +44432,7 @@ static int dissect_UECapabilityEnquiry_v1560_IEs_PDU(tvbuff_t *tvb _U_, packet_i /*--- End of included file: packet-nr-rrc-fn.c ---*/ -#line 381 "./asn1/nr-rrc/packet-nr-rrc-template.c" +#line 383 "./asn1/nr-rrc/packet-nr-rrc-template.c" void proto_register_nr_rrc(void) { @@ -56439,7 +56441,7 @@ proto_register_nr_rrc(void) { NULL, HFILL }}, /*--- End of included file: packet-nr-rrc-hfarr.c ---*/ -#line 389 "./asn1/nr-rrc/packet-nr-rrc-template.c" +#line 391 "./asn1/nr-rrc/packet-nr-rrc-template.c" { &hf_nr_rrc_serialNumber_gs, { "Geographical Scope", "nr-rrc.serialNumber.gs", @@ -57813,7 +57815,7 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_OverheatingAssistanceConfig, /*--- End of included file: packet-nr-rrc-ettarr.c ---*/ -#line 523 "./asn1/nr-rrc/packet-nr-rrc-template.c" +#line 525 "./asn1/nr-rrc/packet-nr-rrc-template.c" &ett_nr_rrc_DedicatedNAS_Message, &ett_rr_rrc_targetRAT_MessageContainer, &ett_nr_rrc_nas_Container, @@ -57875,7 +57877,7 @@ proto_register_nr_rrc(void) { /*--- End of included file: packet-nr-rrc-dis-reg.c ---*/ -#line 566 "./asn1/nr-rrc/packet-nr-rrc-template.c" +#line 568 "./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); |