From d66b4a369aa825c5443ac9e2b3bebbcaddd22df0 Mon Sep 17 00:00:00 2001 From: Darien Spencer Date: Tue, 6 Jun 2017 13:14:56 -0700 Subject: [PATCH] FP - Fix missing TFI bitmask Parsing of the TFI field was not ignoring the 3 leftmost bits. Also updated the comment explaining his mask. Change-Id: I98d6ab9bdec3ce4a8640ece560a467ddbd5b8d42 Reviewed-on: https://code.wireshark.org/review/21978 Reviewed-by: Anders Broman Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin --- epan/dissectors/packet-umts_fp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index c40b3da524..9784713f57 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -5273,10 +5273,8 @@ fp_set_per_packet_inf_from_conv(conversation_t *p_conv, /* Peek at the packet as the per packet info seems not to take the tfi into account */ for (i=0; inum_chans; i++) { - tfi = tvb_get_guint8(tvb, offset); - - /*TFI is 5 bits according to 3GPP TS 25.321, paragraph 6.2.4.4*/ - /*tfi = tvb_get_bits8(tvb, offset*8, 5);*/ + /*TFI is 5 bits according to 3GPP TS 25.427, paragraph 6.2.4.4*/ + tfi = tvb_get_guint8(tvb, offset) & 0x1f; if (pinfo->link_dir == P2P_DIR_UL) { fpi->chan_tf_size[i] = p_conv_data->fp_dch_channel_info[i].ul_chan_tf_size[tfi]; fpi->chan_num_tbs[i] = p_conv_data->fp_dch_channel_info[i].ul_chan_num_tbs[tfi];