jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

GAS: Fix reporting of GAS query timeouts

Browse source 
GAS_QUERY_TIMEOUT value was used for two different things - enum for
status callback and #define for internal eloop timeout). The latter
overwrites the former and as such, the timeout reported ended up going
out with value 5 which matches with GAS_QUERY_CANCELLED instead of
GAS_QUERY_TIMEOUT. This value was not used in existing code, so this
should not modify the current behavior. Anyway, the correct reason for
the failure should be reported. Rename the internal #define for the
timeout period to avoid the name conflict. [Bug 463]

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2012-08-13 21:33:00 +03:00
parent 067ffa2696
commit 1f52c2f7b5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wpa_supplicant/gas_query.c
View file

@ -19,7 +19,7 @@
#include "gas_query.h" #include "gas_query.h"
#define GAS_QUERY_TIMEOUT 5 #define GAS_QUERY_TIMEOUT_PERIOD 5
struct gas_query_pending { struct gas_query_pending {
@ -457,7 +457,7 @@ int gas_query_req(struct gas_query *gas, const u8 *dst, int freq,
return -1; return -1;
} }
eloop_register_timeout(GAS_QUERY_TIMEOUT, 0, gas_query_timeout, eloop_register_timeout(GAS_QUERY_TIMEOUT_PERIOD, 0, gas_query_timeout,
gas, query); gas, query);
return dialog_token; return dialog_token;