diff options
author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2010-12-23 12:16:37 +0000 |
---|---|---|
committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2010-12-23 12:16:37 +0000 |
commit | 5e49db3304f63e1ec996f3239dc45361caf559f3 (patch) | |
tree | 3801e47ab2c0bb2232bb65a985c32436772df145 /epan/dissectors/packet-catapult-dct2000.c | |
parent | c08d3b76d90c4dfbc209558d272a7eb1f38c3174 (diff) |
Properly read UL grant subframe number.
svn path=/trunk/; revision=35251
Diffstat (limited to 'epan/dissectors/packet-catapult-dct2000.c')
-rw-r--r-- | epan/dissectors/packet-catapult-dct2000.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index b41960fe7c..8579b3d4d8 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -1480,18 +1480,21 @@ static void attach_mac_lte_info(packet_info *pinfo) p_mac_lte_info->detailed_phy_info.ul_info.resource_block_start = outhdr_values[i++]; /* Skip retx flag */ i++; - if (outhdr_values_found > 15) { + + if (outhdr_values_found == 16) { + p_mac_lte_info->subframeNumberOfGrantPresent = TRUE; + p_mac_lte_info->subframeNumberOfGrant = outhdr_values[i++]; + } + if (outhdr_values_found > 16) { p_mac_lte_info->detailed_phy_info.ul_info.harq_id = outhdr_values[i++]; p_mac_lte_info->detailed_phy_info.ul_info.ndi = outhdr_values[i++]; + + p_mac_lte_info->subframeNumberOfGrantPresent = TRUE; + p_mac_lte_info->subframeNumberOfGrant = outhdr_values[i++]; } } } - if (p_mac_lte_info->direction == DIRECTION_UPLINK) { - p_mac_lte_info->subframeNumberOfGrantPresent = TRUE; - p_mac_lte_info->subframeNumberOfGrant = outhdr_values[i++]; - } - /* Store info in packet */ p_add_proto_data(pinfo->fd, proto_mac_lte, p_mac_lte_info); } |