Move hostapd configuration parser into separate file
[libeap.git] / hostapd / hostapd.c
index f227242..fefe066 100644 (file)
 
 #include "includes.h"
 
+#include "common.h"
 #include "eloop.h"
+#include "crypto/tls.h"
+#include "common/ieee802_11_defs.h"
+#include "eapol_auth/eapol_auth_sm.h"
+#include "eapol_auth/eapol_auth_sm_i.h"
+#include "radius/radius_client.h"
+#include "radius/radius_server.h"
+#include "eap_server/eap_sim_db.h"
+#include "eap_server/eap.h"
+#include "eap_server/tncs.h"
+#include "l2_packet/l2_packet.h"
 #include "hostapd.h"
 #include "ieee802_1x.h"
 #include "beacon.h"
 #include "hw_features.h"
 #include "accounting.h"
-#include "eapol_sm.h"
 #include "iapp.h"
-#include "ieee802_11_defs.h"
 #include "ieee802_11_auth.h"
 #include "sta_info.h"
 #include "ap_list.h"
 #include "driver_i.h"
-#include "radius/radius_client.h"
-#include "radius/radius_server.h"
 #include "wpa.h"
 #include "preauth.h"
 #include "vlan_init.h"
 #include "ctrl_iface.h"
-#include "tls.h"
-#include "eap_server/eap_sim_db.h"
-#include "eap_server/eap.h"
-#include "eap_server/tncs.h"
-#include "version.h"
-#include "l2_packet/l2_packet.h"
 #include "wps_hostapd.h"
 #include "tkip_countermeasures.h"
 
 
-static int hostapd_radius_get_eap_user(void *ctx, const u8 *identity,
-                                      size_t identity_len, int phase2,
-                                      struct eap_user *user);
 static int hostapd_flush_old_stations(struct hostapd_data *hapd);
 static int hostapd_setup_wpa(struct hostapd_data *hapd);
 static int hostapd_setup_encryption(char *iface, struct hostapd_data *hapd);
 
 extern int wpa_debug_level;
 
+#if defined(EAP_SERVER_SIM) || defined(EAP_SERVER_AKA)
+#define EAP_SIM_DB
+#endif /* EAP_SERVER_SIM || EAP_SERVER_AKA */
+
 
-#ifdef EAP_SERVER
+#ifdef EAP_SIM_DB
 static int hostapd_sim_db_cb_sta(struct hostapd_data *hapd,
                                 struct sta_info *sta, void *ctx)
 {
@@ -66,10 +68,13 @@ static int hostapd_sim_db_cb_sta(struct hostapd_data *hapd,
 static void hostapd_sim_db_cb(void *ctx, void *session_ctx)
 {
        struct hostapd_data *hapd = ctx;
-       if (ap_for_each_sta(hapd, hostapd_sim_db_cb_sta, session_ctx) == 0)
+       if (ap_for_each_sta(hapd, hostapd_sim_db_cb_sta, session_ctx) == 0) {
+#ifdef RADIUS_SERVER
                radius_server_eap_pending_cb(hapd->radius_srv, session_ctx);
+#endif /* RADIUS_SERVER */
+       }
 }
-#endif /* EAP_SERVER */
+#endif /* EAP_SIM_DB */
 
 
 static void hostapd_wpa_auth_conf(struct hostapd_bss_config *conf,
@@ -120,8 +125,11 @@ int hostapd_reload_config(struct hostapd_iface *iface)
        struct hostapd_data *hapd = iface->bss[0];
        struct hostapd_config *newconf, *oldconf;
        struct wpa_auth_config wpa_auth_conf;
+       size_t j;
 
-       newconf = hostapd_config_read(iface->config_fname);
+       if (iface->config_read_cb == NULL)
+               return -1;
+       newconf = iface->config_read_cb(iface->config_fname);
        if (newconf == NULL)
                return -1;
 
@@ -129,11 +137,14 @@ int hostapd_reload_config(struct hostapd_iface *iface)
         * Deauthenticate all stations since the new configuration may not
         * allow them to use the BSS anymore.
         */
-       hostapd_flush_old_stations(hapd);
+       for (j = 0; j < iface->num_bss; j++)
+               hostapd_flush_old_stations(iface->bss[j]);
 
+#ifndef CONFIG_NO_RADIUS
        /* TODO: update dynamic data based on changed configuration
         * items (e.g., open/close sockets, etc.) */
        radius_client_flush(hapd->radius, 0);
+#endif /* CONFIG_NO_RADIUS */
 
        oldconf = hapd->iconf;
        hapd->iconf = newconf;
@@ -167,7 +178,9 @@ int hostapd_reload_config(struct hostapd_iface *iface)
        }
 
        if (hapd->conf->ieee802_1x || hapd->conf->wpa)
-               hostapd_set_ieee8021x(hapd->conf->iface, hapd, 1);
+               hostapd_set_drv_ieee8021x(hapd, hapd->conf->iface, 1);
+       else
+               hostapd_set_drv_ieee8021x(hapd, hapd->conf->iface, 0);
 
        hostapd_config_free(oldconf);
 
@@ -187,127 +200,14 @@ int handle_reload_iface(struct hostapd_iface *iface, void *ctx)
 }
 
 
-#ifdef HOSTAPD_DUMP_STATE
-/**
- * hostapd_dump_state - SIGUSR1 handler to dump hostapd state to a text file
- */
-static void hostapd_dump_state(struct hostapd_data *hapd)
-{
-       FILE *f;
-       time_t now;
-       struct sta_info *sta;
-       int i;
-       char *buf;
-
-       if (!hapd->conf->dump_log_name) {
-               wpa_printf(MSG_DEBUG, "Dump file not defined - ignoring dump "
-                          "request");
-               return;
-       }
-
-       wpa_printf(MSG_DEBUG, "Dumping hostapd state to '%s'",
-                  hapd->conf->dump_log_name);
-       f = fopen(hapd->conf->dump_log_name, "w");
-       if (f == NULL) {
-               wpa_printf(MSG_WARNING, "Could not open dump file '%s' for "
-                          "writing.", hapd->conf->dump_log_name);
-               return;
-       }
-
-       time(&now);
-       fprintf(f, "hostapd state dump - %s", ctime(&now));
-       fprintf(f, "num_sta=%d num_sta_non_erp=%d "
-               "num_sta_no_short_slot_time=%d\n"
-               "num_sta_no_short_preamble=%d\n",
-               hapd->num_sta, hapd->iface->num_sta_non_erp,
-               hapd->iface->num_sta_no_short_slot_time,
-               hapd->iface->num_sta_no_short_preamble);
-
-       for (sta = hapd->sta_list; sta != NULL; sta = sta->next) {
-               fprintf(f, "\nSTA=" MACSTR "\n", MAC2STR(sta->addr));
-
-               fprintf(f,
-                       "  AID=%d flags=0x%x %s%s%s%s%s%s%s%s%s%s%s%s%s%s\n"
-                       "  capability=0x%x listen_interval=%d\n",
-                       sta->aid,
-                       sta->flags,
-                       (sta->flags & WLAN_STA_AUTH ? "[AUTH]" : ""),
-                       (sta->flags & WLAN_STA_ASSOC ? "[ASSOC]" : ""),
-                       (sta->flags & WLAN_STA_PS ? "[PS]" : ""),
-                       (sta->flags & WLAN_STA_TIM ? "[TIM]" : ""),
-                       (sta->flags & WLAN_STA_PERM ? "[PERM]" : ""),
-                       (sta->flags & WLAN_STA_AUTHORIZED ? "[AUTHORIZED]" :
-                        ""),
-                       (sta->flags & WLAN_STA_PENDING_POLL ? "[PENDING_POLL" :
-                        ""),
-                       (sta->flags & WLAN_STA_SHORT_PREAMBLE ?
-                        "[SHORT_PREAMBLE]" : ""),
-                       (sta->flags & WLAN_STA_PREAUTH ? "[PREAUTH]" : ""),
-                       (sta->flags & WLAN_STA_WMM ? "[WMM]" : ""),
-                       (sta->flags & WLAN_STA_MFP ? "[MFP]" : ""),
-                       (sta->flags & WLAN_STA_WPS ? "[WPS]" : ""),
-                       (sta->flags & WLAN_STA_MAYBE_WPS ? "[MAYBE_WPS]" : ""),
-                       (sta->flags & WLAN_STA_NONERP ? "[NonERP]" : ""),
-                       sta->capability,
-                       sta->listen_interval);
-
-               fprintf(f, "  supported_rates=");
-               for (i = 0; i < sta->supported_rates_len; i++)
-                       fprintf(f, "%02x ", sta->supported_rates[i]);
-               fprintf(f, "\n");
-
-               fprintf(f,
-                       "  timeout_next=%s\n",
-                       (sta->timeout_next == STA_NULLFUNC ? "NULLFUNC POLL" :
-                        (sta->timeout_next == STA_DISASSOC ? "DISASSOC" :
-                         "DEAUTH")));
-
-               ieee802_1x_dump_state(f, "  ", sta);
-       }
-
-       buf = os_malloc(4096);
-       if (buf) {
-               int count = radius_client_get_mib(hapd->radius, buf, 4096);
-               if (count < 0)
-                       count = 0;
-               else if (count > 4095)
-                       count = 4095;
-               buf[count] = '\0';
-               fprintf(f, "%s", buf);
-
-               count = radius_server_get_mib(hapd->radius_srv, buf, 4096);
-               if (count < 0)
-                       count = 0;
-               else if (count > 4095)
-                       count = 4095;
-               buf[count] = '\0';
-               fprintf(f, "%s", buf);
-               os_free(buf);
-       }
-       fclose(f);
-}
-
-
-int handle_dump_state_iface(struct hostapd_iface *iface, void *ctx)
-{
-       size_t i;
-
-       for (i = 0; i < iface->num_bss; i++)
-               hostapd_dump_state(iface->bss[i]);
-
-       return 0;
-}
-#endif /* HOSTAPD_DUMP_STATE */
-
-
 static void hostapd_broadcast_key_clear_iface(struct hostapd_data *hapd,
                                              char *ifname)
 {
        int i;
 
        for (i = 0; i < NUM_WEP_KEYS; i++) {
-               if (hostapd_set_key(ifname, hapd, WPA_ALG_NONE, NULL, i,
-                                   i == 0 ? 1 : 0, NULL, 0, NULL, 0)) {
+               if (hapd->drv.set_key(ifname, hapd, WPA_ALG_NONE, NULL, i,
+                                     i == 0 ? 1 : 0, NULL, 0, NULL, 0)) {
                        wpa_printf(MSG_DEBUG, "Failed to clear default "
                                   "encryption keys (ifname=%s keyidx=%d)",
                                   ifname, i);
@@ -316,9 +216,9 @@ static void hostapd_broadcast_key_clear_iface(struct hostapd_data *hapd,
 #ifdef CONFIG_IEEE80211W
        if (hapd->conf->ieee80211w) {
                for (i = NUM_WEP_KEYS; i < NUM_WEP_KEYS + 2; i++) {
-                       if (hostapd_set_key(ifname, hapd, WPA_ALG_NONE, NULL,
-                                           i, i == 0 ? 1 : 0, NULL, 0,
-                                           NULL, 0)) {
+                       if (hapd->drv.set_key(ifname, hapd, WPA_ALG_NONE, NULL,
+                                             i, i == 0 ? 1 : 0, NULL, 0,
+                                             NULL, 0)) {
                                wpa_printf(MSG_DEBUG, "Failed to clear "
                                           "default mgmt encryption keys "
                                           "(ifname=%s keyidx=%d)", ifname, i);
@@ -343,9 +243,11 @@ static int hostapd_broadcast_wep_set(struct hostapd_data *hapd)
 
        idx = ssid->wep.idx;
        if (ssid->wep.default_len &&
-           hostapd_set_key(hapd->conf->iface,
-                           hapd, WPA_ALG_WEP, NULL, idx, idx == ssid->wep.idx,
-                           NULL, 0, ssid->wep.key[idx], ssid->wep.len[idx])) {
+           hapd->drv.set_key(hapd->conf->iface,
+                             hapd, WPA_ALG_WEP, NULL, idx,
+                             idx == ssid->wep.idx,
+                             NULL, 0, ssid->wep.key[idx],
+                             ssid->wep.len[idx])) {
                wpa_printf(MSG_WARNING, "Could not set WEP encryption.");
                errors++;
        }
@@ -363,9 +265,9 @@ static int hostapd_broadcast_wep_set(struct hostapd_data *hapd)
                                continue;
 
                        idx = key->idx;
-                       if (hostapd_set_key(ifname, hapd, WPA_ALG_WEP, NULL,
-                                           idx, idx == key->idx, NULL, 0,
-                                           key->key[idx], key->len[idx])) {
+                       if (hapd->drv.set_key(ifname, hapd, WPA_ALG_WEP, NULL,
+                                             idx, idx == key->idx, NULL, 0,
+                                             key->key[idx], key->len[idx])) {
                                wpa_printf(MSG_WARNING, "Could not set "
                                           "dynamic VLAN WEP encryption.");
                                errors++;
@@ -390,8 +292,6 @@ static void hostapd_cleanup(struct hostapd_data *hapd)
 {
        hostapd_ctrl_iface_deinit(hapd);
 
-       os_free(hapd->default_wep_key);
-       hapd->default_wep_key = NULL;
        iapp_deinit(hapd->iapp);
        hapd->iapp = NULL;
        accounting_deinit(hapd);
@@ -415,10 +315,14 @@ static void hostapd_cleanup(struct hostapd_data *hapd)
        ieee802_1x_deinit(hapd);
        vlan_deinit(hapd);
        hostapd_acl_deinit(hapd);
+#ifndef CONFIG_NO_RADIUS
        radius_client_deinit(hapd->radius);
        hapd->radius = NULL;
+#endif /* CONFIG_NO_RADIUS */
+#ifdef RADIUS_SERVER
        radius_server_deinit(hapd->radius_srv);
        hapd->radius_srv = NULL;
+#endif /* RADIUS_SERVER */
 
 #ifdef CONFIG_IEEE80211R
        l2_packet_deinit(hapd->l2);
@@ -426,8 +330,6 @@ static void hostapd_cleanup(struct hostapd_data *hapd)
 
        hostapd_deinit_wps(hapd);
 
-       hostapd_wireless_event_deinit(hapd);
-
 #ifdef EAP_TLS_FUNCS
        if (hapd->ssl_ctx) {
                tls_deinit(hapd->ssl_ctx);
@@ -435,18 +337,21 @@ static void hostapd_cleanup(struct hostapd_data *hapd)
        }
 #endif /* EAP_TLS_FUNCS */
 
-#ifdef EAP_SERVER
+#if defined(EAP_SERVER_SIM) || defined(EAP_SERVER_AKA)
        if (hapd->eap_sim_db_priv) {
                eap_sim_db_deinit(hapd->eap_sim_db_priv);
                hapd->eap_sim_db_priv = NULL;
        }
-#endif /* EAP_SERVER */
+#endif /* EAP_SERVER_SIM || EAP_SERVER_AKA */
 
        if (hapd->interface_added &&
-           hostapd_bss_remove(hapd, hapd->conf->iface)) {
+           hostapd_if_remove(hapd, WPA_IF_AP_BSS, hapd->conf->iface)) {
                wpa_printf(MSG_WARNING, "Failed to remove BSS interface %s",
                           hapd->conf->iface);
        }
+
+       os_free(hapd->probereq_cb);
+       hapd->probereq_cb = NULL;
 }
 
 
@@ -491,15 +396,17 @@ static int hostapd_setup_encryption(char *iface, struct hostapd_data *hapd)
 
        hostapd_broadcast_wep_set(hapd);
 
-       if (hapd->conf->ssid.wep.default_len)
+       if (hapd->conf->ssid.wep.default_len) {
+               hostapd_set_privacy(hapd, 1);
                return 0;
+       }
 
        for (i = 0; i < 4; i++) {
                if (hapd->conf->ssid.wep.key[i] &&
-                   hostapd_set_key(iface, hapd, WPA_ALG_WEP, NULL, i,
-                                   i == hapd->conf->ssid.wep.idx, NULL, 0,
-                                   hapd->conf->ssid.wep.key[i],
-                                   hapd->conf->ssid.wep.len[i])) {
+                   hapd->drv.set_key(iface, hapd, WPA_ALG_WEP, NULL, i,
+                                     i == hapd->conf->ssid.wep.idx, NULL, 0,
+                                     hapd->conf->ssid.wep.key[i],
+                                     hapd->conf->ssid.wep.len[i])) {
                        wpa_printf(MSG_WARNING, "Could not set WEP "
                                   "encryption.");
                        return -1;
@@ -571,20 +478,10 @@ static void hostapd_wpa_auth_disconnect(void *ctx, const u8 *addr,
                                        u16 reason)
 {
        struct hostapd_data *hapd = ctx;
-       struct sta_info *sta;
-
        wpa_printf(MSG_DEBUG, "%s: WPA authenticator requests disconnect: "
                   "STA " MACSTR " reason %d",
                   __func__, MAC2STR(addr), reason);
-
-       sta = ap_get_sta(hapd, addr);
-       hostapd_sta_deauth(hapd, addr, reason);
-       if (sta == NULL)
-               return;
-       sta->flags &= ~(WLAN_STA_AUTH | WLAN_STA_ASSOC | WLAN_STA_AUTHORIZED);
-       eloop_cancel_timeout(ap_handle_timer, hapd, sta);
-       eloop_register_timeout(0, 0, ap_handle_timer, hapd, sta);
-       sta->timeout_next = STA_REMOVE;
+       ap_sta_disconnect(hapd, NULL, addr, reason);
 }
 
 
@@ -701,8 +598,8 @@ static int hostapd_wpa_auth_set_key(void *ctx, int vlan_id, wpa_alg alg,
                        return -1;
        }
 
-       return hostapd_set_key(ifname, hapd, alg, addr, idx, 1, NULL, 0,
-                              key, key_len);
+       return hapd->drv.set_key(ifname, hapd, alg, addr, idx, 1, NULL, 0,
+                                key, key_len);
 }
 
 
@@ -714,21 +611,12 @@ static int hostapd_wpa_auth_get_seqnum(void *ctx, const u8 *addr, int idx,
 }
 
 
-static int hostapd_wpa_auth_get_seqnum_igtk(void *ctx, const u8 *addr, int idx,
-                                           u8 *seq)
-{
-       struct hostapd_data *hapd = ctx;
-       return hostapd_get_seqnum_igtk(hapd->conf->iface, hapd, addr, idx,
-                                      seq);
-}
-
-
 static int hostapd_wpa_auth_send_eapol(void *ctx, const u8 *addr,
                                       const u8 *data, size_t data_len,
                                       int encrypt)
 {
        struct hostapd_data *hapd = ctx;
-       return hostapd_send_eapol(hapd, addr, data, data_len, encrypt);
+       return hapd->drv.send_eapol(hapd, addr, data, data_len, encrypt);
 }
 
 
@@ -768,10 +656,12 @@ static int hostapd_wpa_auth_for_each_auth(
        void *ctx, int (*cb)(struct wpa_authenticator *sm, void *ctx),
        void *cb_ctx)
 {
+       struct hostapd_data *hapd = ctx;
        struct wpa_auth_iface_iter_data data;
        data.cb = cb;
        data.cb_ctx = cb_ctx;
-       return hostapd_for_each_interface(wpa_auth_iface_iter, &data);
+       return hostapd_for_each_interface(hapd->iface->interfaces,
+                                         wpa_auth_iface_iter, &data);
 }
 
 
@@ -816,7 +706,7 @@ static int hostapd_wpa_auth_send_ft_action(void *ctx, const u8 *dst,
        os_memcpy(m->bssid, hapd->own_addr, ETH_ALEN);
        os_memcpy(&m->u, data, data_len);
 
-       res = hostapd_send_mgmt_frame(hapd, (u8 *) m, mlen, 0);
+       res = hapd->drv.send_mgmt_frame(hapd, (u8 *) m, mlen);
        os_free(m);
        return res;
 }
@@ -994,7 +884,6 @@ static int hostapd_setup_wpa(struct hostapd_data *hapd)
        cb.get_msk = hostapd_wpa_auth_get_msk;
        cb.set_key = hostapd_wpa_auth_set_key;
        cb.get_seqnum = hostapd_wpa_auth_get_seqnum;
-       cb.get_seqnum_igtk = hostapd_wpa_auth_get_seqnum_igtk;
        cb.send_eapol = hostapd_wpa_auth_send_eapol;
        cb.for_each_sta = hostapd_wpa_auth_for_each_sta;
        cb.for_each_auth = hostapd_wpa_auth_for_each_auth;
@@ -1033,6 +922,47 @@ static int hostapd_setup_wpa(struct hostapd_data *hapd)
 }
 
 
+#ifdef RADIUS_SERVER
+
+static int hostapd_radius_get_eap_user(void *ctx, const u8 *identity,
+                                      size_t identity_len, int phase2,
+                                      struct eap_user *user)
+{
+       const struct hostapd_eap_user *eap_user;
+       int i, count;
+
+       eap_user = hostapd_get_eap_user(ctx, identity, identity_len, phase2);
+       if (eap_user == NULL)
+               return -1;
+
+       if (user == NULL)
+               return 0;
+
+       os_memset(user, 0, sizeof(*user));
+       count = EAP_USER_MAX_METHODS;
+       if (count > EAP_MAX_METHODS)
+               count = EAP_MAX_METHODS;
+       for (i = 0; i < count; i++) {
+               user->methods[i].vendor = eap_user->methods[i].vendor;
+               user->methods[i].method = eap_user->methods[i].method;
+       }
+
+       if (eap_user->password) {
+               user->password = os_malloc(eap_user->password_len);
+               if (user->password == NULL)
+                       return -1;
+               os_memcpy(user->password, eap_user->password,
+                         eap_user->password_len);
+               user->password_len = eap_user->password_len;
+               user->password_hash = eap_user->password_hash;
+       }
+       user->force_version = eap_user->force_version;
+       user->ttls_auth = eap_user->ttls_auth;
+
+       return 0;
+}
+
+
 static int hostapd_setup_radius_srv(struct hostapd_data *hapd,
                                    struct hostapd_bss_config *conf)
 {
@@ -1067,6 +997,8 @@ static int hostapd_setup_radius_srv(struct hostapd_data *hapd,
        return 0;
 }
 
+#endif /* RADIUS_SERVER */
+
 
 /**
  * hostapd_setup_bss - Per-BSS setup (initialization)
@@ -1105,14 +1037,21 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
                }
 
                hapd->interface_added = 1;
-               if (hostapd_bss_add(hapd->iface->bss[0], hapd->conf->iface,
-                                   hapd->own_addr)) {
+               if (hostapd_if_add(hapd->iface->bss[0], WPA_IF_AP_BSS,
+                                  hapd->conf->iface, hapd->own_addr, hapd)) {
                        wpa_printf(MSG_ERROR, "Failed to add BSS (BSSID="
                                   MACSTR ")", MAC2STR(hapd->own_addr));
                        return -1;
                }
        }
 
+       hostapd_flush_old_stations(hapd);
+       hostapd_set_privacy(hapd, 0);
+
+       hostapd_broadcast_wep_clear(hapd);
+       if (hostapd_setup_encryption(hapd->conf->iface, hapd))
+               return -1;
+
        /*
         * Fetch the SSID from the system and use it or,
         * if one was specified in the config file, verify they
@@ -1154,14 +1093,6 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
                return -1;
        }
 
-       /* Set flag for whether SSID is broadcast in beacons */
-       if (hostapd_set_broadcast_ssid(hapd,
-                                      !!hapd->conf->ignore_broadcast_ssid)) {
-               wpa_printf(MSG_ERROR, "Could not set broadcast SSID flag for "
-                          "kernel driver");
-               return -1;
-       }
-
        /* Set SSID for the kernel driver (to be used in beacon and probe
         * response frames) */
        if (set_ssid && hostapd_set_ssid(hapd, (u8 *) conf->ssid.ssid,
@@ -1172,11 +1103,13 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
 
        if (wpa_debug_level == MSG_MSGDUMP)
                conf->radius->msg_dumps = 1;
+#ifndef CONFIG_NO_RADIUS
        hapd->radius = radius_client_init(hapd, conf->radius);
        if (hapd->radius == NULL) {
                wpa_printf(MSG_ERROR, "RADIUS client initialization failed.");
                return -1;
        }
+#endif /* CONFIG_NO_RADIUS */
 
        if (hostapd_acl_init(hapd)) {
                wpa_printf(MSG_ERROR, "ACL initialization failed.");
@@ -1231,9 +1164,11 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
 
        ieee802_11_set_beacon(hapd);
 
+#ifdef RADIUS_SERVER
        if (conf->radius_server_clients &&
            hostapd_setup_radius_srv(hapd, conf))
                return -1;
+#endif /* RADIUS_SERVER */
 
        return 0;
 }
@@ -1261,45 +1196,6 @@ static void hostapd_tx_queue_params(struct hostapd_iface *iface)
 }
 
 
-static int hostapd_radius_get_eap_user(void *ctx, const u8 *identity,
-                                      size_t identity_len, int phase2,
-                                      struct eap_user *user)
-{
-       const struct hostapd_eap_user *eap_user;
-       int i, count;
-
-       eap_user = hostapd_get_eap_user(ctx, identity, identity_len, phase2);
-       if (eap_user == NULL)
-               return -1;
-
-       if (user == NULL)
-               return 0;
-
-       os_memset(user, 0, sizeof(*user));
-       count = EAP_USER_MAX_METHODS;
-       if (count > EAP_MAX_METHODS)
-               count = EAP_MAX_METHODS;
-       for (i = 0; i < count; i++) {
-               user->methods[i].vendor = eap_user->methods[i].vendor;
-               user->methods[i].method = eap_user->methods[i].method;
-       }
-
-       if (eap_user->password) {
-               user->password = os_malloc(eap_user->password_len);
-               if (user->password == NULL)
-                       return -1;
-               os_memcpy(user->password, eap_user->password,
-                         eap_user->password_len);
-               user->password_len = eap_user->password_len;
-               user->password_hash = eap_user->password_hash;
-       }
-       user->force_version = eap_user->force_version;
-       user->ttls_auth = eap_user->ttls_auth;
-
-       return 0;
-}
-
-
 static int setup_interface(struct hostapd_iface *iface)
 {
        struct hostapd_data *hapd = iface->bss[0];
@@ -1307,19 +1203,14 @@ static int setup_interface(struct hostapd_iface *iface)
        size_t i;
        char country[4];
        u8 *b = conf->bssid;
-       int freq;
-       size_t j;
-       u8 *prev_addr;
 
        /*
         * Initialize the driver interface and make sure that all BSSes get
         * configured with a pointer to this driver interface.
         */
-       if (b[0] | b[1] | b[2] | b[3] | b[4] | b[5]) {
-               hapd->drv_priv = hostapd_driver_init_bssid(hapd, b);
-       } else {
-               hapd->drv_priv = hostapd_driver_init(hapd);
-       }
+       if (!(b[0] | b[1] | b[2] | b[3] | b[4] | b[5]))
+               b = NULL;
+       hapd->drv_priv = hostapd_driver_init(hapd, b);
 
        if (hapd->drv_priv == NULL) {
                wpa_printf(MSG_ERROR, "%s driver initialization failed.",
@@ -1335,12 +1226,6 @@ static int setup_interface(struct hostapd_iface *iface)
        if (hostapd_validate_bssid_configuration(iface))
                return -1;
 
-#ifdef CONFIG_IEEE80211N
-       SET_2BIT_LE16(&iface->ht_op_mode,
-                     HT_INFO_OPERATION_MODE_OP_MODE_OFFSET,
-                     OP_MODE_PURE);
-#endif /* CONFIG_IEEE80211N */
-
        if (hapd->iconf->country[0] && hapd->iconf->country[1]) {
                os_memcpy(country, hapd->iconf->country, 3);
                country[3] = '\0';
@@ -1350,24 +1235,6 @@ static int setup_interface(struct hostapd_iface *iface)
                }
        }
 
-       if (hapd->iconf->ieee80211d &&
-           hostapd_set_ieee80211d(hapd, 1) < 0) {
-               wpa_printf(MSG_ERROR, "Failed to set ieee80211d (%d)",
-                          hapd->iconf->ieee80211d);
-               return -1;
-       }
-
-       if (hapd->iconf->bridge_packets != INTERNAL_BRIDGE_DO_NOT_CONTROL &&
-           hostapd_set_internal_bridge(hapd, hapd->iconf->bridge_packets)) {
-               wpa_printf(MSG_ERROR, "Failed to set bridge_packets for "
-                          "kernel driver");
-               return -1;
-       }
-
-       /* TODO: merge with hostapd_driver_init() ? */
-       if (hostapd_wireless_event_init(hapd) < 0)
-               return -1;
-
        if (hostapd_get_hw_features(iface)) {
                /* Not all drivers support this yet, so continue without hw
                 * feature data. */
@@ -1378,11 +1245,33 @@ static int setup_interface(struct hostapd_iface *iface)
                                   "channel. (%d)", ret);
                        return -1;
                }
+               ret = hostapd_check_ht_capab(iface);
+               if (ret < 0)
+                       return -1;
+               if (ret == 1) {
+                       wpa_printf(MSG_DEBUG, "Interface initialization will "
+                                  "be completed in a callback");
+                       return 0;
+               }
        }
+       return hostapd_setup_interface_complete(iface, 0);
+}
 
-       hostapd_flush_old_stations(hapd);
-       hostapd_set_privacy(hapd, 0);
 
+int hostapd_setup_interface_complete(struct hostapd_iface *iface, int err)
+{
+       struct hostapd_data *hapd = iface->bss[0];
+       int freq;
+       size_t j;
+       u8 *prev_addr;
+
+       if (err) {
+               wpa_printf(MSG_ERROR, "Interface initialization failed");
+               eloop_terminate();
+               return -1;
+       }
+
+       wpa_printf(MSG_DEBUG, "Completing interface initialization");
        if (hapd->iconf->channel) {
                freq = hostapd_hw_get_freq(hapd, hapd->iconf->channel);
                wpa_printf(MSG_DEBUG, "Mode: %s  Channel: %d  "
@@ -1400,13 +1289,6 @@ static int setup_interface(struct hostapd_iface *iface)
                }
        }
 
-       hostapd_broadcast_wep_clear(hapd);
-       if (hostapd_setup_encryption(hapd->conf->iface, hapd))
-               return -1;
-
-       hostapd_set_beacon_int(hapd, hapd->iconf->beacon_int);
-       ieee802_11_set_beacon(hapd);
-
        if (hapd->iconf->rts_threshold > -1 &&
            hostapd_set_rts(hapd, hapd->iconf->rts_threshold)) {
                wpa_printf(MSG_ERROR, "Could not set RTS threshold for "
@@ -1443,6 +1325,9 @@ static int setup_interface(struct hostapd_iface *iface)
                return -1;
        }
 
+       wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
+                  iface->bss[0]->conf->iface);
+
        return 0;
 }
 
@@ -1467,9 +1352,6 @@ int hostapd_setup_interface(struct hostapd_iface *iface)
                           iface->bss[0]->conf->iface);
                eloop_terminate();
                return -1;
-       } else if (!hostapd_drv_none(iface->bss[0])) {
-               wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
-                          iface->bss[0]->conf->iface);
        }
 
        return 0;
@@ -1498,15 +1380,11 @@ hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
        if (hapd == NULL)
                return NULL;
 
+       hostapd_set_driver_ops(&hapd->drv);
        hapd->iconf = conf;
        hapd->conf = bss;
        hapd->iface = hapd_iface;
 
-       if (hapd->conf->individual_wep_key_len > 0) {
-               /* use key0 in individual key and key1 in broadcast key */
-               hapd->default_wep_key_idx = 1;
-       }
-
 #ifdef EAP_TLS_FUNCS
        if (hapd->conf->eap_server &&
            (hapd->conf->ca_cert || hapd->conf->server_cert ||
@@ -1539,7 +1417,7 @@ hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
        }
 #endif /* EAP_TLS_FUNCS */
 
-#ifdef EAP_SERVER
+#ifdef EAP_SIM_DB
        if (hapd->conf->eap_sim_db) {
                hapd->eap_sim_db_priv =
                        eap_sim_db_init(hapd->conf->eap_sim_db,
@@ -1550,13 +1428,13 @@ hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
                        goto fail;
                }
        }
-#endif /* EAP_SERVER */
+#endif /* EAP_SIM_DB */
 
        hapd->driver = hapd->iconf->driver;
 
        return hapd;
 
-#if defined(EAP_TLS_FUNCS) || defined(EAP_SERVER)
+#if defined(EAP_TLS_FUNCS) || defined(EAP_SIM_DB)
 fail:
 #endif
        /* TODO: cleanup allocated resources(?) */
@@ -1585,3 +1463,60 @@ void hostapd_interface_deinit(struct hostapd_iface *iface)
                os_free(iface->bss[j]);
        hostapd_cleanup_iface(iface);
 }
+
+
+int hostapd_register_probereq_cb(struct hostapd_data *hapd,
+                                void (*cb)(void *ctx, const u8 *sa,
+                                           const u8 *ie, size_t ie_len),
+                                void *ctx)
+{
+       struct hostapd_probereq_cb *n;
+
+       n = os_realloc(hapd->probereq_cb, (hapd->num_probereq_cb + 1) *
+                      sizeof(struct hostapd_probereq_cb));
+       if (n == NULL)
+               return -1;
+
+       hapd->probereq_cb = n;
+       n = &hapd->probereq_cb[hapd->num_probereq_cb];
+       hapd->num_probereq_cb++;
+
+       n->cb = cb;
+       n->ctx = ctx;
+
+       return 0;
+}
+
+
+int hostapd_set_drv_ieee8021x(struct hostapd_data *hapd, const char *ifname,
+                             int enabled)
+{
+       struct wpa_bss_params params;
+       os_memset(&params, 0, sizeof(params));
+       params.ifname = ifname;
+       params.enabled = enabled;
+       if (enabled) {
+               params.wpa = hapd->conf->wpa;
+               params.ieee802_1x = hapd->conf->ieee802_1x;
+               params.wpa_group = hapd->conf->wpa_group;
+               params.wpa_pairwise = hapd->conf->wpa_pairwise;
+               params.wpa_key_mgmt = hapd->conf->wpa_key_mgmt;
+               params.rsn_preauth = hapd->conf->rsn_preauth;
+       }
+       return hostapd_set_ieee8021x(hapd, &params);
+}
+
+
+int hostapd_sta_flags_to_drv(int flags)
+{
+       int res = 0;
+       if (flags & WLAN_STA_AUTHORIZED)
+               res |= WPA_STA_AUTHORIZED;
+       if (flags & WLAN_STA_WMM)
+               res |= WPA_STA_WMM;
+       if (flags & WLAN_STA_SHORT_PREAMBLE)
+               res |= WPA_STA_SHORT_PREAMBLE;
+       if (flags & WLAN_STA_MFP)
+               res |= WPA_STA_MFP;
+       return res;
+}