OSDN Git Service

Cumulative patch from commit b2b688d18d40cd667d0faa149b4a7172166b3bd4
[android-x86/external-wpa_supplicant_8.git] / src / ap / sta_info.c
index 972a723..6704c09 100644 (file)
@@ -1,15 +1,9 @@
 /*
  * hostapd / Station table
- * Copyright (c) 2002-2011, 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"
@@ -18,6 +12,7 @@
 #include "utils/eloop.h"
 #include "common/ieee802_11_defs.h"
 #include "common/wpa_ctrl.h"
+#include "common/sae.h"
 #include "radius/radius.h"
 #include "radius/radius_client.h"
 #include "drivers/driver.h"
@@ -26,6 +21,7 @@
 #include "accounting.h"
 #include "ieee802_1x.h"
 #include "ieee802_11.h"
+#include "ieee802_11_auth.h"
 #include "wpa_auth.h"
 #include "preauth_auth.h"
 #include "ap_config.h"
@@ -34,6 +30,7 @@
 #include "vlan_init.h"
 #include "p2p_hostapd.h"
 #include "ap_drv_ops.h"
+#include "gas_serv.h"
 #include "sta_info.h"
 
 static void ap_sta_remove_in_other_bss(struct hostapd_data *hapd,
@@ -73,6 +70,30 @@ struct sta_info * ap_get_sta(struct hostapd_data *hapd, const u8 *sta)
 }
 
 
+#ifdef CONFIG_P2P
+struct sta_info * ap_get_sta_p2p(struct hostapd_data *hapd, const u8 *addr)
+{
+       struct sta_info *sta;
+
+       for (sta = hapd->sta_list; sta; sta = sta->next) {
+               const u8 *p2p_dev_addr;
+
+               if (sta->p2p_ie == NULL)
+                       continue;
+
+               p2p_dev_addr = p2p_get_go_dev_addr(sta->p2p_ie);
+               if (p2p_dev_addr == NULL)
+                       continue;
+
+               if (os_memcmp(p2p_dev_addr, addr, ETH_ALEN) == 0)
+                       return sta;
+       }
+
+       return NULL;
+}
+#endif /* CONFIG_P2P */
+
+
 static void ap_sta_list_del(struct hostapd_data *hapd, struct sta_info *sta)
 {
        struct sta_info *tmp;
@@ -132,7 +153,7 @@ void ap_free_sta(struct hostapd_data *hapd, struct sta_info *sta)
        ap_sta_set_authorized(hapd, sta, 0);
 
        if (sta->flags & WLAN_STA_WDS)
-               hostapd_set_wds_sta(hapd, sta->addr, sta->aid, 0);
+               hostapd_set_wds_sta(hapd, NULL, sta->addr, sta->aid, 0);
 
        if (!(sta->flags & WLAN_STA_PREAUTH))
                hostapd_drv_sta_remove(hapd, sta->addr);
@@ -200,6 +221,8 @@ void ap_free_sta(struct hostapd_data *hapd, struct sta_info *sta)
        if (set_beacon)
                ieee802_11_set_beacons(hapd->iface);
 
+       wpa_printf(MSG_DEBUG, "%s: cancel ap_handle_timer for " MACSTR,
+                  __func__, MAC2STR(sta->addr));
        eloop_cancel_timeout(ap_handle_timer, hapd, sta);
        eloop_cancel_timeout(ap_handle_session_timer, hapd, sta);
        eloop_cancel_timeout(ap_sta_deauth_cb_timeout, hapd, sta);
@@ -224,11 +247,28 @@ void ap_free_sta(struct hostapd_data *hapd, struct sta_info *sta)
        p2p_group_notif_disassoc(hapd->p2p_group, sta->addr);
 #endif /* CONFIG_P2P */
 
+#ifdef CONFIG_INTERWORKING
+       if (sta->gas_dialog) {
+               int i;
+               for (i = 0; i < GAS_DIALOG_MAX; i++)
+                       gas_serv_dialog_clear(&sta->gas_dialog[i]);
+               os_free(sta->gas_dialog);
+       }
+#endif /* CONFIG_INTERWORKING */
+
        wpabuf_free(sta->wps_ie);
        wpabuf_free(sta->p2p_ie);
+       wpabuf_free(sta->hs20_ie);
 
        os_free(sta->ht_capabilities);
-       os_free(sta->psk);
+       hostapd_free_psk_list(sta->psk);
+       os_free(sta->identity);
+       os_free(sta->radius_cui);
+
+#ifdef CONFIG_SAE
+       sae_clear_data(sta->sae);
+       os_free(sta->sae);
+#endif /* CONFIG_SAE */
 
        os_free(sta);
 }
@@ -267,7 +307,11 @@ void ap_handle_timer(void *eloop_ctx, void *timeout_ctx)
        struct hostapd_data *hapd = eloop_ctx;
        struct sta_info *sta = timeout_ctx;
        unsigned long next_time = 0;
+       int reason;
 
+       wpa_printf(MSG_DEBUG, "%s: " MACSTR " flags=0x%x timeout_next=%d",
+                  __func__, MAC2STR(sta->addr), sta->flags,
+                  sta->timeout_next);
        if (sta->timeout_next == STA_REMOVE) {
                hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,
                               HOSTAPD_LEVEL_INFO, "deauthenticated due to "
@@ -280,12 +324,24 @@ void ap_handle_timer(void *eloop_ctx, void *timeout_ctx)
            (sta->timeout_next == STA_NULLFUNC ||
             sta->timeout_next == STA_DISASSOC)) {
                int inactive_sec;
+               /*
+                * Add random value to timeout so that we don't end up bouncing
+                * all stations at the same time if we have lots of associated
+                * stations that are idle (but keep re-associating).
+                */
+               int fuzz = os_random() % 20;
                inactive_sec = hostapd_drv_get_inact_sec(hapd, sta->addr);
                if (inactive_sec == -1) {
                        wpa_msg(hapd->msg_ctx, MSG_DEBUG,
                                "Check inactivity: Could not "
-                               "get station info rom kernel driver for "
+                               "get station info from kernel driver for "
                                MACSTR, MAC2STR(sta->addr));
+                       /*
+                        * The driver may not support this functionality.
+                        * Anyway, try again after the next inactivity timeout,
+                        * but do not disconnect the station now.
+                        */
+                       next_time = hapd->conf->ap_max_inactivity + fuzz;
                } else if (inactive_sec < hapd->conf->ap_max_inactivity &&
                           sta->flags & WLAN_STA_ASSOC) {
                        /* station activity detected; reset timeout state */
@@ -293,7 +349,7 @@ void ap_handle_timer(void *eloop_ctx, void *timeout_ctx)
                                "Station " MACSTR " has been active %is ago",
                                MAC2STR(sta->addr), inactive_sec);
                        sta->timeout_next = STA_NULLFUNC;
-                       next_time = hapd->conf->ap_max_inactivity -
+                       next_time = hapd->conf->ap_max_inactivity + fuzz -
                                inactive_sec;
                } else {
                        wpa_msg(hapd->msg_ctx, MSG_DEBUG,
@@ -320,6 +376,9 @@ void ap_handle_timer(void *eloop_ctx, void *timeout_ctx)
        }
 
        if (next_time) {
+               wpa_printf(MSG_DEBUG, "%s: register ap_handle_timer timeout "
+                          "for " MACSTR " (%lu seconds)",
+                          __func__, MAC2STR(sta->addr), next_time);
                eloop_register_timeout(next_time, 0, ap_handle_timer, hapd,
                                       sta);
                return;
@@ -344,19 +403,25 @@ void ap_handle_timer(void *eloop_ctx, void *timeout_ctx)
                                hapd, sta->addr,
                                WLAN_REASON_PREV_AUTH_NOT_VALID);
                } else {
-                       hostapd_drv_sta_disassoc(
-                               hapd, sta->addr,
-                               WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY);
+                       reason = (sta->timeout_next == STA_DISASSOC) ?
+                               WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY :
+                               WLAN_REASON_PREV_AUTH_NOT_VALID;
+
+                       hostapd_drv_sta_disassoc(hapd, sta->addr, reason);
                }
        }
 
        switch (sta->timeout_next) {
        case STA_NULLFUNC:
                sta->timeout_next = STA_DISASSOC;
+               wpa_printf(MSG_DEBUG, "%s: register ap_handle_timer timeout "
+                          "for " MACSTR " (%d seconds - AP_DISASSOC_DELAY)",
+                          __func__, MAC2STR(sta->addr), AP_DISASSOC_DELAY);
                eloop_register_timeout(AP_DISASSOC_DELAY, 0, ap_handle_timer,
                                       hapd, sta);
                break;
        case STA_DISASSOC:
+       case STA_DISASSOC_FROM_CLI:
                ap_sta_set_authorized(hapd, sta, 0);
                sta->flags &= ~WLAN_STA_ASSOC;
                ieee802_1x_notify_port_enabled(sta->eapol_sm, 0);
@@ -368,11 +433,16 @@ void ap_handle_timer(void *eloop_ctx, void *timeout_ctx)
                hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,
                               HOSTAPD_LEVEL_INFO, "disassociated due to "
                               "inactivity");
+               reason = (sta->timeout_next == STA_DISASSOC) ?
+                       WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY :
+                       WLAN_REASON_PREV_AUTH_NOT_VALID;
                sta->timeout_next = STA_DEAUTH;
+               wpa_printf(MSG_DEBUG, "%s: register ap_handle_timer timeout "
+                          "for " MACSTR " (%d seconds - AP_DEAUTH_DELAY)",
+                          __func__, MAC2STR(sta->addr), AP_DEAUTH_DELAY);
                eloop_register_timeout(AP_DEAUTH_DELAY, 0, ap_handle_timer,
                                       hapd, sta);
-               mlme_disassociate_indication(
-                       hapd, sta, WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY);
+               mlme_disassociate_indication(hapd, sta, reason);
                break;
        case STA_DEAUTH:
        case STA_REMOVE:
@@ -397,8 +467,14 @@ static void ap_handle_session_timer(void *eloop_ctx, void *timeout_ctx)
        struct sta_info *sta = timeout_ctx;
        u8 addr[ETH_ALEN];
 
-       if (!(sta->flags & WLAN_STA_AUTH))
+       if (!(sta->flags & WLAN_STA_AUTH)) {
+               if (sta->flags & WLAN_STA_GAS) {
+                       wpa_printf(MSG_DEBUG, "GAS: Remove temporary STA "
+                                  "entry " MACSTR, MAC2STR(sta->addr));
+                       ap_free_sta(hapd, sta);
+               }
                return;
+       }
 
        mlme_deauthenticate_indication(hapd, sta,
                                       WLAN_REASON_PREV_AUTH_NOT_VALID);
@@ -453,8 +529,13 @@ struct sta_info * ap_sta_add(struct hostapd_data *hapd, const u8 *addr)
                return NULL;
        }
        sta->acct_interim_interval = hapd->conf->acct_interim_interval;
+       accounting_sta_get_id(hapd, sta);
 
        /* initialize STA info data */
+       wpa_printf(MSG_DEBUG, "%s: register ap_handle_timer timeout "
+                  "for " MACSTR " (%d seconds - ap_max_inactivity)",
+                  __func__, MAC2STR(addr),
+                  hapd->conf->ap_max_inactivity);
        eloop_register_timeout(hapd->conf->ap_max_inactivity, 0,
                               ap_handle_timer, hapd, sta);
        os_memcpy(sta->addr, addr, ETH_ALEN);
@@ -525,9 +606,14 @@ void ap_sta_disassociate(struct hostapd_data *hapd, struct sta_info *sta,
 {
        wpa_printf(MSG_DEBUG, "%s: disassociate STA " MACSTR,
                   hapd->conf->iface, MAC2STR(sta->addr));
-       sta->flags &= ~WLAN_STA_ASSOC;
+       sta->flags &= ~(WLAN_STA_ASSOC | WLAN_STA_ASSOC_REQ_OK);
        ap_sta_set_authorized(hapd, sta, 0);
        sta->timeout_next = STA_DEAUTH;
+       wpa_printf(MSG_DEBUG, "%s: reschedule ap_handle_timer timeout "
+                  "for " MACSTR " (%d seconds - "
+                  "AP_MAX_INACTIVITY_AFTER_DISASSOC)",
+                  __func__, MAC2STR(sta->addr),
+                  AP_MAX_INACTIVITY_AFTER_DISASSOC);
        eloop_cancel_timeout(ap_handle_timer, hapd, sta);
        eloop_register_timeout(AP_MAX_INACTIVITY_AFTER_DISASSOC, 0,
                               ap_handle_timer, hapd, sta);
@@ -561,6 +647,11 @@ void ap_sta_deauthenticate(struct hostapd_data *hapd, struct sta_info *sta,
        sta->flags &= ~(WLAN_STA_AUTH | WLAN_STA_ASSOC);
        ap_sta_set_authorized(hapd, sta, 0);
        sta->timeout_next = STA_REMOVE;
+       wpa_printf(MSG_DEBUG, "%s: reschedule ap_handle_timer timeout "
+                  "for " MACSTR " (%d seconds - "
+                  "AP_MAX_INACTIVITY_AFTER_DEAUTH)",
+                  __func__, MAC2STR(sta->addr),
+                  AP_MAX_INACTIVITY_AFTER_DEAUTH);
        eloop_cancel_timeout(ap_handle_timer, hapd, sta);
        eloop_register_timeout(AP_MAX_INACTIVITY_AFTER_DEAUTH, 0,
                               ap_handle_timer, hapd, sta);
@@ -576,6 +667,23 @@ void ap_sta_deauthenticate(struct hostapd_data *hapd, struct sta_info *sta,
 }
 
 
+#ifdef CONFIG_WPS
+int ap_sta_wps_cancel(struct hostapd_data *hapd,
+                     struct sta_info *sta, void *ctx)
+{
+       if (sta && (sta->flags & WLAN_STA_WPS)) {
+               ap_sta_deauthenticate(hapd, sta,
+                                     WLAN_REASON_PREV_AUTH_NOT_VALID);
+               wpa_printf(MSG_DEBUG, "WPS: %s: Deauth sta=" MACSTR,
+                          __func__, MAC2STR(sta->addr));
+               return 1;
+       }
+
+       return 0;
+}
+#endif /* CONFIG_WPS */
+
+
 int ap_sta_bind_vlan(struct hostapd_data *hapd, struct sta_info *sta,
                     int old_vlanid)
 {
@@ -605,15 +713,19 @@ int ap_sta_bind_vlan(struct hostapd_data *hapd, struct sta_info *sta,
        if (sta->ssid->dynamic_vlan == DYNAMIC_VLAN_DISABLED)
                sta->vlan_id = 0;
        else if (sta->vlan_id > 0) {
+               struct hostapd_vlan *wildcard_vlan = NULL;
                vlan = hapd->conf->vlan;
                while (vlan) {
-                       if (vlan->vlan_id == sta->vlan_id ||
-                           vlan->vlan_id == VLAN_ID_WILDCARD) {
-                               iface = vlan->ifname;
+                       if (vlan->vlan_id == sta->vlan_id)
                                break;
-                       }
+                       if (vlan->vlan_id == VLAN_ID_WILDCARD)
+                               wildcard_vlan = vlan;
                        vlan = vlan->next;
                }
+               if (!vlan)
+                       vlan = wildcard_vlan;
+               if (vlan)
+                       iface = vlan->ifname;
        }
 
        if (sta->vlan_id > 0 && vlan == NULL) {
@@ -728,8 +840,9 @@ static void ap_sa_query_timer(void *eloop_ctx, void *timeout_ctx)
            ap_check_sa_query_timeout(hapd, sta))
                return;
 
-       nbuf = os_realloc(sta->sa_query_trans_id,
-                         (sta->sa_query_count + 1) * WLAN_SA_QUERY_TR_ID_LEN);
+       nbuf = os_realloc_array(sta->sa_query_trans_id,
+                               sta->sa_query_count + 1,
+                               WLAN_SA_QUERY_TR_ID_LEN);
        if (nbuf == NULL)
                return;
        if (sta->sa_query_count == 0) {
@@ -751,9 +864,7 @@ static void ap_sa_query_timer(void *eloop_ctx, void *timeout_ctx)
                       HOSTAPD_LEVEL_DEBUG,
                       "association SA Query attempt %d", sta->sa_query_count);
 
-#ifdef NEED_AP_MLME
        ieee802_11_send_sa_query_req(hapd, sta->addr, trans_id);
-#endif /* NEED_AP_MLME */
 }
 
 
@@ -778,51 +889,46 @@ void ap_sta_set_authorized(struct hostapd_data *hapd, struct sta_info *sta,
                           int authorized)
 {
        const u8 *dev_addr = NULL;
+       char buf[100];
+#ifdef CONFIG_P2P
+       u8 addr[ETH_ALEN];
+#endif /* CONFIG_P2P */
+
        if (!!authorized == !!(sta->flags & WLAN_STA_AUTHORIZED))
                return;
 
 #ifdef CONFIG_P2P
-       dev_addr = p2p_group_get_dev_addr(hapd->p2p_group, sta->addr);
+       if (hapd->p2p_group == NULL) {
+               if (sta->p2p_ie != NULL &&
+                   p2p_parse_dev_addr_in_p2p_ie(sta->p2p_ie, addr) == 0)
+                       dev_addr = addr;
+       } else
+               dev_addr = p2p_group_get_dev_addr(hapd->p2p_group, sta->addr);
 #endif /* CONFIG_P2P */
 
+       if (dev_addr)
+               os_snprintf(buf, sizeof(buf), MACSTR " p2p_dev_addr=" MACSTR,
+                           MAC2STR(sta->addr), MAC2STR(dev_addr));
+       else
+               os_snprintf(buf, sizeof(buf), MACSTR, MAC2STR(sta->addr));
+
        if (authorized) {
-               if (dev_addr)
-                       wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_CONNECTED
-                               MACSTR " p2p_dev_addr=" MACSTR,
-                               MAC2STR(sta->addr), MAC2STR(dev_addr));
-               else
-                       wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_CONNECTED
-                               MACSTR, MAC2STR(sta->addr));
+               wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_CONNECTED "%s", buf);
+
                if (hapd->msg_ctx_parent &&
-                   hapd->msg_ctx_parent != hapd->msg_ctx && dev_addr)
-                       wpa_msg(hapd->msg_ctx_parent, MSG_INFO,
-                               AP_STA_CONNECTED MACSTR " p2p_dev_addr="
-                               MACSTR,
-                               MAC2STR(sta->addr), MAC2STR(dev_addr));
-               else if (hapd->msg_ctx_parent &&
-                        hapd->msg_ctx_parent != hapd->msg_ctx)
-                       wpa_msg(hapd->msg_ctx_parent, MSG_INFO,
-                               AP_STA_CONNECTED MACSTR, MAC2STR(sta->addr));
+                   hapd->msg_ctx_parent != hapd->msg_ctx)
+                       wpa_msg_no_global(hapd->msg_ctx_parent, MSG_INFO,
+                                         AP_STA_CONNECTED "%s", buf);
 
                sta->flags |= WLAN_STA_AUTHORIZED;
        } else {
-               if (dev_addr)
-                       wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_DISCONNECTED
-                               MACSTR " p2p_dev_addr=" MACSTR,
-                               MAC2STR(sta->addr), MAC2STR(dev_addr));
-               else
-                       wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_DISCONNECTED
-                               MACSTR, MAC2STR(sta->addr));
+               wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_DISCONNECTED "%s", buf);
+
                if (hapd->msg_ctx_parent &&
-                   hapd->msg_ctx_parent != hapd->msg_ctx && dev_addr)
-                       wpa_msg(hapd->msg_ctx_parent, MSG_INFO,
-                               AP_STA_DISCONNECTED MACSTR " p2p_dev_addr="
-                               MACSTR, MAC2STR(sta->addr), MAC2STR(dev_addr));
-               else if (hapd->msg_ctx_parent &&
-                        hapd->msg_ctx_parent != hapd->msg_ctx)
-                       wpa_msg(hapd->msg_ctx_parent, MSG_INFO,
-                               AP_STA_DISCONNECTED MACSTR,
-                               MAC2STR(sta->addr));
+                   hapd->msg_ctx_parent != hapd->msg_ctx)
+                       wpa_msg_no_global(hapd->msg_ctx_parent, MSG_INFO,
+                                         AP_STA_DISCONNECTED "%s", buf);
+
                sta->flags &= ~WLAN_STA_AUTHORIZED;
        }
 
@@ -845,7 +951,14 @@ void ap_sta_disconnect(struct hostapd_data *hapd, struct sta_info *sta,
        if (sta == NULL)
                return;
        ap_sta_set_authorized(hapd, sta, 0);
+       wpa_auth_sm_event(sta->wpa_sm, WPA_DEAUTH);
+       ieee802_1x_notify_port_enabled(sta->eapol_sm, 0);
        sta->flags &= ~(WLAN_STA_AUTH | WLAN_STA_ASSOC);
+       wpa_printf(MSG_DEBUG, "%s: reschedule ap_handle_timer timeout "
+                  "for " MACSTR " (%d seconds - "
+                  "AP_MAX_INACTIVITY_AFTER_DEAUTH)",
+                  __func__, MAC2STR(sta->addr),
+                  AP_MAX_INACTIVITY_AFTER_DEAUTH);
        eloop_cancel_timeout(ap_handle_timer, hapd, sta);
        eloop_register_timeout(AP_MAX_INACTIVITY_AFTER_DEAUTH, 0,
                               ap_handle_timer, hapd, sta);