Add a "heuristic dissectors" tab to the Enable Protocols dialog.

This allows for a global place to enable/disable all heuristic dissectors.  This removes the need for individual dissector preferences, but those will be removed at a later date.  The more important part is the epan code to save/restore the enabled state of the heuristic dissector.  The GTK dialog was more for quickly testing the feature (there was already some GTK code in place that started the heuristic dialog tab)

Change-Id: Ie10687505c27a4456c49d5c4c69a5fc5f6394275
Ping-Bug:11152
Reviewed-on: https://code.wireshark.org/review/9508
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

1 files changed, 34 insertions, 7 deletions

diff --git a/epan/disabled_protos.h b/epan/disabled_protos.h
index ac9b746e4a..2f06c22fc5 100644
--- a/epan/disabled_protos.h
+++ b/epan/disabled_protos.h
@@ -29,13 +29,6 @@ extern "C" {
 #endif /* __cplusplus */
 
 /*
- * Item in a list of disabled protocols.
- */
-typedef struct {
-  char *name;		/* protocol name */
-} protocol_def;
-
-/*
  * Read in a list of disabled protocols.
  *
  * On success, "*pref_path_return" is set to NULL.
@@ -68,6 +61,40 @@ set_disabled_protos_list(void);
 WS_DLL_PUBLIC void
 save_disabled_protos_list(char **pref_path_return, int *errno_return);
 
+/*
+ * Read in a list of disabled protocols.
+ *
+ * On success, "*pref_path_return" is set to NULL.
+ * On error, "*pref_path_return" is set to point to the pathname of
+ * the file we tried to read - it should be freed by our caller -
+ * and "*open_errno_return" is set to the error if we couldn't open the file
+ * or "*read_errno_return" is set to the error if we got an error reading
+ * the file.
+ */
+WS_DLL_PUBLIC void
+read_disabled_heur_dissector_list(char **gpath_return, int *gopen_errno_return,
+			  int *gread_errno_return,
+			  char **path_return, int *open_errno_return,
+			  int *read_errno_return);
+
+/*
+ * Disable protocols as per the stored configuration
+ */
+WS_DLL_PUBLIC void
+set_disabled_heur_dissector_list(void);
+
+/*
+ * Write out a list of disabled heuristic dissectors.
+ *
+ * On success, "*pref_path_return" is set to NULL.
+ * On error, "*pref_path_return" is set to point to the pathname of
+ * the file we tried to read - it should be freed by our caller -
+ * and "*errno_return" is set to the error.
+ */
+WS_DLL_PUBLIC void
+save_disabled_heur_dissector_list(char **pref_path_return, int *errno_return);
+
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */