hostapd: Use separate driver operations abstraction

[libeap.git] / hostapd / hostapd.c

diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c
index 16210ea..57154e0 100644 (file)
--- a/hostapd/hostapd.c
+++ b/hostapd/hostapd.c
@@ -33,7 +33,6 @@
 #include "accounting.h"
 #include "iapp.h"
 #include "ieee802_11_auth.h"
-#include "sta_flags.h"
 #include "sta_info.h"
 #include "ap_list.h"
 #include "driver_i.h"
@@ -51,8 +50,12 @@ static int hostapd_setup_encryption(char *iface, struct hostapd_data *hapd);
 
 extern int wpa_debug_level;
 
+#if defined(EAP_SERVER_SIM) || defined(EAP_SERVER_AKA)
+#define EAP_SIM_DB
+#endif /* EAP_SERVER_SIM || EAP_SERVER_AKA */
+
 
-#ifdef EAP_SERVER
+#ifdef EAP_SIM_DB
 static int hostapd_sim_db_cb_sta(struct hostapd_data *hapd,
                                 struct sta_info *sta, void *ctx)
 {
@@ -71,7 +74,7 @@ static void hostapd_sim_db_cb(void *ctx, void *session_ctx)
 #endif /* RADIUS_SERVER */
        }
 }
-#endif /* EAP_SERVER */
+#endif /* EAP_SIM_DB */
 
 
 static void hostapd_wpa_auth_conf(struct hostapd_bss_config *conf,
@@ -173,7 +176,9 @@ int hostapd_reload_config(struct hostapd_iface *iface)
        }
 
        if (hapd->conf->ieee802_1x || hapd->conf->wpa)
-               hostapd_set_ieee8021x(hapd->conf->iface, hapd, 1);
+               hostapd_set_drv_ieee8021x(hapd, hapd->conf->iface, 1);
+       else
+               hostapd_set_drv_ieee8021x(hapd, hapd->conf->iface, 0);
 
        hostapd_config_free(oldconf);
 
@@ -336,7 +341,7 @@ static void hostapd_cleanup(struct hostapd_data *hapd)
 #endif /* EAP_SERVER_SIM || EAP_SERVER_AKA */
 
        if (hapd->interface_added &&
-           hostapd_bss_remove(hapd, hapd->conf->iface)) {
+           hostapd_if_remove(hapd, WPA_IF_AP_BSS, hapd->conf->iface)) {
                wpa_printf(MSG_WARNING, "Failed to remove BSS interface %s",
                           hapd->conf->iface);
        }
@@ -610,15 +615,6 @@ static int hostapd_wpa_auth_get_seqnum(void *ctx, const u8 *addr, int idx,
 }
 
 
-static int hostapd_wpa_auth_get_seqnum_igtk(void *ctx, const u8 *addr, int idx,
-                                           u8 *seq)
-{
-       struct hostapd_data *hapd = ctx;
-       return hostapd_get_seqnum_igtk(hapd->conf->iface, hapd, addr, idx,
-                                      seq);
-}
-
-
 static int hostapd_wpa_auth_send_eapol(void *ctx, const u8 *addr,
                                       const u8 *data, size_t data_len,
                                       int encrypt)
@@ -664,10 +660,12 @@ static int hostapd_wpa_auth_for_each_auth(
        void *ctx, int (*cb)(struct wpa_authenticator *sm, void *ctx),
        void *cb_ctx)
 {
+       struct hostapd_data *hapd = ctx;
        struct wpa_auth_iface_iter_data data;
        data.cb = cb;
        data.cb_ctx = cb_ctx;
-       return hostapd_for_each_interface(wpa_auth_iface_iter, &data);
+       return hostapd_for_each_interface(hapd->iface->interfaces,
+                                         wpa_auth_iface_iter, &data);
 }
 
 
@@ -890,7 +888,6 @@ static int hostapd_setup_wpa(struct hostapd_data *hapd)
        cb.get_msk = hostapd_wpa_auth_get_msk;
        cb.set_key = hostapd_wpa_auth_set_key;
        cb.get_seqnum = hostapd_wpa_auth_get_seqnum;
-       cb.get_seqnum_igtk = hostapd_wpa_auth_get_seqnum_igtk;
        cb.send_eapol = hostapd_wpa_auth_send_eapol;
        cb.for_each_sta = hostapd_wpa_auth_for_each_sta;
        cb.for_each_auth = hostapd_wpa_auth_for_each_auth;
@@ -1044,8 +1041,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)) {
+               if (hostapd_if_add(hapd->iface->bss[0], WPA_IF_AP_BSS,
+                                  hapd->conf->iface, hapd->own_addr, hapd)) {
                        wpa_printf(MSG_ERROR, "Failed to add BSS (BSSID="
                                   MACSTR ")", MAC2STR(hapd->own_addr));
                        return -1;
@@ -1242,13 +1239,6 @@ static int setup_interface(struct hostapd_iface *iface)
                }
        }
 
-       if (hapd->iconf->bridge_packets != INTERNAL_BRIDGE_DO_NOT_CONTROL &&
-           hostapd_set_internal_bridge(hapd, hapd->iconf->bridge_packets)) {
-               wpa_printf(MSG_ERROR, "Failed to set bridge_packets for "
-                          "kernel driver");
-               return -1;
-       }
-
        if (hostapd_get_hw_features(iface)) {
                /* Not all drivers support this yet, so continue without hw
                 * feature data. */
@@ -1394,6 +1384,7 @@ hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
        if (hapd == NULL)
                return NULL;
 
+       hostapd_set_driver_ops(&hapd->drv);
        hapd->iconf = conf;
        hapd->conf = bss;
        hapd->iface = hapd_iface;
@@ -1430,7 +1421,7 @@ hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
        }
 #endif /* EAP_TLS_FUNCS */
 
-#if defined(EAP_SERVER_SIM) || defined(EAP_SERVER_AKA)
+#ifdef EAP_SIM_DB
        if (hapd->conf->eap_sim_db) {
                hapd->eap_sim_db_priv =
                        eap_sim_db_init(hapd->conf->eap_sim_db,
@@ -1441,13 +1432,13 @@ hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
                        goto fail;
                }
        }
-#endif /* EAP_SERVER_SIM || EAP_SERVER_AKA */
+#endif /* EAP_SIM_DB */
 
        hapd->driver = hapd->iconf->driver;
 
        return hapd;
 
-#if defined(EAP_TLS_FUNCS) || defined(EAP_SERVER)
+#if defined(EAP_TLS_FUNCS) || defined(EAP_SIM_DB)
 fail:
 #endif
        /* TODO: cleanup allocated resources(?) */
@@ -1499,3 +1490,37 @@ int hostapd_register_probereq_cb(struct hostapd_data *hapd,
 
        return 0;
 }
+
+
+int hostapd_set_drv_ieee8021x(struct hostapd_data *hapd, const char *ifname,
+                             int enabled)
+{
+       struct wpa_bss_params params;
+       os_memset(&params, 0, sizeof(params));
+       params.ifname = ifname;
+       params.enabled = enabled;
+       if (enabled) {
+               params.wpa = hapd->conf->wpa;
+               params.ieee802_1x = hapd->conf->ieee802_1x;
+               params.wpa_group = hapd->conf->wpa_group;
+               params.wpa_pairwise = hapd->conf->wpa_pairwise;
+               params.wpa_key_mgmt = hapd->conf->wpa_key_mgmt;
+               params.rsn_preauth = hapd->conf->rsn_preauth;
+       }
+       return hostapd_set_ieee8021x(hapd, &params);
+}
+
+
+int hostapd_sta_flags_to_drv(int flags)
+{
+       int res = 0;
+       if (flags & WLAN_STA_AUTHORIZED)
+               res |= WPA_STA_AUTHORIZED;
+       if (flags & WLAN_STA_WMM)
+               res |= WPA_STA_WMM;
+       if (flags & WLAN_STA_SHORT_PREAMBLE)
+               res |= WPA_STA_SHORT_PREAMBLE;
+       if (flags & WLAN_STA_MFP)
+               res |= WPA_STA_MFP;
+       return res;
+}