aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Mathieson <martin.mathieson@keysight.com>2020-03-24 09:19:49 +0000
committerPascal Quantin <pascal@wireshark.org>2020-03-24 10:40:35 +0000
commitd854143e8fa49aea130a0dfa995fe7466076b7c8 (patch)
tree50a962b8417529f02c8fc223151e4db41f269707
parent9c28c92d78c9e936dd555b0b6fe277d890ebd7a4 (diff)
NAS-5GS: shift supi_fmt field before testing
From cppcheck: epan/dissectors/packet-nas_5gs.c:749: style: Mismatching assignment and comparison, comparison 'supi_fmt==1' is always false. Change-Id: I702f0cae24fd95dc925a87ab3766f2995f3eb759 Reviewed-on: https://code.wireshark.org/review/36554 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
-rw-r--r--epan/dissectors/packet-nas_5gs.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/dissectors/packet-nas_5gs.c b/epan/dissectors/packet-nas_5gs.c
index 9fa6666ca1..8ed0ff3b52 100644
--- a/epan/dissectors/packet-nas_5gs.c
+++ b/epan/dissectors/packet-nas_5gs.c
@@ -723,7 +723,7 @@ de_nas_5gs_mm_5gs_mobile_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo,
proto_tree_add_bitmask_list(tree, tvb, offset, 1, flags_supi_fmt_tid, ENC_BIG_ENDIAN);
offset++;
- supi_fmt = oct & 0x70;
+ supi_fmt = (oct & 0x70) >> 4;
if (supi_fmt == 0) {
/* IMSI */
@@ -3172,7 +3172,6 @@ de_nas_5gs_sm_qos_flow_des(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _
val, "%u %s (%u)", val * mult, unit_str, val);
curr_offset += (param_len - 1);
break;
- break;
case 0x06:
proto_tree_add_item(sub_tree2, hf_nas_5gs_sm_averaging_window, tvb, curr_offset, 2, ENC_BIG_ENDIAN);
curr_offset += param_len;