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 /plugins/ethercat | |
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 'plugins/ethercat')
-rw-r--r-- | plugins/ethercat/packet-esl.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/plugins/ethercat/packet-esl.c b/plugins/ethercat/packet-esl.c index 8cc9814ad0..70f0d416bf 100644 --- a/plugins/ethercat/packet-esl.c +++ b/plugins/ethercat/packet-esl.c @@ -92,7 +92,6 @@ typedef struct _EslHeader #define SIZEOF_ESLHEADER 16 static dissector_handle_t eth_withoutfcs_handle; -static int esl_enable_dissector = FALSE; void proto_reg_handoff_esl(void); @@ -349,9 +348,7 @@ proto_register_esl(void) { esl_module = prefs_register_protocol(proto_esl, proto_reg_handoff_esl); - prefs_register_bool_preference(esl_module, "enable", "Enable dissector", - "Enable this dissector (default is false)", - &esl_enable_dissector); + prefs_register_obsolete_preference(esl_module, "enable"); proto_register_field_array(proto_esl,hf,array_length(hf)); proto_register_subtree_array(ett,array_length(ett)); @@ -365,10 +362,9 @@ proto_reg_handoff_esl(void) { if (!initialized) { eth_withoutfcs_handle = find_dissector("eth_withoutfcs"); - heur_dissector_add("eth", dissect_esl_heur, "EtherCAT over Ethernet", "esl_eth", proto_esl); + heur_dissector_add("eth", dissect_esl_heur, "EtherCAT over Ethernet", "esl_eth", proto_esl, HEURISTIC_DISABLE); initialized = TRUE; } - proto_set_decoding(proto_esl, esl_enable_dissector); } /* |