diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2017-01-04 10:53:29 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-01-04 12:46:46 +0000 |
| commit | 9e7e30e6743e9336f310c281b3a54c923e73a54f (patch) | |
| tree | 9d540ed79f4fd2d896456e0702a2d397476ed872 | |
| parent | 79d1ac994f495ab364f4d1285897a629dc002268 (diff) | |
Add a startup message for Initializing extcap.
Change-Id: I06262e98bb4a55ee1eacd7a36b938b45eaffaf76
Reviewed-on: https://code.wireshark.org/review/19535
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | register.h | 1 | ||||
| -rw-r--r-- | ui/gtk/about_dlg.c | 3 | ||||
| -rw-r--r-- | ui/gtk/main.c | 9 | ||||
| -rw-r--r-- | ui/qt/splash_overlay.cpp | 3 | ||||
| -rw-r--r-- | wireshark-qt.cpp | 9 |
5 files changed, 17 insertions, 8 deletions
diff --git a/register.h b/register.h index ece6003090..1f2d078446 100644 --- a/register.h +++ b/register.h @@ -35,6 +35,7 @@ typedef enum { RA_NONE, /* For initialization */ RA_DISSECTORS, /* Initializing dissectors */ RA_LISTENERS, /* Tap listeners */ + RA_EXTCAP, /* extcap register preferences */ RA_REGISTER, /* Built-in register */ RA_PLUGIN_REGISTER, /* Plugin register */ RA_HANDOFF, /* Built-in handoff */ diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c index b7b3bb1000..802d9c6a79 100644 --- a/ui/gtk/about_dlg.c +++ b/ui/gtk/about_dlg.c @@ -215,6 +215,9 @@ splash_update(register_action_e action, const char *message, gpointer client_dat case RA_LISTENERS: action_msg = "Initializing tap listeners ..."; break; + case RA_EXTCAP: + action_msg = "Initializing extcap ..."; + break; case RA_REGISTER: action_msg = "Registering dissector ..."; break; diff --git a/ui/gtk/main.c b/ui/gtk/main.c index ef8c82fa0a..aa9a96ddc1 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -2331,10 +2331,6 @@ main(int argc, char *argv[]) register_all_plugin_tap_listeners(); #endif -#ifdef HAVE_EXTCAP - extcap_register_preferences(); -#endif - register_all_tap_listeners(); conversation_table_set_gui_info(init_conversation_table); hostlist_table_set_gui_info(init_hostlist_table); @@ -2342,6 +2338,11 @@ main(int argc, char *argv[]) rtd_table_iterate_tables(register_response_time_delay_tables, NULL); new_stat_tap_iterate_tables(register_simple_stat_tables, NULL); +#ifdef HAVE_EXTCAP + splash_update(RA_EXTCAP, NULL, (gpointer)splash_win); + extcap_register_preferences(); +#endif + splash_update(RA_PREFERENCES, NULL, (gpointer)splash_win); global_commandline_info.prefs_p = read_configuration_files (&gdp_path, &dp_path); diff --git a/ui/qt/splash_overlay.cpp b/ui/qt/splash_overlay.cpp index 0267c72791..36d814d4f0 100644 --- a/ui/qt/splash_overlay.cpp +++ b/ui/qt/splash_overlay.cpp @@ -139,6 +139,9 @@ void SplashOverlay::splashUpdate(register_action_e action, const char *message) case RA_LISTENERS: action_msg = tr("Initializing tap listeners"); break; + case RA_EXTCAP: + action_msg = tr("Initializing extcap"); + break; case RA_REGISTER: action_msg = tr("Registering dissectors"); break; diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index 1ab55fdab7..d7b9d4f371 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -588,10 +588,6 @@ int main(int argc, char *qt_argv[]) register_all_plugin_tap_listeners(); #endif -#ifdef HAVE_EXTCAP - extcap_register_preferences(); -#endif - register_all_tap_listeners(); conversation_table_set_gui_info(init_conversation_table); hostlist_table_set_gui_info(init_endpoint_table); @@ -603,6 +599,11 @@ int main(int argc, char *qt_argv[]) in_file_type = open_info_name_to_type(ex_opt_get_next("read_format")); } +#ifdef HAVE_EXTCAP + splash_update(RA_EXTCAP, NULL, NULL); + extcap_register_preferences(); +#endif + splash_update(RA_PREFERENCES, NULL, NULL); global_commandline_info.prefs_p = ws_app.readConfigurationFiles(&gdp_path, &dp_path, false); |