diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2016-05-31 00:11:42 +0300 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-16 07:20:02 -0700 |
| commit | be72c3e4a10c2c44b0a2c9eb20dee525ca67aa2b (patch) | |
| tree | 872aeaa800d3a9f7d7dedf76b26c3bb5314459eb | |
| parent | d4480e1de8943e6ae59cb89ca6bbb8fda5439129 (diff) | |
| download | android_external_wpa_supplicant_8-be72c3e4a10c2c44b0a2c9eb20dee525ca67aa2b.tar.gz android_external_wpa_supplicant_8-be72c3e4a10c2c44b0a2c9eb20dee525ca67aa2b.tar.bz2 android_external_wpa_supplicant_8-be72c3e4a10c2c44b0a2c9eb20dee525ca67aa2b.zip | |
Report connection timeouts in CTRL-EVENT-ASSOC-REJECT
Add a new "timeout" argument to the event message if the nl80211 message
indicates that the connection failure is not due to an explicit AP
rejection message. This makes it easier for external programs to figure
out why the connection failed.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Git-commit: 9a5160f5fb1b06392477154bb349cacc49b2ef16
Git-repo: git://w1.fi/srv/git/hostap.git
Change-Id: Ie7a92faf217528213c793aef2a0438bf921c4ac5
CRs-Fixed: 1056212
| -rw-r--r-- | src/drivers/driver.h | 6 | ||||
| -rw-r--r-- | src/drivers/driver_nl80211_event.c | 4 | ||||
| -rw-r--r-- | wpa_supplicant/events.c | 10 |
3 files changed, 16 insertions, 4 deletions
diff --git a/src/drivers/driver.h b/src/drivers/driver.h index a102d9bc..3aecf16e 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -4469,6 +4469,12 @@ union wpa_event_data { * status_code - Status Code from (Re)association Response */ u16 status_code; + + /** + * timed_out - Whether failure is due to timeout (etc.) rather + * than explicit rejection response from the AP. + */ + int timed_out; } assoc_reject; struct timeout_event { diff --git a/src/drivers/driver_nl80211_event.c b/src/drivers/driver_nl80211_event.c index 244718e4..610ab4b1 100644 --- a/src/drivers/driver_nl80211_event.c +++ b/src/drivers/driver_nl80211_event.c @@ -265,6 +265,7 @@ static void mlme_event_connect(struct wpa_driver_nl80211_data *drv, enum nl80211_commands cmd, struct nlattr *status, struct nlattr *addr, struct nlattr *req_ie, struct nlattr *resp_ie, + struct nlattr *timed_out, struct nlattr *authorized, struct nlattr *key_replay_ctr, struct nlattr *ptk_kck, @@ -322,6 +323,7 @@ static void mlme_event_connect(struct wpa_driver_nl80211_data *drv, event.assoc_reject.resp_ies_len = nla_len(resp_ie); } event.assoc_reject.status_code = status_code; + event.assoc_reject.timed_out = timed_out != NULL; wpa_supplicant_event(drv->ctx, EVENT_ASSOC_REJECT, &event); return; } @@ -1644,6 +1646,7 @@ static void qca_nl80211_key_mgmt_auth(struct wpa_driver_nl80211_data *drv, tb[QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_BSSID], tb[QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_REQ_IE], tb[QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_RESP_IE], + NULL, tb[QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_AUTHORIZED], tb[QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_KEY_REPLAY_CTR], tb[QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_PTK_KCK], @@ -2157,6 +2160,7 @@ static void do_process_drv_event(struct i802_bss *bss, int cmd, tb[NL80211_ATTR_MAC], tb[NL80211_ATTR_REQ_IE], tb[NL80211_ATTR_RESP_IE], + tb[NL80211_ATTR_TIMED_OUT], NULL, NULL, NULL, NULL, NULL); break; case NL80211_CMD_CH_SWITCH_NOTIFY: diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index adb59b8c..fed9aca6 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -3521,13 +3521,15 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, case EVENT_ASSOC_REJECT: if (data->assoc_reject.bssid) wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_ASSOC_REJECT - "bssid=" MACSTR " status_code=%u", + "bssid=" MACSTR " status_code=%u%s", MAC2STR(data->assoc_reject.bssid), - data->assoc_reject.status_code); + data->assoc_reject.status_code, + data->assoc_reject.timed_out ? " timeout" : ""); else wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_ASSOC_REJECT - "status_code=%u", - data->assoc_reject.status_code); + "status_code=%u%s", + data->assoc_reject.status_code, + data->assoc_reject.timed_out ? " timeout" : ""); wpa_s->assoc_status_code = data->assoc_reject.status_code; wpas_notify_assoc_status_code(wpa_s); if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME) |