Merge wireless_event_{,de}init() into {,de}init() driver op
[wpasupplicant] / hostapd / hostapd.c
index ba2f6f3..b362ca2 100644 (file)
  */
 
 #include "includes.h"
-#ifndef CONFIG_NATIVE_WINDOWS
-#include <syslog.h>
-#endif /* CONFIG_NATIVE_WINDOWS */
 
 #include "eloop.h"
 #include "hostapd.h"
 #include "ieee802_1x.h"
-#include "ieee802_11.h"
 #include "beacon.h"
 #include "hw_features.h"
 #include "accounting.h"
 #include "eapol_sm.h"
 #include "iapp.h"
-#include "ap.h"
+#include "ieee802_11_defs.h"
 #include "ieee802_11_auth.h"
-#include "ap_list.h"
 #include "sta_info.h"
+#include "ap_list.h"
 #include "driver_i.h"
 #include "radius/radius_client.h"
 #include "radius/radius_server.h"
-#include "radius/radius.h"
 #include "wpa.h"
 #include "preauth.h"
-#include "wme.h"
 #include "vlan_init.h"
 #include "ctrl_iface.h"
 #include "tls.h"
@@ -46,7 +40,7 @@
 #include "version.h"
 #include "l2_packet/l2_packet.h"
 #include "wps_hostapd.h"
-#include "mlme.h"
+#include "tkip_countermeasures.h"
 
 
 static int hostapd_radius_get_eap_user(void *ctx, const u8 *identity,
@@ -56,419 +50,7 @@ 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);
 
-struct hapd_interfaces {
-       size_t count;
-       struct hostapd_iface **iface;
-};
-
-
 extern int wpa_debug_level;
-extern int wpa_debug_show_keys;
-extern int wpa_debug_timestamp;
-
-
-static void hostapd_logger_cb(void *ctx, const u8 *addr, unsigned int module,
-                             int level, const char *txt, size_t len)
-{
-       struct hostapd_data *hapd = ctx;
-       char *format, *module_str;
-       int maxlen;
-       int conf_syslog_level, conf_stdout_level;
-       unsigned int conf_syslog, conf_stdout;
-
-       maxlen = len + 100;
-       format = os_malloc(maxlen);
-       if (!format)
-               return;
-
-       if (hapd && hapd->conf) {
-               conf_syslog_level = hapd->conf->logger_syslog_level;
-               conf_stdout_level = hapd->conf->logger_stdout_level;
-               conf_syslog = hapd->conf->logger_syslog;
-               conf_stdout = hapd->conf->logger_stdout;
-       } else {
-               conf_syslog_level = conf_stdout_level = 0;
-               conf_syslog = conf_stdout = (unsigned int) -1;
-       }
-
-       switch (module) {
-       case HOSTAPD_MODULE_IEEE80211:
-               module_str = "IEEE 802.11";
-               break;
-       case HOSTAPD_MODULE_IEEE8021X:
-               module_str = "IEEE 802.1X";
-               break;
-       case HOSTAPD_MODULE_RADIUS:
-               module_str = "RADIUS";
-               break;
-       case HOSTAPD_MODULE_WPA:
-               module_str = "WPA";
-               break;
-       case HOSTAPD_MODULE_DRIVER:
-               module_str = "DRIVER";
-               break;
-       case HOSTAPD_MODULE_IAPP:
-               module_str = "IAPP";
-               break;
-       case HOSTAPD_MODULE_MLME:
-               module_str = "MLME";
-               break;
-       default:
-               module_str = NULL;
-               break;
-       }
-
-       if (hapd && hapd->conf && addr)
-               os_snprintf(format, maxlen, "%s: STA " MACSTR "%s%s: %s",
-                           hapd->conf->iface, MAC2STR(addr),
-                           module_str ? " " : "", module_str, txt);
-       else if (hapd && hapd->conf)
-               os_snprintf(format, maxlen, "%s:%s%s %s",
-                           hapd->conf->iface, module_str ? " " : "",
-                           module_str, txt);
-       else if (addr)
-               os_snprintf(format, maxlen, "STA " MACSTR "%s%s: %s",
-                           MAC2STR(addr), module_str ? " " : "",
-                           module_str, txt);
-       else
-               os_snprintf(format, maxlen, "%s%s%s",
-                           module_str, module_str ? ": " : "", txt);
-
-       if ((conf_stdout & module) && level >= conf_stdout_level) {
-               wpa_debug_print_timestamp();
-               printf("%s\n", format);
-       }
-
-#ifndef CONFIG_NATIVE_WINDOWS
-       if ((conf_syslog & module) && level >= conf_syslog_level) {
-               int priority;
-               switch (level) {
-               case HOSTAPD_LEVEL_DEBUG_VERBOSE:
-               case HOSTAPD_LEVEL_DEBUG:
-                       priority = LOG_DEBUG;
-                       break;
-               case HOSTAPD_LEVEL_INFO:
-                       priority = LOG_INFO;
-                       break;
-               case HOSTAPD_LEVEL_NOTICE:
-                       priority = LOG_NOTICE;
-                       break;
-               case HOSTAPD_LEVEL_WARNING:
-                       priority = LOG_WARNING;
-                       break;
-               default:
-                       priority = LOG_INFO;
-                       break;
-               }
-               syslog(priority, "%s", format);
-       }
-#endif /* CONFIG_NATIVE_WINDOWS */
-
-       os_free(format);
-}
-
-
-static void ieee80211_tkip_countermeasures_stop(void *eloop_ctx,
-                                               void *timeout_ctx)
-{
-       struct hostapd_data *hapd = eloop_ctx;
-       hapd->tkip_countermeasures = 0;
-       hostapd_set_countermeasures(hapd, 0);
-       hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211,
-                      HOSTAPD_LEVEL_INFO, "TKIP countermeasures ended");
-}
-
-
-static void ieee80211_tkip_countermeasures_start(struct hostapd_data *hapd)
-{
-       struct sta_info *sta;
-
-       hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211,
-                      HOSTAPD_LEVEL_INFO, "TKIP countermeasures initiated");
-
-       wpa_auth_countermeasures_start(hapd->wpa_auth);
-       hapd->tkip_countermeasures = 1;
-       hostapd_set_countermeasures(hapd, 1);
-       wpa_gtk_rekey(hapd->wpa_auth);
-       eloop_cancel_timeout(ieee80211_tkip_countermeasures_stop, hapd, NULL);
-       eloop_register_timeout(60, 0, ieee80211_tkip_countermeasures_stop,
-                              hapd, NULL);
-       for (sta = hapd->sta_list; sta != NULL; sta = sta->next) {
-               hostapd_sta_deauth(hapd, sta->addr,
-                                  WLAN_REASON_MICHAEL_MIC_FAILURE);
-               sta->flags &= ~(WLAN_STA_AUTH | WLAN_STA_ASSOC |
-                               WLAN_STA_AUTHORIZED);
-               hostapd_sta_remove(hapd, sta->addr);
-       }
-}
-
-
-static void ieee80211_michael_mic_failure(struct hostapd_data *hapd,
-                                         const u8 *addr, int local)
-{
-       time_t now;
-
-       if (addr && local) {
-               struct sta_info *sta = ap_get_sta(hapd, addr);
-               if (sta != NULL) {
-                       wpa_auth_sta_local_mic_failure_report(sta->wpa_sm);
-                       hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
-                                      HOSTAPD_LEVEL_INFO,
-                                      "Michael MIC failure detected in "
-                                      "received frame");
-                       mlme_michaelmicfailure_indication(hapd, addr);
-               } else {
-                       wpa_printf(MSG_DEBUG,
-                                  "MLME-MICHAELMICFAILURE.indication "
-                                  "for not associated STA (" MACSTR
-                                  ") ignored", MAC2STR(addr));
-                       return;
-               }
-       }
-
-       time(&now);
-       if (now > hapd->michael_mic_failure + 60) {
-               hapd->michael_mic_failures = 1;
-       } else {
-               hapd->michael_mic_failures++;
-               if (hapd->michael_mic_failures > 1)
-                       ieee80211_tkip_countermeasures_start(hapd);
-       }
-       hapd->michael_mic_failure = now;
-}
-
-
-/**
- * hostapd_prune_associations - Remove extraneous associations
- * @hapd: Pointer to BSS data for the most recent association
- * @sta: Pointer to the associated STA data
- *
- * This function looks through all radios and BSS's for previous
- * (stale) associations of STA. If any are found they are removed.
- */
-static void hostapd_prune_associations(struct hostapd_data *hapd,
-                                      struct sta_info *sta)
-{
-       struct sta_info *osta;
-       struct hostapd_data *ohapd;
-       size_t i, j;
-       struct hapd_interfaces *interfaces = eloop_get_user_data();
-
-       for (i = 0; i < interfaces->count; i++) {
-               for (j = 0; j < interfaces->iface[i]->num_bss; j++) {
-                       ohapd = interfaces->iface[i]->bss[j];
-                       if (ohapd == hapd)
-                               continue;
-                       osta = ap_get_sta(ohapd, sta->addr);
-                       if (!osta)
-                               continue;
-
-                       ap_sta_disassociate(ohapd, osta,
-                                           WLAN_REASON_UNSPECIFIED);
-               }
-       }
-}
-
-
-/**
- * hostapd_new_assoc_sta - Notify that a new station associated with the AP
- * @hapd: Pointer to BSS data
- * @sta: Pointer to the associated STA data
- * @reassoc: 1 to indicate this was a re-association; 0 = first association
- *
- * This function will be called whenever a station associates with the AP. It
- * can be called for ieee802_11.c for drivers that export MLME to hostapd and
- * from driver_*.c for drivers that take care of management frames (IEEE 802.11
- * authentication and association) internally.
- */
-void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta,
-                          int reassoc)
-{
-       if (hapd->tkip_countermeasures) {
-               hostapd_sta_deauth(hapd, sta->addr,
-                                  WLAN_REASON_MICHAEL_MIC_FAILURE);
-               return;
-       }
-
-       hostapd_prune_associations(hapd, sta);
-
-       /* IEEE 802.11F (IAPP) */
-       if (hapd->conf->ieee802_11f)
-               iapp_new_station(hapd->iapp, sta);
-
-       /* Start accounting here, if IEEE 802.1X and WPA are not used.
-        * IEEE 802.1X/WPA code will start accounting after the station has
-        * been authorized. */
-       if (!hapd->conf->ieee802_1x && !hapd->conf->wpa)
-               accounting_sta_start(hapd, sta);
-
-       hostapd_wme_sta_config(hapd, sta);
-
-       /* Start IEEE 802.1X authentication process for new stations */
-       ieee802_1x_new_station(hapd, sta);
-       if (reassoc) {
-               if (sta->auth_alg != WLAN_AUTH_FT &&
-                   !(sta->flags & (WLAN_STA_WPS | WLAN_STA_MAYBE_WPS)))
-                       wpa_auth_sm_event(sta->wpa_sm, WPA_REAUTH);
-       } else
-               wpa_auth_sta_associated(hapd->wpa_auth, sta->wpa_sm);
-}
-
-
-void hostapd_tx_status(struct hostapd_data *hapd, const u8 *addr,
-                      const u8 *buf, size_t len, int ack)
-{
-       struct sta_info *sta;
-
-       sta = ap_get_sta(hapd, addr);
-       if (sta && sta->flags & WLAN_STA_PENDING_POLL) {
-               wpa_printf(MSG_DEBUG, "STA " MACSTR " %s pending "
-                          "activity poll", MAC2STR(sta->addr),
-                          ack ? "ACKed" : "did not ACK");
-               if (ack)
-                       sta->flags &= ~WLAN_STA_PENDING_POLL;
-       }
-       if (sta)
-               ieee802_1x_tx_status(hapd, sta, buf, len, ack);
-}
-
-
-void hostapd_rx_from_unknown_sta(struct hostapd_data *hapd, const u8 *addr)
-{
-       struct sta_info *sta;
-
-       sta = ap_get_sta(hapd, addr);
-       if (!sta || !(sta->flags & WLAN_STA_ASSOC)) {
-               wpa_printf(MSG_DEBUG, "Data/PS-poll frame from not associated "
-                          "STA " MACSTR, MAC2STR(addr));
-               if (sta && (sta->flags & WLAN_STA_AUTH))
-                       hostapd_sta_disassoc(
-                               hapd, addr,
-                               WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
-               else
-                       hostapd_sta_deauth(
-                               hapd, addr,
-                               WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
-       }
-}
-
-
-int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
-                       const u8 *ie, size_t ielen)
-{
-       struct sta_info *sta;
-       int new_assoc, res;
-
-       hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
-                      HOSTAPD_LEVEL_INFO, "associated");
-
-       sta = ap_get_sta(hapd, addr);
-       if (sta) {
-               accounting_sta_stop(hapd, sta);
-       } else {
-               sta = ap_sta_add(hapd, addr);
-               if (sta == NULL)
-                       return -1;
-       }
-       sta->flags &= ~(WLAN_STA_WPS | WLAN_STA_MAYBE_WPS);
-
-       if (hapd->conf->wpa) {
-               if (ie == NULL || ielen == 0) {
-                       if (hapd->conf->wps_state) {
-                               wpa_printf(MSG_DEBUG, "STA did not include "
-                                          "WPA/RSN IE in (Re)Association "
-                                          "Request - possible WPS use");
-                               sta->flags |= WLAN_STA_MAYBE_WPS;
-                               goto skip_wpa_check;
-                       }
-
-                       wpa_printf(MSG_DEBUG, "No WPA/RSN IE from STA");
-                       return -1;
-               }
-               if (hapd->conf->wps_state && ie[0] == 0xdd && ie[1] >= 4 &&
-                   os_memcmp(ie + 2, "\x00\x50\xf2\x04", 4) == 0) {
-                       sta->flags |= WLAN_STA_WPS;
-                       goto skip_wpa_check;
-               }
-
-               if (sta->wpa_sm == NULL)
-                       sta->wpa_sm = wpa_auth_sta_init(hapd->wpa_auth,
-                                                       sta->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);
-               if (res != WPA_IE_OK) {
-                       wpa_printf(MSG_DEBUG, "WPA/RSN information element "
-                                  "rejected? (res %u)", res);
-                       wpa_hexdump(MSG_DEBUG, "IE", ie, ielen);
-                       return -1;
-               }
-       }
-skip_wpa_check:
-
-       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);
-
-       hostapd_new_assoc_sta(hapd, sta, !new_assoc);
-
-       ieee802_1x_notify_port_enabled(sta->eapol_sm, 1);
-
-       return 0;
-}
-
-
-void hostapd_notif_disassoc(struct hostapd_data *hapd, const u8 *addr)
-{
-       struct sta_info *sta;
-
-       hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
-                      HOSTAPD_LEVEL_INFO, "disassociated");
-
-       sta = ap_get_sta(hapd, addr);
-       if (sta == NULL) {
-               wpa_printf(MSG_DEBUG, "Disassociation notification for "
-                          "unknown STA " MACSTR, MAC2STR(addr));
-               return;
-       }
-
-       sta->flags &= ~(WLAN_STA_AUTH | WLAN_STA_ASSOC);
-       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);
-       ap_free_sta(hapd, sta);
-}
-
-
-void hostapd_eapol_receive(struct hostapd_data *hapd, const u8 *sa,
-                          const u8 *buf, size_t len)
-{
-       ieee802_1x_receive(hapd, sa, buf, len);
-}
-
-
-void hostapd_mgmt_rx(struct hostapd_data *hapd, u8 *buf, size_t len,
-                    u16 stype, struct hostapd_frame_info *fi)
-{
-       ieee802_11_mgmt(hapd, buf, len, stype, fi);
-}
-
-
-void hostapd_mgmt_tx_cb(struct hostapd_data *hapd, u8 *buf, size_t len,
-                       u16 stype, int ok)
-{
-       ieee802_11_mgmt_cb(hapd, buf, len, stype, ok);
-}
-
-
-void hostapd_michael_mic_failure(struct hostapd_data *hapd, const u8 *addr)
-{
-       ieee80211_michael_mic_failure(hapd, addr, 1);
-}
 
 
 #ifdef EAP_SERVER
@@ -490,16 +72,6 @@ static void hostapd_sim_db_cb(void *ctx, void *session_ctx)
 #endif /* EAP_SERVER */
 
 
-/**
- * handle_term - SIGINT and SIGTERM handler to terminate hostapd process
- */
-static void handle_term(int sig, void *eloop_ctx, void *signal_ctx)
-{
-       wpa_printf(MSG_DEBUG, "Signal %d received - terminating", sig);
-       eloop_terminate();
-}
-
-
 static void hostapd_wpa_auth_conf(struct hostapd_bss_config *conf,
                                  struct wpa_auth_config *wconf)
 {
@@ -515,7 +87,7 @@ static void hostapd_wpa_auth_conf(struct hostapd_bss_config *conf,
        wconf->rsn_preauth = conf->rsn_preauth;
        wconf->eapol_version = conf->eapol_version;
        wconf->peerkey = conf->peerkey;
-       wconf->wme_enabled = conf->wme_enabled;
+       wconf->wmm_enabled = conf->wmm_enabled;
        wconf->okc = conf->okc;
 #ifdef CONFIG_IEEE80211W
        wconf->ieee80211w = conf->ieee80211w;
@@ -587,6 +159,16 @@ int hostapd_reload_config(struct hostapd_iface *iface)
 
        ieee802_11_set_beacon(hapd);
 
+       if (hapd->conf->ssid.ssid_set &&
+           hostapd_set_ssid(hapd, (u8 *) hapd->conf->ssid.ssid,
+                            hapd->conf->ssid.ssid_len)) {
+               wpa_printf(MSG_ERROR, "Could not set SSID for kernel driver");
+               /* try to continue */
+       }
+
+       if (hapd->conf->ieee802_1x || hapd->conf->wpa)
+               hostapd_set_ieee8021x(hapd->conf->iface, hapd, 1);
+
        hostapd_config_free(oldconf);
 
        wpa_printf(MSG_DEBUG, "Reconfigured interface %s", hapd->conf->iface);
@@ -595,26 +177,13 @@ int hostapd_reload_config(struct hostapd_iface *iface)
 }
 
 
-#ifndef CONFIG_NATIVE_WINDOWS
-/**
- * handle_reload - SIGHUP handler to reload configuration
- */
-static void handle_reload(int sig, void *eloop_ctx, void *signal_ctx)
+int handle_reload_iface(struct hostapd_iface *iface, void *ctx)
 {
-       struct hapd_interfaces *hapds = (struct hapd_interfaces *) eloop_ctx;
-       size_t i;
-
-       wpa_printf(MSG_DEBUG, "Signal %d received - reloading configuration",
-                  sig);
-
-       for (i = 0; i < hapds->count; i++) {
-               if (hostapd_reload_config(hapds->iface[i]) < 0) {
-                       wpa_printf(MSG_WARNING, "Failed to read new "
-                                  "configuration file - continuing with "
-                                  "old.");
-                       continue;
-               }
+       if (hostapd_reload_config(iface) < 0) {
+               wpa_printf(MSG_WARNING, "Failed to read new configuration "
+                          "file - continuing with old.");
        }
+       return 0;
 }
 
 
@@ -674,7 +243,7 @@ static void hostapd_dump_state(struct hostapd_data *hapd)
                        (sta->flags & WLAN_STA_SHORT_PREAMBLE ?
                         "[SHORT_PREAMBLE]" : ""),
                        (sta->flags & WLAN_STA_PREAUTH ? "[PREAUTH]" : ""),
-                       (sta->flags & WLAN_STA_WME ? "[WME]" : ""),
+                       (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]" : ""),
@@ -717,23 +286,19 @@ static void hostapd_dump_state(struct hostapd_data *hapd)
        }
        fclose(f);
 }
-#endif /* HOSTAPD_DUMP_STATE */
 
 
-static void handle_dump_state(int sig, void *eloop_ctx, void *signal_ctx)
+int handle_dump_state_iface(struct hostapd_iface *iface, void *ctx)
 {
-#ifdef HOSTAPD_DUMP_STATE
-       struct hapd_interfaces *hapds = (struct hapd_interfaces *) eloop_ctx;
-       size_t i, j;
+       size_t i;
 
-       for (i = 0; i < hapds->count; i++) {
-               struct hostapd_iface *hapd_iface = hapds->iface[i];
-               for (j = 0; j < hapd_iface->num_bss; j++)
-                       hostapd_dump_state(hapd_iface->bss[j]);
-       }
-#endif /* HOSTAPD_DUMP_STATE */
+       for (i = 0; i < iface->num_bss; i++)
+               hostapd_dump_state(iface->bss[i]);
+
+       return 0;
 }
-#endif /* CONFIG_NATIVE_WINDOWS */
+#endif /* HOSTAPD_DUMP_STATE */
+
 
 static void hostapd_broadcast_key_clear_iface(struct hostapd_data *hapd,
                                              char *ifname)
@@ -741,8 +306,8 @@ static void hostapd_broadcast_key_clear_iface(struct hostapd_data *hapd,
        int i;
 
        for (i = 0; i < NUM_WEP_KEYS; i++) {
-               if (hostapd_set_encryption(ifname, hapd, "none", NULL, i, NULL,
-                                          0, i == 0 ? 1 : 0)) {
+               if (hostapd_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);
@@ -751,9 +316,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_encryption(ifname, hapd, "none", NULL,
-                                                  i, NULL, 0,
-                                                  i == 0 ? 1 : 0)) {
+                       if (hostapd_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);
@@ -778,11 +343,9 @@ static int hostapd_broadcast_wep_set(struct hostapd_data *hapd)
 
        idx = ssid->wep.idx;
        if (ssid->wep.default_len &&
-           hostapd_set_encryption(hapd->conf->iface,
-                                  hapd, "WEP", NULL, idx,
-                                  ssid->wep.key[idx],
-                                  ssid->wep.len[idx],
-                                  idx == ssid->wep.idx)) {
+           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])) {
                wpa_printf(MSG_WARNING, "Could not set WEP encryption.");
                errors++;
        }
@@ -800,10 +363,9 @@ static int hostapd_broadcast_wep_set(struct hostapd_data *hapd)
                                continue;
 
                        idx = key->idx;
-                       if (hostapd_set_encryption(ifname, hapd, "WEP", NULL,
-                                                  idx, key->key[idx],
-                                                  key->len[idx],
-                                                  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])) {
                                wpa_printf(MSG_WARNING, "Could not set "
                                           "dynamic VLAN WEP encryption.");
                                errors++;
@@ -864,8 +426,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);
@@ -934,10 +494,10 @@ static int hostapd_setup_encryption(char *iface, struct hostapd_data *hapd)
 
        for (i = 0; i < 4; i++) {
                if (hapd->conf->ssid.wep.key[i] &&
-                   hostapd_set_encryption(iface, hapd, "WEP", NULL,
-                                          i, hapd->conf->ssid.wep.key[i],
-                                          hapd->conf->ssid.wep.len[i],
-                                          i == hapd->conf->ssid.wep.idx)) {
+                   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])) {
                        wpa_printf(MSG_WARNING, "Could not set WEP "
                                   "encryption.");
                        return -1;
@@ -983,6 +543,7 @@ static int hostapd_flush_old_stations(struct hostapd_data *hapd)
 static void hostapd_wpa_auth_logger(void *ctx, const u8 *addr,
                                    logger_level level, const char *txt)
 {
+#ifndef CONFIG_NO_HOSTAPD_LOGGER
        struct hostapd_data *hapd = ctx;
        int hlevel;
 
@@ -1000,6 +561,7 @@ static void hostapd_wpa_auth_logger(void *ctx, const u8 *addr,
        }
 
        hostapd_logger(hapd, addr, HOSTAPD_MODULE_WPA, hlevel, "%s", txt);
+#endif /* CONFIG_NO_HOSTAPD_LOGGER */
 }
 
 
@@ -1027,7 +589,7 @@ static void hostapd_wpa_auth_disconnect(void *ctx, const u8 *addr,
 static void hostapd_wpa_auth_mic_failure_report(void *ctx, const u8 *addr)
 {
        struct hostapd_data *hapd = ctx;
-       ieee80211_michael_mic_failure(hapd, addr, 0);
+       michael_mic_failure(hapd, addr, 0);
 }
 
 
@@ -1124,7 +686,7 @@ static int hostapd_wpa_auth_get_msk(void *ctx, const u8 *addr, u8 *msk,
 }
 
 
-static int hostapd_wpa_auth_set_key(void *ctx, int vlan_id, const char *alg,
+static int hostapd_wpa_auth_set_key(void *ctx, int vlan_id, wpa_alg alg,
                                    const u8 *addr, int idx, u8 *key,
                                    size_t key_len)
 {
@@ -1137,8 +699,8 @@ static int hostapd_wpa_auth_set_key(void *ctx, int vlan_id, const char *alg,
                        return -1;
        }
 
-       return hostapd_set_encryption(ifname, hapd, alg, addr, idx,
-                                     key, key_len, 1);
+       return hostapd_set_key(ifname, hapd, alg, addr, idx, 1, NULL, 0,
+                              key, key_len);
 }
 
 
@@ -1183,23 +745,31 @@ static int hostapd_wpa_auth_for_each_sta(
 }
 
 
+struct wpa_auth_iface_iter_data {
+       int (*cb)(struct wpa_authenticator *sm, void *ctx);
+       void *cb_ctx;
+};
+
+static int wpa_auth_iface_iter(struct hostapd_iface *iface, void *ctx)
+{
+       struct wpa_auth_iface_iter_data *data = ctx;
+       size_t i;
+       for (i = 0; i < iface->num_bss; i++) {
+               if (data->cb(iface->bss[i]->wpa_auth, data->cb_ctx))
+                       return 1;
+       }
+       return 0;
+}
+
+
 static int hostapd_wpa_auth_for_each_auth(
        void *ctx, int (*cb)(struct wpa_authenticator *sm, void *ctx),
        void *cb_ctx)
 {
-       struct hostapd_data *ohapd;
-       size_t i, j;
-       struct hapd_interfaces *interfaces = eloop_get_user_data();
-
-       for (i = 0; i < interfaces->count; i++) {
-               for (j = 0; j < interfaces->iface[i]->num_bss; j++) {
-                       ohapd = interfaces->iface[i]->bss[j];
-                       if (cb(ohapd->wpa_auth, cb_ctx))
-                               return 1;
-               }
-       }
-
-       return 0;
+       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);
 }
 
 
@@ -1296,6 +866,7 @@ static int hostapd_validate_bssid_configuration(struct hostapd_iface *iface)
        struct hostapd_data *hapd = iface->bss[0];
        unsigned int i = iface->conf->num_bss, bits = 0, j;
        int res;
+       int auto_addr = 0;
 
        if (hostapd_drv_none(hapd))
                return 0;
@@ -1309,8 +880,11 @@ static int hostapd_validate_bssid_configuration(struct hostapd_iface *iface)
        /* Determine the bits necessary to any configured BSSIDs,
           if they are higher than the number of BSSIDs. */
        for (j = 0; j < iface->conf->num_bss; j++) {
-               if (hostapd_mac_comp_empty(iface->conf->bss[j].bssid) == 0)
+               if (hostapd_mac_comp_empty(iface->conf->bss[j].bssid) == 0) {
+                       if (j)
+                               auto_addr++;
                        continue;
+               }
 
                for (i = 0; i < ETH_ALEN; i++) {
                        mask[i] |=
@@ -1319,6 +893,9 @@ static int hostapd_validate_bssid_configuration(struct hostapd_iface *iface)
                }
        }
 
+       if (!auto_addr)
+               goto skip_mask_ext;
+
        for (i = 0; i < ETH_ALEN && mask[i] == 0; i++)
                ;
        j = 0;
@@ -1334,8 +911,11 @@ static int hostapd_validate_bssid_configuration(struct hostapd_iface *iface)
        if (bits < j)
                bits = j;
 
-       if (bits > 40)
+       if (bits > 40) {
+               wpa_printf(MSG_ERROR, "Too many bits in the BSSID mask (%u)",
+                          bits);
                return -1;
+       }
 
        os_memset(mask, 0xff, ETH_ALEN);
        j = bits / 8;
@@ -1345,6 +925,7 @@ static int hostapd_validate_bssid_configuration(struct hostapd_iface *iface)
        while (j--)
                mask[i] <<= 1;
 
+skip_mask_ext:
        wpa_printf(MSG_DEBUG, "BSS count %lu, BSSID mask " MACSTR " (%d bits)",
                   (unsigned long) iface->conf->num_bss, MAC2STR(mask), bits);
 
@@ -1359,6 +940,9 @@ static int hostapd_validate_bssid_configuration(struct hostapd_iface *iface)
                return -1;
        }
 
+       if (!auto_addr)
+               return 0;
+
        for (i = 0; i < ETH_ALEN; i++) {
                if ((hapd->own_addr[i] & mask[i]) != hapd->own_addr[i]) {
                        wpa_printf(MSG_ERROR, "Invalid BSSID mask " MACSTR
@@ -1576,12 +1160,6 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
                return -1;
        }
 
-       if (hostapd_set_dtim_period(hapd, hapd->conf->dtim_period)) {
-               wpa_printf(MSG_ERROR, "Could not set DTIM period 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,
@@ -1729,7 +1307,6 @@ static int setup_interface(struct hostapd_iface *iface)
        u8 *b = conf->bssid;
        int freq;
        size_t j;
-       int ret = 0;
        u8 *prev_addr;
 
        /*
@@ -1762,11 +1339,13 @@ static int setup_interface(struct hostapd_iface *iface)
                      OP_MODE_PURE);
 #endif /* CONFIG_IEEE80211N */
 
-       os_memcpy(country, hapd->iconf->country, 3);
-       country[3] = '\0';
-       if (hostapd_set_country(hapd, country) < 0) {
-               wpa_printf(MSG_ERROR, "Failed to set country code");
-               return -1;
+       if (hapd->iconf->country[0] && hapd->iconf->country[1]) {
+               os_memcpy(country, hapd->iconf->country, 3);
+               country[3] = '\0';
+               if (hostapd_set_country(hapd, country) < 0) {
+                       wpa_printf(MSG_ERROR, "Failed to set country code");
+                       return -1;
+               }
        }
 
        if (hapd->iconf->ieee80211d &&
@@ -1783,10 +1362,6 @@ static int setup_interface(struct hostapd_iface *iface)
                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. */
@@ -1810,6 +1385,7 @@ static int setup_interface(struct hostapd_iface *iface)
                           hapd->iconf->channel, freq);
 
                if (hostapd_set_freq(hapd, hapd->iconf->hw_mode, freq,
+                                    hapd->iconf->channel,
                                     hapd->iconf->ieee80211n,
                                     hapd->iconf->secondary_channel)) {
                        wpa_printf(MSG_ERROR, "Could not set channel for "
@@ -1861,7 +1437,7 @@ static int setup_interface(struct hostapd_iface *iface)
                return -1;
        }
 
-       return ret;
+       return 0;
 }
 
 
@@ -1875,7 +1451,7 @@ static int setup_interface(struct hostapd_iface *iface)
  * Flushes old stations, sets the channel, encryption,
  * beacons, and WDS links based on the configuration.
  */
-static int hostapd_setup_interface(struct hostapd_iface *iface)
+int hostapd_setup_interface(struct hostapd_iface *iface)
 {
        int ret;
 
@@ -1894,38 +1470,6 @@ static int hostapd_setup_interface(struct hostapd_iface *iface)
 }
 
 
-static void show_version(void)
-{
-       fprintf(stderr,
-               "hostapd v" VERSION_STR "\n"
-               "User space daemon for IEEE 802.11 AP management,\n"
-               "IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator\n"
-               "Copyright (c) 2002-2009, Jouni Malinen <j@w1.fi> "
-               "and contributors\n");
-}
-
-
-static void usage(void)
-{
-       show_version();
-       fprintf(stderr,
-               "\n"
-               "usage: hostapd [-hdBKtv] [-P <PID file>] "
-               "<configuration file(s)>\n"
-               "\n"
-               "options:\n"
-               "   -h   show this usage\n"
-               "   -d   show more debug messages (-dd for even more)\n"
-               "   -B   run daemon in the background\n"
-               "   -P   PID file\n"
-               "   -K   include key data in debug messages\n"
-               "   -t   include timestamps in some debug messages\n"
-               "   -v   show hostapd version\n");
-
-       exit(1);
-}
-
-
 /**
  * hostapd_alloc_bss_data - Allocate and initialize per-BSS data
  * @hapd_iface: Pointer to interface data
@@ -1937,7 +1481,7 @@ static void usage(void)
  * freed after hostapd_cleanup() is called for it during interface
  * deinitialization.
  */
-static struct hostapd_data *
+struct hostapd_data *
 hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
                       struct hostapd_config *conf,
                       struct hostapd_bss_config *bss)
@@ -2015,230 +1559,23 @@ fail:
 }
 
 
-/**
- * hostapd_init - Allocate and initialize per-interface data
- * @config_file: Path to the configuration file
- * Returns: Pointer to the allocated interface data or %NULL on failure
- *
- * This function is used to allocate main data structures for per-interface
- * data. The allocated data buffer will be freed by calling
- * hostapd_cleanup_iface().
- */
-static struct hostapd_iface * hostapd_init(const char *config_file)
-{
-       struct hostapd_iface *hapd_iface = NULL;
-       struct hostapd_config *conf = NULL;
-       struct hostapd_data *hapd;
-       size_t i;
-
-       hapd_iface = os_zalloc(sizeof(*hapd_iface));
-       if (hapd_iface == NULL)
-               goto fail;
-
-       hapd_iface->config_fname = os_strdup(config_file);
-       if (hapd_iface->config_fname == NULL)
-               goto fail;
-
-       conf = hostapd_config_read(hapd_iface->config_fname);
-       if (conf == NULL)
-               goto fail;
-       hapd_iface->conf = conf;
-
-       hapd_iface->num_bss = conf->num_bss;
-       hapd_iface->bss = os_zalloc(conf->num_bss *
-                                   sizeof(struct hostapd_data *));
-       if (hapd_iface->bss == NULL)
-               goto fail;
-
-       for (i = 0; i < conf->num_bss; i++) {
-               hapd = hapd_iface->bss[i] =
-                       hostapd_alloc_bss_data(hapd_iface, conf,
-                                              &conf->bss[i]);
-               if (hapd == NULL)
-                       goto fail;
-       }
-
-       return hapd_iface;
-
-fail:
-       if (conf)
-               hostapd_config_free(conf);
-       if (hapd_iface) {
-               for (i = 0; hapd_iface->bss && i < hapd_iface->num_bss; i++) {
-                       hapd = hapd_iface->bss[i];
-                       if (hapd && hapd->ssl_ctx)
-                               tls_deinit(hapd->ssl_ctx);
-               }
-
-               os_free(hapd_iface->config_fname);
-               os_free(hapd_iface->bss);
-               os_free(hapd_iface);
-       }
-       return NULL;
-}
-
-
-int main(int argc, char *argv[])
+void hostapd_interface_deinit(struct hostapd_iface *iface)
 {
-       struct hapd_interfaces interfaces;
-       int ret = 1, k;
-       size_t i, j;
-       int c, debug = 0, daemonize = 0, tnc = 0;
-       const char *pid_file = NULL;
-
-       hostapd_logger_register_cb(hostapd_logger_cb);
-
-       for (;;) {
-               c = getopt(argc, argv, "BdhKP:tv");
-               if (c < 0)
-                       break;
-               switch (c) {
-               case 'h':
-                       usage();
-                       break;
-               case 'd':
-                       debug++;
-                       if (wpa_debug_level > 0)
-                               wpa_debug_level--;
-                       break;
-               case 'B':
-                       daemonize++;
-                       break;
-               case 'K':
-                       wpa_debug_show_keys++;
-                       break;
-               case 'P':
-                       pid_file = optarg;
-                       break;
-               case 't':
-                       wpa_debug_timestamp++;
-                       break;
-               case 'v':
-                       show_version();
-                       exit(1);
-                       break;
-
-               default:
-                       usage();
-                       break;
-               }
-       }
-
-       if (optind == argc)
-               usage();
-
-       if (eap_server_register_methods()) {
-               wpa_printf(MSG_ERROR, "Failed to register EAP methods");
-               return -1;
-       }
-
-       interfaces.count = argc - optind;
-
-       interfaces.iface = os_malloc(interfaces.count *
-                                    sizeof(struct hostapd_iface *));
-       if (interfaces.iface == NULL) {
-               wpa_printf(MSG_ERROR, "malloc failed\n");
-               return -1;
-       }
-
-       if (eloop_init(&interfaces)) {
-               wpa_printf(MSG_ERROR, "Failed to initialize event loop");
-               return -1;
-       }
-
-#ifndef CONFIG_NATIVE_WINDOWS
-       eloop_register_signal(SIGHUP, handle_reload, NULL);
-       eloop_register_signal(SIGUSR1, handle_dump_state, NULL);
-#endif /* CONFIG_NATIVE_WINDOWS */
-       eloop_register_signal_terminate(handle_term, NULL);
-
-       /* Initialize interfaces */
-       for (i = 0; i < interfaces.count; i++) {
-               wpa_printf(MSG_ERROR, "Configuration file: %s",
-                          argv[optind + i]);
-               interfaces.iface[i] = hostapd_init(argv[optind + i]);
-               if (!interfaces.iface[i])
-                       goto out;
-               for (k = 0; k < debug; k++) {
-                       if (interfaces.iface[i]->bss[0]->conf->
-                           logger_stdout_level > 0)
-                               interfaces.iface[i]->bss[0]->conf->
-                                       logger_stdout_level--;
-               }
-
-               ret = hostapd_setup_interface(interfaces.iface[i]);
-               if (ret)
-                       goto out;
-
-               for (k = 0; k < (int) interfaces.iface[i]->num_bss; k++) {
-                       if (interfaces.iface[i]->bss[0]->conf->tnc)
-                               tnc++;
-               }
-       }
-
-#ifdef EAP_TNC
-       if (tnc && tncs_global_init() < 0) {
-               wpa_printf(MSG_ERROR, "Failed to initialize TNCS");
-               goto out;
-       }
-#endif /* EAP_TNC */
-
-       if (daemonize && os_daemonize(pid_file)) {
-               perror("daemon");
-               goto out;
-       }
-
-#ifndef CONFIG_NATIVE_WINDOWS
-       openlog("hostapd", 0, LOG_DAEMON);
-#endif /* CONFIG_NATIVE_WINDOWS */
-
-       eloop_run();
-
-       /* Disconnect associated stations from all interfaces and BSSes */
-       for (i = 0; i < interfaces.count; i++) {
-               for (j = 0; j < interfaces.iface[i]->num_bss; j++) {
-                       struct hostapd_data *hapd =
-                               interfaces.iface[i]->bss[j];
-                       hostapd_free_stas(hapd);
-                       hostapd_flush_old_stations(hapd);
-               }
-       }
-
-       ret = 0;
-
- out:
-       /* Deinitialize all interfaces */
-       for (i = 0; i < interfaces.count; i++) {
-               if (!interfaces.iface[i])
-                       continue;
-               hostapd_cleanup_iface_pre(interfaces.iface[i]);
-               for (j = 0; j < interfaces.iface[i]->num_bss; j++) {
-                       struct hostapd_data *hapd =
-                               interfaces.iface[i]->bss[j];
-                       hostapd_cleanup(hapd);
-                       if (j == interfaces.iface[i]->num_bss - 1 &&
-                           hapd->driver)
-                               hostapd_driver_deinit(hapd);
-               }
-               for (j = 0; j < interfaces.iface[i]->num_bss; j++)
-                       os_free(interfaces.iface[i]->bss[j]);
-               hostapd_cleanup_iface(interfaces.iface[i]);
-       }
-       os_free(interfaces.iface);
-
-#ifdef EAP_TNC
-       tncs_global_deinit();
-#endif /* EAP_TNC */
-
-       eloop_destroy();
-
-#ifndef CONFIG_NATIVE_WINDOWS
-       closelog();
-#endif /* CONFIG_NATIVE_WINDOWS */
-
-       eap_server_unregister_methods();
+       size_t j;
 
-       os_daemonize_terminate(pid_file);
+       if (iface == NULL)
+               return;
 
-       return ret;
+       hostapd_cleanup_iface_pre(iface);
+       for (j = 0; j < iface->num_bss; j++) {
+               struct hostapd_data *hapd = iface->bss[j];
+               hostapd_free_stas(hapd);
+               hostapd_flush_old_stations(hapd);
+               hostapd_cleanup(hapd);
+               if (j == iface->num_bss - 1 && hapd->driver)
+                       hostapd_driver_deinit(hapd);
+       }
+       for (j = 0; j < iface->num_bss; j++)
+               os_free(iface->bss[j]);
+       hostapd_cleanup_iface(iface);
 }