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

LPP: fix RSRP, NRSRP and NRSRQ inequalities 

Change-Id: Idf3883b7a19bb7910e5762bc4caaad509d9a30a7
Reviewed-on: https://code.wireshark.org/review/26708
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2018-04-02 08:18:34 +02:00
parent 7ee07493cb
commit c9904986f7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);
}

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

@ -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);
}