X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=hostapd%2Fhostapd.c;h=da873d0b947feb5788c260d8fe551b328784ea03;hb=03da66bd59567c90dc3b3b0892c3346472a0b413;hp=1da0bf52acfdd3afe042aa0b800f07833a8a79a5;hpb=1aa5c1347140320da0e70b4332ed652557fa9c24;p=libeap.git

diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c
index 1da0bf5..da873d0 100644
--- a/hostapd/hostapd.c
+++ b/hostapd/hostapd.c
@@ -1,6 +1,6 @@
 /*
  * hostapd / Initialization and configuration
- * Copyright (c) 2002-2008, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2002-2009, 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
@@ -13,38 +13,35 @@
  */
 
 #include "includes.h"
-#ifndef CONFIG_NATIVE_WINDOWS
-#include <syslog.h>
-#endif /* CONFIG_NATIVE_WINDOWS */
 
+#include "common.h"
 #include "eloop.h"
+#include "crypto/tls.h"
+#include "common/ieee802_11_defs.h"
+#include "eapol_auth/eapol_auth_sm.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 "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_auth.h"
-#include "ap_list.h"
+#include "sta_flags.h"
 #include "sta_info.h"
-#include "driver.h"
-#include "radius/radius_client.h"
-#include "radius/radius_server.h"
+#include "ap_list.h"
+#include "driver_i.h"
 #include "wpa.h"
 #include "preauth.h"
-#include "wme.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,
@@ -54,212 +51,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;
-};
-
-unsigned char rfc1042_header[6] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
-
-
 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 hostapd_deauth_all_stas(struct hostapd_data *hapd)
-{
-	u8 addr[ETH_ALEN];
-
-	/* New Prism2.5/3 STA firmware versions seem to have issues with this
-	 * broadcast deauth frame. This gets the firmware in odd state where
-	 * nothing works correctly, so let's skip sending this for the hostap
-	 * driver. */
-
-	if (hapd->driver && os_strcmp(hapd->driver->name, "hostap") != 0) {
-		os_memset(addr, 0xff, ETH_ALEN);
-		hostapd_sta_deauth(hapd, addr,
-				   WLAN_REASON_PREV_AUTH_NOT_VALID);
-	}
-}
-
-
-/**
- * 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);
-}
 
 
 #ifdef EAP_SERVER
@@ -281,13 +73,6 @@ static void hostapd_sim_db_cb(void *ctx, void *session_ctx)
 #endif /* EAP_SERVER */
 
 
-static void handle_term(int sig, void *eloop_ctx, void *signal_ctx)
-{
-	printf("Signal %d received - terminating\n", sig);
-	eloop_terminate();
-}
-
-
 static void hostapd_wpa_auth_conf(struct hostapd_bss_config *conf,
 				  struct wpa_auth_config *wconf)
 {
@@ -303,7 +88,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;
@@ -336,6 +121,7 @@ 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 (newconf == NULL)
@@ -345,7 +131,8 @@ 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]);
 
 	/* TODO: update dynamic data based on changed configuration
 	 * items (e.g., open/close sockets, etc.) */
@@ -375,6 +162,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);
@@ -383,157 +180,38 @@ int hostapd_reload_config(struct hostapd_iface *iface)
 }
 
 
-#ifndef CONFIG_NATIVE_WINDOWS
-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;
-
-	printf("Signal %d received - reloading configuration\n", sig);
-
-	for (i = 0; i < hapds->count; i++) {
-		if (hostapd_reload_config(hapds->iface[i]) < 0) {
-			printf("Failed to read new configuration file - "
-			       "continuing with old.\n");
-			continue;
-		}
+	if (hostapd_reload_config(iface) < 0) {
+		wpa_printf(MSG_WARNING, "Failed to read new configuration "
+			   "file - continuing with old.");
 	}
+	return 0;
 }
 
 
-#ifdef HOSTAPD_DUMP_STATE
-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) {
-		printf("Dump file not defined - ignoring dump request\n");
-		return;
-	}
-
-	printf("Dumping hostapd state to '%s'\n", hapd->conf->dump_log_name);
-	f = fopen(hapd->conf->dump_log_name, "w");
-	if (f == NULL) {
-		printf("Could not open dump file '%s' for writing.\n",
-		       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_WME ? "[WME]" : ""),
-			(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);
-}
-#endif /* HOSTAPD_DUMP_STATE */
-
-
-static void handle_dump_state(int sig, void *eloop_ctx, void *signal_ctx)
-{
-#ifdef HOSTAPD_DUMP_STATE
-	struct hapd_interfaces *hapds = (struct hapd_interfaces *) eloop_ctx;
-	size_t i, j;
-
-	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 */
-}
-#endif /* CONFIG_NATIVE_WINDOWS */
-
 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_encryption(ifname, hapd, "none", NULL, i, NULL,
-					   0, i == 0 ? 1 : 0)) {
-			printf("Failed to clear default encryption keys "
-			       "(ifname=%s keyidx=%d)\n", ifname, i);
+		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);
 		}
 	}
 #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)) {
-				printf("Failed to clear default mgmt "
-				       "encryption keys (ifname=%s keyidx=%d)"
-				       "\n", ifname, i);
+			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);
 			}
 		}
 	}
@@ -555,12 +233,10 @@ 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)) {
-		printf("Could not set WEP encryption.\n");
+	    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++;
 	}
 
@@ -577,12 +253,11 @@ 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)) {
-				printf("Could not set dynamic VLAN WEP "
-				       "encryption.\n");
+			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++;
 			}
 		}
@@ -605,8 +280,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);
@@ -641,8 +314,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);
@@ -659,9 +330,12 @@ static void hostapd_cleanup(struct hostapd_data *hapd)
 
 	if (hapd->interface_added &&
 	    hostapd_bss_remove(hapd, hapd->conf->iface)) {
-		printf("Failed to remove BSS interface %s\n",
-		       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;
 }
 
 
@@ -711,11 +385,12 @@ 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)) {
-			printf("Could not set WEP encryption.\n");
+		    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;
 		}
 		if (hapd->conf->ssid.wep.key[i] &&
@@ -736,11 +411,21 @@ static int hostapd_flush_old_stations(struct hostapd_data *hapd)
 
 	wpa_printf(MSG_DEBUG, "Flushing old station entries");
 	if (hostapd_flush(hapd)) {
-		printf("Could not connect to kernel driver.\n");
+		wpa_printf(MSG_WARNING, "Could not connect to kernel driver.");
 		ret = -1;
 	}
 	wpa_printf(MSG_DEBUG, "Deauthenticate all stations");
-	hostapd_deauth_all_stas(hapd);
+
+	/* New Prism2.5/3 STA firmware versions seem to have issues with this
+	 * broadcast deauth frame. This gets the firmware in odd state where
+	 * nothing works correctly, so let's skip sending this for the hostap
+	 * driver. */
+	if (hapd->driver && os_strcmp(hapd->driver->name, "hostap") != 0) {
+		u8 addr[ETH_ALEN];
+		os_memset(addr, 0xff, ETH_ALEN);
+		hostapd_sta_deauth(hapd, addr,
+				   WLAN_REASON_PREV_AUTH_NOT_VALID);
+	}
 
 	return ret;
 }
@@ -749,6 +434,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;
 
@@ -766,6 +452,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 */
 }
 
 
@@ -793,7 +480,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);
 }
 
 
@@ -890,7 +577,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)
 {
@@ -903,8 +590,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);
 }
 
 
@@ -949,23 +636,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);
 }
 
 
@@ -1010,7 +705,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 = hostapd_send_mgmt_frame(hapd, (u8 *) m, mlen);
 	os_free(m);
 	return res;
 }
@@ -1062,6 +757,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;
@@ -1075,8 +771,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] |=
@@ -1085,6 +784,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;
@@ -1100,8 +802,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;
@@ -1111,6 +816,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);
 
@@ -1119,19 +825,23 @@ static int hostapd_validate_bssid_configuration(struct hostapd_iface *iface)
 		return 0;
 
 	if (res < 0) {
-		printf("Driver did not accept BSSID mask " MACSTR " for start "
-		       "address " MACSTR ".\n",
-		       MAC2STR(mask), MAC2STR(hapd->own_addr));
+		wpa_printf(MSG_ERROR, "Driver did not accept BSSID mask "
+			   MACSTR " for start address " MACSTR ".",
+			   MAC2STR(mask), MAC2STR(hapd->own_addr));
 		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]) {
-			printf("Invalid BSSID mask " MACSTR " for start "
-			       "address " MACSTR ".\n"
-			       "Start address must be the first address in the"
-			       " block (i.e., addr AND mask == addr).\n",
-			       MAC2STR(mask), MAC2STR(hapd->own_addr));
+			wpa_printf(MSG_ERROR, "Invalid BSSID mask " MACSTR
+				   " for start address " MACSTR ".",
+				   MAC2STR(mask), MAC2STR(hapd->own_addr));
+			wpa_printf(MSG_ERROR, "Start address must be the "
+				   "first address in the block (i.e., addr "
+				   "AND mask == addr).");
 			return -1;
 		}
 	}
@@ -1184,7 +894,7 @@ static int hostapd_setup_wpa(struct hostapd_data *hapd)
 #endif /* CONFIG_IEEE80211R */
 	hapd->wpa_auth = wpa_init(hapd->own_addr, &_conf, &cb);
 	if (hapd->wpa_auth == NULL) {
-		printf("WPA initialization failed.\n");
+		wpa_printf(MSG_ERROR, "WPA initialization failed.");
 		return -1;
 	}
 
@@ -1202,8 +912,8 @@ static int hostapd_setup_wpa(struct hostapd_data *hapd)
 	}
 
 	if (rsn_preauth_iface_init(hapd)) {
-		printf("Initialization of RSN pre-authentication "
-		       "failed.\n");
+		wpa_printf(MSG_ERROR, "Initialization of RSN "
+			   "pre-authentication failed.");
 		return -1;
 	}
 
@@ -1239,7 +949,7 @@ static int hostapd_setup_radius_srv(struct hostapd_data *hapd,
 
 	hapd->radius_srv = radius_server_init(&srv);
 	if (hapd->radius_srv == NULL) {
-		printf("RADIUS server initialization failed.\n");
+		wpa_printf(MSG_ERROR, "RADIUS server initialization failed.");
 		return -1;
 	}
 
@@ -1276,9 +986,9 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
 			if (hostapd_mac_comp(hapd->own_addr,
 					     hapd->iface->bss[0]->own_addr) ==
 			    0) {
-				printf("BSS '%s' may not have BSSID "
-				       "set to the MAC address of the radio\n",
-				       hapd->conf->iface);
+				wpa_printf(MSG_ERROR, "BSS '%s' may not have "
+					   "BSSID set to the MAC address of "
+					   "the radio", hapd->conf->iface);
 				return -1;
 			}
 		}
@@ -1286,12 +996,19 @@ 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)) {
-			printf("Failed to add BSS (BSSID=" MACSTR ")\n",
-			       MAC2STR(hapd->own_addr));
+			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
@@ -1299,7 +1016,7 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
 	 */
 	ssid_len = hostapd_get_ssid(hapd, ssid, sizeof(ssid));
 	if (ssid_len < 0) {
-		printf("Could not read SSID from system\n");
+		wpa_printf(MSG_ERROR, "Could not read SSID from system");
 		return -1;
 	}
 	if (conf->ssid.ssid_set) {
@@ -1322,27 +1039,14 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
 	}
 
 	if (!hostapd_drv_none(hapd)) {
-		printf("Using interface %s with hwaddr " MACSTR
-		       " and ssid '%s'\n",
-		       hapd->conf->iface, MAC2STR(hapd->own_addr),
-		       hapd->conf->ssid.ssid);
+		wpa_printf(MSG_ERROR, "Using interface %s with hwaddr " MACSTR
+			   " and ssid '%s'",
+			   hapd->conf->iface, MAC2STR(hapd->own_addr),
+			   hapd->conf->ssid.ssid);
 	}
 
 	if (hostapd_setup_wpa_psk(conf)) {
-		printf("WPA-PSK setup failed.\n");
-		return -1;
-	}
-
-	/* Set flag for whether SSID is broadcast in beacons */
-	if (hostapd_set_broadcast_ssid(hapd,
-				       !!hapd->conf->ignore_broadcast_ssid)) {
-		printf("Could not set broadcast SSID flag for kernel "
-		       "driver\n");
-		return -1;
-	}
-
-	if (hostapd_set_dtim_period(hapd, hapd->conf->dtim_period)) {
-		printf("Could not set DTIM period for kernel driver\n");
+		wpa_printf(MSG_ERROR, "WPA-PSK setup failed.");
 		return -1;
 	}
 
@@ -1350,7 +1054,7 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
 	 * response frames) */
 	if (set_ssid && hostapd_set_ssid(hapd, (u8 *) conf->ssid.ssid,
 					 conf->ssid.ssid_len)) {
-		printf("Could not set SSID for kernel driver\n");
+		wpa_printf(MSG_ERROR, "Could not set SSID for kernel driver");
 		return -1;
 	}
 
@@ -1358,19 +1062,19 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
 		conf->radius->msg_dumps = 1;
 	hapd->radius = radius_client_init(hapd, conf->radius);
 	if (hapd->radius == NULL) {
-		printf("RADIUS client initialization failed.\n");
+		wpa_printf(MSG_ERROR, "RADIUS client initialization failed.");
 		return -1;
 	}
 
 	if (hostapd_acl_init(hapd)) {
-		printf("ACL initialization failed.\n");
+		wpa_printf(MSG_ERROR, "ACL initialization failed.");
 		return -1;
 	}
 	if (hostapd_init_wps(hapd, conf))
 		return -1;
 
 	if (ieee802_1x_init(hapd)) {
-		printf("IEEE 802.1X initialization failed.\n");
+		wpa_printf(MSG_ERROR, "IEEE 802.1X initialization failed.");
 		return -1;
 	}
 
@@ -1378,23 +1082,24 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
 		return -1;
 
 	if (accounting_init(hapd)) {
-		printf("Accounting initialization failed.\n");
+		wpa_printf(MSG_ERROR, "Accounting initialization failed.");
 		return -1;
 	}
 
 	if (hapd->conf->ieee802_11f &&
 	    (hapd->iapp = iapp_init(hapd, hapd->conf->iapp_iface)) == NULL) {
-		printf("IEEE 802.11F (IAPP) initialization failed.\n");
+		wpa_printf(MSG_ERROR, "IEEE 802.11F (IAPP) initialization "
+			   "failed.");
 		return -1;
 	}
 
 	if (hostapd_ctrl_iface_init(hapd)) {
-		printf("Failed to setup control interface\n");
+		wpa_printf(MSG_ERROR, "Failed to setup control interface");
 		return -1;
 	}
 
 	if (!hostapd_drv_none(hapd) && vlan_init(hapd)) {
-		printf("VLAN initialization failed.\n");
+		wpa_printf(MSG_ERROR, "VLAN initialization failed.");
 		return -1;
 	}
 
@@ -1405,7 +1110,8 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
 		if (hapd->l2 == NULL &&
 		    (hapd->driver == NULL ||
 		     hapd->driver->send_ether == NULL)) {
-			printf("Failed to open l2_packet interface\n");
+			wpa_printf(MSG_ERROR, "Failed to open l2_packet "
+				   "interface");
 			return -1;
 		}
 	}
@@ -1435,8 +1141,8 @@ static void hostapd_tx_queue_params(struct hostapd_iface *iface)
 
 		if (hostapd_set_tx_queue_params(hapd, i, p->aifs, p->cwmin,
 						p->cwmax, p->burst)) {
-			printf("Failed to set TX queue parameters for queue %d"
-			       ".\n", i);
+			wpa_printf(MSG_DEBUG, "Failed to set TX queue "
+				   "parameters for queue %d.", i);
 			/* Continue anyway */
 		}
 	}
@@ -1489,24 +1195,18 @@ static int setup_interface(struct hostapd_iface *iface)
 	size_t i;
 	char country[4];
 	u8 *b = conf->bssid;
-	int freq;
-	size_t j;
-	int ret = 0;
-	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) {
-		printf("%s driver initialization failed.\n",
-			hapd->driver ? hapd->driver->name : "Unknown");
+		wpa_printf(MSG_ERROR, "%s driver initialization failed.",
+			   hapd->driver ? hapd->driver->name : "Unknown");
 		hapd->driver = NULL;
 		return -1;
 	}
@@ -1518,82 +1218,87 @@ 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 */
-
-	os_memcpy(country, hapd->iconf->country, 3);
-	country[3] = '\0';
-	if (hostapd_set_country(hapd, country) < 0) {
-		printf("Failed to set country code\n");
-		return -1;
-	}
-
-	if (hapd->iconf->ieee80211d &&
-	    hostapd_set_ieee80211d(hapd, 1) < 0) {
-		printf("Failed to set ieee80211d (%d)\n",
-		       hapd->iconf->ieee80211d);
-		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->bridge_packets != INTERNAL_BRIDGE_DO_NOT_CONTROL &&
 	    hostapd_set_internal_bridge(hapd, hapd->iconf->bridge_packets)) {
-		printf("Failed to set bridge_packets for kernel driver\n");
+		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. */
 	} else {
 		int ret = hostapd_select_hw_mode(iface);
 		if (ret < 0) {
-			printf("Could not select hw_mode and channel. (%d)\n",
-			       ret);
+			wpa_printf(MSG_ERROR, "Could not select hw_mode and "
+				   "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);
-		printf("Mode: %s  Channel: %d  Frequency: %d MHz\n",
-		       hostapd_hw_mode_txt(hapd->iconf->hw_mode),
-		       hapd->iconf->channel, freq);
+		wpa_printf(MSG_DEBUG, "Mode: %s  Channel: %d  "
+			   "Frequency: %d MHz",
+			   hostapd_hw_mode_txt(hapd->iconf->hw_mode),
+			   hapd->iconf->channel, freq);
 
 		if (hostapd_set_freq(hapd, hapd->iconf->hw_mode, freq,
+				     hapd->iconf->channel,
 				     hapd->iconf->ieee80211n,
 				     hapd->iconf->secondary_channel)) {
-			printf("Could not set channel for kernel driver\n");
+			wpa_printf(MSG_ERROR, "Could not set channel for "
+				   "kernel driver");
 			return -1;
 		}
 	}
 
-	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)) {
-		printf("Could not set RTS threshold for kernel driver\n");
+		wpa_printf(MSG_ERROR, "Could not set RTS threshold for "
+			   "kernel driver");
 		return -1;
 	}
 
 	if (hapd->iconf->fragm_threshold > -1 &&
 	    hostapd_set_frag(hapd, hapd->iconf->fragm_threshold)) {
-		printf("Could not set fragmentation threshold for kernel "
-		       "driver\n");
+		wpa_printf(MSG_ERROR, "Could not set fragmentation threshold "
+			   "for kernel driver");
 		return -1;
 	}
 
@@ -1619,7 +1324,10 @@ static int setup_interface(struct hostapd_iface *iface)
 		return -1;
 	}
 
-	return ret;
+	wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
+		   iface->bss[0]->conf->iface);
+
+	return 0;
 }
 
 
@@ -1633,7 +1341,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;
 
@@ -1643,47 +1351,12 @@ static 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;
 }
 
 
-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-2008, 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
@@ -1695,7 +1368,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)
@@ -1710,11 +1383,6 @@ hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
 	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 ||
@@ -1723,7 +1391,7 @@ hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
 
 		hapd->ssl_ctx = tls_init(NULL);
 		if (hapd->ssl_ctx == NULL) {
-			printf("Failed to initialize TLS\n");
+			wpa_printf(MSG_ERROR, "Failed to initialize TLS");
 			goto fail;
 		}
 
@@ -1735,13 +1403,13 @@ hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
 		params.dh_file = hapd->conf->dh_file;
 
 		if (tls_global_set_params(hapd->ssl_ctx, &params)) {
-			printf("Failed to set TLS parameters\n");
+			wpa_printf(MSG_ERROR, "Failed to set TLS parameters");
 			goto fail;
 		}
 
 		if (tls_global_set_verify(hapd->ssl_ctx,
 					  hapd->conf->check_crl)) {
-			printf("Failed to enable check_crl\n");
+			wpa_printf(MSG_ERROR, "Failed to enable check_crl");
 			goto fail;
 		}
 	}
@@ -1753,8 +1421,8 @@ hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
 			eap_sim_db_init(hapd->conf->eap_sim_db,
 					hostapd_sim_db_cb, hapd);
 		if (hapd->eap_sim_db_priv == NULL) {
-			printf("Failed to initialize EAP-SIM database "
-			       "interface\n");
+			wpa_printf(MSG_ERROR, "Failed to initialize EAP-SIM "
+				   "database interface");
 			goto fail;
 		}
 	}
@@ -1773,229 +1441,46 @@ 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)
+void hostapd_interface_deinit(struct hostapd_iface *iface)
 {
-	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;
+	size_t j;
 
-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);
-		}
+	if (iface == NULL)
+		return;
 
-		os_free(hapd_iface->config_fname);
-		os_free(hapd_iface->bss);
-		os_free(hapd_iface);
-	}
-	return NULL;
+	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);
 }
 
 
-int main(int argc, char *argv[])
+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 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();
+	struct hostapd_probereq_cb *n;
 
-	if (eap_server_register_methods()) {
-		wpa_printf(MSG_ERROR, "Failed to register EAP methods");
+	n = os_realloc(hapd->probereq_cb, (hapd->num_probereq_cb + 1) *
+		       sizeof(struct hostapd_probereq_cb));
+	if (n == NULL)
 		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++) {
-		printf("Configuration file: %s\n", 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;
-	}
+	hapd->probereq_cb = n;
+	n = &hapd->probereq_cb[hapd->num_probereq_cb];
+	hapd->num_probereq_cb++;
 
-#ifndef CONFIG_NATIVE_WINDOWS
-	openlog("hostapd", 0, LOG_DAEMON);
-#endif /* CONFIG_NATIVE_WINDOWS */
+	n->cb = cb;
+	n->ctx = ctx;
 
-	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();
-
-	os_daemonize_terminate(pid_file);
-
-	return ret;
+	return 0;
 }