From f03745758e8beb10702a8007b605a54b619a870d Mon Sep 17 00:00:00 2001 From: martinm Date: Tue, 2 Nov 2010 15:20:38 +0000 Subject: Add 'ndi' and 'harq-id' as new MAC-PHY DL attributes. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34753 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/dissectors/packet-catapult-dct2000.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'epan/dissectors/packet-catapult-dct2000.c') diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 60273573b4..039e786e98 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -1272,6 +1272,10 @@ void attach_fp_info(packet_info *pinfo, gboolean received, const char *protocol_ /* Channel type */ p_fp_info->channel = outhdr_values[i++]; + /* Sad hack until this value is filled in properly */ + if (p_fp_info->channel == 0) { + p_fp_info->channel = CHANNEL_DCH; + } /* Derive direction from node type/side */ node_type = outhdr_values[i++]; @@ -1427,6 +1431,10 @@ static void attach_mac_lte_info(packet_info *pinfo) p_mac_lte_info->detailed_phy_info.dl_info.resource_block_length = outhdr_values[i++]; p_mac_lte_info->crcStatusValid = TRUE; p_mac_lte_info->detailed_phy_info.dl_info.crc_status = outhdr_values[i++]; + if (outhdr_values_found > 18) { + p_mac_lte_info->detailed_phy_info.dl_info.harq_id = outhdr_values[i++]; + p_mac_lte_info->detailed_phy_info.dl_info.ndi = outhdr_values[i++]; + } } else { p_mac_lte_info->detailed_phy_info.ul_info.present = outhdr_values[i++]; -- cgit v1.2.3