diff options
| author | Kyeyoon Park <kyeyoonp@qca.qualcomm.com> | 2013-10-21 10:13:42 (GMT) |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2013-10-21 10:13:42 (GMT) |
| commit | 24c694b465ea9535436caf85c0e71d4346e15abd (patch) | |
| tree | bf5257698e287d944707b8fcc2849f123168b4be /wpa_supplicant/interworking.c | |
| parent | 7255983b59adb56a74f6c3a97ae9171e1481a12f (diff) | |
| download | hostap-24c694b465ea9535436caf85c0e71d4346e15abd.zip hostap-24c694b465ea9535436caf85c0e71d4346e15abd.tar.gz hostap-24c694b465ea9535436caf85c0e71d4346e15abd.tar.bz2 | |
GAS: Delay GAS query Tx while another query is in progress
It would be possible to issue another GAS query when a previous one is
still in progress and this could result in conflicting offchannel
operations. Prevent that by delaying GAS query initiation until the
previous operation has been completed.
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
Diffstat (limited to 'wpa_supplicant/interworking.c')
| -rw-r--r-- | wpa_supplicant/interworking.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wpa_supplicant/interworking.c b/wpa_supplicant/interworking.c index ba2b2fd..e294917 100644 --- a/wpa_supplicant/interworking.c +++ b/wpa_supplicant/interworking.c @@ -244,6 +244,7 @@ static int interworking_anqp_send_req(struct wpa_supplicant *wpa_s, interworking_anqp_resp_cb, wpa_s); if (res < 0) { wpa_printf(MSG_DEBUG, "ANQP: Failed to send Query Request"); + wpabuf_free(buf); ret = -1; eloop_register_timeout(0, 0, interworking_continue_anqp, wpa_s, NULL); @@ -251,7 +252,6 @@ static int interworking_anqp_send_req(struct wpa_supplicant *wpa_s, wpa_printf(MSG_DEBUG, "ANQP: Query started with dialog token " "%u", res); - wpabuf_free(buf); return ret; } @@ -1877,12 +1877,12 @@ int anqp_send_req(struct wpa_supplicant *wpa_s, const u8 *dst, res = gas_query_req(wpa_s->gas, dst, freq, buf, anqp_resp_cb, wpa_s); if (res < 0) { wpa_printf(MSG_DEBUG, "ANQP: Failed to send Query Request"); + wpabuf_free(buf); ret = -1; } else wpa_printf(MSG_DEBUG, "ANQP: Query started with dialog token " "%u", res); - wpabuf_free(buf); return ret; } @@ -2177,11 +2177,11 @@ int gas_send_request(struct wpa_supplicant *wpa_s, const u8 *dst, res = gas_query_req(wpa_s->gas, dst, freq, buf, gas_resp_cb, wpa_s); if (res < 0) { wpa_printf(MSG_DEBUG, "GAS: Failed to send Query Request"); + wpabuf_free(buf); ret = -1; } else wpa_printf(MSG_DEBUG, "GAS: Query started with dialog token " "%u", res); - wpabuf_free(buf); return ret; } |