diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-02-26 17:04:05 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-02-27 01:04:33 +0000 |
| commit | 842a9b510074c896e54735e2e3a575ea802f23ea (patch) | |
| tree | e8243fc0a53911a9e8759d308a7cef3c4ec36438 /capchild | |
| parent | 60f87ca919a6bfedfdb8b4728f7f221eb6b8af15 (diff) | |
| download | wireshark-842a9b510074c896e54735e2e3a575ea802f23ea.tar.gz wireshark-842a9b510074c896e54735e2e3a575ea802f23ea.tar.bz2 wireshark-842a9b510074c896e54735e2e3a575ea802f23ea.zip | |
Replace extcap_interface_list() with append_extcap_interface_list().
Pull the "rebuild the list of extcap interfaces and, optionally, return
a list of if_infos for them" into a separate
extcap_reload_interface_list() routine, call it in the cases where we
don't want the if_infos list, and have append_extcap_interface_list()
call it, asking it for the if_infos list, and then append the interfaces
to that list.
Change-Id: I07478ab133859484b3e0916144971639f961224b
Reviewed-on: https://code.wireshark.org/review/14189
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'capchild')
| -rw-r--r-- | capchild/capture_ifinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/capchild/capture_ifinfo.c b/capchild/capture_ifinfo.c index 5c4f299415..3d848814d9 100644 --- a/capchild/capture_ifinfo.c +++ b/capchild/capture_ifinfo.c @@ -200,7 +200,7 @@ capture_interface_list(int *err, char **err_str, void (*update_cb)(void)) #ifdef HAVE_EXTCAP /* Add the extcap interfaces after the native and remote interfaces */ g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Loading External Capture Interface List ..."); - extcap_interface_list(&if_list, err_str); + if_list = append_extcap_interface_list(if_list, err_str); #endif return if_list; |