diff options
author | Anders Broman <anders.broman@ericsson.com> | 2013-06-04 04:36:19 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2013-06-04 04:36:19 +0000 |
commit | 78e334b845fd815976369a2a9c0756c8cbe5d7b6 (patch) | |
tree | 7ecc504c8af78c9cb36ec5cfde644c23cea2acbd /capture_opts.c | |
parent | ee109cc7b230127f04a4ef9d4ad5ed98a7820a42 (diff) | |
download | wireshark-78e334b845fd815976369a2a9c0756c8cbe5d7b6.tar.gz |
From Mike Garratt:
Friendly Names support causing unnecessary delay when Wireshark starts.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8034
svn path=/trunk/; revision=49752
Diffstat (limited to 'capture_opts.c')
-rw-r--r-- | capture_opts.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/capture_opts.c b/capture_opts.c index cc5bf10ef9..e9a3a2327d 100644 --- a/capture_opts.c +++ b/capture_opts.c @@ -114,6 +114,7 @@ capture_opts_init(capture_options *capture_opts) capture_opts->autostop_duration = 60; /* 1 min */ capture_opts->output_to_pipe = FALSE; + capture_opts->capture_child = FALSE; } @@ -488,6 +489,11 @@ capture_opts_add_iface_opt(capture_options *capture_opts, const char *optarg_str interface_opts.console_display_name = g_strdup(if_info->name); } free_interface_list(if_list); + } else if (capture_opts->capture_child) { + /* In Wireshark capture child mode, thus proper device name is supplied. */ + /* No need for trying to match it for friendly names. */ + interface_opts.name = g_strdup(optarg_str_p); + interface_opts.console_display_name = g_strdup(optarg_str_p); } else { /* * Retrieve the interface list so that we can search for the |