Remove experimental non-AP STA code from hostapd
[libeap.git] / hostapd / ieee802_11.c
index 388b19d..894d2bc 100644 (file)
@@ -1,6 +1,7 @@
 /*
  * hostapd / IEEE 802.11 Management
  * Copyright (c) 2002-2008, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2007-2008, Intel Corporation
  *
  * 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
@@ -34,7 +35,6 @@
 #include "ap_list.h"
 #include "accounting.h"
 #include "driver.h"
-#include "ieee802_11h.h"
 #include "mlme.h"
 
 
@@ -100,6 +100,146 @@ u8 * hostapd_eid_ext_supp_rates(struct hostapd_data *hapd, u8 *eid)
 }
 
 
+u8 * hostapd_eid_ht_capabilities_info(struct hostapd_data *hapd, u8 *eid)
+{
+#ifdef CONFIG_IEEE80211N
+       struct ieee80211_ht_capability *cap;
+       u8 *pos = eid;
+
+       if (!hapd->iconf->ieee80211n)
+               return eid;
+
+       *pos++ = WLAN_EID_HT_CAP;
+       *pos++ = sizeof(*cap);
+
+       cap = (struct ieee80211_ht_capability *) pos;
+       os_memset(cap, 0, sizeof(*cap));
+       SET_2BIT_U8(&cap->mac_ht_params_info,
+                   MAC_HT_PARAM_INFO_MAX_RX_AMPDU_FACTOR_OFFSET,
+                   MAX_RX_AMPDU_FACTOR_64KB);
+
+       cap->capabilities_info = host_to_le16(hapd->iconf->ht_capab);
+
+       cap->supported_mcs_set[0] = 0xff;
+       cap->supported_mcs_set[1] = 0xff;
+
+       pos += sizeof(*cap);
+
+       return pos;
+#else /* CONFIG_IEEE80211N */
+       return eid;
+#endif /* CONFIG_IEEE80211N */
+}
+
+
+u8 * hostapd_eid_ht_operation(struct hostapd_data *hapd, u8 *eid)
+{
+#ifdef CONFIG_IEEE80211N
+       struct ieee80211_ht_operation *oper;
+       u8 *pos = eid;
+
+       if (!hapd->iconf->ieee80211n)
+               return eid;
+
+       *pos++ = WLAN_EID_HT_OPERATION;
+       *pos++ = sizeof(*oper);
+
+       oper = (struct ieee80211_ht_operation *) pos;
+       os_memset(oper, 0, sizeof(*oper));
+
+       oper->operation_mode = host_to_le16(hapd->iface->ht_op_mode);
+
+       pos += sizeof(*oper);
+
+       return pos;
+#else /* CONFIG_IEEE80211N */
+       return eid;
+#endif /* CONFIG_IEEE80211N */
+}
+
+
+#ifdef CONFIG_IEEE80211N
+
+/*
+op_mode
+Set to 0 (HT pure) under the followign conditions
+       - all STAs in the BSS are 20/40 MHz HT in 20/40 MHz BSS or
+       - all STAs in the BSS are 20 MHz HT in 20 MHz BSS
+Set to 1 (HT non-member protection) if there may be non-HT STAs
+       in both the primary and the secondary channel
+Set to 2 if only HT STAs are associated in BSS,
+       however and at least one 20 MHz HT STA is associated
+Set to 3 (HT mixed mode) when one or more non-HT STAs are associated
+       (currently non-GF HT station is considered as non-HT STA also)
+*/
+int hostapd_ht_operation_update(struct hostapd_iface *iface)
+{
+       u16 cur_op_mode, new_op_mode;
+       int op_mode_changes = 0;
+
+       if (!iface->conf->ieee80211n || iface->conf->ht_op_mode_fixed)
+               return 0;
+
+       wpa_printf(MSG_DEBUG, "%s current operation mode=0x%X",
+                  __func__, iface->ht_op_mode);
+
+       if (!(iface->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT)
+           && iface->num_sta_ht_no_gf) {
+               iface->ht_op_mode |=
+                       HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT;
+               op_mode_changes++;
+       } else if ((iface->ht_op_mode &
+                   HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT) &&
+                  iface->num_sta_ht_no_gf == 0) {
+               iface->ht_op_mode &=
+                       ~HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT;
+               op_mode_changes++;
+       }
+
+       if (!(iface->ht_op_mode & HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT) &&
+           (iface->num_sta_no_ht || iface->olbc_ht)) {
+               iface->ht_op_mode |= HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT;
+               op_mode_changes++;
+       } else if ((iface->ht_op_mode &
+                   HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT) &&
+                  (iface->num_sta_no_ht == 0 && !iface->olbc_ht)) {
+               iface->ht_op_mode &=
+                       ~HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT;
+               op_mode_changes++;
+       }
+
+       /* Note: currently we switch to the MIXED op mode if HT non-greenfield
+        * station is associated. Probably it's a theoretical case, since
+        * it looks like all known HT STAs support greenfield.
+        */
+       new_op_mode = 0;
+       if (iface->num_sta_no_ht ||
+           (iface->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT))
+               new_op_mode = OP_MODE_MIXED;
+       else if ((iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET)
+                && iface->num_sta_ht_20mhz)
+               new_op_mode = OP_MODE_20MHZ_HT_STA_ASSOCED;
+       else if (iface->olbc_ht)
+               new_op_mode = OP_MODE_MAY_BE_LEGACY_STAS;
+       else
+               new_op_mode = OP_MODE_PURE;
+
+       cur_op_mode = iface->ht_op_mode & HT_INFO_OPERATION_MODE_OP_MODE_MASK;
+       if (cur_op_mode != new_op_mode) {
+               iface->ht_op_mode &= ~HT_INFO_OPERATION_MODE_OP_MODE_MASK;
+               iface->ht_op_mode |= new_op_mode;
+               op_mode_changes++;
+       }
+
+       wpa_printf(MSG_DEBUG, "%s new operation mode=0x%X changes=%d",
+                  __func__, iface->ht_op_mode, op_mode_changes);
+
+       return op_mode_changes;
+}
+
+#endif /* CONFIG_IEEE80211N */
+
+
 u16 hostapd_own_capab_info(struct hostapd_data *hapd, struct sta_info *sta,
                           int probe)
 {
@@ -142,209 +282,27 @@ u16 hostapd_own_capab_info(struct hostapd_data *hapd, struct sta_info *sta,
            hapd->iface->num_sta_no_short_slot_time == 0)
                capab |= WLAN_CAPABILITY_SHORT_SLOT_TIME;
 
-       if (hapd->iface->dfs_enable) 
-               capab |= WLAN_CAPABILITY_SPECTRUM_MGMT;
-
        return capab;
 }
 
 
-#define OUI_MICROSOFT 0x0050f2 /* Microsoft (also used in Wi-Fi specs)
-                               * 00:50:F2 */
-
-static int ieee802_11_parse_vendor_specific(struct hostapd_data *hapd,
-                                           u8 *pos, size_t elen,
-                                           struct ieee802_11_elems *elems,
-                                           int show_errors)
-{
-       unsigned int oui;
-
-       /* first 3 bytes in vendor specific information element are the IEEE
-        * OUI of the vendor. The following byte is used a vendor specific
-        * sub-type. */
-       if (elen < 4) {
-               if (show_errors) {
-                       wpa_printf(MSG_MSGDUMP, "short vendor specific "
-                                  "information element ignored (len=%lu)",
-                                  (unsigned long) elen);
-               }
-               return -1;
-       }
-
-       oui = WPA_GET_BE24(pos);
-       switch (oui) {
-       case OUI_MICROSOFT:
-               /* Microsoft/Wi-Fi information elements are further typed and
-                * subtyped */
-               switch (pos[3]) {
-               case 1:
-                       /* Microsoft OUI (00:50:F2) with OUI Type 1:
-                        * real WPA information element */
-                       elems->wpa_ie = pos;
-                       elems->wpa_ie_len = elen;
-                       break;
-               case WME_OUI_TYPE: /* this is a Wi-Fi WME info. element */
-                       if (elen < 5) {
-                               wpa_printf(MSG_MSGDUMP, "short WME "
-                                          "information element ignored "
-                                          "(len=%lu)",
-                                          (unsigned long) elen);
-                               return -1;
-                       }
-                       switch (pos[4]) {
-                       case WME_OUI_SUBTYPE_INFORMATION_ELEMENT:
-                       case WME_OUI_SUBTYPE_PARAMETER_ELEMENT:
-                               elems->wme = pos;
-                               elems->wme_len = elen;
-                               break;
-                       case WME_OUI_SUBTYPE_TSPEC_ELEMENT:
-                               elems->wme_tspec = pos;
-                               elems->wme_tspec_len = elen;
-                               break;
-                       default:
-                               wpa_printf(MSG_MSGDUMP, "unknown WME "
-                                          "information element ignored "
-                                          "(subtype=%d len=%lu)",
-                                          pos[4], (unsigned long) elen);
-                               return -1;
-                       }
-                       break;
-               default:
-                       wpa_printf(MSG_MSGDUMP, "Unknown Microsoft "
-                                  "information element ignored "
-                                  "(type=%d len=%lu)\n",
-                                  pos[3], (unsigned long) elen);
-                       return -1;
-               }
-               break;
-
-       default:
-               wpa_printf(MSG_MSGDUMP, "unknown vendor specific information "
-                          "element ignored (vendor OUI %02x:%02x:%02x "
-                          "len=%lu)",
-                          pos[0], pos[1], pos[2], (unsigned long) elen);
-               return -1;
-       }
-
-       return 0;
-}
-
-
-ParseRes ieee802_11_parse_elems(struct hostapd_data *hapd, u8 *start,
-                               size_t len,
-                               struct ieee802_11_elems *elems,
-                               int show_errors)
+#ifdef CONFIG_IEEE80211W
+static u8 * hostapd_eid_assoc_comeback_time(struct hostapd_data *hapd,
+                                           struct sta_info *sta, u8 *eid)
 {
-       size_t left = len;
-       u8 *pos = start;
-       int unknown = 0;
-
-       os_memset(elems, 0, sizeof(*elems));
-
-       while (left >= 2) {
-               u8 id, elen;
-
-               id = *pos++;
-               elen = *pos++;
-               left -= 2;
-
-               if (elen > left) {
-                       if (show_errors) {
-                               wpa_printf(MSG_DEBUG, "IEEE 802.11 element "
-                                          "parse failed (id=%d elen=%d "
-                                          "left=%lu)",
-                                          id, elen, (unsigned long) left);
-                               wpa_hexdump(MSG_MSGDUMP, "IEs", start, len);
-                       }
-                       return ParseFailed;
-               }
-
-               switch (id) {
-               case WLAN_EID_SSID:
-                       elems->ssid = pos;
-                       elems->ssid_len = elen;
-                       break;
-               case WLAN_EID_SUPP_RATES:
-                       elems->supp_rates = pos;
-                       elems->supp_rates_len = elen;
-                       break;
-               case WLAN_EID_FH_PARAMS:
-                       elems->fh_params = pos;
-                       elems->fh_params_len = elen;
-                       break;
-               case WLAN_EID_DS_PARAMS:
-                       elems->ds_params = pos;
-                       elems->ds_params_len = elen;
-                       break;
-               case WLAN_EID_CF_PARAMS:
-                       elems->cf_params = pos;
-                       elems->cf_params_len = elen;
-                       break;
-               case WLAN_EID_TIM:
-                       elems->tim = pos;
-                       elems->tim_len = elen;
-                       break;
-               case WLAN_EID_IBSS_PARAMS:
-                       elems->ibss_params = pos;
-                       elems->ibss_params_len = elen;
-                       break;
-               case WLAN_EID_CHALLENGE:
-                       elems->challenge = pos;
-                       elems->challenge_len = elen;
-                       break;
-               case WLAN_EID_ERP_INFO:
-                       elems->erp_info = pos;
-                       elems->erp_info_len = elen;
-                       break;
-               case WLAN_EID_EXT_SUPP_RATES:
-                       elems->ext_supp_rates = pos;
-                       elems->ext_supp_rates_len = elen;
-                       break;
-               case WLAN_EID_VENDOR_SPECIFIC:
-                       if (ieee802_11_parse_vendor_specific(hapd, pos, elen,
-                                                            elems,
-                                                            show_errors))
-                               unknown++;
-                       break;
-               case WLAN_EID_RSN:
-                       elems->rsn_ie = pos;
-                       elems->rsn_ie_len = elen;
-                       break;
-               case WLAN_EID_PWR_CAPABILITY:
-                       elems->power_cap = pos;
-                       elems->power_cap_len = elen;
-                       break;
-               case WLAN_EID_SUPPORTED_CHANNELS:
-                       elems->supp_channels = pos;
-                       elems->supp_channels_len = elen;
-                       break;
-               case WLAN_EID_MOBILITY_DOMAIN:
-                       elems->mdie = pos;
-                       elems->mdie_len = elen;
-                       break;
-               case WLAN_EID_FAST_BSS_TRANSITION:
-                       elems->ftie = pos;
-                       elems->ftie_len = elen;
-                       break;
-               default:
-                       unknown++;
-                       if (!show_errors)
-                               break;
-                       wpa_printf(MSG_MSGDUMP, "IEEE 802.11 element parse "
-                                  "ignored unknown element (id=%d elen=%d)",
-                                  id, elen);
-                       break;
-               }
-
-               left -= elen;
-               pos += elen;
-       }
+       u8 *pos = eid;
+       u32 timeout;
 
-       if (left)
-               return ParseFailed;
+       *pos++ = WLAN_EID_ASSOC_COMEBACK_TIME;
+       *pos++ = 4;
+       timeout = (hapd->conf->assoc_ping_attempts - sta->ping_count + 1) *
+               hapd->conf->assoc_ping_timeout;
+       WPA_PUT_LE32(pos, timeout);
+       pos += 4;
 
-       return unknown ? ParseUnknown : ParseOK;
+       return pos;
 }
+#endif /* CONFIG_IEEE80211W */
 
 
 void ieee802_11_print_ssid(char *buf, const u8 *ssid, u8 len)
@@ -365,12 +323,10 @@ void ieee802_11_print_ssid(char *buf, const u8 *ssid, u8 len)
 void ieee802_11_send_deauth(struct hostapd_data *hapd, u8 *addr, u16 reason)
 {
        struct ieee80211_mgmt mgmt;
-       char buf[30];
 
        hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
                       HOSTAPD_LEVEL_DEBUG,
                       "deauthenticate - reason %d", reason);
-       os_snprintf(buf, sizeof(buf), "SEND-DEAUTHENTICATE %d", reason);
        os_memset(&mgmt, 0, sizeof(mgmt));
        mgmt.frame_control = IEEE80211_FC(WLAN_FC_TYPE_MGMT,
                                          WLAN_FC_STYPE_DEAUTH);
@@ -384,88 +340,6 @@ void ieee802_11_send_deauth(struct hostapd_data *hapd, u8 *addr, u16 reason)
 }
 
 
-static void ieee802_11_sta_authenticate(void *eloop_ctx, void *timeout_ctx)
-{
-       struct hostapd_data *hapd = eloop_ctx;
-       struct ieee80211_mgmt mgmt;
-       char ssid_txt[33];
-
-       if (hapd->assoc_ap_state == WAIT_BEACON)
-               hapd->assoc_ap_state = AUTHENTICATE;
-       if (hapd->assoc_ap_state != AUTHENTICATE)
-               return;
-
-       ieee802_11_print_ssid(ssid_txt, (u8 *) hapd->assoc_ap_ssid,
-                             hapd->assoc_ap_ssid_len);
-       printf("Authenticate with AP " MACSTR " SSID=%s (as station)\n",
-              MAC2STR(hapd->conf->assoc_ap_addr), ssid_txt);
-
-       os_memset(&mgmt, 0, sizeof(mgmt));
-       mgmt.frame_control = IEEE80211_FC(WLAN_FC_TYPE_MGMT,
-                                         WLAN_FC_STYPE_AUTH);
-       /* Request TX callback */
-       mgmt.frame_control |= host_to_le16(BIT(1));
-       os_memcpy(mgmt.da, hapd->conf->assoc_ap_addr, ETH_ALEN);
-       os_memcpy(mgmt.sa, hapd->own_addr, ETH_ALEN);
-       os_memcpy(mgmt.bssid, hapd->conf->assoc_ap_addr, ETH_ALEN);
-       mgmt.u.auth.auth_alg = host_to_le16(WLAN_AUTH_OPEN);
-       mgmt.u.auth.auth_transaction = host_to_le16(1);
-       mgmt.u.auth.status_code = host_to_le16(0);
-       if (hostapd_send_mgmt_frame(hapd, &mgmt, IEEE80211_HDRLEN +
-                                   sizeof(mgmt.u.auth), 0) < 0)
-               perror("ieee802_11_sta_authenticate: send");
-
-       /* Try to authenticate again, if this attempt fails or times out. */
-       eloop_register_timeout(5, 0, ieee802_11_sta_authenticate, hapd, NULL);
-}
-
-
-static void ieee802_11_sta_associate(void *eloop_ctx, void *timeout_ctx)
-{
-       struct hostapd_data *hapd = eloop_ctx;
-       u8 buf[256];
-       struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *) buf;
-       u8 *p;
-       char ssid_txt[33];
-
-       if (hapd->assoc_ap_state == AUTHENTICATE)
-               hapd->assoc_ap_state = ASSOCIATE;
-       if (hapd->assoc_ap_state != ASSOCIATE)
-               return;
-
-       ieee802_11_print_ssid(ssid_txt, (u8 *) hapd->assoc_ap_ssid,
-                             hapd->assoc_ap_ssid_len);
-       printf("Associate with AP " MACSTR " SSID=%s (as station)\n",
-              MAC2STR(hapd->conf->assoc_ap_addr), ssid_txt);
-
-       os_memset(mgmt, 0, sizeof(*mgmt));
-       mgmt->frame_control = IEEE80211_FC(WLAN_FC_TYPE_MGMT,
-                                         WLAN_FC_STYPE_ASSOC_REQ);
-       /* Request TX callback */
-       mgmt->frame_control |= host_to_le16(BIT(1));
-       os_memcpy(mgmt->da, hapd->conf->assoc_ap_addr, ETH_ALEN);
-       os_memcpy(mgmt->sa, hapd->own_addr, ETH_ALEN);
-       os_memcpy(mgmt->bssid, hapd->conf->assoc_ap_addr, ETH_ALEN);
-       mgmt->u.assoc_req.capab_info = host_to_le16(0);
-       mgmt->u.assoc_req.listen_interval = host_to_le16(1);
-       p = &mgmt->u.assoc_req.variable[0];
-
-       *p++ = WLAN_EID_SSID;
-       *p++ = hapd->assoc_ap_ssid_len;
-       os_memcpy(p, hapd->assoc_ap_ssid, hapd->assoc_ap_ssid_len);
-       p += hapd->assoc_ap_ssid_len;
-
-       p = hostapd_eid_supp_rates(hapd, p);
-       p = hostapd_eid_ext_supp_rates(hapd, p);
-
-       if (hostapd_send_mgmt_frame(hapd, mgmt, p - (u8 *) mgmt, 0) < 0)
-               perror("ieee802_11_sta_associate: send");
-
-       /* Try to authenticate again, if this attempt fails or times out. */
-       eloop_register_timeout(5, 0, ieee802_11_sta_associate, hapd, NULL);
-}
-
-
 static u16 auth_shared_key(struct hostapd_data *hapd, struct sta_info *sta,
                           u16 auth_transaction, u8 *challenge, int iswep)
 {
@@ -541,8 +415,6 @@ static void send_auth_reply(struct hostapd_data *hapd,
        reply = (struct ieee80211_mgmt *) buf;
        reply->frame_control = IEEE80211_FC(WLAN_FC_TYPE_MGMT,
                                            WLAN_FC_STYPE_AUTH);
-       /* Request TX callback */
-       reply->frame_control |= host_to_le16(BIT(1));
        os_memcpy(reply->da, dst, ETH_ALEN);
        os_memcpy(reply->sa, hapd->own_addr, ETH_ALEN);
        os_memcpy(reply->bssid, bssid, ETH_ALEN);
@@ -628,22 +500,6 @@ static void handle_auth(struct hostapd_data *hapd, struct ieee80211_mgmt *mgmt,
                   status_code, !!(fc & WLAN_FC_ISWEP),
                   challenge ? " challenge" : "");
 
-       if (hapd->assoc_ap_state == AUTHENTICATE && auth_transaction == 2 &&
-           os_memcmp(mgmt->sa, hapd->conf->assoc_ap_addr, ETH_ALEN) == 0 &&
-           os_memcmp(mgmt->bssid, hapd->conf->assoc_ap_addr, ETH_ALEN) == 0) {
-               if (status_code != 0) {
-                       printf("Authentication (as station) with AP "
-                              MACSTR " failed (status_code=%d)\n",
-                              MAC2STR(hapd->conf->assoc_ap_addr),
-                              status_code);
-                       return;
-               }
-               printf("Authenticated (as station) with AP " MACSTR "\n",
-                      MAC2STR(hapd->conf->assoc_ap_addr));
-               ieee802_11_sta_associate(hapd, NULL);
-               return;
-       }
-
        if (hapd->tkip_countermeasures) {
                resp = WLAN_REASON_MICHAEL_MIC_FAILURE;
                goto fail;
@@ -864,16 +720,12 @@ static void handle_assoc(struct hostapd_data *hapd,
                goto fail;
        }
 
-       if (reassoc) {
-               os_memcpy(sta->previous_ap, mgmt->u.reassoc_req.current_ap,
-                         ETH_ALEN);
-       }
-
        sta->capability = capab_info;
 
-       /* followed by SSID and Supported rates */
-       if (ieee802_11_parse_elems(hapd, pos, left, &elems, 1) == ParseFailed
-           || !elems.ssid) {
+       /* followed by SSID and Supported rates; and HT capabilities if 802.11n
+        * is used */
+       if (ieee802_11_parse_elems(pos, left, &elems, 1) == ParseFailed ||
+           !elems.ssid) {
                printf("STA " MACSTR " sent invalid association request\n",
                       MAC2STR(sta->addr));
                resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
@@ -943,6 +795,24 @@ static void handle_assoc(struct hostapd_data *hapd,
                sta->supported_rates_len += elems.ext_supp_rates_len;
        }
 
+#ifdef CONFIG_IEEE80211N
+       /* save HT capabilities in the sta object */
+       os_memset(&sta->ht_capabilities, 0, sizeof(sta->ht_capabilities));
+       if (elems.ht_capabilities &&
+           elems.ht_capabilities_len >= sizeof(struct ieee80211_ht_capability)
+           && (sta->flags & WLAN_STA_WME)) {
+               /* note: without WMM capability, treat the sta as non-HT */
+               sta->flags |= WLAN_STA_HT;
+               sta->ht_capabilities.id = WLAN_EID_HT_CAP;
+               sta->ht_capabilities.length =
+                       sizeof(struct ieee80211_ht_capability);
+               os_memcpy(&sta->ht_capabilities.data,
+                         elems.ht_capabilities,
+                         sizeof(struct ieee80211_ht_capability));
+       } else
+               sta->flags &= ~WLAN_STA_HT;
+#endif /* CONFIG_IEEE80211N */
+
        if ((hapd->conf->wpa & WPA_PROTO_RSN) && elems.rsn_ie) {
                wpa_ie = elems.rsn_ie;
                wpa_ie_len = elems.rsn_ie_len;
@@ -996,6 +866,27 @@ static void handle_assoc(struct hostapd_data *hapd,
                        resp = WLAN_STATUS_INVALID_IE;
                if (resp != WLAN_STATUS_SUCCESS)
                        goto fail;
+#ifdef CONFIG_IEEE80211W
+               if ((sta->flags & WLAN_STA_MFP) && !sta->ping_timed_out) {
+                       /*
+                        * STA has already been associated with MFP and ping
+                        * timeout has not been reached. Reject the
+                        * association attempt temporarily and start ping, if
+                        * one is not pending.
+                        */
+
+                       if (sta->ping_count == 0)
+                               ap_sta_start_ping(hapd, sta);
+
+                       resp = WLAN_STATUS_ASSOC_REJECTED_TEMPORARILY;
+                       goto fail;
+               }
+
+               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) {
@@ -1015,20 +906,6 @@ static void handle_assoc(struct hostapd_data *hapd,
 #endif /* CONFIG_IEEE80211R */
        }
 
-       if (hapd->iface->dfs_enable &&
-           hapd->iconf->ieee80211h == SPECT_STRICT_BINDING) {
-               if (hostapd_check_power_cap(hapd, elems.power_cap,
-                                           elems.power_cap_len)) {
-                       resp = WLAN_STATUS_PWR_CAPABILITY_NOT_VALID;
-                       hostapd_logger(hapd, sta->addr,
-                                      HOSTAPD_MODULE_IEEE80211,
-                                      HOSTAPD_LEVEL_DEBUG,
-                                      "Power capabilities of the station not "
-                                      "acceptable");
-                       goto fail;
-               }
-       }
-
        if (hapd->iface->current_mode->mode == HOSTAPD_MODE_IEEE80211G)
                sta->flags |= WLAN_STA_NONERP;
        for (i = 0; i < sta->supported_rates_len; i++) {
@@ -1068,6 +945,38 @@ static void handle_assoc(struct hostapd_data *hapd,
                        ieee802_11_set_beacons(hapd->iface);
        }
 
+#ifdef CONFIG_IEEE80211N
+       if (sta->flags & WLAN_STA_HT) {
+               if ((sta->ht_capabilities.data.capabilities_info &
+                    HT_CAP_INFO_GREEN_FIELD) == 0) {
+                       hapd->iface->num_sta_ht_no_gf++;
+                       wpa_printf(MSG_DEBUG, "%s STA " MACSTR " - no "
+                                  "greenfield, num of non-gf stations %d",
+                                  __func__, MAC2STR(sta->addr),
+                                  hapd->iface->num_sta_ht_no_gf);
+               }
+               if ((sta->ht_capabilities.data.capabilities_info &
+                    HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET) == 0) {
+                       hapd->iface->num_sta_ht_20mhz++;
+                       wpa_printf(MSG_DEBUG, "%s STA " MACSTR " - 20 MHz HT, "
+                                  "num of 20MHz HT STAs %d",
+                                  __func__, MAC2STR(sta->addr),
+                                  hapd->iface->num_sta_ht_20mhz);
+               }
+       } else {
+               hapd->iface->num_sta_no_ht++;
+               if (hapd->iconf->ieee80211n) {
+                       wpa_printf(MSG_DEBUG, "%s STA " MACSTR
+                                  " - no HT, num of non-HT stations %d",
+                                  __func__, MAC2STR(sta->addr),
+                                  hapd->iface->num_sta_no_ht);
+               }
+       }
+
+       if (hostapd_ht_operation_update(hapd->iface) > 0)
+               ieee802_11_set_beacons(hapd->iface);
+#endif /* CONFIG_IEEE80211N */
+
        /* get a unique AID */
        if (sta->aid > 0) {
                wpa_printf(MSG_DEBUG, "  old AID %d", sta->aid);
@@ -1092,6 +1001,11 @@ static void handle_assoc(struct hostapd_data *hapd,
        /* Station will be marked associated, after it acknowledges AssocResp
         */
 
+       if (reassoc) {
+               os_memcpy(sta->previous_ap, mgmt->u.reassoc_req.current_ap,
+                         ETH_ALEN);
+       }
+
        if (sta->last_assoc_req)
                os_free(sta->last_assoc_req);
        sta->last_assoc_req = os_malloc(len);
@@ -1133,6 +1047,9 @@ static void handle_assoc(struct hostapd_data *hapd,
                if (sta->flags & WLAN_STA_WME)
                        p = hostapd_eid_wme(hapd, p);
 
+               p = hostapd_eid_ht_capabilities_info(hapd, p);
+               p = hostapd_eid_ht_operation(hapd, p);
+
 #ifdef CONFIG_IEEE80211R
                if (resp == WLAN_STATUS_SUCCESS) {
                        /* IEEE 802.11r: Mobility Domain Information, Fast BSS
@@ -1143,10 +1060,12 @@ static void handle_assoc(struct hostapd_data *hapd,
                }
 #endif /* CONFIG_IEEE80211R */
 
-               send_len += p - reply->u.assoc_resp.variable;
+#ifdef CONFIG_IEEE80211W
+               if (resp == WLAN_STATUS_ASSOC_REJECTED_TEMPORARILY)
+                       p = hostapd_eid_assoc_comeback_time(hapd, sta, p);
+#endif /* CONFIG_IEEE80211W */
 
-               /* Request TX callback */
-               reply->frame_control |= host_to_le16(BIT(1));
+               send_len += p - reply->u.assoc_resp.variable;
        }
 
        if (hostapd_send_mgmt_frame(hapd, reply, send_len, 0) < 0)
@@ -1154,57 +1073,6 @@ static void handle_assoc(struct hostapd_data *hapd,
 }
 
 
-static void handle_assoc_resp(struct hostapd_data *hapd,
-                             struct ieee80211_mgmt *mgmt, size_t len)
-{
-       u16 status_code, aid;
-
-       if (hapd->assoc_ap_state != ASSOCIATE) {
-               printf("Unexpected association response received from " MACSTR
-                      "\n", MAC2STR(mgmt->sa));
-               return;
-       }
-
-       if (len < IEEE80211_HDRLEN + sizeof(mgmt->u.assoc_resp)) {
-               printf("handle_assoc_resp - too short payload (len=%lu)\n",
-                      (unsigned long) len);
-               return;
-       }
-
-       if (os_memcmp(mgmt->sa, hapd->conf->assoc_ap_addr, ETH_ALEN) != 0 ||
-           os_memcmp(mgmt->bssid, hapd->conf->assoc_ap_addr, ETH_ALEN) != 0) {
-               printf("Received association response from unexpected address "
-                      "(SA=" MACSTR " BSSID=" MACSTR "\n",
-                      MAC2STR(mgmt->sa), MAC2STR(mgmt->bssid));
-               return;
-       }
-
-       status_code = le_to_host16(mgmt->u.assoc_resp.status_code);
-       aid = le_to_host16(mgmt->u.assoc_resp.aid);
-       aid &= ~(BIT(14) | BIT(15));
-
-       if (status_code != 0) {
-               printf("Association (as station) with AP " MACSTR " failed "
-                      "(status_code=%d)\n",
-                      MAC2STR(hapd->conf->assoc_ap_addr), status_code);
-               /* Try to authenticate again */
-               hapd->assoc_ap_state = AUTHENTICATE;
-               eloop_register_timeout(5, 0, ieee802_11_sta_authenticate,
-                                      hapd, NULL);
-       }
-
-       printf("Associated (as station) with AP " MACSTR " (aid=%d)\n",
-              MAC2STR(hapd->conf->assoc_ap_addr), aid);
-       hapd->assoc_ap_aid = aid;
-       hapd->assoc_ap_state = ASSOCIATED;
-
-       if (hostapd_set_assoc_ap(hapd, hapd->conf->assoc_ap_addr)) {
-               printf("Could not set associated AP address to kernel "
-                      "driver.\n");
-       }
-}
-
-
 static void handle_disassoc(struct hostapd_data *hapd,
                            struct ieee80211_mgmt *mgmt, size_t len)
 {
@@ -1220,19 +1088,6 @@ static void handle_disassoc(struct hostapd_data *hapd,
                   MAC2STR(mgmt->sa),
                   le_to_host16(mgmt->u.disassoc.reason_code));
 
-       if (hapd->assoc_ap_state != DO_NOT_ASSOC &&
-           os_memcmp(mgmt->sa, hapd->conf->assoc_ap_addr, ETH_ALEN) == 0) {
-               printf("Assoc AP " MACSTR " sent disassociation "
-                      "(reason_code=%d) - try to authenticate\n",
-                      MAC2STR(hapd->conf->assoc_ap_addr),
-                      le_to_host16(mgmt->u.disassoc.reason_code));
-               hapd->assoc_ap_state = AUTHENTICATE;
-               ieee802_11_sta_authenticate(hapd, NULL);
-               eloop_register_timeout(0, 500000, ieee802_11_sta_authenticate,
-                                      hapd, NULL);
-               return;
-       }
-
        sta = ap_get_sta(hapd, mgmt->sa);
        if (sta == NULL) {
                printf("Station " MACSTR " trying to disassociate, but it "
@@ -1281,18 +1136,6 @@ static void handle_deauth(struct hostapd_data *hapd,
                   MAC2STR(mgmt->sa),
                   le_to_host16(mgmt->u.deauth.reason_code));
 
-       if (hapd->assoc_ap_state != DO_NOT_ASSOC &&
-           os_memcmp(mgmt->sa, hapd->conf->assoc_ap_addr, ETH_ALEN) == 0) {
-               printf("Assoc AP " MACSTR " sent deauthentication "
-                      "(reason_code=%d) - try to authenticate\n",
-                      MAC2STR(hapd->conf->assoc_ap_addr),
-                      le_to_host16(mgmt->u.deauth.reason_code));
-               hapd->assoc_ap_state = AUTHENTICATE;
-               eloop_register_timeout(0, 500000, ieee802_11_sta_authenticate,
-                                      hapd, NULL);
-               return;
-       }
-
        sta = ap_get_sta(hapd, mgmt->sa);
        if (sta == NULL) {
                printf("Station " MACSTR " trying to deauthenticate, but it "
@@ -1324,24 +1167,63 @@ static void handle_beacon(struct hostapd_data *hapd,
                return;
        }
 
-       (void) ieee802_11_parse_elems(hapd, mgmt->u.beacon.variable,
+       (void) ieee802_11_parse_elems(mgmt->u.beacon.variable,
                                      len - (IEEE80211_HDRLEN +
                                             sizeof(mgmt->u.beacon)), &elems,
                                      0);
 
-       if (hapd->assoc_ap_state == WAIT_BEACON &&
-           os_memcmp(mgmt->sa, hapd->conf->assoc_ap_addr, ETH_ALEN) == 0) {
-               if (elems.ssid && elems.ssid_len <= 32) {
-                       os_memcpy(hapd->assoc_ap_ssid, elems.ssid,
-                                 elems.ssid_len);
-                       hapd->assoc_ap_ssid[elems.ssid_len] = '\0';
-                       hapd->assoc_ap_ssid_len = elems.ssid_len;
-               }
-               ieee802_11_sta_authenticate(hapd, NULL);
+       ap_list_process_beacon(hapd->iface, mgmt, &elems, fi);
+}
+
+
+#ifdef CONFIG_IEEE80211W
+static void hostapd_ping_action(struct hostapd_data *hapd,
+                               struct ieee80211_mgmt *mgmt, size_t len)
+{
+       struct sta_info *sta;
+       u8 *end;
+       int i;
+
+       end = mgmt->u.action.u.ping_resp.trans_id + WLAN_PING_TRANS_ID_LEN;
+       if (((u8 *) mgmt) + len < end) {
+               wpa_printf(MSG_DEBUG, "IEEE 802.11: Too short Ping Action "
+                          "frame (len=%lu)", (unsigned long) len);
+               return;
        }
 
-       ap_list_process_beacon(hapd->iface, mgmt, &elems, fi);
+       if (mgmt->u.action.u.ping_resp.action != WLAN_PING_RESPONSE) {
+               wpa_printf(MSG_DEBUG, "IEEE 802.11: Unexpected Ping Action %d",
+                          mgmt->u.action.u.ping_resp.action);
+               return;
+       }
+
+       /* MLME-PING.confirm */
+
+       sta = ap_get_sta(hapd, mgmt->sa);
+       if (sta == NULL || sta->ping_trans_id == NULL) {
+               wpa_printf(MSG_DEBUG, "IEEE 802.11: No matching STA with "
+                          "pending ping request found");
+               return;
+       }
+
+       for (i = 0; i < sta->ping_count; i++) {
+               if (os_memcmp(sta->ping_trans_id + i * WLAN_PING_TRANS_ID_LEN,
+                             mgmt->u.action.u.ping_resp.trans_id,
+                             WLAN_PING_TRANS_ID_LEN) == 0)
+                       break;
+       }
+
+       if (i >= sta->ping_count) {
+               wpa_printf(MSG_DEBUG, "IEEE 802.11: No matching ping "
+                          "transaction identifier found");
+               return;
+       }
+
+       hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,
+                      HOSTAPD_LEVEL_DEBUG, "Reply to pending ping received");
+       ap_sta_stop_ping(hapd, sta);
 }
+#endif /* CONFIG_IEEE80211W */
 
 
 static void handle_action(struct hostapd_data *hapd,
@@ -1376,9 +1258,14 @@ static void handle_action(struct hostapd_data *hapd,
                return;
        }
 #endif /* CONFIG_IEEE80211R */
-       case WME_ACTION_CATEGORY:
+       case WLAN_ACTION_WMM:
                hostapd_wme_action(hapd, mgmt, len);
                return;
+#ifdef CONFIG_IEEE80211W
+       case WLAN_ACTION_PING:
+               hostapd_ping_action(hapd, mgmt, len);
+               return;
+#endif /* CONFIG_IEEE80211W */
        }
 
        hostapd_logger(hapd, mgmt->sa, HOSTAPD_MODULE_IEEE80211,
@@ -1437,10 +1324,7 @@ void ieee802_11_mgmt(struct hostapd_data *hapd, u8 *buf, size_t len, u16 stype,
                mgmt->bssid[4] == 0xff && mgmt->bssid[5] == 0xff;
 
        if (!broadcast &&
-           os_memcmp(mgmt->bssid, hapd->own_addr, ETH_ALEN) != 0 &&
-           (hapd->assoc_ap_state == DO_NOT_ASSOC ||
-            os_memcmp(mgmt->bssid, hapd->conf->assoc_ap_addr, ETH_ALEN) != 0))
-       {
+           os_memcmp(mgmt->bssid, hapd->own_addr, ETH_ALEN) != 0) {
                printf("MGMT: BSSID=" MACSTR " not our address\n",
                       MAC2STR(mgmt->bssid));
                return;
@@ -1469,10 +1353,6 @@ void ieee802_11_mgmt(struct hostapd_data *hapd, u8 *buf, size_t len, u16 stype,
                wpa_printf(MSG_DEBUG, "mgmt::assoc_req");
                handle_assoc(hapd, mgmt, len, 0);
                break;
-       case WLAN_FC_STYPE_ASSOC_RESP:
-               wpa_printf(MSG_DEBUG, "mgmt::assoc_resp");
-               handle_assoc_resp(hapd, mgmt, len);
-               break;
        case WLAN_FC_STYPE_REASSOC_REQ:
                wpa_printf(MSG_DEBUG, "mgmt::reassoc_req");
                handle_assoc(hapd, mgmt, len, 1);
@@ -1546,6 +1426,7 @@ static void handle_assoc_cb(struct hostapd_data *hapd,
        u16 status;
        struct sta_info *sta;
        int new_assoc = 1;
+       struct ht_cap_ie *ht_cap = NULL;
 
        if (!ok) {
                hostapd_logger(hapd, mgmt->da, HOSTAPD_MODULE_IEEE80211,
@@ -1596,9 +1477,19 @@ static void handle_assoc_cb(struct hostapd_data *hapd,
        else
                mlme_associate_indication(hapd, sta);
 
+#ifdef CONFIG_IEEE80211N
+       if (sta->flags & WLAN_STA_HT)
+               ht_cap = &sta->ht_capabilities;
+#endif /* CONFIG_IEEE80211N */
+
+#ifdef CONFIG_IEEE80211W
+       sta->ping_timed_out = 0;
+#endif /* CONFIG_IEEE80211W */
+
        if (hostapd_sta_add(hapd->conf->iface, hapd, sta->addr, sta->aid,
                            sta->capability, sta->supported_rates,
-                           sta->supported_rates_len, 0, sta->listen_interval))
+                           sta->supported_rates_len, 0, sta->listen_interval,
+                           ht_cap))
        {
                hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,
                               HOSTAPD_LEVEL_NOTICE,
@@ -1665,6 +1556,9 @@ void ieee802_11_mgmt_cb(struct hostapd_data *hapd, u8 *buf, size_t len,
        case WLAN_FC_STYPE_DEAUTH:
                /* ignore */
                break;
+       case WLAN_FC_STYPE_ACTION:
+               wpa_printf(MSG_DEBUG, "mgmt::action cb");
+               break;
        default:
                printf("unknown mgmt cb frame subtype %d\n", stype);
                break;