Add support for FP E-DCH T2 frames.

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

1 files changed, 18 insertions, 0 deletions

diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index 1095c215df..f680df2986 100644
--- a/epan/dissectors/packet-catapult-dct2000.c
+++ b/epan/dissectors/packet-catapult-dct2000.c
@@ -1099,6 +1099,7 @@ static dissector_handle_t look_for_dissector(char *protocol_name)
         (strcmp(protocol_name, "fp_r5") == 0) ||
         (strcmp(protocol_name, "fp_r6") == 0) ||
         (strcmp(protocol_name, "fp_r7") == 0) ||
+        (strcmp(protocol_name, "fp_r8") == 0) ||
         (strcmp(protocol_name, "fpiur_r5") == 0)) {
 
         return find_dissector("fp");
@@ -1231,6 +1232,9 @@ void attach_fp_info(packet_info *pinfo, gboolean received, const char *protocol_
     else if (strcmp(protocol_name, "fp_r7") == 0) {
         p_fp_info->release = 7;
     }
+    else if (strcmp(protocol_name, "fp_r8") == 0) {
+        p_fp_info->release = 8;
+    }
     else if (strcmp(protocol_name, "fpiur_r5") == 0) {
         p_fp_info->release = 5;
     }
@@ -1272,6 +1276,12 @@ void attach_fp_info(packet_info *pinfo, gboolean received, const char *protocol_
             p_fp_info->release_month = 3;
             break;
 
+        case 8:
+            p_fp_info->release_year = 2010;
+            p_fp_info->release_month = 6;
+            break;
+
+
         default:
             p_fp_info->release_year = 0;
             p_fp_info->release_month = 0;
@@ -1360,6 +1370,13 @@ void attach_fp_info(packet_info *pinfo, gboolean received, const char *protocol_
         for (n=0; n < p_fp_info->no_ddi_entries; n++) {
             p_fp_info->edch_macd_pdu_size[n] = outhdr_values[i++];
         }
+
+        if (strcmp(protocol_name, "fp_r8") == 0) {
+            p_fp_info->edch_type = outhdr_values[i++];
+        }
+        else {
+            p_fp_info->edch_type = 0;
+        }
     }
 
     /* Interface must be IuB */
@@ -1810,6 +1827,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         (strcmp(protocol_name, "fp_r5") == 0) ||
         (strcmp(protocol_name, "fp_r6") == 0) ||
         (strcmp(protocol_name, "fp_r7") == 0) ||
+        (strcmp(protocol_name, "fp_r8") == 0) ||
         (strcmp(protocol_name, "fpiur_r5") == 0)) {
 
         parse_outhdr_string(tvb_get_ptr(tvb, outhdr_start, outhdr_length));