diff options
| -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); } |