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-bt-dht.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-bt-dht.c')
| -rw-r--r-- | epan/dissectors/packet-bt-dht.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/epan/dissectors/packet-bt-dht.c b/epan/dissectors/packet-bt-dht.c index 5fdc5129e8..f7d3baac9e 100644 --- a/epan/dissectors/packet-bt-dht.c +++ b/epan/dissectors/packet-bt-dht.c @@ -43,8 +43,6 @@ void proto_reg_handoff_bt_dht(void); static int proto_bt_dht = -1; static dissector_handle_t bt_dht_handle; -static gboolean bt_dht_enable_heuristic_dissection = FALSE; /* disabled by default since heuristic is weak */ - /* fields */ static int hf_bencoded_int = -1; static int hf_bencoded_string = -1; @@ -576,9 +574,7 @@ proto_register_bt_dht(void) ); bt_dht_module = prefs_register_protocol(proto_bt_dht, proto_reg_handoff_bt_dht); - prefs_register_bool_preference(bt_dht_module, "enable", "Enable BT-DHT heuristic dissection", - "Enable BT-DHT heuristic dissection (default is disabled)", - &bt_dht_enable_heuristic_dissection); + prefs_register_obsolete_preference(bt_dht_module, "enable"); proto_register_field_array(proto_bt_dht, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); @@ -594,15 +590,13 @@ proto_reg_handoff_bt_dht(void) * XXX - Still too weak? */ if (!prefs_initialized) { - heur_dissector_add("udp", dissect_bt_dht_heur, "BitTorrent DHT over UDP", "bittorrent_dht_udp", proto_bt_dht); + heur_dissector_add("udp", dissect_bt_dht_heur, "BitTorrent DHT over UDP", "bittorrent_dht_udp", proto_bt_dht, HEURISTIC_DISABLE); bt_dht_handle = new_create_dissector_handle(dissect_bt_dht, proto_bt_dht); dissector_add_for_decode_as("udp.port", bt_dht_handle); prefs_initialized = TRUE; } - - heur_dissector_set_enabled("udp", dissect_bt_dht_heur, proto_bt_dht, bt_dht_enable_heuristic_dissection); } /* |