Tweak the way we setup FP R8 info.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36107 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index f7ce3d4ea003d09d9a60761c5fd15f3276e7aea1..caeec560e955688f6540db1a8e6620d478c91a45 100644 (file)
--- 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;