aboutsummaryrefslogtreecommitdiffstats
path: root/epan/disabled_protos.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-07-12 20:40:31 -0400
committerMichael Mann <mmann78@netscape.net>2015-07-17 17:12:22 +0000
commit21e5a950ade6a20260b63b5f5c055c52ac07b599 (patch)
tree417e76e5a3082c2431ce0f5c6d88cbf7701e0489 /epan/disabled_protos.c
parent5bd6c4aff21dbc8a7ebf31c5d1510fcedf66d875 (diff)
Remove all preferences related to enabling/disabling heuristic dissectors.
The preferences are still supported for backwards compatibility, but the heuristic_protos file has final say on the "preference" to enable/disable a heuristic dissector. Also add parameter to heur_dissector_add() for the "default" enable/disable of a heuristic dissector. With this parameter, a few more (presumably weak) heuristic dissectors have been "registered" but of course default to being disabled. Change-Id: I51bebb2146ef3fbb8418d4f5c7f2cb2b58003a22 Reviewed-on: https://code.wireshark.org/review/9610 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/disabled_protos.c')
-rw-r--r--epan/disabled_protos.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/epan/disabled_protos.c b/epan/disabled_protos.c
index 602f48d57d..2a86f0c281 100644
--- a/epan/disabled_protos.c
+++ b/epan/disabled_protos.c
@@ -477,9 +477,6 @@ set_disabled_heur_dissector_list(void)
heur_protocol_def *heur;
heur_dtbl_entry_t* h;
- /*
- * assume all heuristics are enabled by default
- */
if (disabled_heuristics == NULL)
goto skip;