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
This commit is contained in:
Jeff Morriss 2007-04-11 04:57:43 +00:00
parent d1f795d28e
commit 47668171e3
2 changed files with 4 additions and 0 deletions

View File

@ -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))
{

View File

@ -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"