aboutsummaryrefslogtreecommitdiffstats
path: root/wireshark-qt.cpp
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2016-12-23 15:20:31 -0500
committerMichael Mann <mmann78@netscape.net>2016-12-24 02:30:21 +0000
commitc302812566373c5ac7383b825bea830b716778a5 (patch)
tree28bd309d9392e366bafe4ab7126615a9a0d3e7db /wireshark-qt.cpp
parentfb9a4d7413e7cf10cfce432e0d19e60c2f3acfe5 (diff)
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 <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'wireshark-qt.cpp')
-rw-r--r--wireshark-qt.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp
index f0f1b08..1ab55fd 100644
--- a/wireshark-qt.cpp
+++ b/wireshark-qt.cpp
@@ -713,6 +713,7 @@ int main(int argc, char *qt_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();
}
@@ -724,6 +725,14 @@ int main(int argc, char *qt_argv[])
}
}
+ if(global_dissect_options.enable_protocol_slist) {
+ GSList *proto_enable;
+ for (proto_enable = global_dissect_options.enable_protocol_slist; proto_enable != NULL; proto_enable = g_slist_next(proto_enable))
+ {
+ proto_enable_proto_by_name((char*)proto_enable->data);
+ }
+ }
+
if(global_dissect_options.enable_heur_slist) {
GSList *heur_enable;
for (heur_enable = global_dissect_options.enable_heur_slist; heur_enable != NULL; heur_enable = g_slist_next(heur_enable))