diff options
Diffstat (limited to 'ui/gtk/main.c')
| -rw-r--r-- | ui/gtk/main.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index f2631006f1..ef8c82fa0a 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -1971,6 +1971,8 @@ read_configuration_files(char **gdp_path, char **dp_path) /* 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) { @@ -2462,6 +2464,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(); } @@ -2473,6 +2476,14 @@ main(int argc, char *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.disable_heur_slist) { GSList *heur_enable; for (heur_enable = global_dissect_options.disable_heur_slist; heur_enable != NULL; heur_enable = g_slist_next(heur_enable)) @@ -3346,6 +3357,7 @@ void change_configuration_profile (const gchar *profile_name) proto_enable_all(); if (gdp_path == NULL && dp_path == NULL) { set_disabled_protos_list(); + set_enabled_protos_list(); set_disabled_heur_dissector_list(); } |