index 0cc1fc26858d4c319d8bc2e88994af09340941c5..191748a8afe89bf3bc561e8b8d9e8eb85d40bd36 100644 (file)
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
}
}
+void wpa_supplicant_mark_roaming(struct wpa_supplicant *wpa_s)
+{
+ wpa_s->roaming_in_progress = 1;
+ os_memcpy(wpa_s->prev_bssid, wpa_s->bssid, ETH_ALEN);
+ wpa_s->prev_ssid = wpa_s->current_ssid;
+ wpa_dbg(wpa_s, MSG_DEBUG, "Saving prev AP info for roaming recovery - "
+ "SSID ID: %d BSSID: " MACSTR,
+ wpa_s->prev_ssid->id, MAC2STR(wpa_s->prev_bssid));
+}
+
+void wpa_supplicant_clear_roaming(struct wpa_supplicant *wpa_s,
+ int ignore_deauth_event)
+{
+ wpa_s->roaming_in_progress = 0;
+ wpa_s->ignore_deauth_event = ignore_deauth_event;
+ wpa_s->prev_ssid = NULL;
+ os_memset(wpa_s->prev_bssid, 0, ETH_ALEN);
+}
void wpa_supplicant_mark_disassoc(struct wpa_supplicant *wpa_s)
{
return;
wpa_supplicant_set_state(wpa_s, WPA_DISCONNECTED);
+ wpa_s->conf->ap_scan = DEFAULT_AP_SCAN;
bssid_changed = !is_zero_ether_addr(wpa_s->bssid);
os_memset(wpa_s->bssid, 0, ETH_ALEN);
os_memset(wpa_s->pending_bssid, 0, ETH_ALEN);
else
type = SCARD_GSM_SIM_ONLY;
- wpa_s->scard = scard_init(type);
+ wpa_s->scard = scard_init(type, NULL);
if (wpa_s->scard == NULL) {
wpa_msg(wpa_s, MSG_WARNING, "Failed to initialize SIM "
"(pcsc-lite)");
}
}
+ if (wpa_s->roaming &&
+ os_memcmp(wpa_s->bssid, bss->bssid, ETH_ALEN) == 0) {
+ wpa_dbg(wpa_s, MSG_DEBUG, " skip - current bssid (roaming)");
+ return NULL;
+ }
+
if (ssid_len == 0) {
wpa_dbg(wpa_s, MSG_DEBUG, " skip - SSID not known");
return NULL;
}
+ if (wpa_s->wpa_state >= WPA_AUTHENTICATING &&
+ wpa_s->current_ssid &&
+ os_memcmp(wpa_s->current_ssid->ssid, ssid_, ssid_len) != 0) {
+ wpa_dbg(wpa_s, MSG_DEBUG, " skip - block roaming to "
+ "a different SSID while connected");
+ return NULL;
+ }
+
wpa = wpa_ie_len > 0 || rsn_ie_len > 0;
for (ssid = group; ssid; ssid = ssid->pnext) {
wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_OVERLAP
"PBC session overlap");
#ifdef CONFIG_P2P
- if (wpas_p2p_notif_pbc_overlap(wpa_s) == 1)
+ if (wpas_p2p_notif_pbc_overlap(wpa_s) == 1) {
+ wpa_supplicant_clear_roaming(wpa_s, 0);
return -1;
+ }
#endif /* CONFIG_P2P */
#ifdef CONFIG_WPS
wpas_wps_cancel(wpa_s);
#endif /* CONFIG_WPS */
+ wpa_supplicant_clear_roaming(wpa_s, 0);
return -1;
}
0))) {
if (wpa_supplicant_scard_init(wpa_s, ssid)) {
wpa_supplicant_req_new_scan(wpa_s, 10, 0);
- return 0;
+ wpa_supplicant_clear_roaming(wpa_s, 0);
}
wpa_msg(wpa_s, MSG_DEBUG, "Request association: "
"reassociate: %d selected: "MACSTR " bssid: " MACSTR
} else {
wpa_dbg(wpa_s, MSG_DEBUG, "Already associated with the "
"selected AP");
+ wpa_supplicant_clear_roaming(wpa_s, 0);
}
return 0;
if (wpa_s->reassociate)
return 1; /* explicit request to reassociate */
+ if (wpa_s->roaming)
+ return 1; /* explicit request to roam */
if (wpa_s->wpa_state < WPA_ASSOCIATED)
return 1; /* we are not associated; continue */
if (wpa_s->current_ssid == NULL)
return 1; /* unknown current SSID */
+ if (wpa_s->roaming_disabled) {
+ wpa_dbg(wpa_s, MSG_DEBUG, "Skip roam - "
+ "driver doesn't allow roaming now");
+ return 0;
+ }
if (wpa_s->current_ssid != ssid)
return 1; /* different network block */
if (!current_bss)
return 1; /* current BSS not seen in scan results */
+#ifndef CONFIG_NO_ROAMING
wpa_dbg(wpa_s, MSG_DEBUG, "Considering within-ESS reassociation");
wpa_dbg(wpa_s, MSG_DEBUG, "Current BSS: " MACSTR " level=%d",
MAC2STR(current_bss->bssid), current_bss->level);
return 0;
}
+ wpa_supplicant_mark_roaming(wpa_s);
return 1;
+#else /* CONFIG_NO_ROAMING */
+ return 0;
+#endif /* CONFIG_NO_ROAMING */
}
return 0;
}
#endif /* CONFIG_P2P */
- if (wpa_supplicant_req_sched_scan(wpa_s))
- wpa_supplicant_req_new_scan(wpa_s, timeout_sec,
- timeout_usec);
+ wpa_supplicant_req_sched_scan(wpa_s);
+ wpa_supplicant_req_new_scan(wpa_s, timeout_sec,
+ timeout_usec);
}
}
return 0;
/* Timeout for receiving the first EAPOL packet */
wpa_supplicant_req_auth_timeout(wpa_s, 10, 0);
}
+
+ wpa_supplicant_cancel_sched_scan(wpa_s);
wpa_supplicant_cancel_scan(wpa_s);
if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE) &&
struct os_time now, age;
os_get_time(&now);
os_time_sub(&now, &wpa_s->pending_eapol_rx_time, &age);
- if (age.sec == 0 && age.usec < 100000 &&
+ if (age.sec == 0 && age.usec < 500000 &&
os_memcmp(wpa_s->pending_eapol_rx_src, bssid, ETH_ALEN) ==
0) {
wpa_dbg(wpa_s, MSG_DEBUG, "Process pending EAPOL "
static void wpa_supplicant_event_disassoc(struct wpa_supplicant *wpa_s,
u16 reason_code,
- int locally_generated)
+ int locally_generated,
+ const u8 *addr)
{
const u8 *bssid;
int authenticating;
return;
}
+ if (addr && wpa_s->bssid && os_memcmp(wpa_s->bssid, addr, ETH_ALEN)) {
+ /* This may occur during roaming */
+ wpa_dbg(wpa_s, MSG_DEBUG, "Ignore disconnect from"
+ " a BSS which is not the current one");
+ return;
+ }
+
if (wpa_s->wpa_state == WPA_4WAY_HANDSHAKE &&
wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt)) {
wpa_msg(wpa_s, MSG_INFO, "WPA: 4-Way Handshake failed - "
fast_reconnect = wpa_s->current_bss;
fast_reconnect_ssid = wpa_s->current_ssid;
} else if (wpa_s->wpa_state >= WPA_ASSOCIATING)
- wpa_supplicant_req_scan(wpa_s, 0, 100000);
+ wpa_supplicant_req_scan(wpa_s, 0, 500000);
else
wpa_dbg(wpa_s, MSG_DEBUG, "Do not request new "
"immediate scan");
if (wpa_s->wpa_state >= WPA_AUTHENTICATING)
wpas_connection_failed(wpa_s, bssid);
wpa_sm_notify_disassoc(wpa_s->wpa);
- wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_DISCONNECTED "bssid=" MACSTR
- " reason=%d",
- MAC2STR(bssid), reason_code);
+ if (!is_zero_ether_addr(bssid) ||
+ wpa_s->wpa_state >= WPA_AUTHENTICATING) {
+ wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_DISCONNECTED "bssid=" MACSTR
+ " reason=%d%s",
+ MAC2STR(bssid), reason_code,
+ locally_generated ? " locally_generated=1" : "");
+ }
if (wpa_supplicant_dynamic_keys(wpa_s)) {
wpa_dbg(wpa_s, MSG_DEBUG, "Disconnect event - remove keys");
wpa_s->keys_cleared = 0;
break;
}
#endif /* CONFIG_AP */
- wpa_supplicant_event_disassoc(wpa_s, reason_code,
- locally_generated);
+
+ if (data->deauth_info.reason_code
+ == WLAN_REASON_PREV_AUTH_NOT_VALID &&
+ wpa_s->ignore_deauth_event) {
+ wpa_dbg(wpa_s, MSG_DEBUG, "Ignore deauth event"
+ " with reason=2");
+ wpa_s->ignore_deauth_event = 0;
+ } else {
+ wpa_supplicant_event_disassoc(wpa_s,
+ reason_code,
+ locally_generated,
+ data->deauth_info.addr);
+ }
break;
case EVENT_MICHAEL_MIC_FAILURE:
wpa_supplicant_event_michael_mic_failure(wpa_s, data);
data->signal_change.current_noise,
data->signal_change.current_txrate);
break;
+ case EVENT_ROAMING_ENABLED:
+ wpa_supplicant_enable_roaming(wpa_s);
+ break;
+ case EVENT_ROAMING_DISABLED:
+ wpa_supplicant_disable_roaming(wpa_s);
+ break;
+
+ case EVENT_START_ROAMING:
+ if (!is_zero_ether_addr(wpa_s->bssid)) {
+ wpa_s->roaming = 1;
+ bgscan_notify_beacon_loss(wpa_s);
+ }
+ break;
+
case EVENT_INTERFACE_ENABLED:
wpa_dbg(wpa_s, MSG_DEBUG, "Interface was enabled");
if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED) {
case EVENT_CHANNEL_LIST_CHANGED:
if (wpa_s->drv_priv == NULL)
break; /* Ignore event during drv initialization */
+
+ free_hw_features(wpa_s);
+ wpa_s->hw.modes = wpa_drv_get_hw_feature_data(
+ wpa_s, &wpa_s->hw.num_modes, &wpa_s->hw.flags);
+
#ifdef CONFIG_P2P
wpas_p2p_update_channel_list(wpa_s);
#endif /* CONFIG_P2P */
break;
case EVENT_SCHED_SCAN_STOPPED:
wpa_s->sched_scanning = 0;
- wpa_supplicant_notify_scanning(wpa_s, 0);
if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED)
break;
* If we timed out, start a new sched scan to continue
* searching for more SSIDs.
*/
- if (wpa_s->sched_scan_timed_out)
- wpa_supplicant_req_sched_scan(wpa_s);
+ if (wpa_s->override_sched_scan) {
+ if (wpa_supplicant_req_sched_scan(wpa_s))
+ wpa_supplicant_req_new_scan(wpa_s,
+ wpa_s->scan_interval, 0);
+ }
break;
case EVENT_WPS_BUTTON_PUSHED:
#ifdef CONFIG_WPS