diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2007-04-11 04:57:43 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2007-04-11 04:57:43 +0000 |
| commit | 47668171e34a763b1164a9ffe58a6d457a327931 (patch) | |
| tree | b19058e6694be8ab64a88bbce8ae1abfd3ec96cd | |
| parent | d1f795d28e9d8abf0fe244524bcca5604b0a6103 (diff) | |
| download | wireshark-47668171e34a763b1164a9ffe58a6d457a327931.tar.gz wireshark-47668171e34a763b1164a9ffe58a6d457a327931.tar.bz2 wireshark-47668171e34a763b1164a9ffe58a6d457a327931.zip | |
Fix bug 1377:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1377
and complaints to the mailing list that a bogus (empty or non-ASCII contents)
dialog box was popped up when getting the list of interfaces. The problem was
that 'get_airpcap_interface_list()' wasn't setting the returned error value
when it found that AirPcap was not loaded. If whatever was in that variable
happened to be 1 when a non-AirPcap user requested the list of interfaces
then the bogus dialog would show up.
svn path=/trunk/; revision=21380
| -rw-r--r-- | airpcap_loader.c | 3 | ||||
| -rw-r--r-- | airpcap_loader.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/airpcap_loader.c b/airpcap_loader.c index 1e37cb6c18..e01b6bc792 100644 --- a/airpcap_loader.c +++ b/airpcap_loader.c @@ -1138,7 +1138,10 @@ get_airpcap_interface_list(int *err, char **err_str) char errbuf[PCAP_ERRBUF_SIZE]; if (!AirpcapLoaded) + { + *err = AIRPCAP_NOT_LOADED; return il; + } if (!g_PAirpcapGetDeviceList(&devsList, errbuf)) { diff --git a/airpcap_loader.h b/airpcap_loader.h index 420eb032cd..da345e247a 100644 --- a/airpcap_loader.h +++ b/airpcap_loader.h @@ -33,6 +33,7 @@ /* Error values from "get_airpcap_interface_list()". */ #define CANT_GET_AIRPCAP_INTERFACE_LIST 0 /* error getting list */ #define NO_AIRPCAP_INTERFACES_FOUND 1 /* list is empty */ +#define AIRPCAP_NOT_LOADED 2 /* Airpcap DLL not loaded */ #define AIRPCAP_CHANNEL_ANY_NAME "ANY" |