osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
AndersBroman 2017-01-04 10:53:29 +01:00 committed by Anders Broman
parent 79d1ac994f
commit 9e7e30e674
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
register.h
View File

@ -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 */

3
ui/gtk/about_dlg.c
View File

@ -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;

9
ui/gtk/main.c
View File

@ -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);

3
ui/qt/splash_overlay.cpp
View File

@ -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;

9
wireshark-qt.cpp
View File

@ -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);