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 /caputils | |
| 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 'caputils')
| -rw-r--r-- | caputils/capture-pcap-util-unix.c | 2 | ||||
| -rw-r--r-- | caputils/capture-pcap-util.c | 4 | ||||
| -rw-r--r-- | caputils/capture-wpcap.c | 2 | ||||
| -rw-r--r-- | caputils/capture_ifinfo.h | 3 |
4 files changed, 5 insertions, 6 deletions
diff --git a/caputils/capture-pcap-util-unix.c b/caputils/capture-pcap-util-unix.c index 21e832b166..66404500ce 100644 --- a/caputils/capture-pcap-util-unix.c +++ b/caputils/capture-pcap-util-unix.c @@ -308,7 +308,7 @@ get_interface_list(int *err, char **err_str) /* * No interfaces found. */ - *err = NO_INTERFACES_FOUND; + *err = 0; if (err_str != NULL) *err_str = NULL; } diff --git a/caputils/capture-pcap-util.c b/caputils/capture-pcap-util.c index c4e7df3868..98054c4a0f 100644 --- a/caputils/capture-pcap-util.c +++ b/caputils/capture-pcap-util.c @@ -437,7 +437,7 @@ get_interface_list_findalldevs_ex(const char *source, /* * No interfaces found. */ - *err = NO_INTERFACES_FOUND; + *err = 0; if (err_str != NULL) *err_str = NULL; return NULL; @@ -474,7 +474,7 @@ get_interface_list_findalldevs(int *err, char **err_str) /* * No interfaces found. */ - *err = NO_INTERFACES_FOUND; + *err = 0; if (err_str != NULL) *err_str = NULL; return NULL; diff --git a/caputils/capture-wpcap.c b/caputils/capture-wpcap.c index 707875d374..3fdff7d052 100644 --- a/caputils/capture-wpcap.c +++ b/caputils/capture-wpcap.c @@ -865,7 +865,7 @@ get_interface_list(int *err, char **err_str) /* * No interfaces found. */ - *err = NO_INTERFACES_FOUND; + *err = 0; if (err_str != NULL) *err_str = NULL; } diff --git a/caputils/capture_ifinfo.h b/caputils/capture_ifinfo.h index 7cb70abbdf..2353f06fed 100644 --- a/caputils/capture_ifinfo.h +++ b/caputils/capture_ifinfo.h @@ -81,8 +81,7 @@ extern GList *capture_interface_list(int *err, char **err_str, void (*update_cb) /* Error values from "get_interface_list()/capture_interface_list()". */ #define CANT_GET_INTERFACE_LIST 1 /* error getting list */ -#define NO_INTERFACES_FOUND 2 /* list is empty */ -#define DONT_HAVE_PCAP 3 /* couldn't load WinPcap */ +#define DONT_HAVE_PCAP 2 /* couldn't load WinPcap */ void free_interface_list(GList *if_list); |