#include "includes.h"
#include "common.h"
-#include "../hostapd/hostapd.h"
-#include "../hostapd/config.h"
+#include "ap/hostapd.h"
+#include "ap/config.h"
#ifdef NEED_AP_MLME
-#include "../hostapd/ieee802_11.h"
+#include "ap/ieee802_11.h"
#endif /* NEED_AP_MLME */
-#include "../hostapd/wps_hostapd.h"
+#include "ap/wps_hostapd.h"
#include "../hostapd/ctrl_iface_ap.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 "config.h"
#include "wpa_supplicant_i.h"
#include "driver_i.h"
#include "ap.h"
-int hostapd_for_each_interface(int (*cb)(struct hostapd_iface *iface,
+struct hapd_interfaces {
+ size_t count;
+ struct hostapd_iface **iface;
+};
+
+
+int hostapd_for_each_interface(struct hapd_interfaces *interfaces,
+ int (*cb)(struct hostapd_iface *iface,
void *ctx), void *ctx)
{
/* TODO */
static int ap_driver_set_beacon(const char *iface, void *priv,
const u8 *head, size_t head_len,
const u8 *tail, size_t tail_len,
- int dtim_period)
+ int dtim_period, int beacon_int)
{
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)
-{
- struct ap_driver_data *drv = priv;
- struct wpa_supplicant *wpa_s = drv->hapd->iface->owner;
- return wpa_drv_set_beacon_int(wpa_s, value);
+ dtim_period, beacon_int);
}
.hapd_init = ap_driver_init,
.hapd_deinit = ap_driver_deinit,
.send_ether = ap_driver_send_ether,
- .hapd_set_key = ap_driver_set_key,
+ .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_add = ap_driver_sta_add,
.get_inact_sec = ap_driver_get_inact_sec,
.set_freq = ap_driver_set_freq,
- .hapd_set_beacon = ap_driver_set_beacon,
- .set_beacon_int = ap_driver_set_beacon_int,
+ .set_beacon = ap_driver_set_beacon,
.set_cts_protect = ap_driver_set_cts_protect,
.set_preamble = ap_driver_set_preamble,
.set_short_slot_time = ap_driver_set_short_slot_time,
bss->eap_server = 1;
bss->wps_state = 2;
bss->ap_setup_locked = 1;
- bss->config_methods = os_strdup("display push_button");
+ if (wpa_s->conf->config_methods)
+ bss->config_methods = os_strdup(wpa_s->conf->config_methods);
+ if (wpa_s->conf->device_type)
+ bss->device_type = os_strdup(wpa_s->conf->device_type);
#endif /* CONFIG_WPS */
return 0;
}
+static int hostapd_driver_init(struct hostapd_iface *iface)
+{
+ struct wpa_init_params params;
+ struct hostapd_data *hapd = iface->bss[0];
+
+ if (hapd->driver == NULL || hapd->driver->hapd_init == NULL) {
+ wpa_printf(MSG_ERROR, "No hostapd driver wrapper available");
+ return -1;
+ }
+
+ os_memset(¶ms, 0, sizeof(params));
+ params.ifname = hapd->conf->iface;
+ params.ssid = (const u8 *) hapd->conf->ssid.ssid;
+ params.ssid_len = hapd->conf->ssid.ssid_len;
+
+ params.num_bridge = hapd->iface->num_bss;
+ params.bridge = os_zalloc(hapd->iface->num_bss * sizeof(char *));
+ if (params.bridge == NULL)
+ return -1;
+ params.own_addr = hapd->own_addr;
+
+ hapd->drv_priv = hapd->driver->hapd_init(hapd, ¶ms);
+ os_free(params.bridge);
+ if (hapd->drv_priv == NULL) {
+ wpa_printf(MSG_ERROR, "%s driver initialization failed.",
+ hapd->driver->name);
+ hapd->driver = NULL;
+ return -1;
+ }
+
+ return 0;
+}
+
+
int wpa_supplicant_create_ap(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid)
{
hapd_iface->bss[i]->msg_ctx = wpa_s;
}
- if (hostapd_setup_interface(wpa_s->ap_iface)) {
+ if (hostapd_driver_init(wpa_s->ap_iface) ||
+ hostapd_setup_interface(wpa_s->ap_iface)) {
wpa_printf(MSG_ERROR, "Failed to initialize AP interface");
wpa_supplicant_ap_deinit(wpa_s);
return -1;
}
wpa_s->current_ssid = ssid;
+ os_memcpy(wpa_s->bssid, wpa_s->own_addr, ETH_ALEN);
wpa_supplicant_set_state(wpa_s, WPA_COMPLETED);
return 0;
void ap_tx_status(void *ctx, const u8 *addr,
const u8 *buf, size_t len, int ack)
{
+#ifdef NEED_AP_MLME
struct wpa_supplicant *wpa_s = ctx;
hostapd_tx_status(wpa_s->ap_iface->bss[0], addr, buf, len, ack);
+#endif /* NEED_AP_MLME */
}
-void ap_rx_from_unknown_sta(void *ctx, struct ieee80211_hdr *hdr, size_t len)
+void ap_rx_from_unknown_sta(void *ctx, const struct ieee80211_hdr *hdr,
+ size_t len)
{
+#ifdef NEED_AP_MLME
struct wpa_supplicant *wpa_s = ctx;
- hostapd_rx_from_unknown_sta(wpa_s->ap_iface->bss[0], hdr, len);
+ u16 fc = le_to_host16(hdr->frame_control);
+ ieee802_11_rx_from_unknown(wpa_s->ap_iface->bss[0], hdr->addr2,
+ (fc & (WLAN_FC_TODS | WLAN_FC_FROMDS)) ==
+ (WLAN_FC_TODS | WLAN_FC_FROMDS));
+#endif /* NEED_AP_MLME */
}
-#ifdef NEED_AP_MLME
-void ap_mgmt_rx(void *ctx, u8 *buf, size_t len, u16 stype,
+void ap_mgmt_rx(void *ctx, const u8 *buf, size_t len,
struct hostapd_frame_info *fi)
{
+#ifdef NEED_AP_MLME
struct wpa_supplicant *wpa_s = ctx;
- ieee802_11_mgmt(wpa_s->ap_iface->bss[0], buf, len, stype, fi);
+ ieee802_11_mgmt(wpa_s->ap_iface->bss[0], buf, len, fi);
+#endif /* NEED_AP_MLME */
}
-void ap_mgmt_tx_cb(void *ctx, u8 *buf, size_t len, u16 stype, int ok)
+void ap_mgmt_tx_cb(void *ctx, const u8 *buf, size_t len, u16 stype, int ok)
{
+#ifdef NEED_AP_MLME
struct wpa_supplicant *wpa_s = ctx;
ieee802_11_mgmt_cb(wpa_s->ap_iface->bss[0], buf, len, stype, ok);
-}
#endif /* NEED_AP_MLME */
+}
void wpa_supplicant_ap_rx_eapol(struct wpa_supplicant *wpa_s,
#endif /* CONFIG_WPS */
+#ifdef CONFIG_CTRL_IFACE
+
int ap_ctrl_iface_sta_first(struct wpa_supplicant *wpa_s,
char *buf, size_t buflen)
{
return hostapd_ctrl_iface_sta_next(wpa_s->ap_iface->bss[0], txtaddr,
buf, buflen);
}
+
+
+int ap_ctrl_iface_wpa_get_status(struct wpa_supplicant *wpa_s, char *buf,
+ size_t buflen, int verbose)
+{
+ char *pos = buf, *end = buf + buflen;
+ int ret;
+ struct hostapd_bss_config *conf;
+
+ if (wpa_s->ap_iface == NULL)
+ return -1;
+
+ conf = wpa_s->ap_iface->bss[0]->conf;
+ if (conf->wpa == 0)
+ return 0;
+
+ ret = os_snprintf(pos, end - pos,
+ "pairwise_cipher=%s\n"
+ "group_cipher=%s\n"
+ "key_mgmt=%s\n",
+ wpa_cipher_txt(conf->rsn_pairwise),
+ wpa_cipher_txt(conf->wpa_group),
+ wpa_key_mgmt_txt(conf->wpa_key_mgmt,
+ conf->wpa));
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+ return pos - buf;
+}
+
+#endif /* CONFIG_CTRL_IFACE */
projects / libeap.git / blobdiff