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

tshark: Unconditionally call extcap_register_preferences 

extcap_register_preferences is only called with the -G option
(to dump information) and extcap preferences are not loading,
loading it unconditionally avoids this, as it is done in the
GUI startup.


(cherry picked from commit 506f1c650f)
This commit is contained in:
Enrique Giraldo 2021-01-22 08:37:52 +00:00 committed by Guy Harris
parent c8bc83cb9e
commit edaa78ceac
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tshark.c
View File

@ -943,6 +943,7 @@ main(int argc, char *argv[])
#ifdef HAVE_PLUGINS
register_all_plugin_tap_listeners();
#endif
extcap_register_preferences();
/* Register all tap listeners. */
for (tap_reg_t *t = tap_reg_listener; t->cb_func != NULL; t++) {
t->cb_func();
@ -970,7 +971,6 @@ main(int argc, char *argv[])
if (strcmp(argv[2], "column-formats") == 0)
column_dump_column_formats();
else if (strcmp(argv[2], "currentprefs") == 0) {
extcap_register_preferences();
epan_load_settings();
write_prefs(NULL);
}