#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 "eap_common/eap_defs.h"
#include "eap_server/eap_methods.h"
#include "eap_common/eap_wsc_common.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;
drv = os_zalloc(sizeof(struct ap_driver_data));
if (drv == NULL) {
return NULL;
}
drv->hapd = hapd;
+ os_memcpy(hapd->own_addr, wpa_s->own_addr, ETH_ALEN);
return drv;
}
}
-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)
{
- 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_send_mlme(wpa_s, data, len);
}
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 int ap_driver_set_beacon(const char *iface, void *priv,
- u8 *head, size_t head_len,
- u8 *tail, size_t tail_len)
+ const u8 *head, size_t head_len,
+ const u8 *tail, size_t tail_len,
+ int dtim_period)
{
- 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_set_beacon(wpa_s, head, head_len, tail, tail_len,
+ dtim_period);
}
static int ap_driver_set_beacon_int(void *priv, int value)
{
- wpa_printf(MSG_DEBUG, "AP TODO: %s", __func__);
- return -1;
-}
-
-
-static int ap_driver_set_dtim_period(const char *iface, void *priv, int value)
-{
- 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_set_beacon_int(wpa_s, value);
}
u16 *num_modes,
u16 *flags)
{
- wpa_printf(MSG_DEBUG, "AP TODO: %s", __func__);
- return NULL;
+ struct ap_driver_data *drv = priv;
+ struct wpa_supplicant *wpa_s = drv->hapd->iface->owner;
+ return wpa_drv_get_hw_feature_data(wpa_s, num_modes, flags);
}
-static struct hapd_driver_ops ap_driver_ops =
+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_dtim_period = ap_driver_set_dtim_period,
.set_cts_protect = ap_driver_set_cts_protect,
.set_preamble = ap_driver_set_preamble,
.set_short_slot_time = ap_driver_set_short_slot_time,
.get_hw_feature_data = ap_driver_get_hw_feature_data,
};
-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;
+
+ 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",
}
wpa_supplicant_ap_deinit(wpa_s);
+
+ wpa_printf(MSG_DEBUG, "Setting up AP (SSID='%s')",
+ wpa_ssid_txt(ssid->ssid, ssid->ssid_len));
+
+ os_memset(¶ms, 0, sizeof(params));
+ params.ssid = ssid->ssid;
+ params.ssid_len = ssid->ssid_len;
+ params.mode = ssid->mode;
+ params.freq = ssid->frequency;
+
+ if (wpa_drv_associate(wpa_s, ¶ms) < 0) {
+ wpa_msg(wpa_s, MSG_INFO, "Failed to start AP functionality");
+ return -1;
+ }
+
wpa_s->ap_iface = hapd_iface = os_zalloc(sizeof(*wpa_s->ap_iface));
if (hapd_iface == NULL)
return -1;
return -1;
}
- wpa_printf(MSG_DEBUG, "Setting up AP (SSID='%s')",
- wpa_ssid_txt(ssid->ssid, ssid->ssid_len));
-
- os_memset(¶ms, 0, sizeof(params));
- params.ssid = ssid->ssid;
- params.ssid_len = ssid->ssid_len;
- params.mode = ssid->mode;
-
- if (wpa_drv_associate(wpa_s, ¶ms) < 0) {
- wpa_msg(wpa_s, MSG_INFO, "Failed to start AP functionality");
- return -1;
- }
-
return 0;
}
hostapd_interface_deinit(wpa_s->ap_iface);
wpa_s->ap_iface = NULL;
}
+
+
+void ap_tx_status(void *ctx, const u8 *addr,
+ const u8 *buf, size_t len, int ack)
+{
+ struct wpa_supplicant *wpa_s = ctx;
+ hostapd_tx_status(wpa_s->ap_iface->bss[0], addr, buf, len, ack);
+}
+
+
+void ap_rx_from_unknown_sta(void *ctx, const u8 *addr)
+{
+ struct wpa_supplicant *wpa_s = ctx;
+ ap_rx_from_unknown_sta(wpa_s->ap_iface->bss[0], addr);
+}
+
+
+#ifdef NEED_MLME
+void ap_mgmt_rx(void *ctx, u8 *buf, size_t len, u16 stype,
+ struct hostapd_frame_info *fi)
+{
+ struct wpa_supplicant *wpa_s = ctx;
+ ieee802_11_mgmt(wpa_s->ap_iface->bss[0], buf, len, stype, fi);
+}
+
+
+void ap_mgmt_tx_cb(void *ctx, u8 *buf, size_t len, u16 stype, int ok)
+{
+ struct wpa_supplicant *wpa_s = ctx;
+ ieee802_11_mgmt_cb(wpa_s->ap_iface->bss[0], buf, len, stype, ok);
+}
+#endif /* NEED_MLME */
projects / wpasupplicant / blobdiff