forked from osmocom/wireshark
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:
parent
c8bc83cb9e
commit
edaa78ceac
2
tshark.c
2
tshark.c
|
@ -943,6 +943,7 @@ main(int argc, char *argv[])
|
||||||
#ifdef HAVE_PLUGINS
|
#ifdef HAVE_PLUGINS
|
||||||
register_all_plugin_tap_listeners();
|
register_all_plugin_tap_listeners();
|
||||||
#endif
|
#endif
|
||||||
|
extcap_register_preferences();
|
||||||
/* Register all tap listeners. */
|
/* Register all tap listeners. */
|
||||||
for (tap_reg_t *t = tap_reg_listener; t->cb_func != NULL; t++) {
|
for (tap_reg_t *t = tap_reg_listener; t->cb_func != NULL; t++) {
|
||||||
t->cb_func();
|
t->cb_func();
|
||||||
|
@ -970,7 +971,6 @@ main(int argc, char *argv[])
|
||||||
if (strcmp(argv[2], "column-formats") == 0)
|
if (strcmp(argv[2], "column-formats") == 0)
|
||||||
column_dump_column_formats();
|
column_dump_column_formats();
|
||||||
else if (strcmp(argv[2], "currentprefs") == 0) {
|
else if (strcmp(argv[2], "currentprefs") == 0) {
|
||||||
extcap_register_preferences();
|
|
||||||
epan_load_settings();
|
epan_load_settings();
|
||||||
write_prefs(NULL);
|
write_prefs(NULL);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue