aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2010-03-13 15:14:41 (GMT)
committerJouni Malinen <j@w1.fi>2010-03-13 15:14:41 (GMT)
commit71024cb2553b18308cb23f15c3befe56be94b3c4 (patch)
tree758e153a1e295ab471eef207fbb2d37a94a0e028
parentbdda27eb171893aaa8bf2f574fca517facda176b (diff)
downloadhostap-71024cb2553b18308cb23f15c3befe56be94b3c4.zip
hostap-71024cb2553b18308cb23f15c3befe56be94b3c4.tar.gz
hostap-71024cb2553b18308cb23f15c3befe56be94b3c4.tar.bz2
FT: Request reassociation after successful FT Action frame exchange
-rw-r--r--wpa_supplicant/events.c2
-rw-r--r--wpa_supplicant/sme.c19
-rw-r--r--wpa_supplicant/sme.h4
3 files changed, 18 insertions, 7 deletions
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 866b638..cfe6dc3 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -1545,7 +1545,7 @@ static void ft_rx_action(struct wpa_supplicant *wpa_s, const u8 *data,
target_ap_addr, NULL, 0) < 0)
return;
- /* TODO: trigger re-association with the target AP */
+ sme_associate(wpa_s, WPAS_MODE_INFRA, target_ap_addr, WLAN_AUTH_FT);
}
#endif /* CONFIG_IEEE80211R */
diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c
index 27b7d25..1853d23 100644
--- a/wpa_supplicant/sme.c
+++ b/wpa_supplicant/sme.c
@@ -1,6 +1,6 @@
/*
* wpa_supplicant - SME
- * Copyright (c) 2009, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2009-2010, Jouni Malinen <j@w1.fi>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -239,7 +239,6 @@ void sme_authenticate(struct wpa_supplicant *wpa_s,
void sme_event_auth(struct wpa_supplicant *wpa_s, union wpa_event_data *data)
{
- struct wpa_driver_associate_params params;
struct wpa_ssid *ssid = wpa_s->current_ssid;
if (ssid == NULL) {
@@ -285,8 +284,18 @@ void sme_event_auth(struct wpa_supplicant *wpa_s, union wpa_event_data *data)
}
#endif /* CONFIG_IEEE80211R */
+ sme_associate(wpa_s, ssid->mode, data->auth.peer,
+ data->auth.auth_type);
+}
+
+
+void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode,
+ const u8 *bssid, u16 auth_type)
+{
+ struct wpa_driver_associate_params params;
+
os_memset(&params, 0, sizeof(params));
- params.bssid = data->auth.peer;
+ params.bssid = bssid;
params.ssid = wpa_s->sme.ssid;
params.ssid_len = wpa_s->sme.ssid_len;
params.freq = wpa_s->sme.freq;
@@ -294,12 +303,12 @@ void sme_event_auth(struct wpa_supplicant *wpa_s, union wpa_event_data *data)
wpa_s->sme.assoc_req_ie : NULL;
params.wpa_ie_len = wpa_s->sme.assoc_req_ie_len;
#ifdef CONFIG_IEEE80211R
- if (data->auth.auth_type == WLAN_AUTH_FT && wpa_s->sme.ft_ies) {
+ if (auth_type == WLAN_AUTH_FT && wpa_s->sme.ft_ies) {
params.wpa_ie = wpa_s->sme.ft_ies;
params.wpa_ie_len = wpa_s->sme.ft_ies_len;
}
#endif /* CONFIG_IEEE80211R */
- params.mode = ssid->mode;
+ params.mode = mode;
params.mgmt_frame_protection = wpa_s->sme.mfp;
if (wpa_s->sme.prev_bssid_set)
params.prev_bssid = wpa_s->sme.prev_bssid;
diff --git a/wpa_supplicant/sme.h b/wpa_supplicant/sme.h
index adc133f..3ec8cc9 100644
--- a/wpa_supplicant/sme.h
+++ b/wpa_supplicant/sme.h
@@ -1,6 +1,6 @@
/*
* wpa_supplicant - SME
- * Copyright (c) 2009, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2009-2010, Jouni Malinen <j@w1.fi>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -19,6 +19,8 @@
void sme_authenticate(struct wpa_supplicant *wpa_s,
struct wpa_bss *bss, struct wpa_ssid *ssid);
+void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode,
+ const u8 *bssid, u16 auth_type);
void sme_event_auth(struct wpa_supplicant *wpa_s, union wpa_event_data *data);
int sme_update_ft_ies(struct wpa_supplicant *wpa_s, const u8 *md,
const u8 *ies, size_t ies_len);