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/packet.h | |
| 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/packet.h')
| -rw-r--r-- | epan/packet.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/epan/packet.h b/epan/packet.h index 0fecba3182..b2dfe43986 100644 --- a/epan/packet.h +++ b/epan/packet.h @@ -121,6 +121,11 @@ typedef int (*new_dissector_t)(tvbuff_t *, packet_info *, proto_tree *, void *); typedef gboolean (*heur_dissector_t)(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); +typedef enum { + HEURISTIC_DISABLE, + HEURISTIC_ENABLE +} heuristic_enable_e; + typedef void (*DATFunc) (const gchar *table_name, ftenum_t selector_type, gpointer key, gpointer value, gpointer user_data); typedef void (*DATFunc_handle) (const gchar *table_name, gpointer value, @@ -454,9 +459,10 @@ WS_DLL_PUBLIC heur_dtbl_entry_t* find_heur_dissector_by_unique_short_name(const * @param display_name the string used to present heuristic to user, e.g. "HTTP over TCP" * @param short_name the string used for "internal" use to identify heuristic, e.g. "http_tcp" * @param proto the protocol id of the sub-dissector + * @param enable initially enabled or not */ WS_DLL_PUBLIC void heur_dissector_add(const char *name, heur_dissector_t dissector, - const char *display_name, const char *short_name, const int proto); + const char *display_name, const char *short_name, const int proto, heuristic_enable_e enable); /** Remove a sub-dissector from a heuristic dissector list. * Call this in the prefs_reinit function of the sub-dissector. |