jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
hostap/wpa_supplicant/ap.c

1034 lines
27 KiB
C
Raw Normal View History

Link in AP functionality from hostapd when CONFIG_AP=y This is only allowing the code to be compiled and linked in; the actual functionality is not yet enabled.
2009-03-25 11:23:42 +01:00
/*
* WPA Supplicant - Basic AP mode support routines
* Copyright (c) 2003-2009, Jouni Malinen <j@w1.fi>
* Copyright (c) 2009, Atheros Communications
*
Remove the GPL notification from files contributed by Jouni Malinen Remove the GPL notification text from the files that were initially contributed by myself. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-11 15:46:35 +01:00
* This software may be distributed under the terms of the BSD license.
* See README for more details.
Link in AP functionality from hostapd when CONFIG_AP=y This is only allowing the code to be compiled and linked in; the actual functionality is not yet enabled.
2009-03-25 11:23:42 +01:00
*/
Rename some src/ap files to avoid duplicate file names Doxygen and some build tools may get a bit confused about same file name being used in different directories. Clean this up a bit by renaming some of the duplicated file names in src/ap.
2009-12-25 23:05:40 +01:00
#include "utils/includes.h"
Link in AP functionality from hostapd when CONFIG_AP=y This is only allowing the code to be compiled and linked in; the actual functionality is not yet enabled.
2009-03-25 11:23:42 +01:00
Rename some src/ap files to avoid duplicate file names Doxygen and some build tools may get a bit confused about same file name being used in different directories. Clean this up a bit by renaming some of the duplicated file names in src/ap.
2009-12-25 23:05:40 +01:00
#include "utils/common.h"
WPS: Add wps_ap_pin ctrl_iface command for wpa_supplicant AP mode This can be used to control the AP PIN in wpa_supplicant AP mode in the same way as the identical command in hostapd ctrl_iface.
2010-11-17 15:46:55 +01:00
#include "utils/eloop.h"
wpa_supplicant AP: Copy generated UUID for AP configuration If the wpa_supplicant configuration file does not specify an UUID, we need to copy the generated UUID, not the all zeros buffer reserved for the configured UUID.
2011-03-10 17:40:16 +01:00
#include "utils/uuid.h"
Fix wpa_supplicant build with CONFIG_AP=y
2009-12-27 20:33:18 +01:00
#include "common/ieee802_11_defs.h"
P2P: Send AP mode WPS-FAIL event to parent interface The AP operation with wpa_supplicant requires an additional callback to get the needed event information from hostapd side so that wpa_msg() can be called for wpa_s->parent if needed.
2010-10-14 19:57:00 +02:00
#include "common/wpa_ctrl.h"
Move generic AP functionality implementation into src/ap This code can be shared by both hostapd and wpa_supplicant and this is an initial step in getting the generic code moved to be under the src directories. Couple of generic files still remain under the hostapd directory due to direct dependencies to files there. Once the dependencies have been removed, they will also be moved to the src/ap directory to allow wpa_supplicant to be built without requiring anything from the hostapd directory.
2009-12-25 00:12:50 +01:00
#include "ap/hostapd.h"
Rename some src/ap files to avoid duplicate file names Doxygen and some build tools may get a bit confused about same file name being used in different directories. Clean this up a bit by renaming some of the duplicated file names in src/ap.
2009-12-25 23:05:40 +01:00
#include "ap/ap_config.h"
Fix wpa_supplicant AP mode build after hostapd changes
2010-11-24 15:52:04 +01:00
#include "ap/ap_drv_ops.h"
Replace NEED_MLME with NEED_AP_MLME This makes it clearer that it's about the AP, not client-side MLME, even when built into the client (wpa_supplicant).
2009-08-14 19:01:41 +02:00
#ifdef NEED_AP_MLME
Move generic AP functionality implementation into src/ap This code can be shared by both hostapd and wpa_supplicant and this is an initial step in getting the generic code moved to be under the src directories. Couple of generic files still remain under the hostapd directory due to direct dependencies to files there. Once the dependencies have been removed, they will also be moved to the src/ap directory to allow wpa_supplicant to be built without requiring anything from the hostapd directory.
2009-12-25 00:12:50 +01:00
#include "ap/ieee802_11.h"
Replace NEED_MLME with NEED_AP_MLME This makes it clearer that it's about the AP, not client-side MLME, even when built into the client (wpa_supplicant).
2009-08-14 19:01:41 +02:00
#endif /* NEED_AP_MLME */
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
#include "ap/beacon.h"
Use driver event, EVENT_EAPOL_RX, for EAPOL frame indication
2010-01-03 16:44:40 +01:00
#include "ap/ieee802_1x.h"
Fix wpa_supplicant CONFIG_AP build
2009-12-25 11:06:53 +01:00
#include "ap/wps_hostapd.h"
Move ctrl_iface_ap.c into src/ap
2009-12-25 11:25:55 +01:00
#include "ap/ctrl_iface_ap.h"
wpa_supplicant AP: Add preliminary support for WPS Internal Registrar When in AP mode, wpa_supplicant is now enabling WPS (only Internal Registrar). wpa_cli wps_pbc and wps_pin commands can be used to initiate WPS negotiation similarly to how this is done in station mode (though, the BSSID parameter is ignored).
2009-04-21 15:45:16 +02:00
#include "wps/wps.h"
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
#include "common/ieee802_11_defs.h"
Move wpa_supplicant_create_ap() into ap.c
2009-03-26 15:08:17 +01:00
#include "config_ssid.h"
Copy config_methods and device_type configuration for AP mode
2009-12-21 15:10:21 +01:00
#include "config.h"
Move wpa_supplicant_create_ap() into ap.c
2009-03-26 15:08:17 +01:00
#include "wpa_supplicant_i.h"
Add preliminary hostapd data structure initialization for AP mode wpa_supplicant can now initialize hostapd data structures when mode=2 is used to set up an AP. The hostapd configuration is not yet set based on wpa_supplicant network configuration block. In addition, the glue code for hostapd driver_ops needs number of functions that will be needed for AP functionality.
2009-03-26 19:37:05 +01:00
#include "driver_i.h"
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
#include "p2p_supplicant.h"
Add preliminary hostapd data structure initialization for AP mode wpa_supplicant can now initialize hostapd data structures when mode=2 is used to set up an AP. The hostapd configuration is not yet set based on wpa_supplicant network configuration block. In addition, the glue code for hostapd driver_ops needs number of functions that will be needed for AP functionality.
2009-03-26 19:37:05 +01:00
#include "ap.h"
WPS: Allow pending WPS operation to be cancelled A new ctrl_interface command, WPS_CANCEL, can now be used to cancel a pending or ongoing WPS operation. For now, this is only available with wpa_supplicant (either in station or AP mode). Similar functionality should be added for hostapd, too.
2010-09-06 19:51:06 +02:00
#include "ap/sta_info.h"
wpa_s AP mode: Add notification functions for STA authorized Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-16 14:58:41 +01:00
#include "notify.h"
Link in AP functionality from hostapd when CONFIG_AP=y This is only allowing the code to be compiled and linked in; the actual functionality is not yet enabled.
2009-03-25 11:23:42 +01:00
Fix CONFIG_AP=y build without CONFIG_WPS=y
2010-11-25 22:34:56 +01:00
#ifdef CONFIG_WPS
WPS: Add wps_ap_pin ctrl_iface command for wpa_supplicant AP mode This can be used to control the AP PIN in wpa_supplicant AP mode in the same way as the identical command in hostapd ctrl_iface.
2010-11-17 15:46:55 +01:00
static void wpas_wps_ap_pin_timeout(void *eloop_data, void *user_ctx);
Fix CONFIG_AP=y build without CONFIG_WPS=y
2010-11-25 22:34:56 +01:00
#endif /* CONFIG_WPS */
WPS: Add wps_ap_pin ctrl_iface command for wpa_supplicant AP mode This can be used to control the AP PIN in wpa_supplicant AP mode in the same way as the identical command in hostapd ctrl_iface.
2010-11-17 15:46:55 +01:00
Set hostapd configuration based on wpa_supplicant AP mode config
2009-03-27 15:45:47 +01:00
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];
Do not use virtual driver_ops for wpa_supplicant AP mode Initialize struct hostapd_data driver context with the same driver information that was initialized earlier during wpa_supplicant start. This allows the AP mode operations to be completed directly with the same calls in AP code without having to maintain a separate translation layer between the AP and station mode driver context.
2009-12-25 18:47:08 +01:00
int pairwise;
Merge wpa_supplicant and hostapd driver wrapper implementations This commit merges the driver_ops structures and implementations from hostapd/driver*.[ch] into src/drivers. This is only an initial step and there is room for number of cleanups to share code between the hostapd and wpa_supplicant parts of the wrappers to avoid unnecessary source code duplication.
2009-04-09 12:40:12 +02:00
Do not use virtual driver_ops for wpa_supplicant AP mode Initialize struct hostapd_data driver context with the same driver information that was initialized earlier during wpa_supplicant start. This allows the AP mode operations to be completed directly with the same calls in AP code without having to maintain a separate translation layer between the AP and station mode driver context.
2009-12-25 18:47:08 +01:00
conf->driver = wpa_s->driver;
Set hostapd configuration based on wpa_supplicant AP mode config
2009-03-27 15:45:47 +01:00
os_strlcpy(bss->iface, wpa_s->ifname, sizeof(bss->iface));
if (ssid->frequency == 0) {
/* default channel 11 */
conf->hw_mode = HOSTAPD_MODE_IEEE80211G;
conf->channel = 11;
} else if (ssid->frequency >= 2412 && ssid->frequency <= 2472) {
conf->hw_mode = HOSTAPD_MODE_IEEE80211G;
conf->channel = (ssid->frequency - 2407) / 5;
} else if ((ssid->frequency >= 5180 && ssid->frequency <= 5240) ||
(ssid->frequency >= 5745 && ssid->frequency <= 5825)) {
wpa_supplicant AP: Fix hw_mode for 5 GHz channels
2009-04-12 11:10:08 +02:00
conf->hw_mode = HOSTAPD_MODE_IEEE80211A;
Set hostapd configuration based on wpa_supplicant AP mode config
2009-03-27 15:45:47 +01:00
conf->channel = (ssid->frequency - 5000) / 5;
Introduce 60 GHz band Basic support for the 60 GHz band. Neither P2P nor WPS are yet taken care off. Allows to start AP with very simple config: network={ ssid="test" mode=2 frequency=60480 key_mgmt=NONE } Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-18 10:50:35 +01:00
} else if (ssid->frequency >= 56160 + 2160 * 1 &&
ssid->frequency <= 56160 + 2160 * 4) {
conf->hw_mode = HOSTAPD_MODE_IEEE80211AD;
conf->channel = (ssid->frequency - 56160) / 2160;
Set hostapd configuration based on wpa_supplicant AP mode config
2009-03-27 15:45:47 +01:00
} else {
wpa_printf(MSG_ERROR, "Unsupported AP mode frequency: %d MHz",
ssid->frequency);
return -1;
}
wpa_s AP mode: Enable HT20 if driver supports it If the driver supports HT20, set the config parameter ieee80211n to enable it. This does not enable HT40. Signed-off-by: Angie Chinchilla <angie.v.chinchilla@intel.com>
2011-07-05 15:49:28 +02:00
/* TODO: enable HT40 if driver supports it;
Set hostapd configuration based on wpa_supplicant AP mode config
2009-03-27 15:45:47 +01:00
* drop to 11b if driver does not support 11g */
wpa_s AP mode: Enable HT20 if driver supports it If the driver supports HT20, set the config parameter ieee80211n to enable it. This does not enable HT40. Signed-off-by: Angie Chinchilla <angie.v.chinchilla@intel.com>
2011-07-05 15:49:28 +02:00
#ifdef CONFIG_IEEE80211N
/*
Set ht_capab from based on driver capabilities when in P2P GO mode Set the HT capabilities of a P2P GO according to the wiphy supported ones. Mask-in a white-list of HT capabilities that won't cause problems for non-supporting stations. Signed-hostap: Arik Nemtsov <arik@wizery.com>
2011-11-29 22:45:07 +01:00
* Enable HT20 if the driver supports it, by setting conf->ieee80211n
* and a mask of allowed capabilities within conf->ht_capab.
wpa_s AP mode: Enable HT20 if driver supports it If the driver supports HT20, set the config parameter ieee80211n to enable it. This does not enable HT40. Signed-off-by: Angie Chinchilla <angie.v.chinchilla@intel.com>
2011-07-05 15:49:28 +02:00
* Using default config settings for: conf->ht_op_mode_fixed,
Set ht_capab from based on driver capabilities when in P2P GO mode Set the HT capabilities of a P2P GO according to the wiphy supported ones. Mask-in a white-list of HT capabilities that won't cause problems for non-supporting stations. Signed-hostap: Arik Nemtsov <arik@wizery.com>
2011-11-29 22:45:07 +01:00
* conf->secondary_channel, conf->require_ht
wpa_s AP mode: Enable HT20 if driver supports it If the driver supports HT20, set the config parameter ieee80211n to enable it. This does not enable HT40. Signed-off-by: Angie Chinchilla <angie.v.chinchilla@intel.com>
2011-07-05 15:49:28 +02:00
*/
wpa_supplicant: Unify hardware feature data The hardware feature data is required in several different places throughout the code. Previously, the data was acquired and freed on demand, but with this patch wpa_supplicant will keep a single copy around at runtime for everyone to use. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
2011-10-23 10:58:54 +02:00
if (wpa_s->hw.modes) {
wpa_s AP mode: Enable HT20 if driver supports it If the driver supports HT20, set the config parameter ieee80211n to enable it. This does not enable HT40. Signed-off-by: Angie Chinchilla <angie.v.chinchilla@intel.com>
2011-07-05 15:49:28 +02:00
struct hostapd_hw_modes *mode = NULL;
Allow disable_ht to override 11n configuration in AP mode This is being done only for station mode, extend it to AP mode as well. Signed-hostap: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
2012-04-11 15:24:03 +02:00
int i, no_ht = 0;
wpa_supplicant: Unify hardware feature data The hardware feature data is required in several different places throughout the code. Previously, the data was acquired and freed on demand, but with this patch wpa_supplicant will keep a single copy around at runtime for everyone to use. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
2011-10-23 10:58:54 +02:00
for (i = 0; i < wpa_s->hw.num_modes; i++) {
if (wpa_s->hw.modes[i].mode == conf->hw_mode) {
mode = &wpa_s->hw.modes[i];
wpa_s AP mode: Enable HT20 if driver supports it If the driver supports HT20, set the config parameter ieee80211n to enable it. This does not enable HT40. Signed-off-by: Angie Chinchilla <angie.v.chinchilla@intel.com>
2011-07-05 15:49:28 +02:00
break;
}
}
Allow disable_ht to override 11n configuration in AP mode This is being done only for station mode, extend it to AP mode as well. Signed-hostap: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
2012-04-11 15:24:03 +02:00
#ifdef CONFIG_HT_OVERRIDES
if (ssid->disable_ht) {
conf->ieee80211n = 0;
conf->ht_capab = 0;
no_ht = 1;
}
#endif /* CONFIG_HT_OVERRIDES */
if (!no_ht && mode && mode->ht_capab) {
wpa_s AP mode: Enable HT20 if driver supports it If the driver supports HT20, set the config parameter ieee80211n to enable it. This does not enable HT40. Signed-off-by: Angie Chinchilla <angie.v.chinchilla@intel.com>
2011-07-05 15:49:28 +02:00
conf->ieee80211n = 1;
P2P: Enable 40 MHz support for autonomous P2P group addition Add optional "ht40" argument for p2p_group_add command to enable 40 MHz in 5GHz band. This configures the secondary channel, when HT support is enabled and if the HW supports 40 MHz channel width. Signed-hostap: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
2012-08-15 21:53:01 +02:00
#ifdef CONFIG_P2P
if (conf->hw_mode == HOSTAPD_MODE_IEEE80211A &&
(mode->ht_capab &
HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET) &&
ssid->ht40)
conf->secondary_channel =
wpas_p2p_get_ht40_mode(wpa_s, mode,
conf->channel);
if (conf->secondary_channel)
conf->ht_capab |=
HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET;
#endif /* CONFIG_P2P */
Set ht_capab from based on driver capabilities when in P2P GO mode Set the HT capabilities of a P2P GO according to the wiphy supported ones. Mask-in a white-list of HT capabilities that won't cause problems for non-supporting stations. Signed-hostap: Arik Nemtsov <arik@wizery.com>
2011-11-29 22:45:07 +01:00
/*
* white-list capabilities that won't cause issues
* to connecting stations, while leaving the current
* capabilities intact (currently disabled SMPS).
*/
conf->ht_capab |= mode->ht_capab &
(HT_CAP_INFO_GREEN_FIELD |
HT_CAP_INFO_SHORT_GI20MHZ |
HT_CAP_INFO_SHORT_GI40MHZ |
HT_CAP_INFO_RX_STBC_MASK |
HT_CAP_INFO_MAX_AMSDU_SIZE);
}
wpa_s AP mode: Enable HT20 if driver supports it If the driver supports HT20, set the config parameter ieee80211n to enable it. This does not enable HT40. Signed-off-by: Angie Chinchilla <angie.v.chinchilla@intel.com>
2011-07-05 15:49:28 +02:00
}
#endif /* CONFIG_IEEE80211N */
P2P: Remove 802.11b rates from wpa_supplicant AP mode operations TODO: do this only for P2P group interface
2010-07-18 23:30:25 +02:00
#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;
}
P2P: Fix p2p_intra_bss with nl80211 The current implementation of p2p_intra_bss doesn't work since the flag isn't propagated into the corresponding hostapd config, so AP code will never enable AP isolation and will in fact disable it again after it had been enabled by the P2P code. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-07-15 16:13:44 +02:00
bss->isolate = !wpa_s->conf->p2p_intra_bss;
P2P: Remove 802.11b rates from wpa_supplicant AP mode operations TODO: do this only for P2P group interface
2010-07-18 23:30:25 +02:00
#endif /* CONFIG_P2P */
Set hostapd configuration based on wpa_supplicant AP mode config
2009-03-27 15:45:47 +01:00
if (ssid->ssid_len == 0) {
wpa_printf(MSG_ERROR, "No SSID configured for AP mode");
return -1;
}
os_memcpy(bss->ssid.ssid, ssid->ssid, ssid->ssid_len);
bss->ssid.ssid_len = ssid->ssid_len;
bss->ssid.ssid_set = 1;
Add support for hidden SSID in wpa_supplicant AP mode This also disables WPS support if hidden SSID is enabled in AP mode. Signed-off-by: Vivek Natarajan <nataraja@qca.qualcomm.com> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-27 15:28:45 +01:00
bss->ignore_broadcast_ssid = ssid->ignore_broadcast_ssid;
wpa_supplicant: Set configured auth_algs for AP mode In AP mode, authentication algorithm is reset in hostapd_config_defaults_bss() and never set to the configured one. This would pass the default auth_algs (OPEN|SHARED) to driver regardless of what the wpa_supplicant configuration is requesting. Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
2011-11-16 15:30:36 +01:00
if (ssid->auth_alg)
bss->auth_algs = ssid->auth_alg;
Set hostapd configuration based on wpa_supplicant AP mode config
2009-03-27 15:45:47 +01:00
if (wpa_key_mgmt_wpa_psk(ssid->key_mgmt))
bss->wpa = ssid->proto;
bss->wpa_key_mgmt = ssid->key_mgmt;
bss->wpa_pairwise = ssid->pairwise_cipher;
P2P: Reduce redundant PSK generation for GO The PSK generation done by pbkdf2_sha1() is one of the longest CPU time users according to our profiling from boot to GO started. So I have reduced some steps. I could boot a GO by this command sequence. ------------- add_net set_network 0 ssid '"DIRECT-XX"' set_network 0 psk '"123456789012345678901234567890123456789012345678901234567890123"' set_network 0 proto RSN set_network 0 key_mgmt WPA-PSK set_network 0 pairwise CCMP set_network 0 auth_alg OPEN set_network 0 mode 3 set_network 0 disabled 2 p2p_group_add persistent=0 freq=2412 ------------- By this sequence, pbkdf2_sha1() was called three times and the function calculates the same value each time. Reduce number of calls to pbkdf2_sha1() from 3 to 1 by caching the previous result. Signed-hostap: Masashi Honma <masashi.honma at gmail.com>
2012-11-11 10:39:24 +01:00
if (ssid->psk_set) {
Set hostapd configuration based on wpa_supplicant AP mode config
2009-03-27 15:45:47 +01:00
os_free(bss->ssid.wpa_psk);
bss->ssid.wpa_psk = os_zalloc(sizeof(struct hostapd_wpa_psk));
if (bss->ssid.wpa_psk == NULL)
return -1;
os_memcpy(bss->ssid.wpa_psk->psk, ssid->psk, PMK_LEN);
bss->ssid.wpa_psk->group = 1;
P2P: Reduce redundant PSK generation for GO The PSK generation done by pbkdf2_sha1() is one of the longest CPU time users according to our profiling from boot to GO started. So I have reduced some steps. I could boot a GO by this command sequence. ------------- add_net set_network 0 ssid '"DIRECT-XX"' set_network 0 psk '"123456789012345678901234567890123456789012345678901234567890123"' set_network 0 proto RSN set_network 0 key_mgmt WPA-PSK set_network 0 pairwise CCMP set_network 0 auth_alg OPEN set_network 0 mode 3 set_network 0 disabled 2 p2p_group_add persistent=0 freq=2412 ------------- By this sequence, pbkdf2_sha1() was called three times and the function calculates the same value each time. Reduce number of calls to pbkdf2_sha1() from 3 to 1 by caching the previous result. Signed-hostap: Masashi Honma <masashi.honma at gmail.com>
2012-11-11 10:39:24 +01:00
} else if (ssid->passphrase) {
bss->ssid.wpa_passphrase = os_strdup(ssid->passphrase);
wpa_supplicant AP: Set static WEP keys if configured This is needed to configure static WEP keys to the driver through the hostapd configuration structures.
2011-09-15 14:04:46 +02:00
} else if (ssid->wep_key_len[0] || ssid->wep_key_len[1] ||
ssid->wep_key_len[2] || ssid->wep_key_len[3]) {
struct hostapd_wep_keys *wep = &bss->ssid.wep;
int i;
for (i = 0; i < NUM_WEP_KEYS; i++) {
if (ssid->wep_key_len[i] == 0)
continue;
wep->key[i] = os_malloc(ssid->wep_key_len[i]);
if (wep->key[i] == NULL)
return -1;
os_memcpy(wep->key[i], ssid->wep_key[i],
ssid->wep_key_len[i]);
wep->len[i] = ssid->wep_key_len[i];
}
wep->idx = ssid->wep_tx_keyidx;
wep->keys_set = 1;
Set hostapd configuration based on wpa_supplicant AP mode config
2009-03-27 15:45:47 +01:00
}
wpa_supplicant: Add provision to configure inactivity period in AP mode This patch adds a configuration in network block, ap_max_inactivity, for station's inactivity period when in AP mode. The time period is configured in seconds, by default 300 seconds. Signed-hostap: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
2012-03-27 19:41:27 +02:00
if (ssid->ap_max_inactivity)
bss->ap_max_inactivity = ssid->ap_max_inactivity;
wpa_supplicant: Support dtim_period configuration for AP mode Signed-off-by: Etay Luz <eluz@qca.qualcomm.com>
2012-06-04 16:52:37 +02:00
if (ssid->dtim_period)
bss->dtim_period = ssid->dtim_period;
wpa_supplicant AP: Update WPA/RSN configuration Couple of additional operations are needed to make hostapd configuration valid for WPA.
2009-04-20 15:11:08 +02:00
/* 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;
Add support for using GCMP cipher from IEEE 802.11ad This allows both hostapd and wpa_supplicant to be used to derive and configure keys for GCMP. This is quite similar to CCMP key configuration, but a different cipher suite and somewhat different rules are used in cipher selection. It should be noted that GCMP is not included in default parameters at least for now, so explicit pairwise/group configuration is needed to enable it. This may change in the future to allow GCMP to be selected automatically in cases where CCMP could have been used. This commit does not included changes to WPS or P2P to allow GCMP to be used. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-29 10:52:15 +02:00
else if ((pairwise & (WPA_CIPHER_CCMP | WPA_CIPHER_GCMP)) ==
WPA_CIPHER_GCMP)
bss->wpa_group = WPA_CIPHER_GCMP;
wpa_supplicant AP: Update WPA/RSN configuration Couple of additional operations are needed to make hostapd configuration valid for WPA.
2009-04-20 15:11:08 +02:00
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) {
AP: Set pairwise/group cipher for non-WPA modes This is needed to avoid confusing configuration in some nl80211 drivers that the new AP mode configuration alternatives for setting security policy.
2011-09-15 14:02:59 +02:00
int cipher = WPA_CIPHER_NONE;
wpa_supplicant AP: Update WPA/RSN configuration Couple of additional operations are needed to make hostapd configuration valid for WPA.
2009-04-20 15:11:08 +02:00
bss->ssid.security_policy = SECURITY_IEEE_802_1X;
bss->ssid.wep.default_len = bss->default_wep_key_len;
AP: Set pairwise/group cipher for non-WPA modes This is needed to avoid confusing configuration in some nl80211 drivers that the new AP mode configuration alternatives for setting security policy.
2011-09-15 14:02:59 +02:00
if (bss->default_wep_key_len)
cipher = bss->default_wep_key_len >= 13 ?
WPA_CIPHER_WEP104 : WPA_CIPHER_WEP40;
bss->wpa_group = cipher;
bss->wpa_pairwise = cipher;
bss->rsn_pairwise = cipher;
} else if (bss->ssid.wep.keys_set) {
int cipher = WPA_CIPHER_WEP40;
if (bss->ssid.wep.len[0] >= 13)
cipher = WPA_CIPHER_WEP104;
wpa_supplicant AP: Update WPA/RSN configuration Couple of additional operations are needed to make hostapd configuration valid for WPA.
2009-04-20 15:11:08 +02:00
bss->ssid.security_policy = SECURITY_STATIC_WEP;
AP: Set pairwise/group cipher for non-WPA modes This is needed to avoid confusing configuration in some nl80211 drivers that the new AP mode configuration alternatives for setting security policy.
2011-09-15 14:02:59 +02:00
bss->wpa_group = cipher;
bss->wpa_pairwise = cipher;
bss->rsn_pairwise = cipher;
} else {
wpa_supplicant AP: Update WPA/RSN configuration Couple of additional operations are needed to make hostapd configuration valid for WPA.
2009-04-20 15:11:08 +02:00
bss->ssid.security_policy = SECURITY_PLAINTEXT;
AP: Set pairwise/group cipher for non-WPA modes This is needed to avoid confusing configuration in some nl80211 drivers that the new AP mode configuration alternatives for setting security policy.
2011-09-15 14:02:59 +02:00
bss->wpa_group = WPA_CIPHER_NONE;
bss->wpa_pairwise = WPA_CIPHER_NONE;
bss->rsn_pairwise = WPA_CIPHER_NONE;
}
wpa_supplicant AP: Update WPA/RSN configuration Couple of additional operations are needed to make hostapd configuration valid for WPA.
2009-04-20 15:11:08 +02:00
wpa_supplicant AP: Add preliminary support for WPS Internal Registrar When in AP mode, wpa_supplicant is now enabling WPS (only Internal Registrar). wpa_cli wps_pbc and wps_pin commands can be used to initiate WPS negotiation similarly to how this is done in station mode (though, the BSSID parameter is ignored).
2009-04-21 15:45:16 +02:00
#ifdef CONFIG_WPS
/*
AP: Only enable WPS for open and WPA/WPA2-Personal configuration When wpa_supplicant AP mode is used, WPS was enabled by default regardless of security mode. This is not desired for WEP, so change the AP configuration to enable WPS only for open and WPA/WPA2-Personal networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-14 15:16:29 +01:00
* Enable WPS by default for open and WPA/WPA2-Personal network, but
* require user interaction to actually use it. Only the internal
* Registrar is supported.
wpa_supplicant AP: Add preliminary support for WPS Internal Registrar When in AP mode, wpa_supplicant is now enabling WPS (only Internal Registrar). wpa_cli wps_pbc and wps_pin commands can be used to initiate WPS negotiation similarly to how this is done in station mode (though, the BSSID parameter is ignored).
2009-04-21 15:45:16 +02:00
*/
AP: Only enable WPS for open and WPA/WPA2-Personal configuration When wpa_supplicant AP mode is used, WPS was enabled by default regardless of security mode. This is not desired for WEP, so change the AP configuration to enable WPS only for open and WPA/WPA2-Personal networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-14 15:16:29 +01:00
if (bss->ssid.security_policy != SECURITY_WPA_PSK &&
bss->ssid.security_policy != SECURITY_PLAINTEXT)
goto no_wps;
WPS: Disable WPS(v2) in WPA/TKIP-only configuration When using wpa_supplicant AP mode, WPS support is enabled by default for WPA/WPA2-Personal. Change this to enforce the WPS2 rules on not allowing WPS to be used with WPA/TKIP-only configuration (i.e., at minimum, mixed mode with WPA/TKIP and WPA2/CCMP has to be used for WPS to be enabled). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-12-01 20:46:19 +01:00
#ifdef CONFIG_WPS2
if (bss->ssid.security_policy == SECURITY_WPA_PSK &&
(!(pairwise & WPA_CIPHER_CCMP) || !(bss->wpa & 2)))
goto no_wps; /* WPS2 does not allow WPA/TKIP-only
* configuration */
#endif /* CONFIG_WPS2 */
wpa_supplicant AP: Add preliminary support for WPS Internal Registrar When in AP mode, wpa_supplicant is now enabling WPS (only Internal Registrar). wpa_cli wps_pbc and wps_pin commands can be used to initiate WPS negotiation similarly to how this is done in station mode (though, the BSSID parameter is ignored).
2009-04-21 15:45:16 +02:00
bss->eap_server = 1;
Add support for hidden SSID in wpa_supplicant AP mode This also disables WPS support if hidden SSID is enabled in AP mode. Signed-off-by: Vivek Natarajan <nataraja@qca.qualcomm.com> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-27 15:28:45 +01:00
if (!ssid->ignore_broadcast_ssid)
bss->wps_state = 2;
WPS: Add special AP Setup Locked mode to allow read only ER ap_setup_locked=2 can now be used to enable a special mode where WPS ER can learn the current AP settings, but cannot change then. In other words, the protocol is allowed to continue past M2, but is stopped at M7 when AP is in this mode. WPS IE does not advertise AP Setup Locked in this case to avoid interoperability issues. In wpa_supplicant, use ap_setup_locked=2 by default. Since the AP PIN is disabled by default, this does not enable any new functionality automatically. To allow the read-only ER to go through the protocol, wps_ap_pin command needs to be used to enable the AP PIN.
2010-11-17 15:48:39 +01:00
bss->ap_setup_locked = 2;
Copy config_methods and device_type configuration for AP mode
2009-12-21 15:10:21 +01:00
if (wpa_s->conf->config_methods)
bss->config_methods = os_strdup(wpa_s->conf->config_methods);
WPS: Store (secondary) device type as binary Instead of converting back and forth from the string representation, always use the binary representation internally. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-17 17:50:22 +01:00
os_memcpy(bss->device_type, wpa_s->conf->device_type,
WPS_DEV_TYPE_LEN);
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
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);
}
Copy WPS strings into AP configuration when using wpa_supplicant AP
2010-07-30 02:25:54 +02:00
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);
wpa_supplicant AP: Copy generated UUID for AP configuration If the wpa_supplicant configuration file does not specify an UUID, we need to copy the generated UUID, not the all zeros buffer reserved for the configured UUID.
2011-03-10 17:40:16 +01:00
if (is_nil_uuid(wpa_s->conf->uuid))
os_memcpy(bss->uuid, wpa_s->wps->uuid, WPS_UUID_LEN);
else
os_memcpy(bss->uuid, wpa_s->conf->uuid, WPS_UUID_LEN);
Copy WPS strings into AP configuration when using wpa_supplicant AP
2010-07-30 02:25:54 +02:00
os_memcpy(bss->os_version, wpa_s->conf->os_version, 4);
Allow pbc_in_m1 workaround to be enabled in wpa_supplicant AP mode This workaround for Windows 7 WPS probing mechanism was previously allowed only with hostapd, but the same interoperability issue can happen with wpa_supplicant AP/GO mode. Allow the workaround to be enabled in wpa_supplicant configuration for these uses. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-03 15:51:04 +02:00
bss->pbc_in_m1 = wpa_s->conf->pbc_in_m1;
AP: Only enable WPS for open and WPA/WPA2-Personal configuration When wpa_supplicant AP mode is used, WPS was enabled by default regardless of security mode. This is not desired for WEP, so change the AP configuration to enable WPS only for open and WPA/WPA2-Personal networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-14 15:16:29 +01:00
no_wps:
Copy WPS strings into AP configuration when using wpa_supplicant AP
2010-07-30 02:25:54 +02:00
#endif /* CONFIG_WPS */
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
Fix max_stations to apply to associated STAs, not P2P peers This driver capability limit was supposed to indicate limit on how many stations can associate with us in the AP mode, not how many P2P peers are stored in the peer table.
2010-10-19 16:17:04 +02:00
if (wpa_s->max_stations &&
wpa_s->max_stations < wpa_s->conf->max_num_sta)
bss->max_num_sta = wpa_s->max_stations;
else
bss->max_num_sta = wpa_s->conf->max_num_sta;
Add max_num_sta config option for wpa_supplicant AP mode This can be used to limit the number of stations allowed to be connected to the AP.
2010-10-19 16:08:20 +02:00
Allow AP mode to disconnect STAs based on low ACK condition The nl80211 driver can report low ACK condition (in fact it reports complete loss right now only). Use that, along with a config option, to disconnect stations when the data connection is not working properly, e.g., due to the STA having went outside the range of the AP. This is disabled by default and can be enabled with disassoc_low_ack=1 in hostapd or wpa_supplicant configuration file. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2010-12-28 16:15:01 +01:00
bss->disassoc_low_ack = wpa_s->conf->disassoc_low_ack;
Set hostapd configuration based on wpa_supplicant AP mode config
2009-03-27 15:45:47 +01:00
return 0;
}
Add wpa_supplicant AP mode events for Public Action frames
2010-04-11 19:33:33 +02:00
static void ap_public_action_rx(void *ctx, const u8 *buf, size_t len, int freq)
{
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
#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 */
}
P2P: Send AP mode WPS-FAIL event to parent interface The AP operation with wpa_supplicant requires an additional callback to get the needed event information from hostapd side so that wpa_msg() can be called for wpa_s->parent if needed.
2010-10-14 19:57:00 +02:00
static void ap_wps_event_cb(void *ctx, enum wps_event event,
union wps_event_data *data)
{
P2P: Indicate WPS events from AP mode only during group formation The duplicated WPS event in the parent interface should only be used during P2P group formation, i.e., when the WPS operation was actually started using the parent interface. When authorizing a client to connect to an already running group, the WPS command is issued on the group interface and there is no need to duplicate the event to the parent interface.
2010-11-18 11:42:02 +01:00
#ifdef CONFIG_P2P
P2P: Send AP mode WPS-FAIL event to parent interface The AP operation with wpa_supplicant requires an additional callback to get the needed event information from hostapd side so that wpa_msg() can be called for wpa_s->parent if needed.
2010-10-14 19:57:00 +02:00
struct wpa_supplicant *wpa_s = ctx;
P2P: Fix WpsFailed signal in P2P D-Bus Fix a NULL pointer dereference in commit 3734552f15856f3247f8bc484ffdb6d2a7d08113 in the case of PBC overlap and timeout case. Signed-off-by: Jean-Michel.Bachot <jean-michelx.bachot@intel.com> Signed-off-by: Jayant Sane <jayant.sane@intel.com> Signed-off-by: Angie Chinchilla <angie.v.chinchilla@intel.com>
2011-06-25 14:26:04 +02:00
if (event == WPS_EV_FAIL) {
struct wps_event_fail *fail = &data->fail;
if (wpa_s->parent && wpa_s->parent != wpa_s &&
wpa_s == wpa_s->global->p2p_group_formation) {
/*
* 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);
}
wpas_p2p_wps_failed(wpa_s, fail);
P2P: Send AP mode WPS-FAIL event to parent interface The AP operation with wpa_supplicant requires an additional callback to get the needed event information from hostapd side so that wpa_msg() can be called for wpa_s->parent if needed.
2010-10-14 19:57:00 +02:00
}
P2P: Indicate WPS events from AP mode only during group formation The duplicated WPS event in the parent interface should only be used during P2P group formation, i.e., when the WPS operation was actually started using the parent interface. When authorizing a client to connect to an already running group, the WPS command is issued on the group interface and there is no need to duplicate the event to the parent interface.
2010-11-18 11:42:02 +01:00
#endif /* CONFIG_P2P */
P2P: Send AP mode WPS-FAIL event to parent interface The AP operation with wpa_supplicant requires an additional callback to get the needed event information from hostapd side so that wpa_msg() can be called for wpa_s->parent if needed.
2010-10-14 19:57:00 +02:00
}
wpa_s AP mode: Add notification functions for STA authorized Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-16 14:58:41 +01:00
static void ap_sta_authorized_cb(void *ctx, const u8 *mac_addr,
P2P: Maintain a list of P2P Clients for persistent group on GO Add a new persistent group network block field, p2p_client_list, to maintain a list of P2P Clients that have connected to a persistent group. This allows GO of a persistent group to figure out more easily whether re-invocation of a persistent group can be used with a specific peer device. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-22 21:47:41 +01:00
int authorized, const u8 *p2p_dev_addr)
wpa_s AP mode: Add notification functions for STA authorized Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-16 14:58:41 +01:00
{
P2P: Maintain a list of P2P Clients for persistent group on GO Add a new persistent group network block field, p2p_client_list, to maintain a list of P2P Clients that have connected to a persistent group. This allows GO of a persistent group to figure out more easily whether re-invocation of a persistent group can be used with a specific peer device. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-22 21:47:41 +01:00
wpas_notify_sta_authorized(ctx, mac_addr, authorized, p2p_dev_addr);
wpa_s AP mode: Add notification functions for STA authorized Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-16 14:58:41 +01:00
}
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
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;
Add wpa_supplicant AP mode events for Public Action frames
2010-04-11 19:33:33 +02:00
}
P2P: Filter Probe Request frames based on DA and BSSID in Listen state Only accept Probe Request frames that have a Wildcard BSSID and a destination address that matches with our P2P Device Address or is the broadcast address per P2P specification 3.1.2.1.1.
2011-07-15 19:25:53 +02:00
static int ap_probe_req_rx(void *ctx, const u8 *sa, const u8 *da,
Pass signal strength through, fix units The signal strength is currently never used as the only driver reporting it is nl80211 which uses IEEE80211_RADIOTAP_DB_ANTSIGNAL which is never populated by the kernel. The kernel will (soon) populate IEEE80211_RADIOTAP_DBM_ANTSIGNAL instead though, so use that. Also, since it was never really populated, we can redefine the signal field to be in dBm units only. My next patch will also require knowing the signal strength of probe requests throughout the code (where available), so add it to the necessary APIs. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2012-04-01 17:48:12 +02:00
const u8 *bssid, const u8 *ie, size_t ie_len,
int ssi_signal)
Add wpa_supplicant AP mode events for Public Action frames
2010-04-11 19:33:33 +02:00
{
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
#ifdef CONFIG_P2P
struct wpa_supplicant *wpa_s = ctx;
Pass signal strength through, fix units The signal strength is currently never used as the only driver reporting it is nl80211 which uses IEEE80211_RADIOTAP_DB_ANTSIGNAL which is never populated by the kernel. The kernel will (soon) populate IEEE80211_RADIOTAP_DBM_ANTSIGNAL instead though, so use that. Also, since it was never really populated, we can redefine the signal field to be in dBm units only. My next patch will also require knowing the signal strength of probe requests throughout the code (where available), so add it to the necessary APIs. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2012-04-01 17:48:12 +02:00
return wpas_p2p_probe_req_rx(wpa_s, sa, da, bssid, ie, ie_len,
ssi_signal);
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
#else /* CONFIG_P2P */
Add wpa_supplicant AP mode events for Public Action frames
2010-04-11 19:33:33 +02:00
return 0;
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
#endif /* CONFIG_P2P */
Add wpa_supplicant AP mode events for Public Action frames
2010-04-11 19:33:33 +02:00
}
static void ap_wps_reg_success_cb(void *ctx, const u8 *mac_addr,
const u8 *uuid_e)
{
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
#ifdef CONFIG_P2P
struct wpa_supplicant *wpa_s = ctx;
wpas_p2p_wps_success(wpa_s, mac_addr, 1);
#endif /* CONFIG_P2P */
Add wpa_supplicant AP mode events for Public Action frames
2010-04-11 19:33:33 +02:00
}
wpa_s AP mode: complete only when setup is complete The AP code might, currently only in the case of HT40, defer actual enabling to after a scan. In this case, the wpa_s AP code gets confused. Add a callback for it to use and make it use it to finish only when the setup has actually completed. With appropriate hacks in place this allows using HT40 in P2P mode. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-19 12:11:15 +01:00
static void wpas_ap_configured_cb(void *ctx)
{
struct wpa_supplicant *wpa_s = ctx;
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);
}
Add preliminary hostapd data structure initialization for AP mode wpa_supplicant can now initialize hostapd data structures when mode=2 is used to set up an AP. The hostapd configuration is not yet set based on wpa_supplicant network configuration block. In addition, the glue code for hostapd driver_ops needs number of functions that will be needed for AP functionality.
2009-03-26 19:37:05 +01:00
int wpa_supplicant_create_ap(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid)
{
struct wpa_driver_associate_params params;
struct hostapd_iface *hapd_iface;
struct hostapd_config *conf;
size_t i;
Link in AP functionality from hostapd when CONFIG_AP=y This is only allowing the code to be compiled and linked in; the actual functionality is not yet enabled.
2009-03-25 11:23:42 +01:00
Add preliminary hostapd data structure initialization for AP mode wpa_supplicant can now initialize hostapd data structures when mode=2 is used to set up an AP. The hostapd configuration is not yet set based on wpa_supplicant network configuration block. In addition, the glue code for hostapd driver_ops needs number of functions that will be needed for AP functionality.
2009-03-26 19:37:05 +01:00
if (ssid->ssid == NULL || ssid->ssid_len == 0) {
wpa_printf(MSG_ERROR, "No SSID configured for AP mode");
return -1;
Link in AP functionality from hostapd when CONFIG_AP=y This is only allowing the code to be compiled and linked in; the actual functionality is not yet enabled.
2009-03-25 11:23:42 +01:00
}
Add preliminary hostapd data structure initialization for AP mode wpa_supplicant can now initialize hostapd data structures when mode=2 is used to set up an AP. The hostapd configuration is not yet set based on wpa_supplicant network configuration block. In addition, the glue code for hostapd driver_ops needs number of functions that will be needed for AP functionality.
2009-03-26 19:37:05 +01:00
wpa_supplicant_ap_deinit(wpa_s);
Add Beacon configuration for wpa_supplicant AP mode
2009-04-02 15:09:48 +02:00
wpa_printf(MSG_DEBUG, "Setting up AP (SSID='%s')",
wpa_ssid_txt(ssid->ssid, ssid->ssid_len));
os_memset(&params, 0, sizeof(params));
params.ssid = ssid->ssid;
params.ssid_len = ssid->ssid_len;
Define struct wpa_ssid::mode as an enum with more readable values
2009-12-28 15:00:36 +01:00
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:
P2P: Add dynamic network config block parameters for P2P
2010-07-18 23:30:24 +02:00
case WPAS_MODE_P2P_GO:
case WPAS_MODE_P2P_GROUP_FORMATION:
Define struct wpa_ssid::mode as an enum with more readable values
2009-12-28 15:00:36 +01:00
params.mode = IEEE80211_MODE_AP;
break;
}
Add Beacon configuration for wpa_supplicant AP mode
2009-04-02 15:09:48 +02:00
params.freq = ssid->frequency;
nl80211: Fix WPA_VERSIONS attribute for Connect command The previous code was trying to figure out which WPA version is used based on the extra IEs requested for Association Request. That did not work properly in cases where non-WPA networks are used with some extra IEs. Fix this by using more robust mechanism for passing the WPA versions from core wpa_supplicant to the driver_ops associate().
2011-09-02 19:40:23 +02:00
params.wpa_proto = ssid->proto;
Add more wpa_supplicant AP mode parameters for the driver wrapper This makes it easier to configure AP mode for drivers that take care of WPA/RSN IE generation.
2010-04-11 19:02:01 +02:00
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;
Add support for using GCMP cipher from IEEE 802.11ad This allows both hostapd and wpa_supplicant to be used to derive and configure keys for GCMP. This is quite similar to CCMP key configuration, but a different cipher suite and somewhat different rules are used in cipher selection. It should be noted that GCMP is not included in default parameters at least for now, so explicit pairwise/group configuration is needed to enable it. This may change in the future to allow GCMP to be selected automatically in cases where CCMP could have been used. This commit does not included changes to WPS or P2P to allow GCMP to be used. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-29 10:52:15 +02:00
else if (ssid->pairwise_cipher & WPA_CIPHER_GCMP)
wpa_s->pairwise_cipher = WPA_CIPHER_GCMP;
Add more wpa_supplicant AP mode parameters for the driver wrapper This makes it easier to configure AP mode for drivers that take care of WPA/RSN IE generation.
2010-04-11 19:02:01 +02:00
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;
P2P: Let the driver wrapper know if association is for P2P group
2010-07-18 23:30:25 +02:00
#ifdef CONFIG_P2P
if (ssid->mode == WPAS_MODE_P2P_GO ||
ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION)
params.p2p = 1;
#endif /* CONFIG_P2P */
P2P: Add mechanism for configuring UAPSD parameters for group This is needed to be able to change parameters for dynamically created interfaces between the creation of the interface and association/start AP commands. Following ctrl_interface commands can now be used: P2P_SET client_apsd disable - disable configuration (i.e., use driver default) in client mode P2P_SET client_apsd <BE>,<BK>,<VI>,<VO>;<max SP Length> - enable UASPD with specific trigger configuration (0/1) per AC (max SP Length is currently ignored) P2P_SET go_apsd disable - disable configuration (i.e., use driver default) in AP mode P2P_SET go_apsd <0/1> - disable/enable APSD in AP mode
2010-07-28 19:18:52 +02:00
if (wpa_s->parent->set_ap_uapsd)
params.uapsd = wpa_s->parent->ap_uapsd;
else
params.uapsd = -1;
Add Beacon configuration for wpa_supplicant AP mode
2009-04-02 15:09:48 +02:00
if (wpa_drv_associate(wpa_s, &params) < 0) {
wpa_msg(wpa_s, MSG_INFO, "Failed to start AP functionality");
return -1;
}
Add preliminary hostapd data structure initialization for AP mode wpa_supplicant can now initialize hostapd data structures when mode=2 is used to set up an AP. The hostapd configuration is not yet set based on wpa_supplicant network configuration block. In addition, the glue code for hostapd driver_ops needs number of functions that will be needed for AP functionality.
2009-03-26 19:37:05 +01:00
wpa_s->ap_iface = hapd_iface = os_zalloc(sizeof(*wpa_s->ap_iface));
if (hapd_iface == NULL)
return -1;
Add needed AP driver wrappers (most of which are still to-do)
2009-03-27 16:13:54 +01:00
hapd_iface->owner = wpa_s;
wpa_supplicant: AP mode, set drv_flags In AP/P2P_GO mode we should have correct hostapd drv_flags.
2011-09-21 09:28:38 +02:00
hapd_iface->drv_flags = wpa_s->drv_flags;
Maintain internal copy of Probe Response offload capabilities Signed-hostap: Arik Nemtsov <arik@wizery.com> Signed-off-by: Arik Nemtsov <arik@wizery.com>
2011-12-10 16:17:43 +01:00
hapd_iface->probe_resp_offloads = wpa_s->probe_resp_offloads;
Move wpa_supplicant_create_ap() into ap.c
2009-03-26 15:08:17 +01:00
Add preliminary hostapd data structure initialization for AP mode wpa_supplicant can now initialize hostapd data structures when mode=2 is used to set up an AP. The hostapd configuration is not yet set based on wpa_supplicant network configuration block. In addition, the glue code for hostapd driver_ops needs number of functions that will be needed for AP functionality.
2009-03-26 19:37:05 +01:00
wpa_s->ap_iface->conf = conf = hostapd_config_defaults();
if (conf == NULL) {
wpa_supplicant_ap_deinit(wpa_s);
return -1;
}
Move wpa_supplicant_create_ap() into ap.c
2009-03-26 15:08:17 +01:00
wpa_supplicant AP/P2P: Enable WMM param configuration In case of P2P GO and AP mode, wpa_supplicant uses the default hostapd parameters for WMM. In the default parameters the ACM bit for video and voice are set to 1, meaning, P2P devices and stations which are connected to the GO cannot pass voice or video data packets. Allow this to be changed through wpa_supplicant configuration file with wmm_ac_* parameters. Signed-hostap: Yoni Divinsky <yoni.divinsky@ti.com>
2012-08-12 10:34:07 +02:00
os_memcpy(wpa_s->ap_iface->conf->wmm_ac_params,
wpa_s->conf->wmm_ac_params,
sizeof(wpa_s->conf->wmm_ac_params));
wpa_supplicant AP: Enable uapsd in P2P GO mode if go_apsd was set If uapsd is explicitly enabled, set conf->bss->wmm_enabled and conf->bss->wmm_uapsd to enable (and advertise) uapsd. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Arik Nemtsov <arik@wizery.com>
2011-07-31 20:45:05 +02:00
if (params.uapsd > 0) {
conf->bss->wmm_enabled = 1;
conf->bss->wmm_uapsd = 1;
}
Set hostapd configuration based on wpa_supplicant AP mode config
2009-03-27 15:45:47 +01:00
if (wpa_supplicant_conf_ap(wpa_s, ssid, conf)) {
wpa_printf(MSG_ERROR, "Failed to create AP configuration");
wpa_supplicant_ap_deinit(wpa_s);
return -1;
}
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
#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 */
Add preliminary hostapd data structure initialization for AP mode wpa_supplicant can now initialize hostapd data structures when mode=2 is used to set up an AP. The hostapd configuration is not yet set based on wpa_supplicant network configuration block. In addition, the glue code for hostapd driver_ops needs number of functions that will be needed for AP functionality.
2009-03-26 19:37:05 +01:00
hapd_iface->num_bss = conf->num_bss;
Convert os_zalloc() for an array to use os_calloc() Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-13 19:44:21 +02:00
hapd_iface->bss = os_calloc(conf->num_bss,
Add preliminary hostapd data structure initialization for AP mode wpa_supplicant can now initialize hostapd data structures when mode=2 is used to set up an AP. The hostapd configuration is not yet set based on wpa_supplicant network configuration block. In addition, the glue code for hostapd driver_ops needs number of functions that will be needed for AP functionality.
2009-03-26 19:37:05 +01:00
sizeof(struct hostapd_data *));
if (hapd_iface->bss == NULL) {
wpa_supplicant_ap_deinit(wpa_s);
return -1;
}
Move wpa_supplicant_create_ap() into ap.c
2009-03-26 15:08:17 +01:00
Add preliminary hostapd data structure initialization for AP mode wpa_supplicant can now initialize hostapd data structures when mode=2 is used to set up an AP. The hostapd configuration is not yet set based on wpa_supplicant network configuration block. In addition, the glue code for hostapd driver_ops needs number of functions that will be needed for AP functionality.
2009-03-26 19:37:05 +01:00
for (i = 0; i < conf->num_bss; i++) {
hapd_iface->bss[i] =
hostapd_alloc_bss_data(hapd_iface, conf,
&conf->bss[i]);
if (hapd_iface->bss[i] == NULL) {
wpa_supplicant_ap_deinit(wpa_s);
return -1;
}
Fix hostapd wpa_msg() calls ctx for wpa_supplicant AP mode Need to use wpa_s pointer, not hapd pointer, for these calls.
2009-09-29 20:25:14 +02:00
hapd_iface->bss[i]->msg_ctx = wpa_s;
P2P: Send STA connected/disconnected events to parent ctrl_iface Send the connection events from P2P group to both the group interface and parent interface ctrl_ifaces to make it easier for external monitor programs to see these events without having to listen to all group interfaces when virtual group interfaces are used. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-07-22 00:19:46 +02:00
hapd_iface->bss[i]->msg_ctx_parent = wpa_s->parent;
Add wpa_supplicant AP mode events for Public Action frames
2010-04-11 19:33:33 +02:00
hapd_iface->bss[i]->public_action_cb = ap_public_action_rx;
hapd_iface->bss[i]->public_action_cb_ctx = wpa_s;
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
hapd_iface->bss[i]->vendor_action_cb = ap_vendor_action_rx;
hapd_iface->bss[i]->vendor_action_cb_ctx = wpa_s;
Add wpa_supplicant AP mode events for Public Action frames
2010-04-11 19:33:33 +02:00
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;
P2P: Send AP mode WPS-FAIL event to parent interface The AP operation with wpa_supplicant requires an additional callback to get the needed event information from hostapd side so that wpa_msg() can be called for wpa_s->parent if needed.
2010-10-14 19:57:00 +02:00
hapd_iface->bss[i]->wps_event_cb = ap_wps_event_cb;
hapd_iface->bss[i]->wps_event_cb_ctx = wpa_s;
wpa_s AP mode: Add notification functions for STA authorized Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-16 14:58:41 +01:00
hapd_iface->bss[i]->sta_authorized_cb = ap_sta_authorized_cb;
hapd_iface->bss[i]->sta_authorized_cb_ctx = wpa_s;
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
#ifdef CONFIG_P2P
hapd_iface->bss[i]->p2p = wpa_s->global->p2p;
P2P: Store SSID of the group in p2p_group data This can be used with P2P management operations that need to verify whether the local device is operating a specific group based on P2P Group ID attribute from a peer. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-08 16:33:14 +02:00
hapd_iface->bss[i]->p2p_group = wpas_p2p_group_init(wpa_s,
ssid);
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
#endif /* CONFIG_P2P */
wpa_s AP mode: complete only when setup is complete The AP code might, currently only in the case of HT40, defer actual enabling to after a scan. In this case, the wpa_s AP code gets confused. Add a callback for it to use and make it use it to finish only when the setup has actually completed. With appropriate hacks in place this allows using HT40 in P2P mode. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-19 12:11:15 +01:00
hapd_iface->bss[i]->setup_complete_cb = wpas_ap_configured_cb;
hapd_iface->bss[i]->setup_complete_cb_ctx = wpa_s;
Add preliminary hostapd data structure initialization for AP mode wpa_supplicant can now initialize hostapd data structures when mode=2 is used to set up an AP. The hostapd configuration is not yet set based on wpa_supplicant network configuration block. In addition, the glue code for hostapd driver_ops needs number of functions that will be needed for AP functionality.
2009-03-26 19:37:05 +01:00
}
Do not use virtual driver_ops for wpa_supplicant AP mode Initialize struct hostapd_data driver context with the same driver information that was initialized earlier during wpa_supplicant start. This allows the AP mode operations to be completed directly with the same calls in AP code without having to maintain a separate translation layer between the AP and station mode driver context.
2009-12-25 18:47:08 +01:00
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;
wpa_s AP mode: Fix regression in P2P AP mode setup Commit c76e5d7f9b7a4ed8c201f280a04e579d52765572 moved the ap_configured_cb() call into a completion callback from AP mode code. However, this callback can be called before hostap_setup_interface() returns. In that case, the ap_configured_cb() ended up getting called before the wpa_supplicant connection information was updated. Fix this by reordering code to set up everything before calling hostapd_setup_interface().
2011-04-04 11:50:26 +02:00
wpa_s->current_ssid = ssid;
os_memcpy(wpa_s->bssid, wpa_s->own_addr, ETH_ALEN);
wpa_s->assoc_freq = ssid->frequency;
Do not use virtual driver_ops for wpa_supplicant AP mode Initialize struct hostapd_data driver context with the same driver information that was initialized earlier during wpa_supplicant start. This allows the AP mode operations to be completed directly with the same calls in AP code without having to maintain a separate translation layer between the AP and station mode driver context.
2009-12-25 18:47:08 +01:00
if (hostapd_setup_interface(wpa_s->ap_iface)) {
Add preliminary hostapd data structure initialization for AP mode wpa_supplicant can now initialize hostapd data structures when mode=2 is used to set up an AP. The hostapd configuration is not yet set based on wpa_supplicant network configuration block. In addition, the glue code for hostapd driver_ops needs number of functions that will be needed for AP functionality.
2009-03-26 19:37:05 +01:00
wpa_printf(MSG_ERROR, "Failed to initialize AP interface");
wpa_supplicant_ap_deinit(wpa_s);
return -1;
Move wpa_supplicant_create_ap() into ap.c
2009-03-26 15:08:17 +01:00
}
Add preliminary hostapd data structure initialization for AP mode wpa_supplicant can now initialize hostapd data structures when mode=2 is used to set up an AP. The hostapd configuration is not yet set based on wpa_supplicant network configuration block. In addition, the glue code for hostapd driver_ops needs number of functions that will be needed for AP functionality.
2009-03-26 19:37:05 +01:00
return 0;
}
void wpa_supplicant_ap_deinit(struct wpa_supplicant *wpa_s)
{
Fix CONFIG_AP=y build without CONFIG_WPS=y
2010-11-25 22:34:56 +01:00
#ifdef CONFIG_WPS
WPS: Add wps_ap_pin ctrl_iface command for wpa_supplicant AP mode This can be used to control the AP PIN in wpa_supplicant AP mode in the same way as the identical command in hostapd ctrl_iface.
2010-11-17 15:46:55 +01:00
eloop_cancel_timeout(wpas_wps_ap_pin_timeout, wpa_s, NULL);
Fix CONFIG_AP=y build without CONFIG_WPS=y
2010-11-25 22:34:56 +01:00
#endif /* CONFIG_WPS */
WPS: Add wps_ap_pin ctrl_iface command for wpa_supplicant AP mode This can be used to control the AP PIN in wpa_supplicant AP mode in the same way as the identical command in hostapd ctrl_iface.
2010-11-17 15:46:55 +01:00
Add preliminary hostapd data structure initialization for AP mode wpa_supplicant can now initialize hostapd data structures when mode=2 is used to set up an AP. The hostapd configuration is not yet set based on wpa_supplicant network configuration block. In addition, the glue code for hostapd driver_ops needs number of functions that will be needed for AP functionality.
2009-03-26 19:37:05 +01:00
if (wpa_s->ap_iface == NULL)
return;
wpa_supplicant AP: More thorough AP mode deinit
2010-04-11 19:03:39 +02:00
wpa_s->current_ssid = NULL;
P2P: Fix Action frame sending after disconnection assoc_freq needs to be cleared when an interface gets disconnected. This fixes an issue where P2P Action frame transmission may fail because of missing remain-on-channel operation when using the same interface for group operations (or non-P2P connections) and P2P management operations.
2010-11-25 15:04:07 +01:00
wpa_s->assoc_freq = 0;
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
#ifdef CONFIG_P2P
P2P: Avoid segfault on AP deinit after failed AP start
2010-07-30 01:41:14 +02:00
if (wpa_s->ap_iface->bss)
wpa_s->ap_iface->bss[0]->p2p_group = NULL;
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
wpas_p2p_group_deinit(wpa_s);
#endif /* CONFIG_P2P */
Add preliminary hostapd data structure initialization for AP mode wpa_supplicant can now initialize hostapd data structures when mode=2 is used to set up an AP. The hostapd configuration is not yet set based on wpa_supplicant network configuration block. In addition, the glue code for hostapd driver_ops needs number of functions that will be needed for AP functionality.
2009-03-26 19:37:05 +01:00
hostapd_interface_deinit(wpa_s->ap_iface);
Split hostapd_interface_deinit() into deinit and free parts This allows the driver interface to be deinitialized before struct hostapd_data instance gets freed. This needs to be done so that the driver wrapper does not maintain a context pointer to freed memory.
2009-12-27 20:31:13 +01:00
hostapd_interface_free(wpa_s->ap_iface);
Add preliminary hostapd data structure initialization for AP mode wpa_supplicant can now initialize hostapd data structures when mode=2 is used to set up an AP. The hostapd configuration is not yet set based on wpa_supplicant network configuration block. In addition, the glue code for hostapd driver_ops needs number of functions that will be needed for AP functionality.
2009-03-26 19:37:05 +01:00
wpa_s->ap_iface = NULL;
wpa_supplicant AP: More thorough AP mode deinit
2010-04-11 19:03:39 +02:00
wpa_drv_deinit_ap(wpa_s);
Move wpa_supplicant_create_ap() into ap.c
2009-03-26 15:08:17 +01:00
}
wpa_supplicant AP: Add management frame RX for nl80211
2009-04-02 20:59:14 +02:00
void ap_tx_status(void *ctx, const u8 *addr,
const u8 *buf, size_t len, int ack)
{
Use generic driver events for TX status and RX reporting Replace driver wrapper calls to hostapd_tx_status(), hostapd_rx_from_unknown_sta(), hostapd_mgmt_rx(), and hostapd_mgmt_tx_cb() with new generic driver events EVENT_TX_STATUS, EVENT_RX_FROM_UNKNOWN, and EVENT_RX_MGMT. This cleans up lot of the driver wrapper code to be less dependent on whether it is being used within wpa_supplicant AP mode or hostapd.
2009-12-13 22:05:39 +01:00
#ifdef NEED_AP_MLME
wpa_supplicant AP: Add management frame RX for nl80211
2009-04-02 20:59:14 +02:00
struct wpa_supplicant *wpa_s = ctx;
hostapd_tx_status(wpa_s->ap_iface->bss[0], addr, buf, len, ack);
Use generic driver events for TX status and RX reporting Replace driver wrapper calls to hostapd_tx_status(), hostapd_rx_from_unknown_sta(), hostapd_mgmt_rx(), and hostapd_mgmt_tx_cb() with new generic driver events EVENT_TX_STATUS, EVENT_RX_FROM_UNKNOWN, and EVENT_RX_MGMT. This cleans up lot of the driver wrapper code to be less dependent on whether it is being used within wpa_supplicant AP mode or hostapd.
2009-12-13 22:05:39 +01:00
#endif /* NEED_AP_MLME */
wpa_supplicant AP: Add management frame RX for nl80211
2009-04-02 20:59:14 +02:00
}
AP: Add explicit EAPOL TX status event The new event can be used when EAPOL TX status can't be reported as a complete 802.11 frame but is instead reported as just the EAPOL data as originally passed to hapd_send_eapol(). Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2011-11-19 12:00:30 +01:00
void ap_eapol_tx_status(void *ctx, const u8 *dst,
const u8 *data, size_t len, int ack)
{
#ifdef NEED_AP_MLME
struct wpa_supplicant *wpa_s = ctx;
hostapd_tx_status(wpa_s->ap_iface->bss[0], dst, data, len, ack);
#endif /* NEED_AP_MLME */
}
AP: Do station poll in driver wrapper This offloads the station polling to driver wrappers, which may offload it again to the driver. The hostap driver wrapper uses "real" data frames while nl80211 uses null data frames. Also add a specific event to indicate that a poll was successful for future use with the nl80211 driver.
2011-10-20 20:03:08 +02:00
void ap_client_poll_ok(void *ctx, const u8 *addr)
{
#ifdef NEED_AP_MLME
struct wpa_supplicant *wpa_s = ctx;
if (wpa_s->ap_iface)
hostapd_client_poll_ok(wpa_s->ap_iface->bss[0], addr);
#endif /* NEED_AP_MLME */
}
AP: Pass only bssid/addr/wds to EVENT_RX_FROM_UNKNOWN
2011-10-20 20:51:32 +02:00
void ap_rx_from_unknown_sta(void *ctx, const u8 *addr, int wds)
wpa_supplicant AP: Add management frame RX for nl80211
2009-04-02 20:59:14 +02:00
{
Use generic driver events for TX status and RX reporting Replace driver wrapper calls to hostapd_tx_status(), hostapd_rx_from_unknown_sta(), hostapd_mgmt_rx(), and hostapd_mgmt_tx_cb() with new generic driver events EVENT_TX_STATUS, EVENT_RX_FROM_UNKNOWN, and EVENT_RX_MGMT. This cleans up lot of the driver wrapper code to be less dependent on whether it is being used within wpa_supplicant AP mode or hostapd.
2009-12-13 22:05:39 +01:00
#ifdef NEED_AP_MLME
wpa_supplicant AP: Add management frame RX for nl80211
2009-04-02 20:59:14 +02:00
struct wpa_supplicant *wpa_s = ctx;
AP: Pass only bssid/addr/wds to EVENT_RX_FROM_UNKNOWN
2011-10-20 20:51:32 +02:00
ieee802_11_rx_from_unknown(wpa_s->ap_iface->bss[0], addr, wds);
Use generic driver events for TX status and RX reporting Replace driver wrapper calls to hostapd_tx_status(), hostapd_rx_from_unknown_sta(), hostapd_mgmt_rx(), and hostapd_mgmt_tx_cb() with new generic driver events EVENT_TX_STATUS, EVENT_RX_FROM_UNKNOWN, and EVENT_RX_MGMT. This cleans up lot of the driver wrapper code to be less dependent on whether it is being used within wpa_supplicant AP mode or hostapd.
2009-12-13 22:05:39 +01:00
#endif /* NEED_AP_MLME */
wpa_supplicant AP: Add management frame RX for nl80211
2009-04-02 20:59:14 +02:00
}
Move struct hostapd_frame_info definition away from driver API This is internal data structure for hostapd/AP functionality and does not need to be defined in driver.h.
2010-01-03 11:37:02 +01:00
void ap_mgmt_rx(void *ctx, struct rx_mgmt *rx_mgmt)
wpa_supplicant AP: Add management frame RX for nl80211
2009-04-02 20:59:14 +02:00
{
Use generic driver events for TX status and RX reporting Replace driver wrapper calls to hostapd_tx_status(), hostapd_rx_from_unknown_sta(), hostapd_mgmt_rx(), and hostapd_mgmt_tx_cb() with new generic driver events EVENT_TX_STATUS, EVENT_RX_FROM_UNKNOWN, and EVENT_RX_MGMT. This cleans up lot of the driver wrapper code to be less dependent on whether it is being used within wpa_supplicant AP mode or hostapd.
2009-12-13 22:05:39 +01:00
#ifdef NEED_AP_MLME
wpa_supplicant AP: Add management frame RX for nl80211
2009-04-02 20:59:14 +02:00
struct wpa_supplicant *wpa_s = ctx;
Move struct hostapd_frame_info definition away from driver API This is internal data structure for hostapd/AP functionality and does not need to be defined in driver.h.
2010-01-03 11:37:02 +01:00
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);
Use generic driver events for TX status and RX reporting Replace driver wrapper calls to hostapd_tx_status(), hostapd_rx_from_unknown_sta(), hostapd_mgmt_rx(), and hostapd_mgmt_tx_cb() with new generic driver events EVENT_TX_STATUS, EVENT_RX_FROM_UNKNOWN, and EVENT_RX_MGMT. This cleans up lot of the driver wrapper code to be less dependent on whether it is being used within wpa_supplicant AP mode or hostapd.
2009-12-13 22:05:39 +01:00
#endif /* NEED_AP_MLME */
wpa_supplicant AP: Add management frame RX for nl80211
2009-04-02 20:59:14 +02:00
}
Use generic driver events for TX status and RX reporting Replace driver wrapper calls to hostapd_tx_status(), hostapd_rx_from_unknown_sta(), hostapd_mgmt_rx(), and hostapd_mgmt_tx_cb() with new generic driver events EVENT_TX_STATUS, EVENT_RX_FROM_UNKNOWN, and EVENT_RX_MGMT. This cleans up lot of the driver wrapper code to be less dependent on whether it is being used within wpa_supplicant AP mode or hostapd.
2009-12-13 22:05:39 +01:00
void ap_mgmt_tx_cb(void *ctx, const u8 *buf, size_t len, u16 stype, int ok)
wpa_supplicant AP: Add management frame RX for nl80211
2009-04-02 20:59:14 +02:00
{
Use generic driver events for TX status and RX reporting Replace driver wrapper calls to hostapd_tx_status(), hostapd_rx_from_unknown_sta(), hostapd_mgmt_rx(), and hostapd_mgmt_tx_cb() with new generic driver events EVENT_TX_STATUS, EVENT_RX_FROM_UNKNOWN, and EVENT_RX_MGMT. This cleans up lot of the driver wrapper code to be less dependent on whether it is being used within wpa_supplicant AP mode or hostapd.
2009-12-13 22:05:39 +01:00
#ifdef NEED_AP_MLME
wpa_supplicant AP: Add management frame RX for nl80211
2009-04-02 20:59:14 +02:00
struct wpa_supplicant *wpa_s = ctx;
ieee802_11_mgmt_cb(wpa_s->ap_iface->bss[0], buf, len, stype, ok);
Replace NEED_MLME with NEED_AP_MLME This makes it clearer that it's about the AP, not client-side MLME, even when built into the client (wpa_supplicant).
2009-08-14 19:01:41 +02:00
#endif /* NEED_AP_MLME */
Use generic driver events for TX status and RX reporting Replace driver wrapper calls to hostapd_tx_status(), hostapd_rx_from_unknown_sta(), hostapd_mgmt_rx(), and hostapd_mgmt_tx_cb() with new generic driver events EVENT_TX_STATUS, EVENT_RX_FROM_UNKNOWN, and EVENT_RX_MGMT. This cleans up lot of the driver wrapper code to be less dependent on whether it is being used within wpa_supplicant AP mode or hostapd.
2009-12-13 22:05:39 +01:00
}
wpa_supplicant AP: Add EAPOL frame TX and RX This allows WPA-Personal 4-way handshake to be completed successfully.
2009-04-20 15:27:45 +02:00
void wpa_supplicant_ap_rx_eapol(struct wpa_supplicant *wpa_s,
const u8 *src_addr, const u8 *buf, size_t len)
{
Use driver event, EVENT_EAPOL_RX, for EAPOL frame indication
2010-01-03 16:44:40 +01:00
ieee802_1x_receive(wpa_s->ap_iface->bss[0], src_addr, buf, len);
wpa_supplicant AP: Add EAPOL frame TX and RX This allows WPA-Personal 4-way handshake to be completed successfully.
2009-04-20 15:27:45 +02:00
}
wpa_supplicant AP: Add preliminary support for WPS Internal Registrar When in AP mode, wpa_supplicant is now enabling WPS (only Internal Registrar). wpa_cli wps_pbc and wps_pin commands can be used to initiate WPS negotiation similarly to how this is done in station mode (though, the BSSID parameter is ignored).
2009-04-21 15:45:16 +02:00
#ifdef CONFIG_WPS
P2P: Allow WPS_PBC command on GO to select on P2P Device Address An optional parameter, p2p_dev_addr, can now be given to WPS_PBC command on P2P GO to indicate that only the P2P device with the specified P2P Device Address is allowed to connect using PBC. If any other device tries to use PBC, a session overlap is indicated and the negotiation is rejected with M2D. The command format for specifying the address is "WPS_PBC p2p_dev_addr=<address>", e.g., WPS_PBC p2p_dev_addr=02:03:04:05:06:07 In addition, show the PBC session overlap indication as a WPS failure event on an AP/GO interface. This particular new case shows up as "WPS-FAIL msg=4 config_error=12".
2011-02-07 17:28:36 +01:00
int wpa_supplicant_ap_wps_pbc(struct wpa_supplicant *wpa_s, const u8 *bssid,
const u8 *p2p_dev_addr)
wpa_supplicant AP: Add preliminary support for WPS Internal Registrar When in AP mode, wpa_supplicant is now enabling WPS (only Internal Registrar). wpa_cli wps_pbc and wps_pin commands can be used to initiate WPS negotiation similarly to how this is done in station mode (though, the BSSID parameter is ignored).
2009-04-21 15:45:16 +02:00
{
Make sure AP interface is initialize before accepting WPS commands
2010-04-11 19:06:12 +02:00
if (!wpa_s->ap_iface)
return -1;
P2P: Allow WPS_PBC command on GO to select on P2P Device Address An optional parameter, p2p_dev_addr, can now be given to WPS_PBC command on P2P GO to indicate that only the P2P device with the specified P2P Device Address is allowed to connect using PBC. If any other device tries to use PBC, a session overlap is indicated and the negotiation is rejected with M2D. The command format for specifying the address is "WPS_PBC p2p_dev_addr=<address>", e.g., WPS_PBC p2p_dev_addr=02:03:04:05:06:07 In addition, show the PBC session overlap indication as a WPS failure event on an AP/GO interface. This particular new case shows up as "WPS-FAIL msg=4 config_error=12".
2011-02-07 17:28:36 +01:00
return hostapd_wps_button_pushed(wpa_s->ap_iface->bss[0],
p2p_dev_addr);
wpa_supplicant AP: Add preliminary support for WPS Internal Registrar When in AP mode, wpa_supplicant is now enabling WPS (only Internal Registrar). wpa_cli wps_pbc and wps_pin commands can be used to initiate WPS negotiation similarly to how this is done in station mode (though, the BSSID parameter is ignored).
2009-04-21 15:45:16 +02:00
}
WPS: Allow pending WPS operation to be cancelled A new ctrl_interface command, WPS_CANCEL, can now be used to cancel a pending or ongoing WPS operation. For now, this is only available with wpa_supplicant (either in station or AP mode). Similar functionality should be added for hostapd, too.
2010-09-06 19:51:06 +02:00
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],
Add wps_cancel for hostapd_cli Implement wps_cancel for hostapd similarly to how it was already supported in wpa_supplicant AP mode. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-19 07:23:31 +01:00
ap_sta_wps_cancel, NULL);
WPS: Allow pending WPS operation to be cancelled A new ctrl_interface command, WPS_CANCEL, can now be used to cancel a pending or ongoing WPS operation. For now, this is only available with wpa_supplicant (either in station or AP mode). Similar functionality should be added for hostapd, too.
2010-09-06 19:51:06 +02:00
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;
}
wpa_supplicant AP: Add preliminary support for WPS Internal Registrar When in AP mode, wpa_supplicant is now enabling WPS (only Internal Registrar). wpa_cli wps_pbc and wps_pin commands can be used to initiate WPS negotiation similarly to how this is done in station mode (though, the BSSID parameter is ignored).
2009-04-21 15:45:16 +02:00
int wpa_supplicant_ap_wps_pin(struct wpa_supplicant *wpa_s, const u8 *bssid,
WPS: Allow PIN timeout to be specified with wpa_supplicant AP/GO Extend the wpa_cli wps_pin command to support specification of the PIN expiration time in seconds similarly to hostapd_cli wps_pin command when using wpa_supplicant for AP mode (including P2P GO). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-10-10 16:22:35 +02:00
const char *pin, char *buf, size_t buflen,
int timeout)
wpa_supplicant AP: Add preliminary support for WPS Internal Registrar When in AP mode, wpa_supplicant is now enabling WPS (only Internal Registrar). wpa_cli wps_pbc and wps_pin commands can be used to initiate WPS negotiation similarly to how this is done in station mode (though, the BSSID parameter is ignored).
2009-04-21 15:45:16 +02:00
{
int ret, ret_len = 0;
Make sure AP interface is initialize before accepting WPS commands
2010-04-11 19:06:12 +02:00
if (!wpa_s->ap_iface)
return -1;
wpa_supplicant AP: Add preliminary support for WPS Internal Registrar When in AP mode, wpa_supplicant is now enabling WPS (only Internal Registrar). wpa_cli wps_pbc and wps_pin commands can be used to initiate WPS negotiation similarly to how this is done in station mode (though, the BSSID parameter is ignored).
2009-04-21 15:45:16 +02:00
if (pin == NULL) {
unsigned int rpin = wps_generate_pin();
Fix generated WPS PIN values to use zero-padding The dynamically generated PINs are supposed to have 8 digits, but some PIN generatation cases were not zero-padding these properly.
2011-12-02 22:04:39 +01:00
ret_len = os_snprintf(buf, buflen, "%08d", rpin);
wpa_supplicant AP: Add preliminary support for WPS Internal Registrar When in AP mode, wpa_supplicant is now enabling WPS (only Internal Registrar). wpa_cli wps_pbc and wps_pin commands can be used to initiate WPS negotiation similarly to how this is done in station mode (though, the BSSID parameter is ignored).
2009-04-21 15:45:16 +02:00
pin = buf;
Fix AP mode wps_pin command to return the entered PIN This command is supposed to return the PIN value that was generated or passed in as an argument. In the AP case, the entered PIN was not being returned.
2010-07-29 02:56:37 +02:00
} else
ret_len = os_snprintf(buf, buflen, "%s", pin);
wpa_supplicant AP: Add preliminary support for WPS Internal Registrar When in AP mode, wpa_supplicant is now enabling WPS (only Internal Registrar). wpa_cli wps_pbc and wps_pin commands can be used to initiate WPS negotiation similarly to how this is done in station mode (though, the BSSID parameter is ignored).
2009-04-21 15:45:16 +02:00
WPS 2.0: Add support for AuthorizedMACs attribute Advertize list of authorized enrollee MAC addresses in Beacon and Probe Response frames and use these when selecting the AP. In order to provide the list, the enrollee MAC address should be specified whenever adding a new PIN. In addition, add UUID-R into SetSelectedRegistrar action to make it potentially easier for an AP to figure out which ER sent the action should there be multiple ERs using the same IP address.
2009-12-12 15:40:10 +01:00
ret = hostapd_wps_add_pin(wpa_s->ap_iface->bss[0], bssid, "any", pin,
WPS: Allow PIN timeout to be specified with wpa_supplicant AP/GO Extend the wpa_cli wps_pin command to support specification of the PIN expiration time in seconds similarly to hostapd_cli wps_pin command when using wpa_supplicant for AP mode (including P2P GO). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-10-10 16:22:35 +02:00
timeout);
wpa_supplicant AP: Add preliminary support for WPS Internal Registrar When in AP mode, wpa_supplicant is now enabling WPS (only Internal Registrar). wpa_cli wps_pbc and wps_pin commands can be used to initiate WPS negotiation similarly to how this is done in station mode (though, the BSSID parameter is ignored).
2009-04-21 15:45:16 +02:00
if (ret)
return -1;
return ret_len;
}
WPS: Add wps_ap_pin ctrl_iface command for wpa_supplicant AP mode This can be used to control the AP PIN in wpa_supplicant AP mode in the same way as the identical command in hostapd ctrl_iface.
2010-11-17 15:46:55 +01:00
static void wpas_wps_ap_pin_timeout(void *eloop_data, void *user_ctx)
{
struct wpa_supplicant *wpa_s = eloop_data;
wpa_printf(MSG_DEBUG, "WPS: AP PIN timed out");
wpas_wps_ap_pin_disable(wpa_s);
}
static void wpas_wps_ap_pin_enable(struct wpa_supplicant *wpa_s, int timeout)
{
struct hostapd_data *hapd;
if (wpa_s->ap_iface == NULL)
return;
hapd = wpa_s->ap_iface->bss[0];
wpa_printf(MSG_DEBUG, "WPS: Enabling AP PIN (timeout=%d)", timeout);
hapd->ap_pin_failures = 0;
eloop_cancel_timeout(wpas_wps_ap_pin_timeout, wpa_s, NULL);
if (timeout > 0)
eloop_register_timeout(timeout, 0,
wpas_wps_ap_pin_timeout, wpa_s, NULL);
}
void wpas_wps_ap_pin_disable(struct wpa_supplicant *wpa_s)
{
struct hostapd_data *hapd;
if (wpa_s->ap_iface == NULL)
return;
wpa_printf(MSG_DEBUG, "WPS: Disabling AP PIN");
hapd = wpa_s->ap_iface->bss[0];
os_free(hapd->conf->ap_pin);
hapd->conf->ap_pin = NULL;
eloop_cancel_timeout(wpas_wps_ap_pin_timeout, wpa_s, NULL);
}
const char * wpas_wps_ap_pin_random(struct wpa_supplicant *wpa_s, int timeout)
{
struct hostapd_data *hapd;
unsigned int pin;
char pin_txt[9];
if (wpa_s->ap_iface == NULL)
return NULL;
hapd = wpa_s->ap_iface->bss[0];
pin = wps_generate_pin();
Fix generated WPS PIN values to use zero-padding The dynamically generated PINs are supposed to have 8 digits, but some PIN generatation cases were not zero-padding these properly.
2011-12-02 22:04:39 +01:00
os_snprintf(pin_txt, sizeof(pin_txt), "%08u", pin);
WPS: Add wps_ap_pin ctrl_iface command for wpa_supplicant AP mode This can be used to control the AP PIN in wpa_supplicant AP mode in the same way as the identical command in hostapd ctrl_iface.
2010-11-17 15:46:55 +01:00
os_free(hapd->conf->ap_pin);
hapd->conf->ap_pin = os_strdup(pin_txt);
if (hapd->conf->ap_pin == NULL)
return NULL;
wpas_wps_ap_pin_enable(wpa_s, timeout);
return hapd->conf->ap_pin;
}
const char * wpas_wps_ap_pin_get(struct wpa_supplicant *wpa_s)
{
struct hostapd_data *hapd;
if (wpa_s->ap_iface == NULL)
return NULL;
hapd = wpa_s->ap_iface->bss[0];
return hapd->conf->ap_pin;
}
int wpas_wps_ap_pin_set(struct wpa_supplicant *wpa_s, const char *pin,
int timeout)
{
struct hostapd_data *hapd;
char pin_txt[9];
int ret;
if (wpa_s->ap_iface == NULL)
return -1;
hapd = wpa_s->ap_iface->bss[0];
ret = os_snprintf(pin_txt, sizeof(pin_txt), "%s", pin);
if (ret < 0 || ret >= (int) sizeof(pin_txt))
return -1;
os_free(hapd->conf->ap_pin);
hapd->conf->ap_pin = os_strdup(pin_txt);
if (hapd->conf->ap_pin == NULL)
return -1;
wpas_wps_ap_pin_enable(wpa_s, timeout);
return 0;
}
void wpa_supplicant_ap_pwd_auth_fail(struct wpa_supplicant *wpa_s)
{
struct hostapd_data *hapd;
if (wpa_s->ap_iface == NULL)
return;
hapd = wpa_s->ap_iface->bss[0];
/*
* Registrar failed to prove its knowledge of the AP PIN. Disable AP
* PIN if this happens multiple times to slow down brute force attacks.
*/
hapd->ap_pin_failures++;
wpa_printf(MSG_DEBUG, "WPS: AP PIN authentication failure number %u",
hapd->ap_pin_failures);
if (hapd->ap_pin_failures < 3)
return;
wpa_printf(MSG_DEBUG, "WPS: Disable AP PIN");
hapd->ap_pin_failures = 0;
os_free(hapd->conf->ap_pin);
hapd->conf->ap_pin = NULL;
}
wpa_supplicant AP: Add preliminary support for WPS Internal Registrar When in AP mode, wpa_supplicant is now enabling WPS (only Internal Registrar). wpa_cli wps_pbc and wps_pin commands can be used to initiate WPS negotiation similarly to how this is done in station mode (though, the BSSID parameter is ignored).
2009-04-21 15:45:16 +02:00
#endif /* CONFIG_WPS */
Add station table query to wpa_supplicant AP ctrl_iface "wpa_cli all_sta" and "wpa_cli sta <addr>" can now be used to fetch information about stations associated with the wpa_supplicant-controlled AP.
2009-09-08 11:58:02 +02:00
Fix CONFIG_AP=y build without CONFIG_CTRL_IFACE
2009-10-13 10:15:39 +02:00
#ifdef CONFIG_CTRL_IFACE
Add station table query to wpa_supplicant AP ctrl_iface "wpa_cli all_sta" and "wpa_cli sta <addr>" can now be used to fetch information about stations associated with the wpa_supplicant-controlled AP.
2009-09-08 11:58:02 +02:00
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);
}
Fix CONFIG_AP=y build without CONFIG_CTRL_IFACE
2009-10-13 10:15:39 +02:00
Add AP mode WPA status into ctrl_iface
2009-10-16 17:35:45 +02:00
Add wpa_supplicant AP mode STA deauthenticate/disassociate commands Move disassociate and deauthenticate commands to ctrl_iface_ap.c, so that they ares accessible for wpa_supplicant AP mode and wpa_cli (with CONFIG_AP option enabled). Signed-hostap: Jithu Jance <jithu@broadcom.com>
2012-02-25 16:22:48 +01:00
int ap_ctrl_iface_sta_disassociate(struct wpa_supplicant *wpa_s,
const char *txtaddr)
{
if (wpa_s->ap_iface == NULL)
return -1;
return hostapd_ctrl_iface_disassociate(wpa_s->ap_iface->bss[0],
txtaddr);
}
int ap_ctrl_iface_sta_deauthenticate(struct wpa_supplicant *wpa_s,
const char *txtaddr)
{
if (wpa_s->ap_iface == NULL)
return -1;
return hostapd_ctrl_iface_deauthenticate(wpa_s->ap_iface->bss[0],
txtaddr);
}
Add AP mode WPA status into ctrl_iface
2009-10-16 17:35:45 +02:00
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;
}
Fix CONFIG_AP=y build without CONFIG_CTRL_IFACE
2009-10-13 10:15:39 +02:00
#endif /* CONFIG_CTRL_IFACE */
wpa_supplicant AP mode: Add function for enabling MAC address filtering This can be used to allow only a specific station to associate.
2010-04-11 19:08:00 +02:00
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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;
P2P: Fix GO start on interface that has active station connection The active station connection triggered wpa_supplicant AP mode startup to try to update Beacon IEs before the AP mode was properly initialized and that resulted in NULL pointer dereference in driver_nl80211.c. Fix this by skipping the IE update before the AP mode is initialized. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-12-21 12:34:25 +01:00
if (ssid == NULL || wpa_s->ap_iface == NULL ||
ssid->mode == WPAS_MODE_INFRA ||
ssid->mode == WPAS_MODE_IBSS)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return -1;
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
#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 */
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
hapd = iface->bss[0];
P2P: Fix GO start on interface that has active station connection The active station connection triggered wpa_supplicant AP mode startup to try to update Beacon IEs before the AP mode was properly initialized and that resulted in NULL pointer dereference in driver_nl80211.c. Fix this by skipping the IE update before the AP mode is initialized. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-12-21 12:34:25 +01:00
if (hapd->drv_priv == NULL)
return -1;
ieee802_11_set_beacons(iface);
Fix wpa_supplicant AP mode build after hostapd changes
2010-11-24 15:52:04 +01:00
hostapd_set_ap_wps_ie(hapd);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return 0;
}
nl80211: Handle CH_SWITCH event Some drivers may independently decide to switch channels. Handle this by updating the hostapd and wpa_supplicant AP and GO configuration. Signed-hostap: Thomas Pedersen <c_tpeder@qca.qualcomm.com>
2012-06-25 13:45:14 +02:00
void wpas_ap_ch_switch(struct wpa_supplicant *wpa_s, int freq, int ht,
int offset)
{
if (!wpa_s->ap_iface)
return;
wpa_s->assoc_freq = freq;
hostapd_event_ch_switch(wpa_s->ap_iface->bss[0], freq, ht, offset);
}
wpa_supplicant AP mode: Add function for enabling MAC address filtering This can be used to allow only a specific station to associate.
2010-04-11 19:08:00 +02:00
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;
}
Reference in a new issue Copy permalink