Maintain a pointer to the current BSS table entry
[mech_eap.git] / wpa_supplicant / events.c
index 34b06e3..3c2010c 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * WPA Supplicant - Driver event processing
- * Copyright (c) 2003-2008, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2003-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
 
 #include "common.h"
 #include "eapol_supp/eapol_supp_sm.h"
-#include "wpa.h"
+#include "rsn_supp/wpa.h"
 #include "eloop.h"
-#include "drivers/driver.h"
 #include "config.h"
 #include "l2_packet/l2_packet.h"
 #include "wpa_supplicant_i.h"
+#include "driver_i.h"
 #include "pcsc_funcs.h"
-#include "preauth.h"
-#include "pmksa_cache.h"
-#include "wpa_ctrl.h"
+#include "rsn_supp/preauth.h"
+#include "rsn_supp/pmksa_cache.h"
+#include "common/wpa_ctrl.h"
 #include "eap_peer/eap.h"
-#include "ctrl_iface_dbus.h"
-#include "ieee802_11_defs.h"
+#include "notify.h"
+#include "common/ieee802_11_defs.h"
 #include "blacklist.h"
 #include "wpas_glue.h"
-#include "wps/wps.h"
+#include "wps_supplicant.h"
+#include "ibss_rsn.h"
+#include "sme.h"
+#include "bgscan.h"
+#include "ap.h"
+#include "bss.h"
 
 
 static int wpa_supplicant_select_config(struct wpa_supplicant *wpa_s)
 {
-       struct wpa_ssid *ssid;
+       struct wpa_ssid *ssid, *old_ssid;
 
        if (wpa_s->conf->ap_scan == 1 && wpa_s->current_ssid)
                return 0;
@@ -72,9 +77,12 @@ static int wpa_supplicant_select_config(struct wpa_supplicant *wpa_s)
 
        if (wpa_s->current_ssid && wpa_s->current_ssid != ssid)
                eapol_sm_invalidate_cached_session(wpa_s->eapol);
+       old_ssid = wpa_s->current_ssid;
        wpa_s->current_ssid = ssid;
        wpa_supplicant_rsn_supp_set_config(wpa_s, wpa_s->current_ssid);
        wpa_supplicant_initiate_eapol(wpa_s);
+       if (old_ssid != wpa_s->current_ssid)
+               wpas_notify_network_changed(wpa_s);
 
        return 0;
 }
@@ -96,9 +104,15 @@ static void wpa_supplicant_stop_countermeasures(void *eloop_ctx,
 
 void wpa_supplicant_mark_disassoc(struct wpa_supplicant *wpa_s)
 {
+       int bssid_changed;
+
        wpa_supplicant_set_state(wpa_s, WPA_DISCONNECTED);
+       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);
+       if (bssid_changed)
+               wpas_notify_bssid_changed(wpa_s);
+
        eapol_sm_notify_portEnabled(wpa_s->eapol, FALSE);
        eapol_sm_notify_portValid(wpa_s->eapol, FALSE);
        if (wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt))
@@ -251,6 +265,11 @@ static int wpa_supplicant_match_privacy(struct wpa_scan_res *bss,
        if (ssid->mixed_cell)
                return 1;
 
+#ifdef CONFIG_WPS
+       if (ssid->key_mgmt & WPA_KEY_MGMT_WPS)
+               return 1;
+#endif /* CONFIG_WPS */
+
        for (i = 0; i < NUM_WEP_KEYS; i++) {
                if (ssid->wep_key_len[i]) {
                        privacy = 1;
@@ -270,59 +289,18 @@ static int wpa_supplicant_match_privacy(struct wpa_scan_res *bss,
 }
 
 
-static int wpa_supplicant_ssid_bss_match(struct wpa_ssid *ssid,
+static int wpa_supplicant_ssid_bss_match(struct wpa_supplicant *wpa_s,
+                                        struct wpa_ssid *ssid,
                                         struct wpa_scan_res *bss)
 {
        struct wpa_ie_data ie;
        int proto_match = 0;
        const u8 *rsn_ie, *wpa_ie;
+       int ret;
 
-#ifdef CONFIG_WPS
-       if (ssid->key_mgmt & WPA_KEY_MGMT_WPS) {
-               const u8 *wps_ie;
-               wps_ie = wpa_scan_get_vendor_ie(bss, WPS_IE_VENDOR_TYPE);
-               if (eap_is_wps_pbc_enrollee(&ssid->eap)) {
-                       if (!wps_ie) {
-                               wpa_printf(MSG_DEBUG, "   skip - non-WPS AP");
-                               return 0;
-                       }
-
-                       if (!wps_is_selected_pbc_registrar(wps_ie + 6,
-                                                          wps_ie[1] - 4)) {
-                               wpa_printf(MSG_DEBUG, "   skip - WPS AP "
-                                          "without active PBC Registrar");
-                               return 0;
-                       }
-
-                       /* TODO: overlap detection */
-                       wpa_printf(MSG_DEBUG, "   selected based on WPS IE "
-                                  "(Active PBC)");
-                       return 1;
-               }
-
-               if (eap_is_wps_pin_enrollee(&ssid->eap)) {
-                       if (!wps_ie) {
-                               wpa_printf(MSG_DEBUG, "   skip - non-WPS AP");
-                               return 0;
-                       }
-
-                       if (!wps_is_selected_pin_registrar(wps_ie + 6,
-                                                          wps_ie[1] - 4)) {
-                               wpa_printf(MSG_DEBUG, "   skip - WPS AP "
-                                          "without active PIN Registrar");
-                               return 0;
-                       }
-                       wpa_printf(MSG_DEBUG, "   selected based on WPS IE "
-                                  "(Active PIN)");
-                       return 1;
-               }
-
-               if (wps_ie) {
-                       wpa_printf(MSG_DEBUG, "   selected based on WPS IE");
-                       return 1;
-               }
-       }
-#endif /* CONFIG_WPS */
+       ret = wpas_wps_ssid_bss_match(wpa_s, ssid, bss);
+       if (ret >= 0)
+               return ret;
 
        rsn_ie = wpa_scan_get_ie(bss, WLAN_EID_RSN);
        while ((ssid->proto & WPA_PROTO_RSN) && rsn_ie) {
@@ -412,36 +390,9 @@ static int wpa_supplicant_ssid_bss_match(struct wpa_ssid *ssid,
 }
 
 
-#ifdef CONFIG_WPS
-static int wps_ssid_wildcard_ok(struct wpa_ssid *ssid,
-                               struct wpa_scan_res *bss)
-{
-       const u8 *wps_ie;
-
-       if (eap_is_wps_pbc_enrollee(&ssid->eap)) {
-               wps_ie = wpa_scan_get_vendor_ie(bss, WPS_IE_VENDOR_TYPE);
-               if (wps_ie &&
-                   wps_is_selected_pbc_registrar(wps_ie + 6, wps_ie[1] - 4)) {
-                       /* allow wildcard SSID for WPS PBC */
-                       return 1;
-               }
-       }
-
-       if (eap_is_wps_pin_enrollee(&ssid->eap)) {
-               wps_ie = wpa_scan_get_vendor_ie(bss, WPS_IE_VENDOR_TYPE);
-               if (wps_ie &&
-                   wps_is_selected_pin_registrar(wps_ie + 6, wps_ie[1] - 4)) {
-                       /* allow wildcard SSID for WPS PIN */
-                       return 1;
-               }
-       }
-
-       return 0;
-}
-#endif /* CONFIG_WPS */
-
-static struct wpa_scan_res *
+static struct wpa_bss *
 wpa_supplicant_select_bss_wpa(struct wpa_supplicant *wpa_s,
+                             struct wpa_scan_results *scan_res,
                              struct wpa_ssid *group,
                              struct wpa_ssid **selected_ssid)
 {
@@ -452,10 +403,10 @@ wpa_supplicant_select_bss_wpa(struct wpa_supplicant *wpa_s,
        const u8 *ie;
 
        wpa_printf(MSG_DEBUG, "Try to find WPA-enabled AP");
-       for (i = 0; i < wpa_s->scan_res->num; i++) {
+       for (i = 0; i < scan_res->num; i++) {
                const u8 *ssid_;
                u8 wpa_ie_len, rsn_ie_len, ssid_len;
-               bss = wpa_s->scan_res->res[i];
+               bss = scan_res->res[i];
 
                ie = wpa_scan_get_ie(bss, WLAN_EID_SSID);
                ssid_ = ie ? ie + 2 : (u8 *) "";
@@ -479,6 +430,11 @@ wpa_supplicant_select_bss_wpa(struct wpa_supplicant *wpa_s,
                        continue;
                }
 
+               if (ssid_len == 0) {
+                       wpa_printf(MSG_DEBUG, "   skip - SSID not known");
+                       continue;
+               }
+
                if (wpa_ie_len == 0 && rsn_ie_len == 0) {
                        wpa_printf(MSG_DEBUG, "   skip - no WPA/RSN IE");
                        continue;
@@ -494,7 +450,7 @@ wpa_supplicant_select_bss_wpa(struct wpa_supplicant *wpa_s,
 
 #ifdef CONFIG_WPS
                        if (ssid->ssid_len == 0 &&
-                           wps_ssid_wildcard_ok(ssid, bss))
+                           wpas_wps_ssid_wildcard_ok(wpa_s, ssid, bss))
                                check_ssid = 0;
 #endif /* CONFIG_WPS */
 
@@ -514,7 +470,7 @@ wpa_supplicant_select_bss_wpa(struct wpa_supplicant *wpa_s,
                                continue;
                        }
 
-                       if (!wpa_supplicant_ssid_bss_match(ssid, bss))
+                       if (!wpa_supplicant_ssid_bss_match(wpa_s, ssid, bss))
                                continue;
 
                        wpa_printf(MSG_DEBUG, "   selected WPA AP "
@@ -522,7 +478,7 @@ wpa_supplicant_select_bss_wpa(struct wpa_supplicant *wpa_s,
                                   MAC2STR(bss->bssid),
                                   wpa_ssid_txt(ssid_, ssid_len));
                        *selected_ssid = ssid;
-                       return bss;
+                       return wpa_bss_get(wpa_s, bss->bssid, ssid_, ssid_len);
                }
        }
 
@@ -530,8 +486,9 @@ wpa_supplicant_select_bss_wpa(struct wpa_supplicant *wpa_s,
 }
 
 
-static struct wpa_scan_res *
+static struct wpa_bss *
 wpa_supplicant_select_bss_non_wpa(struct wpa_supplicant *wpa_s,
+                                 struct wpa_scan_results *scan_res,
                                  struct wpa_ssid *group,
                                  struct wpa_ssid **selected_ssid)
 {
@@ -542,10 +499,10 @@ wpa_supplicant_select_bss_non_wpa(struct wpa_supplicant *wpa_s,
        const u8 *ie;
 
        wpa_printf(MSG_DEBUG, "Try to find non-WPA AP");
-       for (i = 0; i < wpa_s->scan_res->num; i++) {
+       for (i = 0; i < scan_res->num; i++) {
                const u8 *ssid_;
                u8 wpa_ie_len, rsn_ie_len, ssid_len;
-               bss = wpa_s->scan_res->res[i];
+               bss = scan_res->res[i];
 
                ie = wpa_scan_get_ie(bss, WLAN_EID_SSID);
                ssid_ = ie ? ie + 2 : (u8 *) "";
@@ -569,6 +526,11 @@ wpa_supplicant_select_bss_non_wpa(struct wpa_supplicant *wpa_s,
                        continue;
                }
 
+               if (ssid_len == 0) {
+                       wpa_printf(MSG_DEBUG, "   skip - SSID not known");
+                       continue;
+               }
+
                for (ssid = group; ssid; ssid = ssid->pnext) {
                        int check_ssid = ssid->ssid_len != 0;
 
@@ -584,7 +546,8 @@ wpa_supplicant_select_bss_non_wpa(struct wpa_supplicant *wpa_s,
                                 * with our mode. */
                                check_ssid = 1;
                                if (ssid->ssid_len == 0 &&
-                                   wps_ssid_wildcard_ok(ssid, bss))
+                                   wpas_wps_ssid_wildcard_ok(wpa_s, ssid,
+                                                             bss))
                                        check_ssid = 0;
                        }
 #endif /* CONFIG_WPS */
@@ -604,7 +567,7 @@ wpa_supplicant_select_bss_non_wpa(struct wpa_supplicant *wpa_s,
                                           "BSSID mismatch");
                                continue;
                        }
-                       
+
                        if (!(ssid->key_mgmt & WPA_KEY_MGMT_NONE) &&
                            !(ssid->key_mgmt & WPA_KEY_MGMT_WPS) &&
                            !(ssid->key_mgmt & WPA_KEY_MGMT_IEEE8021X_NO_WPA))
@@ -614,7 +577,7 @@ wpa_supplicant_select_bss_non_wpa(struct wpa_supplicant *wpa_s,
                                continue;
                        }
 
-                       if ((ssid->key_mgmt & 
+                       if ((ssid->key_mgmt &
                             (WPA_KEY_MGMT_IEEE8021X | WPA_KEY_MGMT_PSK |
                              WPA_KEY_MGMT_FT_IEEE8021X | WPA_KEY_MGMT_FT_PSK |
                              WPA_KEY_MGMT_IEEE8021X_SHA256 |
@@ -642,7 +605,7 @@ wpa_supplicant_select_bss_non_wpa(struct wpa_supplicant *wpa_s,
                                   MAC2STR(bss->bssid),
                                   wpa_ssid_txt(ssid_, ssid_len));
                        *selected_ssid = ssid;
-                       return bss;
+                       return wpa_bss_get(wpa_s, bss->bssid, ssid_, ssid_len);
                }
        }
 
@@ -650,98 +613,185 @@ wpa_supplicant_select_bss_non_wpa(struct wpa_supplicant *wpa_s,
 }
 
 
-static struct wpa_scan_res *
-wpa_supplicant_select_bss(struct wpa_supplicant *wpa_s, struct wpa_ssid *group,
+static struct wpa_bss *
+wpa_supplicant_select_bss(struct wpa_supplicant *wpa_s,
+                         struct wpa_scan_results *scan_res,
+                         struct wpa_ssid *group,
                          struct wpa_ssid **selected_ssid)
 {
-       struct wpa_scan_res *selected;
+       struct wpa_bss *selected;
 
        wpa_printf(MSG_DEBUG, "Selecting BSS from priority group %d",
                   group->priority);
 
        /* First, try to find WPA-enabled AP */
-       selected = wpa_supplicant_select_bss_wpa(wpa_s, group, selected_ssid);
+       selected = wpa_supplicant_select_bss_wpa(wpa_s, scan_res, group,
+                                                selected_ssid);
        if (selected)
                return selected;
 
        /* If no WPA-enabled AP found, try to find non-WPA AP, if configuration
         * allows this. */
-       return wpa_supplicant_select_bss_non_wpa(wpa_s, group, selected_ssid);
+       return wpa_supplicant_select_bss_non_wpa(wpa_s, scan_res, group,
+                                                selected_ssid);
 }
 
 
-#ifdef CONFIG_WPS
+static struct wpa_bss *
+wpa_supplicant_pick_network(struct wpa_supplicant *wpa_s,
+                           struct wpa_scan_results *scan_res,
+                           struct wpa_ssid **selected_ssid)
+{
+       struct wpa_bss *selected = NULL;
+       int prio;
+
+       while (selected == NULL) {
+               for (prio = 0; prio < wpa_s->conf->num_prio; prio++) {
+                       selected = wpa_supplicant_select_bss(
+                               wpa_s, scan_res, wpa_s->conf->pssid[prio],
+                               selected_ssid);
+                       if (selected)
+                               break;
+               }
 
-static int wpa_scan_pbc_overlap(struct wpa_supplicant *wpa_s,
-                               struct wpa_scan_res *selected,
-                               struct wpa_ssid *ssid)
+               if (selected == NULL && wpa_s->blacklist) {
+                       wpa_printf(MSG_DEBUG, "No APs found - clear blacklist "
+                                  "and try again");
+                       wpa_blacklist_clear(wpa_s);
+                       wpa_s->blacklist_cleared++;
+               } else if (selected == NULL)
+                       break;
+       }
+
+       return selected;
+}
+
+
+static void wpa_supplicant_req_new_scan(struct wpa_supplicant *wpa_s,
+                                       int timeout)
 {
-       const u8 *sel_uuid, *uuid;
-       size_t i;
-       const u8 *wps_ie;
+       if (wpa_s->scan_res_tried == 1 && wpa_s->conf->ap_scan == 1) {
+               /*
+                * Quick recovery if the initial scan results were not
+                * complete when fetched before the first scan request.
+                */
+               wpa_s->scan_res_tried++;
+               timeout = 0;
+       } else if (!wpa_supplicant_enabled_networks(wpa_s->conf)) {
+               /*
+                * No networks are enabled; short-circuit request so
+                * we don't wait timeout seconds before transitioning
+                * to INACTIVE state.
+                */
+               wpa_supplicant_set_state(wpa_s, WPA_INACTIVE);
+               return;
+       }
+       wpa_supplicant_req_scan(wpa_s, timeout, 0);
+}
 
-       if (!eap_is_wps_pbc_enrollee(&ssid->eap))
-               return 0;
 
-       /* Make sure that only one AP is in active PBC mode */
-       wps_ie = wpa_scan_get_vendor_ie(selected, WPS_IE_VENDOR_TYPE);
-       if (wps_ie)
-               sel_uuid = wps_get_uuid_e(wps_ie + 6, wps_ie[1] - 4);
-       else
-               sel_uuid = NULL;
-       if (!sel_uuid) {
-               wpa_printf(MSG_DEBUG, "WPS: UUID-E not "
-                          "available for PBC overlap "
-                          "detection");
-               return 1;
+static void wpa_supplicant_connect(struct wpa_supplicant *wpa_s,
+                                  struct wpa_bss *selected,
+                                  struct wpa_ssid *ssid)
+{
+       if (wpas_wps_scan_pbc_overlap(wpa_s, selected, ssid)) {
+               wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_OVERLAP
+                       "PBC session overlap");
+               wpa_supplicant_req_new_scan(wpa_s, 10);
+               return;
        }
 
-       for (i = 0; i < wpa_s->scan_res->num; i++) {
-               struct wpa_scan_res *bss = wpa_s->scan_res->res[i];
-               if (bss == selected)
-                       continue;
-               wps_ie = wpa_scan_get_vendor_ie(bss, WPS_IE_VENDOR_TYPE);
-               if (!wps_ie)
-                       continue;
-               if (!wps_is_selected_pbc_registrar(wps_ie + 6,
-                                                  wps_ie[1] - 4))
-                       continue;
-               uuid = wps_get_uuid_e(wps_ie + 6, wps_ie[1] - 4);
-               if (uuid == NULL) {
-                       wpa_printf(MSG_DEBUG, "WPS: UUID-E not "
-                                  "available for PBC overlap "
-                                  "detection (other BSS)");
-                       return 1;
+       /*
+        * Do not trigger new association unless the BSSID has changed or if
+        * reassociation is requested. If we are in process of associating with
+        * the selected BSSID, do not trigger new attempt.
+        */
+       if (wpa_s->reassociate ||
+           (os_memcmp(selected->bssid, wpa_s->bssid, ETH_ALEN) != 0 &&
+            (wpa_s->wpa_state != WPA_ASSOCIATING ||
+             os_memcmp(selected->bssid, wpa_s->pending_bssid, ETH_ALEN) !=
+             0))) {
+               if (wpa_supplicant_scard_init(wpa_s, ssid)) {
+                       wpa_supplicant_req_new_scan(wpa_s, 10);
+                       return;
                }
-               if (os_memcmp(sel_uuid, uuid, 16) != 0)
-                       return 1; /* PBC overlap */
-
-               /* TODO: verify that this is reasonable dual-band situation */
+               wpa_supplicant_associate(wpa_s, selected, ssid);
+       } else {
+               wpa_printf(MSG_DEBUG, "Already associated with the selected "
+                          "AP");
        }
+}
 
-       return 0;
+
+static struct wpa_ssid *
+wpa_supplicant_pick_new_network(struct wpa_supplicant *wpa_s)
+{
+       int prio;
+       struct wpa_ssid *ssid;
+
+       for (prio = 0; prio < wpa_s->conf->num_prio; prio++) {
+               for (ssid = wpa_s->conf->pssid[prio]; ssid; ssid = ssid->pnext)
+               {
+                       if (ssid->disabled)
+                               continue;
+                       if (ssid->mode == IEEE80211_MODE_IBSS ||
+                           ssid->mode == IEEE80211_MODE_AP)
+                               return ssid;
+               }
+       }
+       return NULL;
 }
 
-#else /* CONFIG_WPS */
 
-#define wpa_scan_pbc_overlap(w, s, i) 0
+/* TODO: move the rsn_preauth_scan_result*() to be called from notify.c based
+ * on BSS added and BSS changed events */
+static void wpa_supplicant_rsn_preauth_scan_results(
+       struct wpa_supplicant *wpa_s, struct wpa_scan_results *scan_res)
+{
+       int i;
+
+       if (rsn_preauth_scan_results(wpa_s->wpa) < 0)
+               return;
+
+       for (i = scan_res->num - 1; i >= 0; i--) {
+               const u8 *ssid, *rsn;
+               struct wpa_scan_res *r;
 
-#endif /* CONFIG_WPS */
+               r = scan_res->res[i];
 
+               ssid = wpa_scan_get_ie(r, WLAN_EID_SSID);
+               if (ssid == NULL)
+                       continue;
+
+               rsn = wpa_scan_get_ie(r, WLAN_EID_RSN);
+               if (rsn == NULL)
+                       continue;
 
-static void wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s)
+               rsn_preauth_scan_result(wpa_s->wpa, r->bssid, ssid, rsn);
+       }
+
+}
+
+
+static void wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s,
+                                             union wpa_event_data *data)
 {
-       int prio, timeout;
-       struct wpa_scan_res *selected = NULL;
+       struct wpa_bss *selected;
        struct wpa_ssid *ssid = NULL;
+       struct wpa_scan_results *scan_res;
+
+       wpa_supplicant_notify_scanning(wpa_s, 0);
 
-       if (wpa_supplicant_get_scan_results(wpa_s) < 0) {
+       scan_res = wpa_supplicant_get_scan_results(wpa_s,
+                                                  data ? &data->scan_info :
+                                                  NULL, 1);
+       if (scan_res == NULL) {
                if (wpa_s->conf->ap_scan == 2)
                        return;
                wpa_printf(MSG_DEBUG, "Failed to get scan results - try "
                           "scanning again");
-               timeout = 1;
-               goto req_scan;
+               wpa_supplicant_req_new_scan(wpa_s, 1);
+               return;
        }
 
        /*
@@ -749,88 +799,105 @@ static void wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s)
         * and there were no results.
         */
        if (wpa_s->scan_res_tried == 1 && wpa_s->conf->ap_scan == 1 &&
-           wpa_s->scan_res->num == 0) {
+           scan_res->num == 0) {
                wpa_msg(wpa_s, MSG_DEBUG, "Cached scan results are "
                        "empty - not posting");
        } else {
-               wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS);
-               wpa_supplicant_dbus_notify_scan_results(wpa_s);
+               wpa_printf(MSG_DEBUG, "New scan results available");
+               wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS);
+               wpas_notify_scan_results(wpa_s);
        }
 
-       if (wpa_s->conf->ap_scan == 2 || wpa_s->disconnected)
+       wpas_notify_scan_done(wpa_s, 1);
+
+       if ((wpa_s->conf->ap_scan == 2 && !wpas_wps_searching(wpa_s))) {
+               wpa_scan_results_free(scan_res);
                return;
+       }
 
-       while (selected == NULL) {
-               for (prio = 0; prio < wpa_s->conf->num_prio; prio++) {
-                       selected = wpa_supplicant_select_bss(
-                               wpa_s, wpa_s->conf->pssid[prio], &ssid);
-                       if (selected)
-                               break;
-               }
+       if (wpa_s->disconnected) {
+               wpa_supplicant_set_state(wpa_s, WPA_DISCONNECTED);
+               wpa_scan_results_free(scan_res);
+               return;
+       }
 
-               if (selected == NULL && wpa_s->blacklist) {
-                       wpa_printf(MSG_DEBUG, "No APs found - clear blacklist "
-                                  "and try again");
-                       wpa_blacklist_clear(wpa_s);
-               } else if (selected == NULL) {
-                       break;
-               }
+       if (bgscan_notify_scan(wpa_s) == 1) {
+               wpa_scan_results_free(scan_res);
+               return;
        }
 
-       if (selected) {
-               if (wpa_scan_pbc_overlap(wpa_s, selected, ssid)) {
-                       wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_OVERLAP
-                               "PBC session overlap");
-                       timeout = 10;
-                       goto req_scan;
-               }
+       wpa_supplicant_rsn_preauth_scan_results(wpa_s, scan_res);
 
-               /* Do not trigger new association unless the BSSID has changed
-                * or if reassociation is requested. If we are in process of
-                * associating with the selected BSSID, do not trigger new
-                * attempt. */
-               if (wpa_s->reassociate ||
-                   (os_memcmp(selected->bssid, wpa_s->bssid, ETH_ALEN) != 0 &&
-                    (wpa_s->wpa_state != WPA_ASSOCIATING ||
-                     os_memcmp(selected->bssid, wpa_s->pending_bssid,
-                               ETH_ALEN) != 0))) {
-                       if (wpa_supplicant_scard_init(wpa_s, ssid)) {
-                               wpa_supplicant_req_scan(wpa_s, 10, 0);
-                               return;
-                       }
-                       wpa_supplicant_associate(wpa_s, selected, ssid);
-               } else {
-                       wpa_printf(MSG_DEBUG, "Already associated with the "
-                                  "selected AP.");
-               }
-               rsn_preauth_scan_results(wpa_s->wpa, wpa_s->scan_res);
+       selected = wpa_supplicant_pick_network(wpa_s, scan_res, &ssid);
+       wpa_scan_results_free(scan_res);
+
+       if (selected) {
+               wpa_supplicant_connect(wpa_s, selected, ssid);
        } else {
-               wpa_printf(MSG_DEBUG, "No suitable AP found.");
-               timeout = 5;
-               goto req_scan;
+               wpa_printf(MSG_DEBUG, "No suitable network found");
+               ssid = wpa_supplicant_pick_new_network(wpa_s);
+               if (ssid) {
+                       wpa_printf(MSG_DEBUG, "Setup a new network");
+                       wpa_supplicant_associate(wpa_s, NULL, ssid);
+               } else
+                       wpa_supplicant_req_new_scan(wpa_s, 5);
        }
+}
+#endif /* CONFIG_NO_SCAN_PROCESSING */
 
-       return;
 
-req_scan:
-       if (wpa_s->scan_res_tried == 1 && wpa_s->conf->ap_scan == 1) {
-               /*
-                * Quick recovery if the initial scan results were not
-                * complete when fetched before the first scan request.
-                */
-               wpa_s->scan_res_tried++;
-               timeout = 0;
+#ifdef CONFIG_IEEE80211R
+static void wpa_assoc_set_ft_params(struct wpa_supplicant *wpa_s,
+                                   const u8 *ftie, const u8 *mdie)
+{
+       const u8 *mobility_domain = NULL;
+       const u8 *r0kh_id = NULL;
+       size_t r0kh_id_len = 0;
+       const u8 *r1kh_id = NULL;
+       struct rsn_ftie *hdr;
+       const u8 *pos, *end;
+
+       if (mdie == NULL || ftie == NULL)
+               return;
+
+       if (mdie[1] >= MOBILITY_DOMAIN_ID_LEN) {
+               mobility_domain = mdie + 2;
+#ifdef CONFIG_SME
+               wpa_s->sme.ft_used = 1;
+               os_memcpy(wpa_s->sme.mobility_domain, mobility_domain, 2);
+#endif /* CONFIG_SME */
        }
-       wpa_supplicant_req_scan(wpa_s, timeout, 0);
+       if (ftie[1] >= sizeof(struct rsn_ftie)) {
+               end = ftie + 2 + ftie[1];
+               hdr = (struct rsn_ftie *) (ftie + 2);
+               pos = (const u8 *) (hdr + 1);
+               while (pos + 1 < end) {
+                       if (pos + 2 + pos[1] > end)
+                               break;
+                       if (pos[0] == FTIE_SUBELEM_R1KH_ID &&
+                           pos[1] == FT_R1KH_ID_LEN)
+                               r1kh_id = pos + 2;
+                       else if (pos[0] == FTIE_SUBELEM_R0KH_ID &&
+                                pos[1] >= 1 && pos[1] <= FT_R0KH_ID_MAX_LEN) {
+                               r0kh_id = pos + 2;
+                               r0kh_id_len = pos[1];
+                       }
+                       pos += 2 + pos[1];
+               }
+       }
+       wpa_sm_set_ft_params(wpa_s->wpa, mobility_domain, r0kh_id,
+                            r0kh_id_len, r1kh_id);
 }
-#endif /* CONFIG_NO_SCAN_PROCESSING */
-
+#endif /* CONFIG_IEEE80211R */
 
 static void wpa_supplicant_event_associnfo(struct wpa_supplicant *wpa_s,
                                           union wpa_event_data *data)
 {
        int l, len, found = 0, wpa_found, rsn_found;
-       u8 *p;
+       const u8 *p;
+#ifdef CONFIG_IEEE80211R
+       const u8 *mdie = NULL, *ftie = NULL;
+#endif /* CONFIG_IEEE80211R */
 
        wpa_printf(MSG_DEBUG, "Association info event");
        if (data->assoc_info.req_ies)
@@ -843,6 +910,8 @@ static void wpa_supplicant_event_associnfo(struct wpa_supplicant *wpa_s,
                wpa_hexdump(MSG_DEBUG, "beacon_ies",
                            data->assoc_info.beacon_ies,
                            data->assoc_info.beacon_ies_len);
+       if (data->assoc_info.freq)
+               wpa_printf(MSG_DEBUG, "freq=%u MHz", data->assoc_info.freq);
 
        p = data->assoc_info.req_ies;
        l = data->assoc_info.req_ies_len;
@@ -870,6 +939,29 @@ static void wpa_supplicant_event_associnfo(struct wpa_supplicant *wpa_s,
        if (!found && data->assoc_info.req_ies)
                wpa_sm_set_assoc_wpa_ie(wpa_s->wpa, NULL, 0);
 
+#ifdef CONFIG_IEEE80211R
+       p = data->assoc_info.resp_ies;
+       l = data->assoc_info.resp_ies_len;
+
+       /* Go through the IEs and make a copy of the FT/MD IE, if present. */
+       while (p && l >= 2) {
+               len = p[1] + 2;
+               if (len > l) {
+                       wpa_hexdump(MSG_DEBUG, "Truncated IE in assoc_info",
+                                   p, l);
+                       break;
+               }
+               if (p[0] == WLAN_EID_FAST_BSS_TRANSITION)
+                       ftie = p;
+               else if (p[0] == WLAN_EID_MOBILITY_DOMAIN)
+                       mdie = p;
+               l -= len;
+               p += len;
+       }
+
+       wpa_assoc_set_ft_params(wpa_s, ftie, mdie);
+#endif /* CONFIG_IEEE80211R */
+
        /* WPA/RSN IE from Beacon/ProbeResp */
        p = data->assoc_info.beacon_ies;
        l = data->assoc_info.beacon_ies_len;
@@ -907,6 +999,8 @@ static void wpa_supplicant_event_associnfo(struct wpa_supplicant *wpa_s,
                wpa_sm_set_ap_rsn_ie(wpa_s->wpa, NULL, 0);
        if (wpa_found || rsn_found)
                wpa_s->ap_ies_from_associnfo = 1;
+
+       wpa_s->assoc_freq = data->assoc_info.freq;
 }
 
 
@@ -915,20 +1009,26 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
 {
        u8 bssid[ETH_ALEN];
        int ft_completed = wpa_ft_is_completed(wpa_s->wpa);
+       int bssid_changed;
+       struct wpa_driver_capa capa;
 
        if (data)
                wpa_supplicant_event_associnfo(wpa_s, data);
 
        wpa_supplicant_set_state(wpa_s, WPA_ASSOCIATED);
-       if (wpa_s->use_client_mlme)
+       if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_USER_SPACE_MLME)
                os_memcpy(bssid, wpa_s->bssid, ETH_ALEN);
-       if (wpa_s->use_client_mlme ||
+       if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_USER_SPACE_MLME) ||
            (wpa_drv_get_bssid(wpa_s, bssid) >= 0 &&
             os_memcmp(bssid, wpa_s->bssid, ETH_ALEN) != 0)) {
                wpa_msg(wpa_s, MSG_DEBUG, "Associated to a new BSS: BSSID="
                        MACSTR, MAC2STR(bssid));
+               bssid_changed = os_memcmp(wpa_s->bssid, bssid, ETH_ALEN);
                os_memcpy(wpa_s->bssid, bssid, ETH_ALEN);
                os_memset(wpa_s->pending_bssid, 0, ETH_ALEN);
+               if (bssid_changed)
+                       wpas_notify_bssid_changed(wpa_s);
+
                if (wpa_supplicant_dynamic_keys(wpa_s) && !ft_completed) {
                        wpa_clear_keys(wpa_s, bssid);
                }
@@ -937,8 +1037,24 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
                                wpa_s, WLAN_REASON_DEAUTH_LEAVING);
                        return;
                }
+               if (wpa_s->current_ssid) {
+                       struct wpa_bss *bss = NULL;
+                       struct wpa_ssid *ssid = wpa_s->current_ssid;
+                       if (ssid->ssid_len > 0)
+                               bss = wpa_bss_get(wpa_s, bssid,
+                                                 ssid->ssid, ssid->ssid_len);
+                       if (!bss)
+                               bss = wpa_bss_get_bssid(wpa_s, bssid);
+                       if (bss)
+                               wpa_s->current_bss = bss;
+               }
        }
 
+#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));
        if (wpa_s->current_ssid) {
                /* When using scanning (ap_scan=1), SIM PC/SC interface can be
@@ -968,7 +1084,9 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
        eapol_sm_notify_portEnabled(wpa_s->eapol, TRUE);
        wpa_s->eapol_received = 0;
        if (wpa_s->key_mgmt == WPA_KEY_MGMT_NONE ||
-           wpa_s->key_mgmt == WPA_KEY_MGMT_WPA_NONE) {
+           wpa_s->key_mgmt == WPA_KEY_MGMT_WPA_NONE ||
+           (wpa_s->current_ssid &&
+            wpa_s->current_ssid->mode == IEEE80211_MODE_IBSS)) {
                wpa_supplicant_cancel_auth_timeout(wpa_s);
                wpa_supplicant_set_state(wpa_s, WPA_COMPLETED);
        } else if (!ft_completed) {
@@ -977,7 +1095,7 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
        }
        wpa_supplicant_cancel_scan(wpa_s);
 
-       if (wpa_s->driver_4way_handshake &&
+       if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE) &&
            wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt)) {
                /*
                 * We are done; the driver will take care of RSN 4-way
@@ -988,12 +1106,65 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
                eapol_sm_notify_portValid(wpa_s->eapol, TRUE);
                eapol_sm_notify_eap_success(wpa_s->eapol, TRUE);
        }
+
+       if (wpa_s->pending_eapol_rx) {
+               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 &&
+                   os_memcmp(wpa_s->pending_eapol_rx_src, bssid, ETH_ALEN) ==
+                   0) {
+                       wpa_printf(MSG_DEBUG, "Process pending EAPOL frame "
+                                  "that was received just before association "
+                                  "notification");
+                       wpa_supplicant_rx_eapol(
+                               wpa_s, wpa_s->pending_eapol_rx_src,
+                               wpabuf_head(wpa_s->pending_eapol_rx),
+                               wpabuf_len(wpa_s->pending_eapol_rx));
+               }
+               wpabuf_free(wpa_s->pending_eapol_rx);
+               wpa_s->pending_eapol_rx = NULL;
+       }
+
+#ifdef CONFIG_BGSCAN
+       if (wpa_s->current_ssid != wpa_s->bgscan_ssid) {
+               bgscan_deinit(wpa_s);
+               if (wpa_s->current_ssid && wpa_s->current_ssid->bgscan) {
+                       if (bgscan_init(wpa_s, wpa_s->current_ssid)) {
+                               wpa_printf(MSG_DEBUG, "Failed to initialize "
+                                          "bgscan");
+                               /*
+                                * Live without bgscan; it is only used as a
+                                * roaming optimization, so the initial
+                                * connection is not affected.
+                                */
+                       } else
+                               wpa_s->bgscan_ssid = wpa_s->current_ssid;
+               } else
+                       wpa_s->bgscan_ssid = NULL;
+       }
+#endif /* CONFIG_BGSCAN */
+
+       if ((wpa_s->key_mgmt == WPA_KEY_MGMT_NONE ||
+            wpa_s->key_mgmt == WPA_KEY_MGMT_IEEE8021X_NO_WPA) &&
+           wpa_s->current_ssid && wpa_drv_get_capa(wpa_s, &capa) == 0 &&
+           capa.flags & WPA_DRIVER_FLAGS_SET_KEYS_AFTER_ASSOC_DONE) {
+               /* Set static WEP keys again */
+               wpa_set_wep_keys(wpa_s, wpa_s->current_ssid);
+       }
 }
 
 
 static void wpa_supplicant_event_disassoc(struct wpa_supplicant *wpa_s)
 {
        const u8 *bssid;
+#ifdef CONFIG_SME
+       int authenticating;
+       u8 prev_pending_bssid[ETH_ALEN];
+
+       authenticating = wpa_s->wpa_state == WPA_AUTHENTICATING;
+       os_memcpy(prev_pending_bssid, wpa_s->pending_bssid, ETH_ALEN);
+#endif /* CONFIG_SME */
 
        if (wpa_s->key_mgmt == WPA_KEY_MGMT_WPA_NONE) {
                /*
@@ -1025,6 +1196,21 @@ static void wpa_supplicant_event_disassoc(struct wpa_supplicant *wpa_s)
                wpa_clear_keys(wpa_s, wpa_s->bssid);
        }
        wpa_supplicant_mark_disassoc(wpa_s);
+       bgscan_deinit(wpa_s);
+#ifdef CONFIG_SME
+       if (authenticating &&
+           (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME)) {
+               /*
+                * mac80211-workaround to force deauth on failed auth cmd,
+                * requires us to remain in authenticating state to allow the
+                * second authentication attempt to be continued properly.
+                */
+               wpa_printf(MSG_DEBUG, "SME: Allow pending authentication to "
+                          "proceed after disconnection event");
+               wpa_supplicant_set_state(wpa_s, WPA_AUTHENTICATING);
+               os_memcpy(wpa_s->pending_bssid, prev_pending_bssid, ETH_ALEN);
+       }
+#endif /* CONFIG_SME */
 }
 
 
@@ -1135,6 +1321,19 @@ wpa_supplicant_event_michael_mic_failure(struct wpa_supplicant *wpa_s,
 }
 
 
+#ifdef CONFIG_TERMINATE_ONLASTIF
+static int any_interfaces(struct wpa_supplicant *head)
+{
+       struct wpa_supplicant *wpa_s;
+
+       for (wpa_s = head; wpa_s != NULL; wpa_s = wpa_s->next)
+               if (!wpa_s->interface_removed)
+                       return 1;
+       return 0;
+}
+#endif /* CONFIG_TERMINATE_ONLASTIF */
+
+
 static void
 wpa_supplicant_event_interface_status(struct wpa_supplicant *wpa_s,
                                      union wpa_event_data *data)
@@ -1159,6 +1358,11 @@ wpa_supplicant_event_interface_status(struct wpa_supplicant *wpa_s,
                wpa_supplicant_mark_disassoc(wpa_s);
                l2_packet_deinit(wpa_s->l2);
                wpa_s->l2 = NULL;
+#ifdef CONFIG_TERMINATE_ONLASTIF
+               /* check if last interface */
+               if (!any_interfaces(wpa_s->global->ifaces))
+                       eloop_terminate();
+#endif /* CONFIG_TERMINATE_ONLASTIF */
                break;
        }
 }
@@ -1187,23 +1391,43 @@ wpa_supplicant_event_ft_response(struct wpa_supplicant *wpa_s,
        if (wpa_ft_process_response(wpa_s->wpa, data->ft_ies.ies,
                                    data->ft_ies.ies_len,
                                    data->ft_ies.ft_action,
-                                   data->ft_ies.target_ap) < 0) {
+                                   data->ft_ies.target_ap,
+                                   data->ft_ies.ric_ies,
+                                   data->ft_ies.ric_ies_len) < 0) {
                /* TODO: prevent MLME/driver from trying to associate? */
        }
 }
 #endif /* CONFIG_IEEE80211R */
 
 
+#ifdef CONFIG_IBSS_RSN
+static void wpa_supplicant_event_ibss_rsn_start(struct wpa_supplicant *wpa_s,
+                                               union wpa_event_data *data)
+{
+       if (data == NULL)
+               return;
+       ibss_rsn_start(wpa_s->ibss_rsn, data->ibss_rsn_start.peer);
+}
+#endif /* CONFIG_IBSS_RSN */
+
+
 void wpa_supplicant_event(void *ctx, wpa_event_type event,
                          union wpa_event_data *data)
 {
        struct wpa_supplicant *wpa_s = ctx;
 
        switch (event) {
+       case EVENT_AUTH:
+               sme_event_auth(wpa_s, data);
+               break;
        case EVENT_ASSOC:
                wpa_supplicant_event_assoc(wpa_s, data);
                break;
        case EVENT_DISASSOC:
+               if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME)
+                       sme_event_disassoc(wpa_s, data);
+               /* fall through */
+       case EVENT_DEAUTH:
                wpa_supplicant_event_disassoc(wpa_s);
                break;
        case EVENT_MICHAEL_MIC_FAILURE:
@@ -1211,7 +1435,7 @@ void wpa_supplicant_event(void *ctx, wpa_event_type event,
                break;
 #ifndef CONFIG_NO_SCAN_PROCESSING
        case EVENT_SCAN_RESULTS:
-               wpa_supplicant_event_scan_results(wpa_s);
+               wpa_supplicant_event_scan_results(wpa_s, data);
                break;
 #endif /* CONFIG_NO_SCAN_PROCESSING */
        case EVENT_ASSOCINFO:
@@ -1233,6 +1457,52 @@ void wpa_supplicant_event(void *ctx, wpa_event_type event,
                wpa_supplicant_event_ft_response(wpa_s, data);
                break;
 #endif /* CONFIG_IEEE80211R */
+#ifdef CONFIG_IBSS_RSN
+       case EVENT_IBSS_RSN_START:
+               wpa_supplicant_event_ibss_rsn_start(wpa_s, data);
+               break;
+#endif /* CONFIG_IBSS_RSN */
+       case EVENT_ASSOC_REJECT:
+               sme_event_assoc_reject(wpa_s, data);
+               break;
+       case EVENT_AUTH_TIMED_OUT:
+               sme_event_auth_timed_out(wpa_s, data);
+               break;
+       case EVENT_ASSOC_TIMED_OUT:
+               sme_event_assoc_timed_out(wpa_s, data);
+               break;
+#ifdef CONFIG_AP
+       case EVENT_TX_STATUS:
+               if (wpa_s->ap_iface == NULL)
+                       break;
+               switch (data->tx_status.type) {
+               case WLAN_FC_TYPE_MGMT:
+                       ap_mgmt_tx_cb(wpa_s, data->tx_status.data,
+                                     data->tx_status.data_len,
+                                     data->tx_status.stype,
+                                     data->tx_status.ack);
+                       break;
+               case WLAN_FC_TYPE_DATA:
+                       ap_tx_status(wpa_s, data->tx_status.dst,
+                                    data->tx_status.data,
+                                    data->tx_status.data_len,
+                                    data->tx_status.ack);
+                       break;
+               }
+               break;
+       case EVENT_RX_FROM_UNKNOWN:
+               if (wpa_s->ap_iface == NULL)
+                       break;
+               ap_rx_from_unknown_sta(wpa_s, data->rx_from_unknown.hdr,
+                                      data->rx_from_unknown.len);
+               break;
+       case EVENT_RX_MGMT:
+               if (wpa_s->ap_iface == NULL)
+                       break;
+               ap_mgmt_rx(wpa_s, data->rx_mgmt.frame,
+                          data->rx_mgmt.frame_len, data->rx_mgmt.fi);
+               break;
+#endif /* CONFIG_AP */
        default:
                wpa_printf(MSG_INFO, "Unknown event %d", event);
                break;