The heuristic for T.125 per is too week and we do not have a PER dissector

for T.125 so remove the test.
Remove unused hf entries.
Fixes bug 10350.

Change-Id: If28de7877388c669082f8c8a21dd63107d417fbf
Reviewed-on: https://code.wireshark.org/review/3458
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 2 insertions, 23 deletions

diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c
index 2e017db939..73fdc710d4 100644
--- a/epan/dissectors/packet-t125.c
+++ b/epan/dissectors/packet-t125.c
@@ -424,12 +424,8 @@ dissect_t125_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, vo
   gint8 ber_class;
   gboolean pc;
   gint32 tag;
-  guint32 choice_index = 100;
-  asn1_ctx_t asn1_ctx;
   volatile gboolean failed;
 
-  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
-
   /*
    * We must catch all the "ran past the end of the packet" exceptions
    * here and, if we catch one, just return FALSE.  It's too painful
@@ -452,23 +448,6 @@ dissect_t125_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, vo
     return TRUE;
   }
 
-  failed = FALSE;
-  TRY {
-    /* or PER */
-    dissect_per_constrained_integer(tvb, 0, &asn1_ctx,
-                                    NULL, hf_t125_heur, 0, 42,
-                                    &choice_index, FALSE);
-  } CATCH_BOUNDS_ERRORS {
-    failed = TRUE;
-  } ENDTRY;
-
-  /* is this strong enough ? */
-  if (!failed && (choice_index <=42)) {
-    dissect_t125(tvb, pinfo, parent_tree, NULL);
-
-    return TRUE;
-  }
-
   return FALSE;
 }
 
@@ -591,7 +570,7 @@ void proto_register_t125(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-t125-hfarr.c ---*/
-#line 159 "../../asn1/t125/packet-t125-template.c"
+#line 138 "../../asn1/t125/packet-t125-template.c"
   };
 
   /* List of subtrees */
@@ -608,7 +587,7 @@ void proto_register_t125(void) {
     &ett_t125_ConnectMCSPDU,
 
 /*--- End of included file: packet-t125-ettarr.c ---*/
-#line 165 "../../asn1/t125/packet-t125-template.c"
+#line 144 "../../asn1/t125/packet-t125-template.c"
   };
 
   /* Register protocol */