Fixed copy-paste error in retry configuration (incorrect ioctl used)
[wpasupplicant] / hostapd / hostapd.c
index 3431d2d..51379dd 100644 (file)
 #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_i.h"
 #include "radius/radius_client.h"
 #include "radius/radius_server.h"
-#include "radius/radius.h"
 #include "wpa.h"
 #include "preauth.h"
-#include "wme.h"
 #include "vlan_init.h"
 #include "ctrl_iface.h"
 #include "tls.h"
@@ -46,7 +44,7 @@
 #include "version.h"
 #include "l2_packet/l2_packet.h"
 #include "wps_hostapd.h"
-#include "mlme.h"
+#include "tkip_countermeasures.h"
 
 
 static int hostapd_radius_get_eap_user(void *ctx, const u8 *identity,
@@ -67,6 +65,24 @@ 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)
 {
@@ -166,326 +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);
-               }
-       }
-}
-
-
-static void ieee80211_tkip_countermeasures_stop(void *eloop_ctx,
-                                               void *timeout_ctx)
-{
-       struct hostapd_data *hapd = eloop_ctx;
-       hapd->tkip_countermeasures = 0;
-       hostapd_set_countermeasures(hapd, 0);
-       hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211,
-                      HOSTAPD_LEVEL_INFO, "TKIP countermeasures ended");
-}
-
-
-static void ieee80211_tkip_countermeasures_start(struct hostapd_data *hapd)
-{
-       struct sta_info *sta;
-
-       hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211,
-                      HOSTAPD_LEVEL_INFO, "TKIP countermeasures initiated");
-
-       wpa_auth_countermeasures_start(hapd->wpa_auth);
-       hapd->tkip_countermeasures = 1;
-       hostapd_set_countermeasures(hapd, 1);
-       wpa_gtk_rekey(hapd->wpa_auth);
-       eloop_cancel_timeout(ieee80211_tkip_countermeasures_stop, hapd, NULL);
-       eloop_register_timeout(60, 0, ieee80211_tkip_countermeasures_stop,
-                              hapd, NULL);
-       for (sta = hapd->sta_list; sta != NULL; sta = sta->next) {
-               hostapd_sta_deauth(hapd, sta->addr,
-                                  WLAN_REASON_MICHAEL_MIC_FAILURE);
-               sta->flags &= ~(WLAN_STA_AUTH | WLAN_STA_ASSOC |
-                               WLAN_STA_AUTHORIZED);
-               hostapd_sta_remove(hapd, sta->addr);
-       }
-}
-
-
-static void ieee80211_michael_mic_failure(struct hostapd_data *hapd,
-                                         const u8 *addr, int local)
-{
-       time_t now;
-
-       if (addr && local) {
-               struct sta_info *sta = ap_get_sta(hapd, addr);
-               if (sta != NULL) {
-                       wpa_auth_sta_local_mic_failure_report(sta->wpa_sm);
-                       hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
-                                      HOSTAPD_LEVEL_INFO,
-                                      "Michael MIC failure detected in "
-                                      "received frame");
-                       mlme_michaelmicfailure_indication(hapd, addr);
-               } else {
-                       wpa_printf(MSG_DEBUG,
-                                  "MLME-MICHAELMICFAILURE.indication "
-                                  "for not associated STA (" MACSTR
-                                  ") ignored", MAC2STR(addr));
-                       return;
-               }
-       }
-
-       time(&now);
-       if (now > hapd->michael_mic_failure + 60) {
-               hapd->michael_mic_failures = 1;
-       } else {
-               hapd->michael_mic_failures++;
-               if (hapd->michael_mic_failures > 1)
-                       ieee80211_tkip_countermeasures_start(hapd);
-       }
-       hapd->michael_mic_failure = now;
-}
-
-
-/**
- * hostapd_new_assoc_sta - Notify that a new station associated with the AP
- * @hapd: Pointer to BSS data
- * @sta: Pointer to the associated STA data
- * @reassoc: 1 to indicate this was a re-association; 0 = first association
- *
- * This function will be called whenever a station associates with the AP. It
- * can be called for ieee802_11.c for drivers that export MLME to hostapd and
- * from driver_*.c for drivers that take care of management frames (IEEE 802.11
- * authentication and association) internally.
- */
-void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta,
-                          int reassoc)
-{
-       if (hapd->tkip_countermeasures) {
-               hostapd_sta_deauth(hapd, sta->addr,
-                                  WLAN_REASON_MICHAEL_MIC_FAILURE);
-               return;
-       }
-
-       hostapd_prune_associations(hapd, sta);
-
-       /* IEEE 802.11F (IAPP) */
-       if (hapd->conf->ieee802_11f)
-               iapp_new_station(hapd->iapp, sta);
-
-       /* Start accounting here, if IEEE 802.1X and WPA are not used.
-        * IEEE 802.1X/WPA code will start accounting after the station has
-        * been authorized. */
-       if (!hapd->conf->ieee802_1x && !hapd->conf->wpa)
-               accounting_sta_start(hapd, sta);
-
-       hostapd_wme_sta_config(hapd, sta);
-
-       /* Start IEEE 802.1X authentication process for new stations */
-       ieee802_1x_new_station(hapd, sta);
-       if (reassoc) {
-               if (sta->auth_alg != WLAN_AUTH_FT &&
-                   !(sta->flags & (WLAN_STA_WPS | WLAN_STA_MAYBE_WPS)))
-                       wpa_auth_sm_event(sta->wpa_sm, WPA_REAUTH);
-       } else
-               wpa_auth_sta_associated(hapd->wpa_auth, sta->wpa_sm);
-}
-
-
-void hostapd_tx_status(struct hostapd_data *hapd, const u8 *addr,
-                      const u8 *buf, size_t len, int ack)
-{
-       struct sta_info *sta;
-
-       sta = ap_get_sta(hapd, addr);
-       if (sta && sta->flags & WLAN_STA_PENDING_POLL) {
-               wpa_printf(MSG_DEBUG, "STA " MACSTR " %s pending "
-                          "activity poll", MAC2STR(sta->addr),
-                          ack ? "ACKed" : "did not ACK");
-               if (ack)
-                       sta->flags &= ~WLAN_STA_PENDING_POLL;
-       }
-       if (sta)
-               ieee802_1x_tx_status(hapd, sta, buf, len, ack);
-}
-
-
-void hostapd_rx_from_unknown_sta(struct hostapd_data *hapd, const u8 *addr)
-{
-       struct sta_info *sta;
-
-       sta = ap_get_sta(hapd, addr);
-       if (!sta || !(sta->flags & WLAN_STA_ASSOC)) {
-               wpa_printf(MSG_DEBUG, "Data/PS-poll frame from not associated "
-                          "STA " MACSTR, MAC2STR(addr));
-               if (sta && (sta->flags & WLAN_STA_AUTH))
-                       hostapd_sta_disassoc(
-                               hapd, addr,
-                               WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
-               else
-                       hostapd_sta_deauth(
-                               hapd, addr,
-                               WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
-       }
-}
-
-
-int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
-                       const u8 *ie, size_t ielen)
-{
-       struct sta_info *sta;
-       int new_assoc, res;
-
-       hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
-                      HOSTAPD_LEVEL_INFO, "associated");
-
-       sta = ap_get_sta(hapd, addr);
-       if (sta) {
-               accounting_sta_stop(hapd, sta);
-       } else {
-               sta = ap_sta_add(hapd, addr);
-               if (sta == NULL)
-                       return -1;
-       }
-       sta->flags &= ~(WLAN_STA_WPS | WLAN_STA_MAYBE_WPS);
-
-       if (hapd->conf->wpa) {
-               if (ie == NULL || ielen == 0) {
-                       if (hapd->conf->wps_state) {
-                               wpa_printf(MSG_DEBUG, "STA did not include "
-                                          "WPA/RSN IE in (Re)Association "
-                                          "Request - possible WPS use");
-                               sta->flags |= WLAN_STA_MAYBE_WPS;
-                               goto skip_wpa_check;
-                       }
-
-                       wpa_printf(MSG_DEBUG, "No WPA/RSN IE from STA");
-                       return -1;
-               }
-               if (hapd->conf->wps_state && ie[0] == 0xdd && ie[1] >= 4 &&
-                   os_memcmp(ie + 2, "\x00\x50\xf2\x04", 4) == 0) {
-                       sta->flags |= WLAN_STA_WPS;
-                       goto skip_wpa_check;
-               }
-
-               if (sta->wpa_sm == NULL)
-                       sta->wpa_sm = wpa_auth_sta_init(hapd->wpa_auth,
-                                                       sta->addr);
-               if (sta->wpa_sm == NULL) {
-                       wpa_printf(MSG_ERROR, "Failed to initialize WPA state "
-                                  "machine");
-                       return -1;
-               }
-               res = wpa_validate_wpa_ie(hapd->wpa_auth, sta->wpa_sm,
-                                         ie, ielen, NULL, 0);
-               if (res != WPA_IE_OK) {
-                       wpa_printf(MSG_DEBUG, "WPA/RSN information element "
-                                  "rejected? (res %u)", res);
-                       wpa_hexdump(MSG_DEBUG, "IE", ie, ielen);
-                       return -1;
-               }
-       }
-skip_wpa_check:
-
-       new_assoc = (sta->flags & WLAN_STA_ASSOC) == 0;
-       sta->flags |= WLAN_STA_AUTH | WLAN_STA_ASSOC;
-       wpa_auth_sm_event(sta->wpa_sm, WPA_ASSOC);
-
-       hostapd_new_assoc_sta(hapd, sta, !new_assoc);
-
-       ieee802_1x_notify_port_enabled(sta->eapol_sm, 1);
-
-       return 0;
-}
-
-
-void hostapd_notif_disassoc(struct hostapd_data *hapd, const u8 *addr)
-{
-       struct sta_info *sta;
-
-       hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
-                      HOSTAPD_LEVEL_INFO, "disassociated");
-
-       sta = ap_get_sta(hapd, addr);
-       if (sta == NULL) {
-               wpa_printf(MSG_DEBUG, "Disassociation notification for "
-                          "unknown STA " MACSTR, MAC2STR(addr));
-               return;
-       }
-
-       sta->flags &= ~(WLAN_STA_AUTH | WLAN_STA_ASSOC);
-       wpa_auth_sm_event(sta->wpa_sm, WPA_DISASSOC);
-       sta->acct_terminate_cause = RADIUS_ACCT_TERMINATE_CAUSE_USER_REQUEST;
-       ieee802_1x_notify_port_enabled(sta->eapol_sm, 0);
-       ap_free_sta(hapd, sta);
-}
-
-
-void hostapd_eapol_receive(struct hostapd_data *hapd, const u8 *sa,
-                          const u8 *buf, size_t len)
-{
-       ieee802_1x_receive(hapd, sa, buf, len);
-}
-
-
-void hostapd_mgmt_rx(struct hostapd_data *hapd, u8 *buf, size_t len,
-                    u16 stype, struct hostapd_frame_info *fi)
-{
-       ieee802_11_mgmt(hapd, buf, len, stype, fi);
-}
-
-
-void hostapd_mgmt_tx_cb(struct hostapd_data *hapd, u8 *buf, size_t len,
-                       u16 stype, int ok)
-{
-       ieee802_11_mgmt_cb(hapd, buf, len, stype, ok);
-}
-
-
-void hostapd_michael_mic_failure(struct hostapd_data *hapd, const u8 *addr)
-{
-       ieee80211_michael_mic_failure(hapd, addr, 1);
-}
+#endif /* CONFIG_NO_HOSTAPD_LOGGER */
 
 
 #ifdef EAP_SERVER
@@ -981,7 +678,17 @@ static int hostapd_flush_old_stations(struct hostapd_data *hapd)
                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;
 }
@@ -990,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;
 
@@ -1007,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 */
 }
 
 
@@ -1034,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);
 }
 
 
@@ -2085,16 +1794,140 @@ fail:
 }
 
 
+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;
+       }
+
+       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)
+{
+#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)
@@ -2134,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) {
@@ -2148,104 +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++) {
-               wpa_printf(MSG_ERROR, "Configuration file: %s",
-                          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(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");
+       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_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;
 }