X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=wpa_supplicant%2Fap.c;h=ea57540107ff9529f4112f5b3e331d785aa8bc25;hb=HEAD;hp=06d6d2e4a1b814dbda194933e69f3b1f7556efa1;hpb=b2cc805619cd60fdbb6fdc869f7716ab1d02a7bd;p=libeap.git diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c index 06d6d2e..ea57540 100644 --- a/wpa_supplicant/ap.c +++ b/wpa_supplicant/ap.c @@ -13,304 +13,42 @@ * See README and COPYING for more details. */ -#include "includes.h" +#include "utils/includes.h" -#include "common.h" -#include "../hostapd/hostapd.h" -#include "../hostapd/config.h" +#include "utils/common.h" +#include "common/ieee802_11_defs.h" +#include "common/wpa_ctrl.h" +#include "ap/hostapd.h" +#include "ap/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/beacon.h" +#include "ap/ieee802_1x.h" +#include "ap/wps_hostapd.h" +#include "ap/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 "common/ieee802_11_defs.h" #include "config_ssid.h" +#include "config.h" #include "wpa_supplicant_i.h" #include "driver_i.h" +#include "p2p_supplicant.h" #include "ap.h" +#include "ap/sta_info.h" -int hostapd_for_each_interface(int (*cb)(struct hostapd_iface *iface, - void *ctx), void *ctx) -{ - /* TODO */ - return 0; -} - - -int hostapd_ctrl_iface_init(struct hostapd_data *hapd) -{ - return 0; -} - - -void hostapd_ctrl_iface_deinit(struct hostapd_data *hapd) -{ -} - - -struct ap_driver_data { - 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) { - wpa_printf(MSG_ERROR, "Could not allocate memory for AP " - "driver data"); - return NULL; - } - drv->hapd = hapd; - os_memcpy(hapd->own_addr, wpa_s->own_addr, ETH_ALEN); - - return drv; -} - - -static void ap_driver_deinit(void *priv) -{ - struct ap_driver_data *drv = priv; - - os_free(drv); -} - - -static int ap_driver_send_ether(void *priv, const u8 *dst, const u8 *src, - u16 proto, const u8 *data, size_t data_len) -{ - wpa_printf(MSG_DEBUG, "AP TODO: %s", __func__); - return -1; -} - - -static int ap_driver_set_key(const char *iface, void *priv, wpa_alg alg, - const u8 *addr, int key_idx, int set_tx, - const u8 *seq, size_t seq_len, const u8 *key, - size_t key_len) -{ - struct ap_driver_data *drv = priv; - struct wpa_supplicant *wpa_s = drv->hapd->iface->owner; - return wpa_drv_set_key(wpa_s, alg, addr, key_idx, set_tx, seq, seq_len, - key, key_len); -} - - -static int ap_driver_get_seqnum(const char *iface, void *priv, const u8 *addr, - int idx, u8 *seq) -{ - wpa_printf(MSG_DEBUG, "AP TODO: %s", __func__); - return -1; -} - - -static int ap_driver_flush(void *priv) -{ - wpa_printf(MSG_DEBUG, "AP TODO: %s", __func__); - return -1; -} - - -static int ap_driver_read_sta_data(void *priv, - struct hostap_sta_driver_data *data, - const u8 *addr) -{ - wpa_printf(MSG_DEBUG, "AP TODO: %s", __func__); - return -1; -} - - -static int ap_driver_sta_set_flags(void *priv, const u8 *addr, int total_flags, - int flags_or, int flags_and) -{ - 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 *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 *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) -{ - 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_mlme(void *priv, const u8 *data, size_t len) -{ - 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) -{ - 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_get_inact_sec(void *priv, const u8 *addr) -{ - wpa_printf(MSG_DEBUG, "AP TODO: %s", __func__); - return -1; -} - - -static int ap_driver_set_freq(void *priv, struct hostapd_freq_params *freq) -{ - wpa_printf(MSG_DEBUG, "AP TODO: %s", __func__); - return 0; -} - - -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) -{ - 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); -} - - -static int ap_driver_set_cts_protect(void *priv, int value) -{ - wpa_printf(MSG_DEBUG, "AP TODO: %s", __func__); - return -1; -} - - -static int ap_driver_set_preamble(void *priv, int value) -{ - wpa_printf(MSG_DEBUG, "AP TODO: %s", __func__); - return -1; -} - - -static int ap_driver_set_short_slot_time(void *priv, int value) -{ - wpa_printf(MSG_DEBUG, "AP TODO: %s", __func__); - return -1; -} - - -static int ap_driver_set_tx_queue_params(void *priv, int queue, int aifs, - int cw_min, int cw_max, - int burst_time) -{ - wpa_printf(MSG_DEBUG, "AP TODO: %s", __func__); - return -1; -} - - -static struct hostapd_hw_modes *ap_driver_get_hw_feature_data(void *priv, - u16 *num_modes, - u16 *flags) -{ - 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 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", - .hapd_init = ap_driver_init, - .hapd_deinit = ap_driver_deinit, - .send_ether = ap_driver_send_ether, - .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_set_flags = ap_driver_sta_set_flags, - .sta_deauth = ap_driver_sta_deauth, - .sta_disassoc = ap_driver_sta_disassoc, - .sta_remove = ap_driver_sta_remove, - .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, - .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, -}; - - -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; + int 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; - } + conf->driver = wpa_s->driver; os_strlcpy(bss->iface, wpa_s->ifname, sizeof(bss->iface)); @@ -334,6 +72,34 @@ static int wpa_supplicant_conf_ap(struct wpa_supplicant *wpa_s, /* TODO: enable HT if driver supports it; * drop to 11b if driver does not support 11g */ +#ifdef CONFIG_P2P + if (conf->hw_mode == HOSTAPD_MODE_IEEE80211G) { + /* Remove 802.11b rates from supported and basic rate sets */ + int *list = os_malloc(4 * sizeof(int)); + if (list) { + list[0] = 60; + list[1] = 120; + list[2] = 240; + list[3] = -1; + } + conf->basic_rates = list; + + list = os_malloc(9 * sizeof(int)); + if (list) { + list[0] = 60; + list[1] = 90; + list[2] = 120; + list[3] = 180; + list[4] = 240; + list[5] = 360; + list[6] = 480; + list[7] = 540; + list[8] = -1; + } + conf->supported_rates = list; + } +#endif /* CONFIG_P2P */ + if (ssid->ssid_len == 0) { wpa_printf(MSG_ERROR, "No SSID configured for AP mode"); return -1; @@ -392,13 +158,111 @@ static int wpa_supplicant_conf_ap(struct wpa_supplicant *wpa_s, 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); + if (wpa_s->conf->device_name) { + bss->device_name = os_strdup(wpa_s->conf->device_name); + bss->friendly_name = os_strdup(wpa_s->conf->device_name); + } + if (wpa_s->conf->manufacturer) + bss->manufacturer = os_strdup(wpa_s->conf->manufacturer); + if (wpa_s->conf->model_name) + bss->model_name = os_strdup(wpa_s->conf->model_name); + if (wpa_s->conf->model_number) + bss->model_number = os_strdup(wpa_s->conf->model_number); + if (wpa_s->conf->serial_number) + bss->serial_number = os_strdup(wpa_s->conf->serial_number); + os_memcpy(bss->uuid, wpa_s->conf->uuid, WPS_UUID_LEN); + os_memcpy(bss->os_version, wpa_s->conf->os_version, 4); #endif /* CONFIG_WPS */ return 0; } +static void ap_public_action_rx(void *ctx, const u8 *buf, size_t len, int freq) +{ +#ifdef CONFIG_P2P + struct wpa_supplicant *wpa_s = ctx; + const struct ieee80211_mgmt *mgmt; + size_t hdr_len; + + mgmt = (const struct ieee80211_mgmt *) buf; + hdr_len = (const u8 *) &mgmt->u.action.u.vs_public_action.action - buf; + if (hdr_len > len) + return; + wpas_p2p_rx_action(wpa_s, mgmt->da, mgmt->sa, mgmt->bssid, + mgmt->u.action.category, + &mgmt->u.action.u.vs_public_action.action, + len - hdr_len, freq); +#endif /* CONFIG_P2P */ +} + + +static void ap_wps_event_cb(void *ctx, enum wps_event event, + union wps_event_data *data) +{ + struct wpa_supplicant *wpa_s = ctx; + + if (event == WPS_EV_FAIL && wpa_s->parent && wpa_s->parent != wpa_s) { + struct wps_event_fail *fail = &data->fail; + + /* + * src/ap/wps_hostapd.c has already sent this on the main + * interface, so only send on the parent interface here if + * needed. + */ + wpa_msg(wpa_s->parent, MSG_INFO, WPS_EVENT_FAIL + "msg=%d config_error=%d", + fail->msg, fail->config_error); + } +} + + +static int ap_vendor_action_rx(void *ctx, const u8 *buf, size_t len, int freq) +{ +#ifdef CONFIG_P2P + struct wpa_supplicant *wpa_s = ctx; + const struct ieee80211_mgmt *mgmt; + size_t hdr_len; + + mgmt = (const struct ieee80211_mgmt *) buf; + hdr_len = (const u8 *) &mgmt->u.action.u.vs_public_action.action - buf; + if (hdr_len > len) + return -1; + wpas_p2p_rx_action(wpa_s, mgmt->da, mgmt->sa, mgmt->bssid, + mgmt->u.action.category, + &mgmt->u.action.u.vs_public_action.action, + len - hdr_len, freq); +#endif /* CONFIG_P2P */ + return 0; +} + + +static int ap_probe_req_rx(void *ctx, const u8 *addr, const u8 *ie, + size_t ie_len) +{ +#ifdef CONFIG_P2P + struct wpa_supplicant *wpa_s = ctx; + return wpas_p2p_probe_req_rx(wpa_s, addr, ie, ie_len); +#else /* CONFIG_P2P */ + return 0; +#endif /* CONFIG_P2P */ +} + + +static void ap_wps_reg_success_cb(void *ctx, const u8 *mac_addr, + const u8 *uuid_e) +{ +#ifdef CONFIG_P2P + struct wpa_supplicant *wpa_s = ctx; + wpas_p2p_wps_success(wpa_s, mac_addr, 1); +#endif /* CONFIG_P2P */ +} + + int wpa_supplicant_create_ap(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid) { @@ -420,9 +284,53 @@ int wpa_supplicant_create_ap(struct wpa_supplicant *wpa_s, os_memset(¶ms, 0, sizeof(params)); params.ssid = ssid->ssid; params.ssid_len = ssid->ssid_len; - params.mode = ssid->mode; + switch (ssid->mode) { + case WPAS_MODE_INFRA: + params.mode = IEEE80211_MODE_INFRA; + break; + case WPAS_MODE_IBSS: + params.mode = IEEE80211_MODE_IBSS; + break; + case WPAS_MODE_AP: + case WPAS_MODE_P2P_GO: + case WPAS_MODE_P2P_GROUP_FORMATION: + params.mode = IEEE80211_MODE_AP; + break; + } params.freq = ssid->frequency; + if (ssid->key_mgmt & WPA_KEY_MGMT_PSK) + wpa_s->key_mgmt = WPA_KEY_MGMT_PSK; + else + wpa_s->key_mgmt = WPA_KEY_MGMT_NONE; + params.key_mgmt_suite = key_mgmt2driver(wpa_s->key_mgmt); + + if (ssid->pairwise_cipher & WPA_CIPHER_CCMP) + wpa_s->pairwise_cipher = WPA_CIPHER_CCMP; + else if (ssid->pairwise_cipher & WPA_CIPHER_TKIP) + wpa_s->pairwise_cipher = WPA_CIPHER_TKIP; + else if (ssid->pairwise_cipher & WPA_CIPHER_NONE) + wpa_s->pairwise_cipher = WPA_CIPHER_NONE; + else { + wpa_printf(MSG_WARNING, "WPA: Failed to select pairwise " + "cipher."); + return -1; + } + params.pairwise_suite = cipher_suite2driver(wpa_s->pairwise_cipher); + params.group_suite = params.pairwise_suite; + +#ifdef CONFIG_P2P + if (ssid->mode == WPAS_MODE_P2P_GO || + ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION) + params.p2p = 1; + wpa_drv_set_intra_bss(wpa_s, wpa_s->conf->p2p_intra_bss); +#endif /* CONFIG_P2P */ + + if (wpa_s->parent->set_ap_uapsd) + params.uapsd = wpa_s->parent->ap_uapsd; + else + params.uapsd = -1; + if (wpa_drv_associate(wpa_s, ¶ms) < 0) { wpa_msg(wpa_s, MSG_INFO, "Failed to start AP functionality"); return -1; @@ -445,6 +353,14 @@ int wpa_supplicant_create_ap(struct wpa_supplicant *wpa_s, return -1; } +#ifdef CONFIG_P2P + if (ssid->mode == WPAS_MODE_P2P_GO) + conf->bss[0].p2p = P2P_ENABLED | P2P_GROUP_OWNER; + else if (ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION) + conf->bss[0].p2p = P2P_ENABLED | P2P_GROUP_OWNER | + P2P_GROUP_FORMATION; +#endif /* CONFIG_P2P */ + hapd_iface->num_bss = conf->num_bss; hapd_iface->bss = os_zalloc(conf->num_bss * sizeof(struct hostapd_data *)); @@ -461,8 +377,30 @@ int wpa_supplicant_create_ap(struct wpa_supplicant *wpa_s, wpa_supplicant_ap_deinit(wpa_s); return -1; } + + hapd_iface->bss[i]->msg_ctx = wpa_s; + hapd_iface->bss[i]->public_action_cb = ap_public_action_rx; + hapd_iface->bss[i]->public_action_cb_ctx = wpa_s; + hapd_iface->bss[i]->vendor_action_cb = ap_vendor_action_rx; + hapd_iface->bss[i]->vendor_action_cb_ctx = wpa_s; + hostapd_register_probereq_cb(hapd_iface->bss[i], + ap_probe_req_rx, wpa_s); + hapd_iface->bss[i]->wps_reg_success_cb = ap_wps_reg_success_cb; + hapd_iface->bss[i]->wps_reg_success_cb_ctx = wpa_s; + hapd_iface->bss[i]->wps_event_cb = ap_wps_event_cb; + hapd_iface->bss[i]->wps_event_cb_ctx = wpa_s; +#ifdef CONFIG_P2P + hapd_iface->bss[i]->p2p = wpa_s->global->p2p; + hapd_iface->bss[i]->p2p_group = wpas_p2p_group_init( + wpa_s, ssid->p2p_persistent_group, + ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION); +#endif /* CONFIG_P2P */ } + os_memcpy(hapd_iface->bss[0]->own_addr, wpa_s->own_addr, ETH_ALEN); + hapd_iface->bss[0]->driver = wpa_s->driver; + hapd_iface->bss[0]->drv_priv = wpa_s->drv_priv; + if (hostapd_setup_interface(wpa_s->ap_iface)) { wpa_printf(MSG_ERROR, "Failed to initialize AP interface"); wpa_supplicant_ap_deinit(wpa_s); @@ -470,8 +408,14 @@ int wpa_supplicant_create_ap(struct wpa_supplicant *wpa_s, } wpa_s->current_ssid = ssid; + os_memcpy(wpa_s->bssid, wpa_s->own_addr, ETH_ALEN); + wpa_s->assoc_freq = ssid->frequency; wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); + if (wpa_s->ap_configured_cb) + wpa_s->ap_configured_cb(wpa_s->ap_configured_cb_ctx, + wpa_s->ap_configured_cb_data); + return 0; } @@ -481,47 +425,70 @@ void wpa_supplicant_ap_deinit(struct wpa_supplicant *wpa_s) if (wpa_s->ap_iface == NULL) return; + wpa_s->current_ssid = NULL; +#ifdef CONFIG_P2P + if (wpa_s->ap_iface->bss) + wpa_s->ap_iface->bss[0]->p2p_group = NULL; + wpas_p2p_group_deinit(wpa_s); +#endif /* CONFIG_P2P */ hostapd_interface_deinit(wpa_s->ap_iface); + hostapd_interface_free(wpa_s->ap_iface); wpa_s->ap_iface = NULL; + wpa_drv_deinit_ap(wpa_s); } 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, const u8 *addr) +void ap_rx_from_unknown_sta(void *ctx, const u8 *frame, size_t len) { +#ifdef NEED_AP_MLME struct wpa_supplicant *wpa_s = ctx; - ap_rx_from_unknown_sta(wpa_s->ap_iface->bss[0], addr); + const struct ieee80211_hdr *hdr = + (const struct ieee80211_hdr *) frame; + 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, - struct hostapd_frame_info *fi) +void ap_mgmt_rx(void *ctx, struct rx_mgmt *rx_mgmt) { +#ifdef NEED_AP_MLME struct wpa_supplicant *wpa_s = ctx; - ieee802_11_mgmt(wpa_s->ap_iface->bss[0], buf, len, stype, fi); + struct hostapd_frame_info fi; + os_memset(&fi, 0, sizeof(fi)); + fi.datarate = rx_mgmt->datarate; + fi.ssi_signal = rx_mgmt->ssi_signal; + ieee802_11_mgmt(wpa_s->ap_iface->bss[0], rx_mgmt->frame, + rx_mgmt->frame_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, const u8 *src_addr, const u8 *buf, size_t len) { - hostapd_eapol_receive(wpa_s->ap_iface->bss[0], src_addr, buf, len); + ieee802_1x_receive(wpa_s->ap_iface->bss[0], src_addr, buf, len); } @@ -529,25 +496,206 @@ void wpa_supplicant_ap_rx_eapol(struct wpa_supplicant *wpa_s, int wpa_supplicant_ap_wps_pbc(struct wpa_supplicant *wpa_s, const u8 *bssid) { + if (!wpa_s->ap_iface) + return -1; return hostapd_wps_button_pushed(wpa_s->ap_iface->bss[0]); } +static int wpa_supplicant_ap_wps_sta_cancel(struct hostapd_data *hapd, + struct sta_info *sta, void *ctx) +{ + if (sta && (sta->flags & WLAN_STA_WPS)) { + ap_sta_deauthenticate(hapd, sta, + WLAN_REASON_PREV_AUTH_NOT_VALID); + wpa_printf(MSG_DEBUG, "WPS: %s: Deauth sta=" MACSTR, + __func__, MAC2STR(sta->addr)); + return 1; + } + + return 0; +} + + +int wpa_supplicant_ap_wps_cancel(struct wpa_supplicant *wpa_s) +{ + struct wps_registrar *reg; + int reg_sel = 0, wps_sta = 0; + + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]->wps) + return -1; + + reg = wpa_s->ap_iface->bss[0]->wps->registrar; + reg_sel = wps_registrar_wps_cancel(reg); + wps_sta = ap_for_each_sta(wpa_s->ap_iface->bss[0], + wpa_supplicant_ap_wps_sta_cancel, NULL); + + if (!reg_sel && !wps_sta) { + wpa_printf(MSG_DEBUG, "No WPS operation in progress at this " + "time"); + return -1; + } + + /* + * There are 2 cases to return wps cancel as success: + * 1. When wps cancel was initiated but no connection has been + * established with client yet. + * 2. Client is in the middle of exchanging WPS messages. + */ + + return 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 (!wpa_s->ap_iface) + return -1; + if (pin == NULL) { unsigned int rpin = wps_generate_pin(); ret_len = os_snprintf(buf, buflen, "%d", rpin); pin = buf; - } + } else + ret_len = os_snprintf(buf, buflen, "%s", pin); - ret = hostapd_wps_add_pin(wpa_s->ap_iface->bss[0], "any", pin, 0); + ret = hostapd_wps_add_pin(wpa_s->ap_iface->bss[0], bssid, "any", pin, + 0); if (ret) return -1; return ret_len; } #endif /* CONFIG_WPS */ + + +#ifdef CONFIG_CTRL_IFACE + +int ap_ctrl_iface_sta_first(struct wpa_supplicant *wpa_s, + char *buf, size_t buflen) +{ + if (wpa_s->ap_iface == NULL) + return -1; + return hostapd_ctrl_iface_sta_first(wpa_s->ap_iface->bss[0], + buf, buflen); +} + + +int ap_ctrl_iface_sta(struct wpa_supplicant *wpa_s, const char *txtaddr, + char *buf, size_t buflen) +{ + if (wpa_s->ap_iface == NULL) + return -1; + return hostapd_ctrl_iface_sta(wpa_s->ap_iface->bss[0], txtaddr, + buf, buflen); +} + + +int ap_ctrl_iface_sta_next(struct wpa_supplicant *wpa_s, const char *txtaddr, + char *buf, size_t buflen) +{ + if (wpa_s->ap_iface == NULL) + return -1; + 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 */ + + +int wpa_supplicant_ap_update_beacon(struct wpa_supplicant *wpa_s) +{ + struct hostapd_iface *iface = wpa_s->ap_iface; + struct wpa_ssid *ssid = wpa_s->current_ssid; + struct hostapd_data *hapd; + + if (ssid == NULL || wpa_s->ap_iface == NULL) + return -1; + +#ifdef CONFIG_P2P + if (ssid->mode == WPAS_MODE_P2P_GO) + iface->conf->bss[0].p2p = P2P_ENABLED | P2P_GROUP_OWNER; + else if (ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION) + iface->conf->bss[0].p2p = P2P_ENABLED | P2P_GROUP_OWNER | + P2P_GROUP_FORMATION; +#endif /* CONFIG_P2P */ + + ieee802_11_set_beacons(iface); + hapd = iface->bss[0]; + hapd->drv.set_ap_wps_ie(hapd); + + return 0; +} + + +int wpa_supplicant_ap_mac_addr_filter(struct wpa_supplicant *wpa_s, + const u8 *addr) +{ + struct hostapd_data *hapd; + struct hostapd_bss_config *conf; + + if (!wpa_s->ap_iface) + return -1; + + if (addr) + wpa_printf(MSG_DEBUG, "AP: Set MAC address filter: " MACSTR, + MAC2STR(addr)); + else + wpa_printf(MSG_DEBUG, "AP: Clear MAC address filter"); + + hapd = wpa_s->ap_iface->bss[0]; + conf = hapd->conf; + + os_free(conf->accept_mac); + conf->accept_mac = NULL; + conf->num_accept_mac = 0; + os_free(conf->deny_mac); + conf->deny_mac = NULL; + conf->num_deny_mac = 0; + + if (addr == NULL) { + conf->macaddr_acl = ACCEPT_UNLESS_DENIED; + return 0; + } + + conf->macaddr_acl = DENY_UNLESS_ACCEPTED; + conf->accept_mac = os_zalloc(sizeof(struct mac_acl_entry)); + if (conf->accept_mac == NULL) + return -1; + os_memcpy(conf->accept_mac[0].addr, addr, ETH_ALEN); + conf->num_accept_mac = 1; + + return 0; +}