diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-07-12 20:40:31 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-07-17 17:12:22 +0000 |
| commit | 21e5a950ade6a20260b63b5f5c055c52ac07b599 (patch) | |
| tree | 417e76e5a3082c2431ce0f5c6d88cbf7701e0489 /epan/dissectors/packet-cattp.c | |
| parent | 5bd6c4aff21dbc8a7ebf31c5d1510fcedf66d875 (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/dissectors/packet-cattp.c')
| -rw-r--r-- | epan/dissectors/packet-cattp.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/epan/dissectors/packet-cattp.c b/epan/dissectors/packet-cattp.c index d369f6cdc0..3c85874cb1 100644 --- a/epan/dissectors/packet-cattp.c +++ b/epan/dissectors/packet-cattp.c @@ -101,9 +101,6 @@ static dissector_handle_t data_handle; /* Preference to control whether to check the CATTP checksum */ static gboolean cattp_check_checksum = TRUE; -/* Preference to control whether to heuristically detect CATTP packets */ -static gboolean cattp_enable_heuristic_dissection = TRUE; - /* Reason code mapping */ static const value_string cattp_reset_reason[] = { { 0, "Normal Ending" }, @@ -564,10 +561,7 @@ proto_register_cattp(void) "Whether the checksum of all messages should be validated or not", &cattp_check_checksum); - prefs_register_bool_preference(cattp_module, "enable", - "Enable " CATTP_SHORTNAME " heuristic dissection", - "Enable " CATTP_SHORTNAME " heuristic dissection (default is enabled)", - &cattp_enable_heuristic_dissection); + prefs_register_obsolete_preference(cattp_module, "enable"); } /* Handoff */ @@ -585,13 +579,10 @@ proto_reg_handoff_cattp(void) /* find data handle */ data_handle = find_dissector("data"); - heur_dissector_add("udp", dissect_cattp_heur, "CAT-TP over UDP", "cattp_udp", proto_cattp); + heur_dissector_add("udp", dissect_cattp_heur, "CAT-TP over UDP", "cattp_udp", proto_cattp, HEURISTIC_ENABLE); dissector_add_for_decode_as("udp.port", cattp_handle); initialized = TRUE; } - - heur_dissector_set_enabled("udp", dissect_cattp_heur, proto_cattp, - cattp_enable_heuristic_dissection); } /* |