diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-07-22 16:53:18 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-07-22 23:53:49 +0000 |
| commit | f6ce0cdacd642d31cf198d0bdc4654bbd5afd951 (patch) | |
| tree | ea1cabe3d37f686171cb3fb273595eafe04d163a /capchild | |
| parent | 4261109e1e15ec16b3d38df9e6011d676a558487 (diff) | |
| download | wireshark-f6ce0cdacd642d31cf198d0bdc4654bbd5afd951.tar.gz | |
Get rid of NO_INTERFACES_FOUND - it's not an error.
It just means "pcap didn't give me any interfaces, and didn't report an
error". Hopefully, in the future, there will be pcap APIs that
distinguish between the (admittedly unlikely, these days) case of "there
really *are* no interfaces on which *anybody* can capture" and "you
don't have sufficient permission to capture", and we can report the
latter as an error. (Given that pcap supports more than just "regular
interfaces", though, there are cases where you don't have permission to
capture on those but you have permission to capture raw USB traffic, for
example, so perhaps what's really needed is per-interface indications of
permissions.)
Change-Id: I7b8abb0829e8502f5259c95e8af31655f79d36a1
Reviewed-on: https://code.wireshark.org/review/3169
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'capchild')
| -rw-r--r-- | capchild/capture_ifinfo.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/capchild/capture_ifinfo.c b/capchild/capture_ifinfo.c index 94af1c0274..54e4d4c4fc 100644 --- a/capchild/capture_ifinfo.c +++ b/capchild/capture_ifinfo.c @@ -116,6 +116,8 @@ capture_interface_list(int *err, char **err_str, void (*update_cb)(void)) g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface List ..."); + *err = 0; + /* Try to get our interface list */ ret = sync_interface_list_open(&data, &primary_msg, &secondary_msg, update_cb); if (ret != 0) { @@ -188,9 +190,6 @@ capture_interface_list(int *err, char **err_str, void (*update_cb)(void)) } g_strfreev(raw_list); - /* Check to see if we built a list */ - if (if_list == NULL) - *err = NO_INTERFACES_FOUND; #ifdef HAVE_PCAP_REMOTE if (remote_interface_list && g_list_length(remote_interface_list) > 0) { append_remote_list(if_list); |