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

wext: Clean up the disconnect BSSID/SSID clearing

Browse source
This commit is contained in:
Jouni Malinen 2011-10-21 19:09:25 +03:00 committed by Jouni Malinen
parent 48f8e03622
commit 724950836f
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/drivers/driver_wext.c
View file

@ -1840,31 +1840,36 @@ static void wpa_driver_wext_disconnect(struct wpa_driver_wext_data *drv)
} }
if (iwr.u.mode == IW_MODE_INFRA) { if (iwr.u.mode == IW_MODE_INFRA) {
/* Clear the BSSID selection */
if (wpa_driver_wext_set_bssid(drv, null_bssid) < 0) {
wpa_printf(MSG_DEBUG, "WEXT: Failed to clear BSSID "
"selection on disconnect");
}
if (drv->cfg80211) { if (drv->cfg80211) {
/* /*
* cfg80211 supports SIOCSIWMLME commands, so there is * cfg80211 supports SIOCSIWMLME commands, so there is
* no need for the random SSID hack, but clear the * no need for the random SSID hack, but clear the
* BSSID and SSID. * SSID.
*/ */
if (wpa_driver_wext_set_bssid(drv, null_bssid) < 0 || if (wpa_driver_wext_set_ssid(drv, (u8 *) "", 0) < 0) {
wpa_driver_wext_set_ssid(drv, (u8 *) "", 0) < 0) {
wpa_printf(MSG_DEBUG, "WEXT: Failed to clear " wpa_printf(MSG_DEBUG, "WEXT: Failed to clear "
"to disconnect"); "SSID on disconnect");
} }
return; return;
} }
/* /*
* Clear the BSSID selection and set a random SSID to make sure * Set a random SSID to make sure the driver will not be trying
* the driver will not be trying to associate with something * to associate with something even if it does not understand
* even if it does not understand SIOCSIWMLME commands (or * SIOCSIWMLME commands (or tries to associate automatically
* tries to associate automatically after deauth/disassoc). * after deauth/disassoc).
*/ */
for (i = 0; i < 32; i++) for (i = 0; i < 32; i++)
ssid[i] = rand() & 0xFF; ssid[i] = rand() & 0xFF;
if (wpa_driver_wext_set_bssid(drv, null_bssid) < 0 || if (wpa_driver_wext_set_ssid(drv, ssid, 32) < 0) {
wpa_driver_wext_set_ssid(drv, ssid, 32) < 0) {
wpa_printf(MSG_DEBUG, "WEXT: Failed to set bogus " wpa_printf(MSG_DEBUG, "WEXT: Failed to set bogus "
"BSSID/SSID to disconnect"); "SSID to disconnect");
} }
} }
} }