From c9904986f7c52857bed8bb72bbe61b39c8f8de12 Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Mon, 2 Apr 2018 08:18:34 +0200 Subject: [PATCH] LPP: fix RSRP, NRSRP and NRSRQ inequalities Change-Id: Idf3883b7a19bb7910e5762bc4caaad509d9a30a7 Reviewed-on: https://code.wireshark.org/review/26708 Reviewed-by: Pascal Quantin --- epan/dissectors/asn1/lpp/packet-lpp-template.c | 6 +++--- epan/dissectors/packet-lpp.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epan/dissectors/asn1/lpp/packet-lpp-template.c b/epan/dissectors/asn1/lpp/packet-lpp-template.c index 641946ab94..81780156b7 100644 --- a/epan/dissectors/asn1/lpp/packet-lpp-template.c +++ b/epan/dissectors/asn1/lpp/packet-lpp-template.c @@ -1642,7 +1642,7 @@ lpp_rsrp_Result_fmt(gchar *s, guint32 v) if (v == 0) { g_snprintf(s, ITEM_LABEL_LENGTH, "RSRP < -140dBm (0)"); } else if (v < 97) { - g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm < RSRP <= %ddBm (%u)", v-141, v-140, v); + g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm <= RSRP < %ddBm (%u)", v-141, v-140, v); } else { g_snprintf(s, ITEM_LABEL_LENGTH, "-44dBm <= RSRP (97)"); } @@ -1666,7 +1666,7 @@ lpp_nrsrp_Result_fmt(gchar *s, guint32 v) if (v == 0) { g_snprintf(s, ITEM_LABEL_LENGTH, "NRSRP < -156dBm (0)"); } else if (v < 113) { - g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm < NRSRP <= %ddBm (%u)", v-157, v-156, v); + g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm <= NRSRP < %ddBm (%u)", v-157, v-156, v); } else { g_snprintf(s, ITEM_LABEL_LENGTH, "-44dBm <= NRSRP (97)"); } @@ -1678,7 +1678,7 @@ lpp_nrsrq_Result_fmt(gchar *s, guint32 v) if (v == 0) { g_snprintf(s, ITEM_LABEL_LENGTH, "NRSRQ < -19.5dB (0)"); } else if (v < 46) { - g_snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB < NRSRQ <= %.1fdB (%u)", ((float)v/2)-20, (((float)v+1)/2)-20, v); + g_snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB <= NRSRQ < %.1fdB (%u)", ((float)v/2)-20, (((float)v+1)/2)-20, v); } else { g_snprintf(s, ITEM_LABEL_LENGTH, "2.5dB <= NRSRQ (%u)", v); } diff --git a/epan/dissectors/packet-lpp.c b/epan/dissectors/packet-lpp.c index 30bf987948..37d4dbdf99 100644 --- a/epan/dissectors/packet-lpp.c +++ b/epan/dissectors/packet-lpp.c @@ -3375,7 +3375,7 @@ lpp_rsrp_Result_fmt(gchar *s, guint32 v) if (v == 0) { g_snprintf(s, ITEM_LABEL_LENGTH, "RSRP < -140dBm (0)"); } else if (v < 97) { - g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm < RSRP <= %ddBm (%u)", v-141, v-140, v); + g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm <= RSRP < %ddBm (%u)", v-141, v-140, v); } else { g_snprintf(s, ITEM_LABEL_LENGTH, "-44dBm <= RSRP (97)"); } @@ -3399,7 +3399,7 @@ lpp_nrsrp_Result_fmt(gchar *s, guint32 v) if (v == 0) { g_snprintf(s, ITEM_LABEL_LENGTH, "NRSRP < -156dBm (0)"); } else if (v < 113) { - g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm < NRSRP <= %ddBm (%u)", v-157, v-156, v); + g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm <= NRSRP < %ddBm (%u)", v-157, v-156, v); } else { g_snprintf(s, ITEM_LABEL_LENGTH, "-44dBm <= NRSRP (97)"); } @@ -3411,7 +3411,7 @@ lpp_nrsrq_Result_fmt(gchar *s, guint32 v) if (v == 0) { g_snprintf(s, ITEM_LABEL_LENGTH, "NRSRQ < -19.5dB (0)"); } else if (v < 46) { - g_snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB < NRSRQ <= %.1fdB (%u)", ((float)v/2)-20, (((float)v+1)/2)-20, v); + g_snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB <= NRSRQ < %.1fdB (%u)", ((float)v/2)-20, (((float)v+1)/2)-20, v); } else { g_snprintf(s, ITEM_LABEL_LENGTH, "2.5dB <= NRSRQ (%u)", v); }