Improve the way the encoded FP variant is interpreted.

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

1 files changed, 9 insertions, 1 deletions

diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index c24b5c28c1..ffc93bfd9a 100644
--- a/epan/dissectors/packet-catapult-dct2000.c
+++ b/epan/dissectors/packet-catapult-dct2000.c
@@ -1189,6 +1189,7 @@ void attach_fp_info(packet_info *pinfo, gboolean received, const char *protocol_
     int  chan;
     int  tf_start, num_chans_start;
     gint node_type;
+    int  calculated_variant;
 
     /* Only need to set info once per session. */
     struct fp_info *p_fp_info = p_get_proto_data(pinfo->fd, proto_fp);
@@ -1235,7 +1236,14 @@ void attach_fp_info(packet_info *pinfo, gboolean received, const char *protocol_
     /* Only R6 sub-versions currently influence format within a release */
     switch (p_fp_info->release) {
         case 6:
-            switch (variant % 256) {
+            if (variant < 256) {
+                calculated_variant = variant;
+            }
+            else {
+                calculated_variant = variant / 256;
+            }
+
+            switch (calculated_variant) {
                 case 1:
                     p_fp_info->release_year = 2005;
                     p_fp_info->release_month = 6;