From c302812566373c5ac7383b825bea830b716778a5 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Fri, 23 Dec 2016 15:20:31 -0500 Subject: Add enabled protocol list for dissectors who are disabled by default We save a list of dissectors that are disabled through the Enabled Protocols dialog. This is because we assume dissectors are enabled by default. For dissectors that are disabled by default, we have no way to keep them enabled through the Enabled Protocols dialog. A dissector that defaults to being disabled has to be reset to enabled each time Wireshark is launched. Add a list similar to the disabled list for enabling dissectors that are disabled by default. This mostly applies to post-dissectors. Change-Id: I31a8d97a9fdbc472fe2a8666384e0f8786bb8e9f Reviewed-on: https://code.wireshark.org/review/19405 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- tfshark.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tfshark.c') diff --git a/tfshark.c b/tfshark.c index 333777e01a..a255f78ff6 100644 --- a/tfshark.c +++ b/tfshark.c @@ -622,6 +622,8 @@ main(int argc, char *argv[]) /* Read the disabled protocols file. */ read_disabled_protos_list(&gdp_path, &gdp_open_errno, &gdp_read_errno, &dp_path, &dp_open_errno, &dp_read_errno); + read_enabled_protos_list(&gdp_path, &gdp_open_errno, &gdp_read_errno, + &dp_path, &dp_open_errno, &dp_read_errno); read_disabled_heur_dissector_list(&gdp_path, &gdp_open_errno, &gdp_read_errno, &dp_path, &dp_open_errno, &dp_read_errno); if (gdp_path != NULL) { @@ -935,6 +937,7 @@ main(int argc, char *argv[]) /* disabled protocols as per configuration file */ if (gdp_path == NULL && dp_path == NULL) { set_disabled_protos_list(); + set_enabled_protos_list(); set_disabled_heur_dissector_list(); } -- cgit v1.2.3