diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2011-11-21 16:18:33 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2011-11-21 16:18:33 +0000 |
| commit | ab9ede8e8f35c3dc92274e96f55cd4a262834a12 (patch) | |
| tree | a5bd2ae6488f699fc8198e2449fe310f3c543b86 /epan/dissectors/packet-catapult-dct2000.c | |
| parent | ffd84cbf3c0ba7478c8f9eb8db0b7fc7d5377aeb (diff) | |
Add the system frame number (SFN) to the context fields logged along with LTE MAC frames.
svn path=/trunk/; revision=39971
Diffstat (limited to 'epan/dissectors/packet-catapult-dct2000.c')
| -rw-r--r-- | epan/dissectors/packet-catapult-dct2000.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 6c7407c958..cff6ca2cc9 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -260,7 +260,7 @@ static const value_string transport_channel_type_vals[] = { #define MAX_OUTHDR_VALUES 32 static guint outhdr_values[MAX_OUTHDR_VALUES]; -static gint outhdr_values_found = 0; +static guint outhdr_values_found = 0; extern int proto_fp; extern int proto_rlc; @@ -1763,18 +1763,23 @@ static void attach_mac_lte_info(packet_info *pinfo) if (outhdr_values_found == 16) { p_mac_lte_info->subframeNumberOfGrantPresent = TRUE; - p_mac_lte_info->subframeNumberOfGrant = outhdr_values[i]; + 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]; + p_mac_lte_info->subframeNumberOfGrant = outhdr_values[i++]; } } } + /* System frame number */ + if (i < outhdr_values_found) { + p_mac_lte_info->sysframeNumber = outhdr_values[i]; + } + /* Store info in packet */ set_mac_lte_proto_data(pinfo, p_mac_lte_info); } |