diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2011-03-01 10:54:57 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2011-03-01 10:54:57 +0000 |
| commit | 0b2e755182e01518b13db2f375baf7ca9eeb749d (patch) | |
| tree | c7782ec352be95390a79d9b8f04ea904f4ba552f /epan/dissectors | |
| parent | aa9102b72f5a511cca63206c464c2f88bc2dd335 (diff) | |
Tweak the way we setup FP R8 info.
svn path=/trunk/; revision=36107
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-catapult-dct2000.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index f7ce3d4ea0..caeec560e9 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -1308,13 +1308,15 @@ void attach_fp_info(packet_info *pinfo, gboolean received, const char *protocol_ (!received && (node_type == 1))); /* Division type introduced for R7 */ - if (p_fp_info->release == 7) { + if ((p_fp_info->release == 7) || + (p_fp_info->release == 8)) { p_fp_info->division = outhdr_values[i++]; } /* HS-DSCH config */ if (p_fp_info->channel == CHANNEL_HSDSCH) { - if (p_fp_info->release == 7) { + if ((p_fp_info->release == 7) || + (p_fp_info->release == 8)) { /* Entity (MAC-hs or MAC-ehs) used */ if (outhdr_values[i++]) { p_fp_info->hsdsch_entity = ehs; @@ -1349,6 +1351,11 @@ void attach_fp_info(packet_info *pinfo, gboolean received, const char *protocol_ /* Number of channels (for coordinated channels) */ p_fp_info->num_chans = outhdr_values[i++]; + /* EDCH-Common is always T2 */ + if (p_fp_info->channel == CHANNEL_EDCH_COMMON) { + p_fp_info->edch_type = 1; + } + if (p_fp_info->channel != CHANNEL_EDCH) { /* TF size for each channel */ tf_start = i; |