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

nl80211/SME: Use reassociation when roaming within the ESS

Browse source
This commit is contained in:
Jouni Malinen 2009-11-17 19:25:05 +02:00
parent 3fd2a226f9
commit 62fa124ce2
5 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/drivers/driver.h
View file

@ -409,6 +409,14 @@ struct wpa_driver_associate_params {
* still be allowed for key negotiation. * still be allowed for key negotiation.
*/ */
int drop_unencrypted; int drop_unencrypted;
/**
* prev_bssid - Previously used BSSID in this ESS
*
* When not %NULL, this is a request to use reassociation instead of
* association.
*/
const u8 *prev_bssid;
}; };
/** /**

7
src/drivers/driver_nl80211.c
View file

@ -3599,6 +3599,13 @@ static int wpa_driver_nl80211_associate(
NLA_PUT_FLAG(msg, NL80211_ATTR_CONTROL_PORT); NLA_PUT_FLAG(msg, NL80211_ATTR_CONTROL_PORT);
if (params->prev_bssid) {
wpa_printf(MSG_DEBUG, " * prev_bssid=" MACSTR,
MAC2STR(params->prev_bssid));
NLA_PUT(msg, NL80211_ATTR_PREV_BSSID, ETH_ALEN,
params->prev_bssid);
}
ret = send_and_recv_msgs(drv, msg, NULL, NULL); ret = send_and_recv_msgs(drv, msg, NULL, NULL);
msg = NULL; msg = NULL;
if (ret) { if (ret) {

5
wpa_supplicant/events.c
View file

@ -983,6 +983,11 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
} }
} }
#ifdef CONFIG_SME
os_memcpy(wpa_s->sme.prev_bssid, bssid, ETH_ALEN);
wpa_s->sme.prev_bssid_set = 1;
#endif /* CONFIG_SME */
wpa_msg(wpa_s, MSG_INFO, "Associated with " MACSTR, MAC2STR(bssid)); wpa_msg(wpa_s, MSG_INFO, "Associated with " MACSTR, MAC2STR(bssid));
if (wpa_s->current_ssid) { if (wpa_s->current_ssid) {
/* When using scanning (ap_scan=1), SIM PC/SC interface can be /* When using scanning (ap_scan=1), SIM PC/SC interface can be

7
wpa_supplicant/sme.c
View file

@ -59,6 +59,10 @@ void sme_authenticate(struct wpa_supplicant *wpa_s,
params.ssid = ie + 2; params.ssid = ie + 2;
params.ssid_len = ie[1]; params.ssid_len = ie[1];
if (wpa_s->sme.ssid_len != params.ssid_len ||
os_memcmp(wpa_s->sme.ssid, params.ssid, params.ssid_len) != 0)
wpa_s->sme.prev_bssid_set = 0;
wpa_s->sme.freq = params.freq; wpa_s->sme.freq = params.freq;
os_memcpy(wpa_s->sme.ssid, params.ssid, params.ssid_len); os_memcpy(wpa_s->sme.ssid, params.ssid, params.ssid_len);
wpa_s->sme.ssid_len = params.ssid_len; wpa_s->sme.ssid_len = params.ssid_len;
@ -312,6 +316,8 @@ void sme_event_auth(struct wpa_supplicant *wpa_s, union wpa_event_data *data)
#endif /* CONFIG_IEEE80211R */ #endif /* CONFIG_IEEE80211R */
params.mode = ssid->mode; params.mode = ssid->mode;
params.mgmt_frame_protection = wpa_s->sme.mfp; params.mgmt_frame_protection = wpa_s->sme.mfp;
if (wpa_s->sme.prev_bssid_set)
params.prev_bssid = wpa_s->sme.prev_bssid;
wpa_msg(wpa_s, MSG_INFO, "Trying to associate with " MACSTR wpa_msg(wpa_s, MSG_INFO, "Trying to associate with " MACSTR
" (SSID='%s' freq=%d MHz)", MAC2STR(params.bssid), " (SSID='%s' freq=%d MHz)", MAC2STR(params.bssid),
@ -378,6 +384,7 @@ void sme_event_assoc_reject(struct wpa_supplicant *wpa_s,
wpa_msg(wpa_s, MSG_INFO, wpa_msg(wpa_s, MSG_INFO,
"Deauth request to the driver failed"); "Deauth request to the driver failed");
} }
wpa_s->sme.prev_bssid_set = 0;
if (wpa_blacklist_add(wpa_s, wpa_s->pending_bssid) == 0) { if (wpa_blacklist_add(wpa_s, wpa_s->pending_bssid) == 0) {
struct wpa_blacklist *b; struct wpa_blacklist *b;

2
wpa_supplicant/wpa_supplicant_i.h
View file

@ -407,6 +407,8 @@ struct wpa_supplicant {
u8 mobility_domain[2]; u8 mobility_domain[2];
u8 *ft_ies; u8 *ft_ies;
size_t ft_ies_len; size_t ft_ies_len;
u8 prev_bssid[ETH_ALEN];
int prev_bssid_set;
} sme; } sme;
#endif /* CONFIG_SME */ #endif /* CONFIG_SME */