Fixed copy-paste error in retry configuration (incorrect ioctl used)
[wpasupplicant] / hostapd / hostapd.c
index 9f6b168..51379dd 100644 (file)
@@ -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
 #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 "driver.h"
+#include "driver_i.h"
 #include "radius/radius_client.h"
 #include "radius/radius_server.h"
 #include "wpa.h"
 #include "preauth.h"
-#include "wme.h"
 #include "vlan_init.h"
 #include "ctrl_iface.h"
 #include "tls.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);
 
 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;
 
 
+int hostapd_for_each_interface(int (*cb)(struct hostapd_iface *iface,
+                                        void *ctx), void *ctx)
+{
+       struct hapd_interfaces *interfaces = eloop_get_user_data();
+       size_t i;
+       int ret;
+
+       for (i = 0; i < interfaces->count; i++) {
+               ret = cb(interfaces->iface[i], ctx);
+               if (ret)
+                       return ret;
+       }
+
+       return 0;
+}
+
+
+#ifndef CONFIG_NO_HOSTAPD_LOGGER
 static void hostapd_logger_cb(void *ctx, const u8 *addr, unsigned int module,
                              int level, const char *txt, size_t len)
 {
@@ -162,99 +182,7 @@ static void hostapd_logger_cb(void *ctx, const u8 *addr, unsigned int module,
 
        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)
-                       wpa_auth_sm_event(sta->wpa_sm, WPA_REAUTH);
-       } else
-               wpa_auth_sta_associated(hapd->wpa_auth, sta->wpa_sm);
-}
+#endif /* CONFIG_NO_HOSTAPD_LOGGER */
 
 
 #ifdef EAP_SERVER
@@ -276,9 +204,12 @@ 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)
 {
-       printf("Signal %d received - terminating\n", sig);
+       wpa_printf(MSG_DEBUG, "Signal %d received - terminating", sig);
        eloop_terminate();
 }
 
@@ -326,46 +257,85 @@ static void hostapd_wpa_auth_conf(struct hostapd_bss_config *conf,
 }
 
 
-#ifndef CONFIG_NATIVE_WINDOWS
-static void handle_reload(int sig, void *eloop_ctx, void *signal_ctx)
+int hostapd_reload_config(struct hostapd_iface *iface)
 {
-       struct hapd_interfaces *hapds = (struct hapd_interfaces *) eloop_ctx;
-       struct hostapd_config *newconf;
-       size_t i;
+       struct hostapd_data *hapd = iface->bss[0];
+       struct hostapd_config *newconf, *oldconf;
        struct wpa_auth_config wpa_auth_conf;
 
-       printf("Signal %d received - reloading configuration\n", sig);
+       newconf = hostapd_config_read(iface->config_fname);
+       if (newconf == NULL)
+               return -1;
 
-       for (i = 0; i < hapds->count; i++) {
-               struct hostapd_data *hapd = hapds->iface[i]->bss[0];
-               newconf = hostapd_config_read(hapds->iface[i]->config_fname);
-               if (newconf == NULL) {
-                       printf("Failed to read new configuration file - "
-                              "continuing with old.\n");
-                       continue;
-               }
-               /* TODO: update dynamic data based on changed configuration
-                * items (e.g., open/close sockets, remove stations added to
-                * deny list, etc.) */
-               radius_client_flush(hapd->radius, 0);
-               hostapd_config_free(hapd->iconf);
+       /*
+        * Deauthenticate all stations since the new configuration may not
+        * allow them to use the BSS anymore.
+        */
+       hostapd_flush_old_stations(hapd);
+
+       /* TODO: update dynamic data based on changed configuration
+        * items (e.g., open/close sockets, etc.) */
+       radius_client_flush(hapd->radius, 0);
+
+       oldconf = hapd->iconf;
+       hapd->iconf = newconf;
+       hapd->conf = &newconf->bss[0];
+       iface->conf = newconf;
+
+       if (hostapd_setup_wpa_psk(hapd->conf)) {
+               wpa_printf(MSG_ERROR, "Failed to re-configure WPA PSK "
+                          "after reloading configuration");
+       }
 
+       if (hapd->conf->wpa && hapd->wpa_auth == NULL)
+               hostapd_setup_wpa(hapd);
+       else if (hapd->conf->wpa) {
                hostapd_wpa_auth_conf(&newconf->bss[0], &wpa_auth_conf);
                wpa_reconfig(hapd->wpa_auth, &wpa_auth_conf);
+       } else if (hapd->wpa_auth) {
+               wpa_deinit(hapd->wpa_auth);
+               hapd->wpa_auth = NULL;
+               hostapd_set_privacy(hapd, 0);
+               hostapd_setup_encryption(hapd->conf->iface, hapd);
+       }
+
+       ieee802_11_set_beacon(hapd);
+
+       hostapd_config_free(oldconf);
 
-               hapd->iconf = newconf;
-               hapd->conf = &newconf->bss[0];
-               hapds->iface[i]->conf = newconf;
+       wpa_printf(MSG_DEBUG, "Reconfigured interface %s", hapd->conf->iface);
 
-               if (hostapd_setup_wpa_psk(hapd->conf)) {
-                       wpa_printf(MSG_ERROR, "Failed to re-configure WPA PSK "
-                                  "after reloading configuration");
+       return 0;
+}
+
+
+#ifndef CONFIG_NATIVE_WINDOWS
+/**
+ * handle_reload - SIGHUP handler to reload configuration
+ */
+static void handle_reload(int sig, void *eloop_ctx, void *signal_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;
                }
        }
 }
 
 
 #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;
@@ -375,15 +345,17 @@ static void hostapd_dump_state(struct hostapd_data *hapd)
        char *buf;
 
        if (!hapd->conf->dump_log_name) {
-               printf("Dump file not defined - ignoring dump request\n");
+               wpa_printf(MSG_DEBUG, "Dump file not defined - ignoring dump "
+                          "request");
                return;
        }
 
-       printf("Dumping hostapd state to '%s'\n", hapd->conf->dump_log_name);
+       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) {
-               printf("Could not open dump file '%s' for writing.\n",
-                      hapd->conf->dump_log_name);
+               wpa_printf(MSG_WARNING, "Could not open dump file '%s' for "
+                          "writing.", hapd->conf->dump_log_name);
                return;
        }
 
@@ -400,7 +372,7 @@ static void hostapd_dump_state(struct hostapd_data *hapd)
                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\n"
+                       "  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,
@@ -418,6 +390,8 @@ static void hostapd_dump_state(struct hostapd_data *hapd)
                        (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);
@@ -483,10 +457,24 @@ static void hostapd_broadcast_key_clear_iface(struct hostapd_data *hapd,
        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);
+                       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)) {
+                               wpa_printf(MSG_DEBUG, "Failed to clear "
+                                          "default mgmt encryption keys "
+                                          "(ifname=%s keyidx=%d)", ifname, i);
+                       }
                }
        }
+#endif /* CONFIG_IEEE80211W */
 }
 
 
@@ -509,7 +497,7 @@ static int hostapd_broadcast_wep_set(struct hostapd_data *hapd)
                                   ssid->wep.key[idx],
                                   ssid->wep.len[idx],
                                   idx == ssid->wep.idx)) {
-               printf("Could not set WEP encryption.\n");
+               wpa_printf(MSG_WARNING, "Could not set WEP encryption.");
                errors++;
        }
 
@@ -530,8 +518,8 @@ static int hostapd_broadcast_wep_set(struct hostapd_data *hapd)
                                                   idx, key->key[idx],
                                                   key->len[idx],
                                                   idx == key->idx)) {
-                               printf("Could not set dynamic VLAN WEP "
-                                      "encryption.\n");
+                               wpa_printf(MSG_WARNING, "Could not set "
+                                          "dynamic VLAN WEP encryption.");
                                errors++;
                        }
                }
@@ -588,6 +576,8 @@ static void hostapd_cleanup(struct hostapd_data *hapd)
        l2_packet_deinit(hapd->l2);
 #endif /* CONFIG_IEEE80211R */
 
+       hostapd_deinit_wps(hapd);
+
        hostapd_wireless_event_deinit(hapd);
 
 #ifdef EAP_TLS_FUNCS
@@ -606,8 +596,8 @@ 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);
        }
 }
 
@@ -662,7 +652,8 @@ static int hostapd_setup_encryption(char *iface, struct hostapd_data *hapd)
                                           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");
+                       wpa_printf(MSG_WARNING, "Could not set WEP "
+                                  "encryption.");
                        return -1;
                }
                if (hapd->conf->ssid.wep.key[i] &&
@@ -683,11 +674,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;
 }
@@ -696,6 +697,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;
 
@@ -713,6 +715,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 */
 }
 
 
@@ -740,7 +743,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);
 }
 
 
@@ -1066,19 +1069,20 @@ 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;
        }
 
        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;
                }
        }
@@ -1131,7 +1135,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;
        }
 
@@ -1149,8 +1153,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;
        }
 
@@ -1178,12 +1182,15 @@ static int hostapd_setup_radius_srv(struct hostapd_data *hapd,
        srv.pac_key_refresh_time = conf->pac_key_refresh_time;
        srv.eap_sim_aka_result_ind = conf->eap_sim_aka_result_ind;
        srv.tnc = conf->tnc;
+       srv.wps = hapd->wps;
        srv.ipv6 = conf->radius_server_ipv6;
        srv.get_eap_user = hostapd_radius_get_eap_user;
+       srv.eap_req_id_text = conf->eap_req_id_text;
+       srv.eap_req_id_text_len = conf->eap_req_id_text_len;
 
        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;
        }
 
@@ -1220,9 +1227,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;
                        }
                }
@@ -1230,8 +1237,8 @@ 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;
                }
        }
@@ -1243,7 +1250,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) {
@@ -1266,27 +1273,28 @@ 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");
+               wpa_printf(MSG_ERROR, "WPA-PSK setup failed.");
                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");
+               wpa_printf(MSG_ERROR, "Could not set broadcast SSID flag for "
+                          "kernel driver");
                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, "Could not set DTIM period for kernel "
+                          "driver");
                return -1;
        }
 
@@ -1294,7 +1302,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;
        }
 
@@ -1302,17 +1310,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;
        }
 
@@ -1320,23 +1330,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;
        }
 
@@ -1347,7 +1358,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;
                }
        }
@@ -1377,153 +1389,14 @@ 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 */
                }
        }
 }
 
 
-/**
- * setup_interface2 - Setup (initialize) an interface (part 2)
- * @iface: Pointer to interface data.
- * Returns: 0 on success; -1 on failure.
- *
- * Flushes old stations, sets the channel, DFS parameters, encryption,
- * beacons, and WDS links based on the configuration.
- */
-static int setup_interface2(struct hostapd_iface *iface)
-{
-       struct hostapd_data *hapd = iface->bss[0];
-       int freq;
-       size_t j;
-       int ret = 0;
-       u8 *prev_addr;
-
-       hostapd_flush_old_stations(hapd);
-       hostapd_set_privacy(hapd, 0);
-
-       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);
-
-               if (hostapd_set_freq(hapd, hapd->iconf->hw_mode, freq)) {
-                       printf("Could not set channel for kernel driver\n");
-                       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");
-               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");
-               return -1;
-       }
-
-       prev_addr = hapd->own_addr;
-
-       for (j = 0; j < iface->num_bss; j++) {
-               hapd = iface->bss[j];
-               if (j)
-                       os_memcpy(hapd->own_addr, prev_addr, ETH_ALEN);
-               if (hostapd_setup_bss(hapd, j == 0))
-                       return -1;
-               if (hostapd_mac_comp_empty(hapd->conf->bssid) == 0)
-                       prev_addr = hapd->own_addr;
-       }
-
-       hostapd_tx_queue_params(iface);
-
-       ap_list_init(iface);
-
-       if (hostapd_driver_commit(hapd) < 0) {
-               wpa_printf(MSG_ERROR, "%s: Failed to commit driver "
-                          "configuration", __func__);
-               return -1;
-       }
-
-       return ret;
-}
-
-
-static void setup_interface_start(void *eloop_data, void *user_ctx);
-static void setup_interface2_handler(void *eloop_data, void *user_ctx);
-
-/**
- * setup_interface_finalize - Finish setup interface & call the callback
- * @iface: Pointer to interface data.
- * @status: Status of the setup interface (0 on success; -1 on failure).
- * Returns: 0 on success; -1 on failure (e.g., was not in progress).
- */
-static int setup_interface_finalize(struct hostapd_iface *iface, int status)
-{
-       hostapd_iface_cb cb;
-
-       if (!iface->setup_cb)
-               return -1;
-       
-       eloop_cancel_timeout(setup_interface_start, iface, NULL);
-       eloop_cancel_timeout(setup_interface2_handler, iface, NULL);
-       hostapd_select_hw_mode_stop(iface);
-
-       cb = iface->setup_cb;
-
-       iface->setup_cb = NULL;
-
-       cb(iface, status);
-
-       return 0;
-}
-
-
-/**
- * setup_interface2_wrapper - Wrapper for setup_interface2()
- * @iface: Pointer to interface data.
- * @status: Status of the hw mode select.
- *
- * Wrapper for setup_interface2() to calls finalize function upon completion.
- */
-static void setup_interface2_wrapper(struct hostapd_iface *iface, int status)
-{
-       int ret = status;
-       if (ret)
-               printf("Could not select hw_mode and channel. (%d)\n", ret);
-       else
-               ret = setup_interface2(iface);
-
-       setup_interface_finalize(iface, ret);
-}
-
-
-/**
- * setup_interface2_handler - Used for immediate call of setup_interface2
- * @eloop_data: Stores the struct hostapd_iface * for the interface.
- * @user_ctx: Unused.
- */
-static void setup_interface2_handler(void *eloop_data, void *user_ctx)
-{
-       struct hostapd_iface *iface = eloop_data;
-
-       setup_interface2_wrapper(iface, 0);
-}
-
-
 static int hostapd_radius_get_eap_user(void *ctx, const u8 *identity,
                                       size_t identity_len, int phase2,
                                       struct eap_user *user)
@@ -1563,23 +1436,17 @@ static int hostapd_radius_get_eap_user(void *ctx, const u8 *identity,
 }
 
 
-/**
- * setup_interface1 - Setup (initialize) an interface (part 1)
- * @iface: Pointer to interface data
- * Returns: 0 on success, -1 on failure
- *
- * Initializes the driver interface, validates the configuration,
- * and sets driver parameters based on the configuration.
- * Schedules setup_interface2() to be called immediately or after
- * hardware mode setup takes place. 
- */
-static int setup_interface1(struct hostapd_iface *iface)
+static int setup_interface(struct hostapd_iface *iface)
 {
        struct hostapd_data *hapd = iface->bss[0];
        struct hostapd_bss_config *conf = hapd->conf;
        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
@@ -1592,8 +1459,8 @@ static int setup_interface1(struct hostapd_iface *iface)
        }
 
        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;
        }
@@ -1614,20 +1481,21 @@ static int setup_interface1(struct hostapd_iface *iface)
        os_memcpy(country, hapd->iconf->country, 3);
        country[3] = '\0';
        if (hostapd_set_country(hapd, country) < 0) {
-               printf("Failed to set country code\n");
+               wpa_printf(MSG_ERROR, "Failed to set country code");
                return -1;
        }
 
        if (hapd->iconf->ieee80211d &&
            hostapd_set_ieee80211d(hapd, 1) < 0) {
-               printf("Failed to set ieee80211d (%d)\n",
-                      hapd->iconf->ieee80211d);
+               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)) {
-               printf("Failed to set bridge_packets for kernel driver\n");
+               wpa_printf(MSG_ERROR, "Failed to set bridge_packets for "
+                          "kernel driver");
                return -1;
        }
 
@@ -1639,84 +1507,116 @@ static int setup_interface1(struct hostapd_iface *iface)
                /* Not all drivers support this yet, so continue without hw
                 * feature data. */
        } else {
-               return hostapd_select_hw_mode_start(iface,
-                                                   setup_interface2_wrapper);
+               int ret = hostapd_select_hw_mode(iface);
+               if (ret < 0) {
+                       wpa_printf(MSG_ERROR, "Could not select hw_mode and "
+                                  "channel. (%d)", ret);
+                       return -1;
+               }
        }
 
-       eloop_register_timeout(0, 0, setup_interface2_handler, iface, NULL);
-       return 0;
-}
+       hostapd_flush_old_stations(hapd);
+       hostapd_set_privacy(hapd, 0);
 
+       if (hapd->iconf->channel) {
+               freq = hostapd_hw_get_freq(hapd, hapd->iconf->channel);
+               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->ieee80211n,
+                                    hapd->iconf->secondary_channel)) {
+                       wpa_printf(MSG_ERROR, "Could not set channel for "
+                                  "kernel driver");
+                       return -1;
+               }
+       }
 
-/**
- * setup_interface_start - Handler to start setup interface
- * @eloop_data: Stores the struct hostapd_iface * for the interface.
- * @user_ctx: Unused.
- *
- * An eloop handler is used so that all errors can be processed by the
- * callback without introducing stack recursion.
- */
-static void setup_interface_start(void *eloop_data, void *user_ctx)
-{
-       struct hostapd_iface *iface = eloop_data;
+       hostapd_broadcast_wep_clear(hapd);
+       if (hostapd_setup_encryption(hapd->conf->iface, hapd))
+               return -1;
 
-       int ret;
+       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 "
+                          "kernel driver");
+               return -1;
+       }
 
-       ret = setup_interface1(iface);
-       if (ret)
-               setup_interface_finalize(iface, ret);
+       if (hapd->iconf->fragm_threshold > -1 &&
+           hostapd_set_frag(hapd, hapd->iconf->fragm_threshold)) {
+               wpa_printf(MSG_ERROR, "Could not set fragmentation threshold "
+                          "for kernel driver");
+               return -1;
+       }
+
+       prev_addr = hapd->own_addr;
+
+       for (j = 0; j < iface->num_bss; j++) {
+               hapd = iface->bss[j];
+               if (j)
+                       os_memcpy(hapd->own_addr, prev_addr, ETH_ALEN);
+               if (hostapd_setup_bss(hapd, j == 0))
+                       return -1;
+               if (hostapd_mac_comp_empty(hapd->conf->bssid) == 0)
+                       prev_addr = hapd->own_addr;
+       }
+
+       hostapd_tx_queue_params(iface);
+
+       ap_list_init(iface);
+
+       if (hostapd_driver_commit(hapd) < 0) {
+               wpa_printf(MSG_ERROR, "%s: Failed to commit driver "
+                          "configuration", __func__);
+               return -1;
+       }
+
+       return ret;
 }
 
 
 /**
- * hostapd_setup_interface_start - Start the setup of an interface
+ * hostapd_setup_interface - Setup of an interface
  * @iface: Pointer to interface data.
- * @cb: The function to callback when done.
- * Returns:  0 if it starts successfully; cb will be called when done.
- *          -1 on failure; cb will not be called.
+ * Returns: 0 on success, -1 on failure
  *
  * Initializes the driver interface, validates the configuration,
  * and sets driver parameters based on the configuration.
- * Flushes old stations, sets the channel, DFS parameters, encryption,
+ * Flushes old stations, sets the channel, encryption,
  * beacons, and WDS links based on the configuration.
  */
-int hostapd_setup_interface_start(struct hostapd_iface *iface,
-                                 hostapd_iface_cb cb)
+static int hostapd_setup_interface(struct hostapd_iface *iface)
 {
-       if (iface->setup_cb) {
-               wpa_printf(MSG_DEBUG,
-                          "%s: Interface setup already in progress.\n",
+       int ret;
+
+       ret = setup_interface(iface);
+       if (ret) {
+               wpa_printf(MSG_DEBUG, "%s: Unable to setup interface.",
                           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);
        }
 
-       iface->setup_cb = cb;
-
-       eloop_register_timeout(0, 0, setup_interface_start, iface, NULL);
-
        return 0;
 }
 
 
-/**
- * hostapd_setup_interace_stop - Stops the setup of an interface
- * @iface: Pointer to interface data
- * Returns:  0 if successfully stopped;
- *          -1 on failure (i.e., was not in progress)
- */
-int hostapd_setup_interface_stop(struct hostapd_iface *iface)
-{
-       return setup_interface_finalize(iface, -1);
-}
-
-
 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> "
+               "Copyright (c) 2002-2009, Jouni Malinen <j@w1.fi> "
                "and contributors\n");
 }
 
@@ -1781,7 +1681,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;
                }
 
@@ -1793,13 +1693,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;
                }
        }
@@ -1811,16 +1711,13 @@ 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;
                }
        }
 #endif /* EAP_SERVER */
 
-       if (hapd->conf->assoc_ap)
-               hapd->assoc_ap_state = WAIT_BEACON;
-
        hapd->driver = hapd->iconf->driver;
 
        return hapd;
@@ -1897,42 +1794,140 @@ fail:
 }
 
 
-/**
- * register_drivers - Register driver interfaces
- *
- * This function is generated by Makefile (into driver_conf.c) to call all
- * configured driver interfaces to register them to core hostapd.
- */
-void register_drivers(void);
+static int hostapd_global_init(struct hapd_interfaces *interfaces)
+{
+       hostapd_logger_register_cb(hostapd_logger_cb);
 
+       if (eap_server_register_methods()) {
+               wpa_printf(MSG_ERROR, "Failed to register EAP methods");
+               return -1;
+       }
 
-/**
- * setup_interface_done - Callback when an interface is done being setup.
- * @iface: Pointer to interface data.
- * @status: Status of the interface setup (0 on success; -1 on failure).
- */
-static void setup_interface_done(struct hostapd_iface *iface, int status)
+       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);
+
+#ifndef CONFIG_NATIVE_WINDOWS
+       openlog("hostapd", 0, LOG_DAEMON);
+#endif /* CONFIG_NATIVE_WINDOWS */
+
+       return 0;
+}
+
+
+static void hostapd_global_deinit(const char *pid_file)
 {
-       if (status) {
-               wpa_printf(MSG_DEBUG, "%s: Unable to setup interface.",
-                          iface->bss[0]->conf->iface);
-               eloop_terminate();
-       } else if (!hostapd_drv_none(iface->bss[0]))
-               wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
-                          iface->bss[0]->conf->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);
+}
+
+
+static void hostapd_interface_deinit(struct hostapd_iface *iface)
+{
+       size_t j;
+
+       if (iface == NULL)
+               return;
+
+       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);
+}
+
+
+static struct hostapd_iface * hostapd_interface_init(const char *config_fname,
+                                                    int debug)
+{
+       struct hostapd_iface *iface;
+       int k;
+
+       wpa_printf(MSG_ERROR, "Configuration file: %s", config_fname);
+       iface = hostapd_init(config_fname);
+       if (!iface)
+               return NULL;
+
+       for (k = 0; k < debug; k++) {
+               if (iface->bss[0]->conf->logger_stdout_level > 0)
+                       iface->bss[0]->conf->logger_stdout_level--;
+       }
+
+       if (hostapd_setup_interface(iface)) {
+               hostapd_interface_deinit(iface);
+               return NULL;
+       }
+
+       return iface;
+}
+
+
+static int hostapd_global_run(struct hapd_interfaces *ifaces, int daemonize,
+                             const char *pid_file)
+{
+#ifdef EAP_TNC
+       int tnc = 0;
+       size_t i, k;
+
+       for (i = 0; !tnc && i < ifaces->count; i++) {
+               for (k = 0; k < ifaces->iface[i]->num_bss; k++) {
+                       if (ifaces->iface[i]->bss[0]->conf->tnc) {
+                               tnc++;
+                               break;
+                       }
+               }
+       }
+
+       if (tnc && tncs_global_init() < 0) {
+               wpa_printf(MSG_ERROR, "Failed to initialize TNCS");
+               return -1;
+       }
+#endif /* EAP_TNC */
+
+       if (daemonize && os_daemonize(pid_file)) {
+               perror("daemon");
+               return -1;
+       }
+
+       eloop_run();
+
+       return 0;
 }
 
 
 int main(int argc, char *argv[])
 {
        struct hapd_interfaces interfaces;
-       int ret = 1, k;
-       size_t i, j;
-       int c, debug = 0, daemonize = 0, tnc = 0;
+       int ret = 1;
+       size_t i;
+       int c, debug = 0, daemonize = 0;
        const char *pid_file = NULL;
 
-       hostapd_logger_register_cb(hostapd_logger_cb);
-
        for (;;) {
                c = getopt(argc, argv, "BdhKP:tv");
                if (c < 0)
@@ -1972,13 +1967,7 @@ int main(int argc, char *argv[])
        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) {
@@ -1986,105 +1975,29 @@ int main(int argc, char *argv[])
                return -1;
        }
 
-       if (eloop_init(&interfaces)) {
-               wpa_printf(MSG_ERROR, "Failed to initialize event loop");
+       if (hostapd_global_init(&interfaces))
                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]);
+               interfaces.iface[i] = hostapd_interface_init(argv[optind + i],
+                                                            debug);
                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_start(interfaces.iface[i],
-                                                   setup_interface_done);
-               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");
+       if (hostapd_global_run(&interfaces, daemonize, pid_file))
                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_setup_interface_stop(interfaces.iface[i]);
-               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]);
-       }
+       for (i = 0; i < interfaces.count; i++)
+               hostapd_interface_deinit(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);
+       hostapd_global_deinit(pid_file);
 
        return ret;
 }