- Map gre -> IP

- Change a value string value to help an easily-frightened colleague

svn path=/trunk/; revision=22224

epan/dissectors/packet-catapult-dct2000.c

@@ -92,7 +92,7 @@ static const value_string encap_vals[] = {
     { WTAP_ENCAP_FRELAY,                 "Frame Relay" },
     { WTAP_ENCAP_MTP2,                   "MTP2" },
     { DCT2000_ENCAP_NBAP,                "NBAP" },
-    { DCT2000_ENCAP_UNHANDLED,           "Unhandled Protocol" },
+    { DCT2000_ENCAP_UNHANDLED,           "No Direct Encapsulation" },
     { 0,                                 NULL },
 };
 
@@ -875,7 +875,6 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             */
             protocol_handle = 0;
 
-
             /* Try IP Prim heuristic if configured to */
             if (!protocol_handle && catapult_dct2000_try_ipprim_heuristic)
             {

wiretap/catapult_dct2000.c

@@ -919,6 +919,7 @@ gboolean parse_line(gint line_length, gint *seconds, gint *useconds,
 
     if ((strcmp(protocol_name, "ip") == 0) ||
         (strcmp(protocol_name, "sctp") == 0) ||
+        (strcmp(protocol_name, "gre") == 0) ||
         (strcmp(protocol_name, "mipv6") == 0))
     {
         *encap = WTAP_ENCAP_RAW_IP;