Add AP channel switch mechanism
[mech_eap.git] / src / ap / drv_callbacks.c
index 7d6f01b..1b69ba8 100644 (file)
@@ -1,15 +1,9 @@
 /*
  * hostapd / Callback functions for driver wrappers
- * Copyright (c) 2002-2009, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2002-2013, 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
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  */
 
 #include "utils/includes.h"
 #include "crypto/random.h"
 #include "p2p/p2p.h"
 #include "wps/wps.h"
+#include "wnm_ap.h"
 #include "hostapd.h"
 #include "ieee802_11.h"
 #include "sta_info.h"
 #include "accounting.h"
 #include "tkip_countermeasures.h"
-#include "iapp.h"
 #include "ieee802_1x.h"
 #include "wpa_auth.h"
-#include "wmm.h"
 #include "wps_hostapd.h"
 #include "ap_drv_ops.h"
 #include "ap_config.h"
+#include "hw_features.h"
+#include "dfs.h"
 
 
 int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
-                       const u8 *ie, size_t ielen, int reassoc)
+                       const u8 *req_ies, size_t req_ies_len, int reassoc)
 {
        struct sta_info *sta;
        int new_assoc, res;
        struct ieee802_11_elems elems;
-#ifdef CONFIG_P2P
-       const u8 *all_ies = ie;
-       size_t all_ies_len = ielen;
-#endif /* CONFIG_P2P */
+       const u8 *ie;
+       size_t ielen;
+#ifdef CONFIG_IEEE80211R
+       u8 buf[sizeof(struct ieee80211_mgmt) + 1024];
+       u8 *p = buf;
+#endif /* CONFIG_IEEE80211R */
+       u16 reason = WLAN_REASON_UNSPECIFIED;
+       u16 status = WLAN_STATUS_SUCCESS;
+       const u8 *p2p_dev_addr = NULL;
 
        if (addr == NULL) {
                /*
@@ -65,7 +65,7 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
        hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
                       HOSTAPD_LEVEL_INFO, "associated");
 
-       ieee802_11_parse_elems(ie, ielen, &elems, 0);
+       ieee802_11_parse_elems(req_ies, req_ies_len, &elems, 0);
        if (elems.wps_ie) {
                ie = elems.wps_ie - 2;
                ielen = elems.wps_ie_len + 2;
@@ -87,22 +87,50 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
 
        sta = ap_get_sta(hapd, addr);
        if (sta) {
+               ap_sta_no_session_timeout(hapd, sta);
                accounting_sta_stop(hapd, sta);
+
+               /*
+                * Make sure that the previously registered inactivity timer
+                * will not remove the STA immediately.
+                */
+               sta->timeout_next = STA_NULLFUNC;
        } else {
                sta = ap_sta_add(hapd, addr);
-               if (sta == NULL)
+               if (sta == NULL) {
+                       hostapd_drv_sta_disassoc(hapd, addr,
+                                                WLAN_REASON_DISASSOC_AP_BUSY);
                        return -1;
+               }
        }
        sta->flags &= ~(WLAN_STA_WPS | WLAN_STA_MAYBE_WPS | WLAN_STA_WPS2);
 
 #ifdef CONFIG_P2P
        if (elems.p2p) {
                wpabuf_free(sta->p2p_ie);
-               sta->p2p_ie = ieee802_11_vendor_ie_concat(all_ies, all_ies_len,
+               sta->p2p_ie = ieee802_11_vendor_ie_concat(req_ies, req_ies_len,
                                                          P2P_IE_VENDOR_TYPE);
+               if (sta->p2p_ie)
+                       p2p_dev_addr = p2p_get_go_dev_addr(sta->p2p_ie);
        }
 #endif /* CONFIG_P2P */
 
+#ifdef CONFIG_INTERWORKING
+       if (elems.ext_capab && elems.ext_capab_len > 4) {
+               if (elems.ext_capab[4] & 0x01)
+                       sta->qos_map_enabled = 1;
+       }
+#endif /* CONFIG_INTERWORKING */
+
+#ifdef CONFIG_HS20
+       wpabuf_free(sta->hs20_ie);
+       if (elems.hs20 && elems.hs20_len > 4) {
+               sta->hs20_ie = wpabuf_alloc_copy(elems.hs20 + 4,
+                                                elems.hs20_len - 4);
+       } else
+               sta->hs20_ie = NULL;
+#endif /* CONFIG_HS20 */
+
        if (hapd->conf->wpa) {
                if (ie == NULL || ielen == 0) {
 #ifdef CONFIG_WPS
@@ -139,59 +167,112 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
 
                if (sta->wpa_sm == NULL)
                        sta->wpa_sm = wpa_auth_sta_init(hapd->wpa_auth,
-                                                       sta->addr);
+                                                       sta->addr,
+                                                       p2p_dev_addr);
                if (sta->wpa_sm == NULL) {
                        wpa_printf(MSG_ERROR, "Failed to initialize WPA state "
                                   "machine");
                        return -1;
                }
                res = wpa_validate_wpa_ie(hapd->wpa_auth, sta->wpa_sm,
-                                         ie, ielen, NULL, 0);
+                                         ie, ielen,
+                                         elems.mdie, elems.mdie_len);
                if (res != WPA_IE_OK) {
-                       int resp;
                        wpa_printf(MSG_DEBUG, "WPA/RSN information element "
                                   "rejected? (res %u)", res);
                        wpa_hexdump(MSG_DEBUG, "IE", ie, ielen);
-                       if (res == WPA_INVALID_GROUP)
-                               resp = WLAN_REASON_GROUP_CIPHER_NOT_VALID;
-                       else if (res == WPA_INVALID_PAIRWISE)
-                               resp = WLAN_REASON_PAIRWISE_CIPHER_NOT_VALID;
-                       else if (res == WPA_INVALID_AKMP)
-                               resp = WLAN_REASON_AKMP_NOT_VALID;
+                       if (res == WPA_INVALID_GROUP) {
+                               reason = WLAN_REASON_GROUP_CIPHER_NOT_VALID;
+                               status = WLAN_STATUS_GROUP_CIPHER_NOT_VALID;
+                       } else if (res == WPA_INVALID_PAIRWISE) {
+                               reason = WLAN_REASON_PAIRWISE_CIPHER_NOT_VALID;
+                               status = WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID;
+                       } else if (res == WPA_INVALID_AKMP) {
+                               reason = WLAN_REASON_AKMP_NOT_VALID;
+                               status = WLAN_STATUS_AKMP_NOT_VALID;
+                       }
 #ifdef CONFIG_IEEE80211W
-                       else if (res == WPA_MGMT_FRAME_PROTECTION_VIOLATION)
-                               resp = WLAN_REASON_INVALID_IE;
-                       else if (res == WPA_INVALID_MGMT_GROUP_CIPHER)
-                               resp = WLAN_REASON_GROUP_CIPHER_NOT_VALID;
+                       else if (res == WPA_MGMT_FRAME_PROTECTION_VIOLATION) {
+                               reason = WLAN_REASON_INVALID_IE;
+                               status = WLAN_STATUS_INVALID_IE;
+                       } else if (res == WPA_INVALID_MGMT_GROUP_CIPHER) {
+                               reason = WLAN_REASON_GROUP_CIPHER_NOT_VALID;
+                               status = WLAN_STATUS_GROUP_CIPHER_NOT_VALID;
+                       }
 #endif /* CONFIG_IEEE80211W */
-                       else
-                               resp = WLAN_REASON_INVALID_IE;
-                       hostapd_drv_sta_disassoc(hapd, sta->addr, resp);
-                       ap_free_sta(hapd, sta);
-                       return -1;
+                       else {
+                               reason = WLAN_REASON_INVALID_IE;
+                               status = WLAN_STATUS_INVALID_IE;
+                       }
+                       goto fail;
                }
+#ifdef CONFIG_IEEE80211W
+               if ((sta->flags & WLAN_STA_MFP) && !sta->sa_query_timed_out &&
+                   sta->sa_query_count > 0)
+                       ap_check_sa_query_timeout(hapd, sta);
+               if ((sta->flags & WLAN_STA_MFP) && !sta->sa_query_timed_out &&
+                   (sta->auth_alg != WLAN_AUTH_FT)) {
+                       /*
+                        * STA has already been associated with MFP and SA
+                        * Query timeout has not been reached. Reject the
+                        * association attempt temporarily and start SA Query,
+                        * if one is not pending.
+                        */
+
+                       if (sta->sa_query_count == 0)
+                               ap_sta_start_sa_query(hapd, sta);
+
+#ifdef CONFIG_IEEE80211R
+                       status = WLAN_STATUS_ASSOC_REJECTED_TEMPORARILY;
+
+                       p = hostapd_eid_assoc_comeback_time(hapd, sta, p);
+
+                       hostapd_sta_assoc(hapd, addr, reassoc, status, buf,
+                                         p - buf);
+#endif /* CONFIG_IEEE80211R */
+                       return 0;
+               }
+
+               if (wpa_auth_uses_mfp(sta->wpa_sm))
+                       sta->flags |= WLAN_STA_MFP;
+               else
+                       sta->flags &= ~WLAN_STA_MFP;
+#endif /* CONFIG_IEEE80211W */
+
+#ifdef CONFIG_IEEE80211R
+               if (sta->auth_alg == WLAN_AUTH_FT) {
+                       status = wpa_ft_validate_reassoc(sta->wpa_sm, req_ies,
+                                                        req_ies_len);
+                       if (status != WLAN_STATUS_SUCCESS) {
+                               if (status == WLAN_STATUS_INVALID_PMKID)
+                                       reason = WLAN_REASON_INVALID_IE;
+                               if (status == WLAN_STATUS_INVALID_MDIE)
+                                       reason = WLAN_REASON_INVALID_IE;
+                               if (status == WLAN_STATUS_INVALID_FTIE)
+                                       reason = WLAN_REASON_INVALID_IE;
+                               goto fail;
+                       }
+               }
+#endif /* CONFIG_IEEE80211R */
        } else if (hapd->conf->wps_state) {
 #ifdef CONFIG_WPS
                struct wpabuf *wps;
-               wps = ieee802_11_vendor_ie_concat(ie, ielen,
-                                                 WPS_IE_VENDOR_TYPE);
+               if (req_ies)
+                       wps = ieee802_11_vendor_ie_concat(req_ies, req_ies_len,
+                                                         WPS_IE_VENDOR_TYPE);
+               else
+                       wps = NULL;
 #ifdef CONFIG_WPS_STRICT
-               if (ie) {
-                       if (wps && wps_validate_assoc_req(wps) < 0) {
-                               hostapd_drv_sta_disassoc(
-                                       hapd, sta->addr,
-                                       WLAN_REASON_INVALID_IE);
-                               ap_free_sta(hapd, sta);
-                               wpabuf_free(wps);
-                               return -1;
-                       }
+               if (wps && wps_validate_assoc_req(wps) < 0) {
+                       reason = WLAN_REASON_INVALID_IE;
+                       status = WLAN_STATUS_INVALID_IE;
                        wpabuf_free(wps);
+                       goto fail;
                }
 #endif /* CONFIG_WPS_STRICT */
-               if (ie && ielen > 4 && ie[0] == 0xdd && ie[1] >= 4 &&
-                   os_memcmp(ie + 2, "\x00\x50\xf2\x04", 4) == 0) {
+               if (wps) {
                        sta->flags |= WLAN_STA_WPS;
-                       if (wps && wps_is_20(wps)) {
+                       if (wps_is_20(wps)) {
                                wpa_printf(MSG_DEBUG, "WPS: STA supports "
                                           "WPS 2.0");
                                sta->flags |= WLAN_STA_WPS2;
@@ -205,20 +286,45 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
 skip_wpa_check:
 #endif /* CONFIG_WPS */
 
+#ifdef CONFIG_IEEE80211R
+       p = wpa_sm_write_assoc_resp_ies(sta->wpa_sm, buf, sizeof(buf),
+                                       sta->auth_alg, req_ies, req_ies_len);
+
+       hostapd_sta_assoc(hapd, addr, reassoc, status, buf, p - buf);
+#else /* CONFIG_IEEE80211R */
+       /* Keep compiler silent about unused variables */
+       if (status) {
+       }
+#endif /* CONFIG_IEEE80211R */
+
        new_assoc = (sta->flags & WLAN_STA_ASSOC) == 0;
        sta->flags |= WLAN_STA_AUTH | WLAN_STA_ASSOC;
-       wpa_auth_sm_event(sta->wpa_sm, WPA_ASSOC);
+
+       if (reassoc && (sta->auth_alg == WLAN_AUTH_FT))
+               wpa_auth_sm_event(sta->wpa_sm, WPA_ASSOC_FT);
+       else
+               wpa_auth_sm_event(sta->wpa_sm, WPA_ASSOC);
 
        hostapd_new_assoc_sta(hapd, sta, !new_assoc);
 
        ieee802_1x_notify_port_enabled(sta->eapol_sm, 1);
 
 #ifdef CONFIG_P2P
-       p2p_group_notif_assoc(hapd->p2p_group, sta->addr,
-                             all_ies, all_ies_len);
+       if (req_ies) {
+               p2p_group_notif_assoc(hapd->p2p_group, sta->addr,
+                                     req_ies, req_ies_len);
+       }
 #endif /* CONFIG_P2P */
 
        return 0;
+
+fail:
+#ifdef CONFIG_IEEE80211R
+       hostapd_sta_assoc(hapd, addr, reassoc, status, buf, p - buf);
+#endif /* CONFIG_IEEE80211R */
+       hostapd_drv_sta_disassoc(hapd, sta->addr, reason);
+       ap_free_sta(hapd, sta);
+       return -1;
 }
 
 
@@ -249,9 +355,8 @@ void hostapd_notif_disassoc(struct hostapd_data *hapd, const u8 *addr)
                return;
        }
 
+       ap_sta_set_authorized(hapd, sta, 0);
        sta->flags &= ~(WLAN_STA_AUTH | WLAN_STA_ASSOC);
-       wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_DISCONNECTED MACSTR,
-               MAC2STR(sta->addr));
        wpa_auth_sm_event(sta->wpa_sm, WPA_DISASSOC);
        sta->acct_terminate_cause = RADIUS_ACCT_TERMINATE_CAUSE_USER_REQUEST;
        ieee802_1x_notify_port_enabled(sta->eapol_sm, 0);
@@ -275,8 +380,59 @@ void hostapd_event_sta_low_ack(struct hostapd_data *hapd, const u8 *addr)
 }
 
 
+void hostapd_event_ch_switch(struct hostapd_data *hapd, int freq, int ht,
+                            int offset)
+{
+#ifdef NEED_AP_MLME
+       int channel;
+
+       hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211,
+                      HOSTAPD_LEVEL_INFO, "driver had channel switch: "
+                      "freq=%d, ht=%d, offset=%d", freq, ht, offset);
+
+       hapd->iface->freq = freq;
+
+       channel = hostapd_hw_get_channel(hapd, freq);
+       if (!channel) {
+               hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211,
+                              HOSTAPD_LEVEL_WARNING, "driver switched to "
+                              "bad channel!");
+               return;
+       }
+
+       hapd->iconf->channel = channel;
+       hapd->iconf->ieee80211n = ht;
+       hapd->iconf->secondary_channel = offset;
+
+       if (hapd->iface->csa_in_progress && freq == hapd->iface->cs_freq) {
+               hostapd_cleanup_cs_params(hapd);
+
+               wpa_msg(hapd->msg_ctx, MSG_INFO, AP_CSA_FINISHED "freq=%d",
+                       freq);
+       }
+#endif /* NEED_AP_MLME */
+}
+
+
+void hostapd_event_connect_failed_reason(struct hostapd_data *hapd,
+                                        const u8 *addr, int reason_code)
+{
+       switch (reason_code) {
+       case MAX_CLIENT_REACHED:
+               wpa_msg(hapd->msg_ctx, MSG_INFO, AP_REJECTED_MAX_STA MACSTR,
+                       MAC2STR(addr));
+               break;
+       case BLOCKED_CLIENT:
+               wpa_msg(hapd->msg_ctx, MSG_INFO, AP_REJECTED_BLOCKED_STA MACSTR,
+                       MAC2STR(addr));
+               break;
+       }
+}
+
+
 int hostapd_probe_req_rx(struct hostapd_data *hapd, const u8 *sa, const u8 *da,
-                        const u8 *bssid, const u8 *ie, size_t ie_len)
+                        const u8 *bssid, const u8 *ie, size_t ie_len,
+                        int ssi_signal)
 {
        size_t i;
        int ret = 0;
@@ -287,7 +443,8 @@ int hostapd_probe_req_rx(struct hostapd_data *hapd, const u8 *sa, const u8 *da,
        random_add_randomness(sa, ETH_ALEN);
        for (i = 0; hapd->probereq_cb && i < hapd->num_probereq_cb; i++) {
                if (hapd->probereq_cb[i].cb(hapd->probereq_cb[i].ctx,
-                                           sa, da, bssid, ie, ie_len) > 0) {
+                                           sa, da, bssid, ie, ie_len,
+                                           ssi_signal) > 0) {
                        ret = 1;
                        break;
                }
@@ -298,48 +455,112 @@ int hostapd_probe_req_rx(struct hostapd_data *hapd, const u8 *sa, const u8 *da,
 
 #ifdef HOSTAPD
 
-#ifdef NEED_AP_MLME
-
-static const u8 * get_hdr_bssid(const struct ieee80211_hdr *hdr, size_t len)
+#ifdef CONFIG_IEEE80211R
+static void hostapd_notify_auth_ft_finish(void *ctx, const u8 *dst,
+                                         const u8 *bssid,
+                                         u16 auth_transaction, u16 status,
+                                         const u8 *ies, size_t ies_len)
 {
-       u16 fc, type, stype;
+       struct hostapd_data *hapd = ctx;
+       struct sta_info *sta;
 
-       /*
-        * PS-Poll frames are 16 bytes. All other frames are
-        * 24 bytes or longer.
-        */
-       if (len < 16)
-               return NULL;
+       sta = ap_get_sta(hapd, dst);
+       if (sta == NULL)
+               return;
 
-       fc = le_to_host16(hdr->frame_control);
-       type = WLAN_FC_GET_TYPE(fc);
-       stype = WLAN_FC_GET_STYPE(fc);
+       hostapd_logger(hapd, dst, HOSTAPD_MODULE_IEEE80211,
+                      HOSTAPD_LEVEL_DEBUG, "authentication OK (FT)");
+       sta->flags |= WLAN_STA_AUTH;
 
-       switch (type) {
-       case WLAN_FC_TYPE_DATA:
-               if (len < 24)
-                       return NULL;
-               switch (fc & (WLAN_FC_FROMDS | WLAN_FC_TODS)) {
-               case WLAN_FC_FROMDS | WLAN_FC_TODS:
-               case WLAN_FC_TODS:
-                       return hdr->addr1;
-               case WLAN_FC_FROMDS:
-                       return hdr->addr2;
-               default:
-                       return NULL;
+       hostapd_sta_auth(hapd, dst, auth_transaction, status, ies, ies_len);
+}
+#endif /* CONFIG_IEEE80211R */
+
+
+static void hostapd_notif_auth(struct hostapd_data *hapd,
+                              struct auth_info *rx_auth)
+{
+       struct sta_info *sta;
+       u16 status = WLAN_STATUS_SUCCESS;
+       u8 resp_ies[2 + WLAN_AUTH_CHALLENGE_LEN];
+       size_t resp_ies_len = 0;
+
+       sta = ap_get_sta(hapd, rx_auth->peer);
+       if (!sta) {
+               sta = ap_sta_add(hapd, rx_auth->peer);
+               if (sta == NULL) {
+                       status = WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA;
+                       goto fail;
                }
-       case WLAN_FC_TYPE_CTRL:
-               if (stype != WLAN_FC_STYPE_PSPOLL)
-                       return NULL;
-               return hdr->addr1;
-       case WLAN_FC_TYPE_MGMT:
-               return hdr->addr3;
-       default:
-               return NULL;
        }
+       sta->flags &= ~WLAN_STA_PREAUTH;
+       ieee802_1x_notify_pre_auth(sta->eapol_sm, 0);
+#ifdef CONFIG_IEEE80211R
+       if (rx_auth->auth_type == WLAN_AUTH_FT && hapd->wpa_auth) {
+               sta->auth_alg = WLAN_AUTH_FT;
+               if (sta->wpa_sm == NULL)
+                       sta->wpa_sm = wpa_auth_sta_init(hapd->wpa_auth,
+                                                       sta->addr, NULL);
+               if (sta->wpa_sm == NULL) {
+                       wpa_printf(MSG_DEBUG, "FT: Failed to initialize WPA "
+                                  "state machine");
+                       status = WLAN_STATUS_UNSPECIFIED_FAILURE;
+                       goto fail;
+               }
+               wpa_ft_process_auth(sta->wpa_sm, rx_auth->bssid,
+                                   rx_auth->auth_transaction, rx_auth->ies,
+                                   rx_auth->ies_len,
+                                   hostapd_notify_auth_ft_finish, hapd);
+               return;
+       }
+#endif /* CONFIG_IEEE80211R */
+fail:
+       hostapd_sta_auth(hapd, rx_auth->peer, rx_auth->auth_transaction + 1,
+                        status, resp_ies, resp_ies_len);
 }
 
 
+static void hostapd_action_rx(struct hostapd_data *hapd,
+                             struct rx_action *action)
+{
+       struct sta_info *sta;
+
+        wpa_printf(MSG_DEBUG, "RX_ACTION cat %d action plen %d",
+                  action->category, (int) action->len);
+
+       sta = ap_get_sta(hapd, action->sa);
+       if (sta == NULL) {
+               wpa_printf(MSG_DEBUG, "%s: station not found", __func__);
+               return;
+       }
+#ifdef CONFIG_IEEE80211R
+       if (action->category == WLAN_ACTION_FT) {
+               wpa_printf(MSG_DEBUG, "%s: FT_ACTION length %d",
+                          __func__, (int) action->len);
+               wpa_ft_action_rx(sta->wpa_sm, action->data, action->len);
+       }
+#endif /* CONFIG_IEEE80211R */
+#ifdef CONFIG_IEEE80211W
+       if (action->category == WLAN_ACTION_SA_QUERY && action->len >= 4) {
+               wpa_printf(MSG_DEBUG, "%s: SA_QUERY_ACTION length %d",
+                          __func__, (int) action->len);
+               ieee802_11_sa_query_action(hapd, action->sa,
+                                          *(action->data + 1),
+                                          action->data + 2);
+       }
+#endif /* CONFIG_IEEE80211W */
+#ifdef CONFIG_WNM
+       if (action->category == WLAN_ACTION_WNM) {
+               wpa_printf(MSG_DEBUG, "%s: WNM_ACTION length %d",
+                          __func__, (int) action->len);
+               ieee802_11_rx_wnm_action_ap(hapd, action);
+       }
+#endif /* CONFIG_WNM */
+}
+
+
+#ifdef NEED_AP_MLME
+
 #define HAPD_BROADCAST ((struct hostapd_data *) -1)
 
 static struct hostapd_data * get_hapd_bssid(struct hostapd_iface *iface,
@@ -363,17 +584,14 @@ static struct hostapd_data * get_hapd_bssid(struct hostapd_iface *iface,
 
 
 static void hostapd_rx_from_unknown_sta(struct hostapd_data *hapd,
-                                       const u8 *frame, size_t len)
+                                       const u8 *bssid, const u8 *addr,
+                                       int wds)
 {
-       const struct ieee80211_hdr *hdr = (const struct ieee80211_hdr *) frame;
-       u16 fc = le_to_host16(hdr->frame_control);
-       hapd = get_hapd_bssid(hapd->iface, get_hdr_bssid(hdr, len));
+       hapd = get_hapd_bssid(hapd->iface, bssid);
        if (hapd == NULL || hapd == HAPD_BROADCAST)
                return;
 
-       ieee802_11_rx_from_unknown(hapd, hdr->addr2,
-                                  (fc & (WLAN_FC_TODS | WLAN_FC_FROMDS)) ==
-                                  (WLAN_FC_TODS | WLAN_FC_FROMDS));
+       ieee802_11_rx_from_unknown(hapd, addr, wds);
 }
 
 
@@ -500,12 +718,15 @@ static void hostapd_event_eapol_rx(struct hostapd_data *hapd, const u8 *src,
                                   const u8 *data, size_t data_len)
 {
        struct hostapd_iface *iface = hapd->iface;
+       struct sta_info *sta;
        size_t j;
 
        for (j = 0; j < iface->num_bss; j++) {
-               if (ap_get_sta(iface->bss[j], src)) {
-                       hapd = iface->bss[j];
-                       break;
+               if ((sta = ap_get_sta(iface->bss[j], src))) {
+                       if (sta->flags & WLAN_STA_ASSOC) {
+                               hapd = iface->bss[j];
+                               break;
+                       }
                }
        }
 
@@ -513,10 +734,140 @@ static void hostapd_event_eapol_rx(struct hostapd_data *hapd, const u8 *src,
 }
 
 
+static struct hostapd_channel_data * hostapd_get_mode_channel(
+       struct hostapd_iface *iface, unsigned int freq)
+{
+       int i;
+       struct hostapd_channel_data *chan;
+
+       for (i = 0; i < iface->current_mode->num_channels; i++) {
+               chan = &iface->current_mode->channels[i];
+               if (!chan)
+                       return NULL;
+               if ((unsigned int) chan->freq == freq)
+                       return chan;
+       }
+
+       return NULL;
+}
+
+
+static void hostapd_update_nf(struct hostapd_iface *iface,
+                             struct hostapd_channel_data *chan,
+                             struct freq_survey *survey)
+{
+       if (!iface->chans_surveyed) {
+               chan->min_nf = survey->nf;
+               iface->lowest_nf = survey->nf;
+       } else {
+               if (dl_list_empty(&chan->survey_list))
+                       chan->min_nf = survey->nf;
+               else if (survey->nf < chan->min_nf)
+                       chan->min_nf = survey->nf;
+               if (survey->nf < iface->lowest_nf)
+                       iface->lowest_nf = survey->nf;
+       }
+}
+
+
+static void hostapd_event_get_survey(struct hostapd_data *hapd,
+                                    struct survey_results *survey_results)
+{
+       struct hostapd_iface *iface = hapd->iface;
+       struct freq_survey *survey, *tmp;
+       struct hostapd_channel_data *chan;
+
+       if (dl_list_empty(&survey_results->survey_list)) {
+               wpa_printf(MSG_DEBUG, "No survey data received");
+               return;
+       }
+
+       dl_list_for_each_safe(survey, tmp, &survey_results->survey_list,
+                             struct freq_survey, list) {
+               chan = hostapd_get_mode_channel(iface, survey->freq);
+               if (!chan)
+                       continue;
+               if (chan->flag & HOSTAPD_CHAN_DISABLED)
+                       continue;
+
+               dl_list_del(&survey->list);
+               dl_list_add_tail(&chan->survey_list, &survey->list);
+
+               hostapd_update_nf(iface, chan, survey);
+
+               iface->chans_surveyed++;
+       }
+}
+
+
+#ifdef NEED_AP_MLME
+
+static void hostapd_event_dfs_radar_detected(struct hostapd_data *hapd,
+                                            struct dfs_event *radar)
+{
+       wpa_printf(MSG_DEBUG, "DFS radar detected on %d MHz", radar->freq);
+       hostapd_dfs_radar_detected(hapd->iface, radar->freq, radar->ht_enabled,
+                                  radar->chan_offset, radar->chan_width,
+                                  radar->cf1, radar->cf2);
+}
+
+
+static void hostapd_event_dfs_cac_finished(struct hostapd_data *hapd,
+                                          struct dfs_event *radar)
+{
+       wpa_printf(MSG_DEBUG, "DFS CAC finished on %d MHz", radar->freq);
+       hostapd_dfs_complete_cac(hapd->iface, 1, radar->freq, radar->ht_enabled,
+                                radar->chan_offset, radar->chan_width,
+                                radar->cf1, radar->cf2);
+}
+
+
+static void hostapd_event_dfs_cac_aborted(struct hostapd_data *hapd,
+                                         struct dfs_event *radar)
+{
+       wpa_printf(MSG_DEBUG, "DFS CAC aborted on %d MHz", radar->freq);
+       hostapd_dfs_complete_cac(hapd->iface, 0, radar->freq, radar->ht_enabled,
+                                radar->chan_offset, radar->chan_width,
+                                radar->cf1, radar->cf2);
+}
+
+
+static void hostapd_event_dfs_nop_finished(struct hostapd_data *hapd,
+                                          struct dfs_event *radar)
+{
+       wpa_printf(MSG_DEBUG, "DFS NOP finished on %d MHz", radar->freq);
+       hostapd_dfs_nop_finished(hapd->iface, radar->freq, radar->ht_enabled,
+                                radar->chan_offset, radar->chan_width,
+                                radar->cf1, radar->cf2);
+}
+
+#endif /* NEED_AP_MLME */
+
+
 void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
                          union wpa_event_data *data)
 {
        struct hostapd_data *hapd = ctx;
+#ifndef CONFIG_NO_STDOUT_DEBUG
+       int level = MSG_DEBUG;
+
+       if (event == EVENT_RX_MGMT && data->rx_mgmt.frame &&
+           data->rx_mgmt.frame_len >= 24) {
+               const struct ieee80211_hdr *hdr;
+               u16 fc;
+               hdr = (const struct ieee80211_hdr *) data->rx_mgmt.frame;
+               fc = le_to_host16(hdr->frame_control);
+               if (WLAN_FC_GET_TYPE(fc) == WLAN_FC_TYPE_MGMT &&
+                   WLAN_FC_GET_STYPE(fc) == WLAN_FC_STYPE_BEACON)
+                       level = MSG_EXCESSIVE;
+               if (WLAN_FC_GET_TYPE(fc) == WLAN_FC_TYPE_MGMT &&
+                   WLAN_FC_GET_STYPE(fc) == WLAN_FC_STYPE_PROBE_REQ)
+                       level = MSG_EXCESSIVE;
+       }
+
+       wpa_dbg(hapd->msg_ctx, level, "Event %s (%d) received",
+               event_to_string(event), event);
+#endif /* CONFIG_NO_STDOUT_DEBUG */
 
        switch (event) {
        case EVENT_MICHAEL_MIC_FAILURE:
@@ -552,9 +903,19 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
                        break;
                }
                break;
+       case EVENT_EAPOL_TX_STATUS:
+               hostapd_eapol_tx_status(hapd, data->eapol_tx_status.dst,
+                                       data->eapol_tx_status.data,
+                                       data->eapol_tx_status.data_len,
+                                       data->eapol_tx_status.ack);
+               break;
+       case EVENT_DRIVER_CLIENT_POLL_OK:
+               hostapd_client_poll_ok(hapd, data->client_poll.addr);
+               break;
        case EVENT_RX_FROM_UNKNOWN:
-               hostapd_rx_from_unknown_sta(hapd, data->rx_from_unknown.frame,
-                                           data->rx_from_unknown.len);
+               hostapd_rx_from_unknown_sta(hapd, data->rx_from_unknown.bssid,
+                                           data->rx_from_unknown.addr,
+                                           data->rx_from_unknown.wds);
                break;
        case EVENT_RX_MGMT:
                hostapd_mgmt_rx(hapd, &data->rx_mgmt);
@@ -568,7 +929,8 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
                                     data->rx_probe_req.da,
                                     data->rx_probe_req.bssid,
                                     data->rx_probe_req.ie,
-                                    data->rx_probe_req.ie_len);
+                                    data->rx_probe_req.ie_len,
+                                    data->rx_probe_req.ssi_signal);
                break;
        case EVENT_NEW_STA:
                hostapd_event_new_sta(hapd, data->new_sta.addr);
@@ -597,12 +959,63 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
                        break;
                hostapd_event_sta_low_ack(hapd, data->low_ack.addr);
                break;
-#ifdef NEED_AP_MLME
        case EVENT_RX_ACTION:
                if (data->rx_action.da == NULL || data->rx_action.sa == NULL ||
                    data->rx_action.bssid == NULL)
                        break;
+#ifdef NEED_AP_MLME
                hostapd_rx_action(hapd, &data->rx_action);
+#endif /* NEED_AP_MLME */
+               hostapd_action_rx(hapd, &data->rx_action);
+               break;
+       case EVENT_AUTH:
+               hostapd_notif_auth(hapd, &data->auth);
+               break;
+       case EVENT_CH_SWITCH:
+               if (!data)
+                       break;
+               hostapd_event_ch_switch(hapd, data->ch_switch.freq,
+                                       data->ch_switch.ht_enabled,
+                                       data->ch_switch.ch_offset);
+               break;
+       case EVENT_CONNECT_FAILED_REASON:
+               if (!data)
+                       break;
+               hostapd_event_connect_failed_reason(
+                       hapd, data->connect_failed_reason.addr,
+                       data->connect_failed_reason.code);
+               break;
+       case EVENT_SURVEY:
+               hostapd_event_get_survey(hapd, &data->survey_results);
+               break;
+#ifdef NEED_AP_MLME
+       case EVENT_DFS_RADAR_DETECTED:
+               if (!data)
+                       break;
+               hostapd_event_dfs_radar_detected(hapd, &data->dfs_event);
+               break;
+       case EVENT_DFS_CAC_FINISHED:
+               if (!data)
+                       break;
+               hostapd_event_dfs_cac_finished(hapd, &data->dfs_event);
+               break;
+       case EVENT_DFS_CAC_ABORTED:
+               if (!data)
+                       break;
+               hostapd_event_dfs_cac_aborted(hapd, &data->dfs_event);
+               break;
+       case EVENT_DFS_NOP_FINISHED:
+               if (!data)
+                       break;
+               hostapd_event_dfs_nop_finished(hapd, &data->dfs_event);
+               break;
+       case EVENT_CHANNEL_LIST_CHANGED:
+               /* channel list changed (regulatory?), update channel list */
+               /* TODO: check this. hostapd_get_hw_features() initializes
+                * too much stuff. */
+               /* hostapd_get_hw_features(hapd->iface); */
+               hostapd_channel_list_updated(
+                       hapd->iface, data->channel_list_changed.initiator);
                break;
 #endif /* NEED_AP_MLME */
        default: