#include "common.h"
#include "../hostapd/hostapd.h"
#include "../hostapd/config.h"
-#include "../hostapd/driver.h"
#ifdef NEED_MLME
#include "../hostapd/ieee802_11.h"
#endif /* NEED_MLME */
+#include "../hostapd/wps_hostapd.h"
#include "eap_common/eap_defs.h"
#include "eap_server/eap_methods.h"
#include "eap_common/eap_wsc_common.h"
+#include "wps/wps.h"
#include "config_ssid.h"
#include "wpa_supplicant_i.h"
#include "driver_i.h"
};
-static void * ap_driver_init(struct hostapd_data *hapd)
+static void * ap_driver_init(struct hostapd_data *hapd,
+ struct wpa_init_params *params)
{
struct ap_driver_data *drv;
struct wpa_supplicant *wpa_s = hapd->iface->owner;
static int ap_driver_sta_set_flags(void *priv, const u8 *addr, int total_flags,
int flags_or, int flags_and)
{
- wpa_printf(MSG_DEBUG, "AP TODO: %s", __func__);
- return -1;
+ struct ap_driver_data *drv = priv;
+ struct wpa_supplicant *wpa_s = drv->hapd->iface->owner;
+ return wpa_drv_sta_set_flags(wpa_s, addr, total_flags, flags_or,
+ flags_and);
}
-static int ap_driver_sta_deauth(void *priv, const u8 *addr, int reason)
+static int ap_driver_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr,
+ int reason)
{
wpa_printf(MSG_DEBUG, "AP TODO: %s", __func__);
return -1;
}
-static int ap_driver_sta_disassoc(void *priv, const u8 *addr, int reason)
+static int ap_driver_sta_disassoc(void *priv, const u8 *own_addr,
+ const u8 *addr, int reason)
{
wpa_printf(MSG_DEBUG, "AP TODO: %s", __func__);
return -1;
static int ap_driver_sta_remove(void *priv, const u8 *addr)
{
- wpa_printf(MSG_DEBUG, "AP TODO: %s", __func__);
- return -1;
+ struct ap_driver_data *drv = priv;
+ struct wpa_supplicant *wpa_s = drv->hapd->iface->owner;
+ return wpa_drv_sta_remove(wpa_s, addr);
}
-static int ap_driver_send_mgmt_frame(void *priv, const void *data, size_t len,
- int flags)
+static int ap_driver_send_mlme(void *priv, const u8 *data, size_t len)
{
struct ap_driver_data *drv = priv;
struct wpa_supplicant *wpa_s = drv->hapd->iface->owner;
static int ap_driver_sta_add(const char *ifname, void *priv,
struct hostapd_sta_add_params *params)
{
- wpa_printf(MSG_DEBUG, "AP TODO: %s", __func__);
- return -1;
+ struct ap_driver_data *drv = priv;
+ struct wpa_supplicant *wpa_s = drv->hapd->iface->owner;
+ return wpa_drv_sta_add(wpa_s, params);
}
}
-static struct hapd_driver_ops ap_driver_ops =
+static int ap_driver_hapd_send_eapol(void *priv, const u8 *addr,
+ const u8 *data, size_t data_len,
+ int encrypt, const u8 *own_addr)
+{
+ struct ap_driver_data *drv = priv;
+ struct wpa_supplicant *wpa_s = drv->hapd->iface->owner;
+ return wpa_drv_hapd_send_eapol(wpa_s, addr, data, data_len, encrypt,
+ own_addr);
+}
+
+
+struct wpa_driver_ops ap_driver_ops =
{
.name = "wpa_supplicant",
- .init = ap_driver_init,
- .deinit = ap_driver_deinit,
+ .hapd_init = ap_driver_init,
+ .hapd_deinit = ap_driver_deinit,
.send_ether = ap_driver_send_ether,
- .set_key = ap_driver_set_key,
+ .hapd_set_key = ap_driver_set_key,
.get_seqnum = ap_driver_get_seqnum,
.flush = ap_driver_flush,
.read_sta_data = ap_driver_read_sta_data,
.sta_deauth = ap_driver_sta_deauth,
.sta_disassoc = ap_driver_sta_disassoc,
.sta_remove = ap_driver_sta_remove,
- .send_mgmt_frame = ap_driver_send_mgmt_frame,
+ .send_mlme = ap_driver_send_mlme,
.sta_add = ap_driver_sta_add,
.get_inact_sec = ap_driver_get_inact_sec,
.set_freq = ap_driver_set_freq,
- .set_beacon = ap_driver_set_beacon,
+ .hapd_set_beacon = ap_driver_set_beacon,
.set_beacon_int = ap_driver_set_beacon_int,
.set_cts_protect = ap_driver_set_cts_protect,
.set_preamble = ap_driver_set_preamble,
.set_short_slot_time = ap_driver_set_short_slot_time,
.set_tx_queue_params = ap_driver_set_tx_queue_params,
.get_hw_feature_data = ap_driver_get_hw_feature_data,
+ .hapd_send_eapol = ap_driver_hapd_send_eapol,
};
-struct hapd_driver_ops *hostapd_drivers[] =
-{
- &ap_driver_ops,
- NULL
-};
+extern struct wpa_driver_ops *wpa_drivers[];
static int wpa_supplicant_conf_ap(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid,
struct hostapd_config *conf)
{
struct hostapd_bss_config *bss = &conf->bss[0];
+ int j, pairwise;
+
+ for (j = 0; wpa_drivers[j]; j++) {
+ if (os_strcmp("wpa_supplicant", wpa_drivers[j]->name) == 0) {
+ conf->driver = wpa_drivers[j];
+ break;
+ }
+ }
+ if (conf->driver == NULL) {
+ wpa_printf(MSG_ERROR, "No AP driver ops found");
+ return -1;
+ }
os_strlcpy(bss->iface, wpa_s->ifname, sizeof(bss->iface));
conf->channel = (ssid->frequency - 2407) / 5;
} else if ((ssid->frequency >= 5180 && ssid->frequency <= 5240) ||
(ssid->frequency >= 5745 && ssid->frequency <= 5825)) {
- conf->hw_mode = HOSTAPD_MODE_IEEE80211G;
+ conf->hw_mode = HOSTAPD_MODE_IEEE80211A;
conf->channel = (ssid->frequency - 5000) / 5;
} else {
wpa_printf(MSG_ERROR, "Unsupported AP mode frequency: %d MHz",
bss->wpa_pairwise = ssid->pairwise_cipher;
if (ssid->passphrase) {
bss->ssid.wpa_passphrase = os_strdup(ssid->passphrase);
- if (hostapd_setup_wpa_psk(bss))
- return -1;
} else if (ssid->psk_set) {
os_free(bss->ssid.wpa_psk);
bss->ssid.wpa_psk = os_zalloc(sizeof(struct hostapd_wpa_psk));
bss->ssid.wpa_psk->group = 1;
}
+ /* Select group cipher based on the enabled pairwise cipher suites */
+ pairwise = 0;
+ if (bss->wpa & 1)
+ pairwise |= bss->wpa_pairwise;
+ if (bss->wpa & 2) {
+ if (bss->rsn_pairwise == 0)
+ bss->rsn_pairwise = bss->wpa_pairwise;
+ pairwise |= bss->rsn_pairwise;
+ }
+ if (pairwise & WPA_CIPHER_TKIP)
+ bss->wpa_group = WPA_CIPHER_TKIP;
+ else
+ bss->wpa_group = WPA_CIPHER_CCMP;
+
+ if (bss->wpa && bss->ieee802_1x)
+ bss->ssid.security_policy = SECURITY_WPA;
+ else if (bss->wpa)
+ bss->ssid.security_policy = SECURITY_WPA_PSK;
+ else if (bss->ieee802_1x) {
+ bss->ssid.security_policy = SECURITY_IEEE_802_1X;
+ bss->ssid.wep.default_len = bss->default_wep_key_len;
+ } else if (bss->ssid.wep.keys_set)
+ bss->ssid.security_policy = SECURITY_STATIC_WEP;
+ else
+ bss->ssid.security_policy = SECURITY_PLAINTEXT;
+
+#ifdef CONFIG_WPS
+ /*
+ * Enable WPS by default, but require user interaction to actually use
+ * it. Only the internal Registrar is supported.
+ */
+ bss->eap_server = 1;
+ bss->wps_state = 2;
+ bss->ap_setup_locked = 1;
+ bss->config_methods = os_strdup("display push_button");
+#endif /* CONFIG_WPS */
+
return 0;
}
ieee802_11_mgmt_cb(wpa_s->ap_iface->bss[0], buf, len, stype, ok);
}
#endif /* NEED_MLME */
+
+
+void wpa_supplicant_ap_rx_eapol(struct wpa_supplicant *wpa_s,
+ const u8 *src_addr, const u8 *buf, size_t len)
+{
+ hostapd_eapol_receive(wpa_s->ap_iface->bss[0], src_addr, buf, len);
+}
+
+
+#ifdef CONFIG_WPS
+
+int wpa_supplicant_ap_wps_pbc(struct wpa_supplicant *wpa_s, const u8 *bssid)
+{
+ return hostapd_wps_button_pushed(wpa_s->ap_iface->bss[0]);
+}
+
+
+int wpa_supplicant_ap_wps_pin(struct wpa_supplicant *wpa_s, const u8 *bssid,
+ const char *pin, char *buf, size_t buflen)
+{
+ int ret, ret_len = 0;
+
+ if (pin == NULL) {
+ unsigned int rpin = wps_generate_pin();
+ ret_len = os_snprintf(buf, buflen, "%d", rpin);
+ pin = buf;
+ }
+
+ ret = hostapd_wps_add_pin(wpa_s->ap_iface->bss[0], "any", pin);
+ if (ret)
+ return -1;
+ return ret_len;
+}
+
+#endif /* CONFIG_WPS */
projects / wpasupplicant / blobdiff