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

1489 lines
38 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"
Clear EAPOL supplicant configuration info on current_ssid changes There were some code paths that allowed obsolete configuration data pointer to be maintained within EAPOL supplicant in case a network was removed while not connection to it (i.e., wpa_s->current_ssid not pointing to the network that was removed). This could result in use of freed memory, e.g., from eap_sm_notify_ctrl_attached() when a new control interface connected prior to the EAPOL supplicant configuration pointer got updated. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-08-25 18:46:57 +02:00
#include "eapol_supp/eapol_supp_sm.h"
P2P NFC: Report connection handover as trigger for P2P "NFC_REPORT_HANDOVER {INIT,RESP} P2P <req> <sel>" can now be used to report completed NFC negotiated connection handover in which the P2P alternative carrier was selected. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-27 17:50:14 +02:00
#include "crypto/dh_group5.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"
DFS: wpa_supplicant event processing Add radar event processing logic for AP/P2P GO. The DFS processing functions from hostapd are now used for these wpa_supplicant cases as well for both offloaded and non-offloaded DFS. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-03-05 03:03:39 +01:00
#include "ap/dfs.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
P2P: Remove compiler warning without CONFIG_IEEE80211N Commit ca9bc5b5666a08c741ddd21c451ecb92aa33a11a added wpas_conf_ap_vht() as a static function with the caller within CONFIG_IEEE80211N, but the function outside. This resulted in a compiler warning for wpa_supplicant AP/P2P builds when CONFIG_IEEE80211N=y was not used. Fix that by using matching conditional block around the function. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-27 19:46:19 +01:00
#ifdef CONFIG_IEEE80211N
P2P: Add VHT support Start GO with VHT support if VHT option was requested and the appropriate channels are available. Signed-hostap: Eliad Peller <eliadx.peller@intel.com>
2013-10-27 19:08:36 +01:00
static void wpas_conf_ap_vht(struct wpa_supplicant *wpa_s,
struct hostapd_config *conf,
struct hostapd_hw_modes *mode)
{
Fix CONFIG_AP=y build without CONFIG_P2P=y Commit ca9bc5b5666a08c741ddd21c451ecb92aa33a11a used P2P functionality from ap.c without proper ifdef CONFIG_P2P. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-04-07 11:32:58 +02:00
#ifdef CONFIG_P2P
P2P: Add VHT support Start GO with VHT support if VHT option was requested and the appropriate channels are available. Signed-hostap: Eliad Peller <eliadx.peller@intel.com>
2013-10-27 19:08:36 +01:00
u8 center_chan = 0;
u8 channel = conf->channel;
if (!conf->secondary_channel)
goto no_vht;
P2P: Add support for VHT 80+80 MHz and 160 MHz The new max_oper_chwidth and freq2 arguments to P2P_CONNECT, P2P_INVITE, and P2P_GROUP_ADD control interface commands can be used to request larger VHT operating channel bandwidth to be used than the previously used maximum 80 MHz. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-28 22:14:10 +01:00
switch (conf->vht_oper_chwidth) {
case VHT_CHANWIDTH_80MHZ:
case VHT_CHANWIDTH_80P80MHZ:
center_chan = wpas_p2p_get_vht80_center(wpa_s, mode, channel);
break;
case VHT_CHANWIDTH_160MHZ:
center_chan = wpas_p2p_get_vht160_center(wpa_s, mode, channel);
break;
default:
/*
* conf->vht_oper_chwidth might not be set for non-P2P GO cases,
* try oper_cwidth 160 MHz first then VHT 80 MHz, if 160 MHz is
* not supported.
*/
conf->vht_oper_chwidth = VHT_CHANWIDTH_160MHZ;
center_chan = wpas_p2p_get_vht160_center(wpa_s, mode, channel);
if (!center_chan) {
conf->vht_oper_chwidth = VHT_CHANWIDTH_80MHZ;
center_chan = wpas_p2p_get_vht80_center(wpa_s, mode,
channel);
}
break;
}
P2P: Add VHT support Start GO with VHT support if VHT option was requested and the appropriate channels are available. Signed-hostap: Eliad Peller <eliadx.peller@intel.com>
2013-10-27 19:08:36 +01:00
if (!center_chan)
goto no_vht;
conf->vht_oper_centr_freq_seg0_idx = center_chan;
return;
no_vht:
conf->vht_oper_centr_freq_seg0_idx =
channel + conf->secondary_channel * 2;
Fix CONFIG_AP=y build without CONFIG_P2P=y Commit ca9bc5b5666a08c741ddd21c451ecb92aa33a11a used P2P functionality from ap.c without proper ifdef CONFIG_P2P. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-04-07 11:32:58 +02:00
#else /* CONFIG_P2P */
conf->vht_oper_centr_freq_seg0_idx =
conf->channel + conf->secondary_channel * 2;
#endif /* CONFIG_P2P */
P2P: Fall back to no VHT when starting AP/P2P GO In cases where the bandwidth is not set when starting an AP/P2P GO, the code tries to use 160 MHz or 80 MHz channels. As a result, the AP/P2P GO configuration is set to use these channel widths even if they are not available, which may results in failing to start the AP/P2P GO. Fix this by changing the AP/P2P GO configuration not to use VHT channels when they are not available. In this case the AP/P2P GO will use a 40 MHz channel, if available, or a 20 MHz channel, if this is the maximum available width. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2016-01-25 11:28:49 +01:00
conf->vht_oper_chwidth = VHT_CHANWIDTH_USE_HT;
P2P: Add VHT support Start GO with VHT support if VHT option was requested and the appropriate channels are available. Signed-hostap: Eliad Peller <eliadx.peller@intel.com>
2013-10-27 19:08:36 +01:00
}
P2P: Remove compiler warning without CONFIG_IEEE80211N Commit ca9bc5b5666a08c741ddd21c451ecb92aa33a11a added wpas_conf_ap_vht() as a static function with the caller within CONFIG_IEEE80211N, but the function outside. This resulted in a compiler warning for wpa_supplicant AP/P2P builds when CONFIG_IEEE80211N=y was not used. Fix that by using matching conditional block around the function. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-27 19:46:19 +01:00
#endif /* CONFIG_IEEE80211N */
P2P: Add VHT support Start GO with VHT support if VHT option was requested and the appropriate channels are available. Signed-hostap: Eliad Peller <eliadx.peller@intel.com>
2013-10-27 19:08:36 +01:00
P2P: Implement wpas_p2p_move_go_csa() Use channel switch mechanism to move a P2P GO to a new channel, when required. In order to be able to reconfigure the GO channel, split wpa_supplicant_conf_ap() function, so the frequency configuration part can be reused to find additional CSA settings. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-09-08 11:46:16 +02:00
int wpa_supplicant_conf_ap_ht(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid,
struct hostapd_config *conf)
Set hostapd configuration based on wpa_supplicant AP mode config
2009-03-27 15:45:47 +01:00
{
P2P: Implement wpas_p2p_move_go_csa() Use channel switch mechanism to move a P2P GO to a new channel, when required. In order to be able to reconfigure the GO channel, split wpa_supplicant_conf_ap() function, so the frequency configuration part can be reused to find additional CSA settings. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-09-08 11:46:16 +02:00
conf->hw_mode = ieee80211_freq_to_chan(ssid->frequency,
&conf->channel);
if (conf->hw_mode == NUM_HOSTAPD_MODES) {
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 |
AP: Enable HT Tx STBC for AP/GO if supported by driver Publish support for Tx STBC in the HT capabilities of a GO and AP controlled by wpa_supplicant in case the hardware supports it. Signed-off-by: Eyal Shapira <eyalx.shapira@intel.com>
2015-01-19 02:44:09 +01:00
HT_CAP_INFO_TX_STBC |
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
HT_CAP_INFO_MAX_AMSDU_SIZE);
P2P: Add VHT support Start GO with VHT support if VHT option was requested and the appropriate channels are available. Signed-hostap: Eliad Peller <eliadx.peller@intel.com>
2013-10-27 19:08:36 +01:00
if (mode->vht_capab && ssid->vht) {
conf->ieee80211ac = 1;
wpas_conf_ap_vht(wpa_s, conf, mode);
}
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
}
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
}
P2P: Do not allow 40 MHz co-ex PRI/SEC switch to force MCC Do not allow 40 MHz co-ex PRI/SEC switch to force us to change our PRI channel if we have an existing connection on the selected PRI channel since doing multi-channel concurrency is likely to cause more harm than using different PRI/SEC selection in environment with multiple BSSes on these two channels with mixed 20 MHz or PRI channel selection. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-06-28 17:14:58 +02:00
if (conf->secondary_channel) {
struct wpa_supplicant *iface;
for (iface = wpa_s->global->ifaces; iface; iface = iface->next)
{
if (iface == wpa_s ||
iface->wpa_state < WPA_AUTHENTICATING ||
(int) iface->assoc_freq != ssid->frequency)
continue;
/*
* Do not allow 40 MHz co-ex PRI/SEC switch to force us
* to change our PRI channel since we have an existing,
* concurrent connection on that channel and doing
* multi-channel concurrency is likely to cause more
* harm than using different PRI/SEC selection in
* environment with multiple BSSes on these two channels
* with mixed 20 MHz or PRI channel selection.
*/
conf->no_pri_sec_switch = 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
#endif /* CONFIG_IEEE80211N */
P2P: Implement wpas_p2p_move_go_csa() Use channel switch mechanism to move a P2P GO to a new channel, when required. In order to be able to reconfigure the GO channel, split wpa_supplicant_conf_ap() function, so the frequency configuration part can be reused to find additional CSA settings. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-09-08 11:46:16 +02:00
return 0;
mesh: Enable mesh HT mode Add a new option "mesh_ht_mode" that specifies the HT mode for the mesh, with this option on, mesh beacons, actions frames, and probe responses with include the appropriate HT information elements. [original implementation by Chun-Yeow Yeoh <yeohchunyeow@gmail.com>] [some fixes by Masashi Honma <masashi.honma@gmail.com>] Signed-off-by: Ashok Nagarajan <ashok.dragon@gmail.com> Signed-off-by: Javier Cardona <javier@cozybit.com> Signed-off-by: Jason Mobarak <x@jason.mobarak.name>
2014-09-01 06:23:36 +02: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];
conf->driver = wpa_s->driver;
os_strlcpy(bss->iface, wpa_s->ifname, sizeof(bss->iface));
P2P: Implement wpas_p2p_move_go_csa() Use channel switch mechanism to move a P2P GO to a new channel, when required. In order to be able to reconfigure the GO channel, split wpa_supplicant_conf_ap() function, so the frequency configuration part can be reused to find additional CSA settings. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-09-08 11:46:16 +02:00
if (wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf))
mesh: Enable mesh HT mode Add a new option "mesh_ht_mode" that specifies the HT mode for the mesh, with this option on, mesh beacons, actions frames, and probe responses with include the appropriate HT information elements. [original implementation by Chun-Yeow Yeoh <yeohchunyeow@gmail.com>] [some fixes by Masashi Honma <masashi.honma@gmail.com>] Signed-off-by: Ashok Nagarajan <ashok.dragon@gmail.com> Signed-off-by: Javier Cardona <javier@cozybit.com> Signed-off-by: Jason Mobarak <x@jason.mobarak.name>
2014-09-01 06:23:36 +02:00
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
wpa_supplicant: Enable Automatic Channel Selection support for AP mode Since hostapd supports ACS now, let's enable its support in wpa_supplicant as well when starting AP mode. Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com> [u.oelmann@pengutronix.de: rebased series from hostap_2_1~944 to master] [u.oelmann@pengutronix.de: adjusted added text in defconfig] Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
2015-11-27 12:40:37 +01:00
#ifdef CONFIG_ACS
if (ssid->acs) {
/* Setting channel to 0 in order to enable ACS */
conf->channel = 0;
wpa_printf(MSG_DEBUG, "Use automatic channel selection");
}
#endif /* CONFIG_ACS */
DFS: Allow wpa_supplicant AP mode to use non-offloaded DFS This extends the hostapd-like setup of DFS-in-userspace for wpa_supplicant AP mode operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-03-05 15:20:03 +01:00
if (ieee80211_is_dfs(ssid->frequency) && wpa_s->conf->country[0]) {
conf->ieee80211h = 1;
conf->ieee80211d = 1;
conf->country[0] = wpa_s->conf->country[0];
conf->country[1] = wpa_s->conf->country[1];
}
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
Remove 802.11b rates only in case of P2P group operation 11b rates removal have had impact on SoftAP functionality in wpa_supplicant. This patch verifies that only in case of P2P group operation 11b rates will be eliminated. Refer also to commit 4c2c30289305b67c09f464ba29352b008b5ec433. Signed-hostap: Alexander Bondar <alexander.bondar@intel.com> Signed-hostap: Ilan Peer <ilan.peer@intel.com>
2013-06-22 10:28:33 +02:00
if (conf->hw_mode == HOSTAPD_MODE_IEEE80211G &&
(ssid->mode == WPAS_MODE_P2P_GO ||
ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION)) {
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
/* 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: Allow per-device PSK to be assigned "wpa_cli p2p_set per_sta_psk <0/1>" can now be used to disable/enable use of per-device PSKs in P2P groups. This is disabled by default. When enabled, a default passphrase is still generated by the GO for legacy stations, but all P2P and non-P2P devices using WPS will get a unique PSK. This gives more protection for the P2P group by preventing clients from being able to derive the unicast keys used by other clients. This is also a step towards allowing specific clients to be removed from a group reliably without having to tear down the full group to do so. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-09-01 09:08:30 +02:00
bss->force_per_enrollee_psk = wpa_s->global->p2p_per_sta_psk;
P2P: Add support for IP address assignment in 4-way handshake This new mechanism allows P2P Client to request an IPv4 address from the GO as part of the 4-way handshake to avoid use of DHCP exchange after 4-way handshake. If the new mechanism is used, the assigned IP address is shown in the P2P-GROUP-STARTED event on the client side with following new parameters: ip_addr, ip_mask, go_ip_addr. The assigned IP address is included in the AP-STA-CONNECTED event on the GO side as a new ip_addr parameter. The IP address is valid for the duration of the association. The IP address pool for this new mechanism is configured as global wpa_supplicant configuration file parameters ip_addr_go, ip_addr_mask, ip_addr_star, ip_addr_end. For example: ip_addr_go=192.168.42.1 ip_addr_mask=255.255.255.0 ip_addr_start=192.168.42.2 ip_addr_end=192.168.42.100 DHCP mechanism is expected to be enabled at the same time to support P2P Devices that do not use the new mechanism. The easiest way of managing the IP addresses is by splitting the IP address range into two parts and assign a separate range for wpa_supplicant and DHCP server. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-16 18:13:31 +01:00
if (ssid->p2p_group) {
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
os_memcpy(bss->ip_addr_go, wpa_s->p2pdev->conf->ip_addr_go, 4);
os_memcpy(bss->ip_addr_mask, wpa_s->p2pdev->conf->ip_addr_mask,
P2P: Add support for IP address assignment in 4-way handshake This new mechanism allows P2P Client to request an IPv4 address from the GO as part of the 4-way handshake to avoid use of DHCP exchange after 4-way handshake. If the new mechanism is used, the assigned IP address is shown in the P2P-GROUP-STARTED event on the client side with following new parameters: ip_addr, ip_mask, go_ip_addr. The assigned IP address is included in the AP-STA-CONNECTED event on the GO side as a new ip_addr parameter. The IP address is valid for the duration of the association. The IP address pool for this new mechanism is configured as global wpa_supplicant configuration file parameters ip_addr_go, ip_addr_mask, ip_addr_star, ip_addr_end. For example: ip_addr_go=192.168.42.1 ip_addr_mask=255.255.255.0 ip_addr_start=192.168.42.2 ip_addr_end=192.168.42.100 DHCP mechanism is expected to be enabled at the same time to support P2P Devices that do not use the new mechanism. The easiest way of managing the IP addresses is by splitting the IP address range into two parts and assign a separate range for wpa_supplicant and DHCP server. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-16 18:13:31 +01:00
4);
os_memcpy(bss->ip_addr_start,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev->conf->ip_addr_start, 4);
os_memcpy(bss->ip_addr_end, wpa_s->p2pdev->conf->ip_addr_end,
P2P: Add support for IP address assignment in 4-way handshake This new mechanism allows P2P Client to request an IPv4 address from the GO as part of the 4-way handshake to avoid use of DHCP exchange after 4-way handshake. If the new mechanism is used, the assigned IP address is shown in the P2P-GROUP-STARTED event on the client side with following new parameters: ip_addr, ip_mask, go_ip_addr. The assigned IP address is included in the AP-STA-CONNECTED event on the GO side as a new ip_addr parameter. The IP address is valid for the duration of the association. The IP address pool for this new mechanism is configured as global wpa_supplicant configuration file parameters ip_addr_go, ip_addr_mask, ip_addr_star, ip_addr_end. For example: ip_addr_go=192.168.42.1 ip_addr_mask=255.255.255.0 ip_addr_start=192.168.42.2 ip_addr_end=192.168.42.100 DHCP mechanism is expected to be enabled at the same time to support P2P Devices that do not use the new mechanism. The easiest way of managing the IP addresses is by splitting the IP address range into two parts and assign a separate range for wpa_supplicant and DHCP server. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-16 18:13:31 +01:00
4);
}
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) {
Clear wpa_psk memory when setting up wpa_supplicant AP mode This is more of a theoretical case since this part is done only during setup and the structure is not allocated in practice. Anyway, maintaining more consistent use of bin_clear_free() for structures that may contain keys is useful. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-29 12:05:32 +01:00
bin_clear_free(bss->ssid.wpa_psk, sizeof(*bss->ssid.wpa_psk));
Set hostapd configuration based on wpa_supplicant AP mode config
2009-03-27 15:45:47 +01:00
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;
Allow wpa_supplicant AP mode to configure Beacon interval beacon_int (in TU) can now be used to configure Beacon interval for AP mode operations (including P2P GO) in wpa_supplicant. This can be set either in a network block or as a global parameter in the configuration file (or with "SET beacon_int <value>" control interface command) to apply for all networks that do not include the beacon_int parameter to override the default. In addition, this commits extends the dtim_period parameter to be available as a global parameter to set the default value. dtim_period is now stored in the configuration file, too, if it was set. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-01 19:50:08 +01:00
else if (wpa_s->conf->dtim_period)
bss->dtim_period = wpa_s->conf->dtim_period;
if (ssid->beacon_int)
conf->beacon_int = ssid->beacon_int;
else if (wpa_s->conf->beacon_int)
conf->beacon_int = wpa_s->conf->beacon_int;
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
P2P: Allow configuring CTWindow when working as GO Read p2p_go_ctwindow (0-127 TUs) from the config file, and pass it to the driver on GO start. Use p2p_go_ctwindow=0 (no CTWindow) by default. Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
2015-02-18 03:35:12 +01:00
#ifdef CONFIG_P2P
P2P: Set CTWindow only for P2P GO CTWindow was set for all AP interfaces if the driver supports it and this parameter is set in wpa_supplicant configuration. This results in failing to start an AP that is not a P2P GO as this setting is rejected by the driver. Fix that by setting the CTWindow only for P2P GO interface. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2015-10-14 11:26:30 +02:00
if (ssid->mode == WPAS_MODE_P2P_GO ||
ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION) {
if (wpa_s->conf->p2p_go_ctwindow > conf->beacon_int) {
wpa_printf(MSG_INFO,
"CTWindow (%d) is bigger than beacon interval (%d) - avoid configuring it",
wpa_s->conf->p2p_go_ctwindow,
conf->beacon_int);
conf->p2p_go_ctwindow = 0;
} else {
conf->p2p_go_ctwindow = wpa_s->conf->p2p_go_ctwindow;
}
P2P: Allow configuring CTWindow when working as GO Read p2p_go_ctwindow (0-127 TUs) from the config file, and pass it to the driver on GO start. Use p2p_go_ctwindow=0 (no CTWindow) by default. Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
2015-02-18 03:35:12 +01:00
}
#endif /* CONFIG_P2P */
Use a helper function for selection group cipher for AP mode Signed-hostap: Jouni Malinen <j@w1.fi>
2013-01-13 16:41:40 +01:00
if ((bss->wpa & 2) && bss->rsn_pairwise == 0)
bss->rsn_pairwise = bss->wpa_pairwise;
bss->wpa_group = wpa_select_ap_group_cipher(bss->wpa, bss->wpa_pairwise,
bss->rsn_pairwise);
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
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
P2P: Increase GTK rekeying period to 24 hours Strong ciphers do not need frequent rekeying, so increase the default GTK rekeying period to 24 hours. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-23 13:11:10 +02:00
if (bss->wpa_group_rekey < 86400 && (bss->wpa & 2) &&
(bss->wpa_group == WPA_CIPHER_CCMP ||
Add definitions for new cipher suites from IEEE Std 802.11ac-2013 This adds initial parts for supporting the new GCMP-256, CCMP-256, BIP-GMAC-128, BIP-GMAC-256, and BIP-CMAC-256 cipher suites. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-24 21:21:04 +01:00
bss->wpa_group == WPA_CIPHER_GCMP ||
bss->wpa_group == WPA_CIPHER_CCMP_256 ||
bss->wpa_group == WPA_CIPHER_GCMP_256)) {
P2P: Increase GTK rekeying period to 24 hours Strong ciphers do not need frequent rekeying, so increase the default GTK rekeying period to 24 hours. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-23 13:11:10 +02:00
/*
* Strong ciphers do not need frequent rekeying, so increase
* the default GTK rekeying period to 24 hours.
*/
bss->wpa_group_rekey = 86400;
}
wpa_supplicant AP: Allow PMF to be enabled with ieee80211w The ieee80211w parameter was not previously copied to the hostapd BSS structure from wpa_supplicant configuration, so PMF was practically disabled. Allow it to be configured through the wpa_supplicant network configuration block. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-13 17:00:08 +01:00
#ifdef CONFIG_IEEE80211W
if (ssid->ieee80211w != MGMT_FRAME_PROTECTION_DEFAULT)
bss->ieee80211w = ssid->ieee80211w;
#endif /* CONFIG_IEEE80211W */
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
if (bss->ssid.security_policy == SECURITY_WPA_PSK &&
P2P: Support GCMP as part of 60 GHz support Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-26 13:04:29 +01:00
(!(bss->rsn_pairwise & (WPA_CIPHER_CCMP | WPA_CIPHER_GCMP)) ||
!(bss->wpa & 2)))
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
goto no_wps; /* WPS2 does not allow WPA/TKIP-only
* configuration */
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;
Add ap_vendor_elements for wpa_supplicant AP/P2P GO mode This new parameter allows wpa_supplicant AP mode operations to use similar design to the vendor_elements parameter in hostapd to add vendor_elements into Beacon/Probe Response IE parameters. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-21 14:52:41 +01:00
if (wpa_s->conf->ap_vendor_elements) {
bss->vendor_elements =
wpabuf_dup(wpa_s->conf->ap_vendor_elements);
}
wpa_supplicant: Basic support for PBSS/PCP PBSS (Personal Basic Service Set) is a new BSS type for DMG networks. It is similar to infrastructure BSS, having an AP-like entity called PCP (PBSS Control Point), but it has few differences. PBSS support is mandatory for IEEE 802.11ad devices. Add a new "pbss" argument to network block. The argument is used in the following scenarios: 1. When network has mode=2 (AP), when pbss flag is set will start as a PCP instead of an AP. 2. When network has mode=0 (station), when pbss flag is set will connect to PCP instead of AP. The function wpa_scan_res_match() was modified to match BSS according to the pbss flag in the network block (wpa_ssid structure). When pbss flag is set it will match only PCPs, and when it is clear it will match only APs. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-02-08 11:30:04 +01:00
bss->pbss = ssid->pbss;
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;
mgmt = (const struct ieee80211_mgmt *) buf;
P2P: Use cleaner way of generating pointer to a field (CID 68095) The Action code field is in a fixed location, so the IEEE80211_HDRLEN can be used here to clean up bounds checking to avoid false reports from static analyzer. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-12 19:13:50 +02:00
if (len < IEEE80211_HDRLEN + 1)
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
return;
GAS server: Add support for Protected Dual of Public Action frames When GAS is used with PMF negotiated, Protected Dual of Public Action frames are expected to be used instead of Public Action frames, i.e., the GAS/ANQP frames are expected to be encrypted. Add support for this different category of Action frames being used for GAS. The payload after the Category field is identical, so the only change is in using the Category field based on what was received in the request frames. For backwards compatibility, do not enforce protected dual to be used on the AP side, i.e., follow what the station does. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-01-23 10:15:28 +01:00
if (mgmt->u.action.category != WLAN_ACTION_PUBLIC)
return;
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
wpas_p2p_rx_action(wpa_s, mgmt->da, mgmt->sa, mgmt->bssid,
mgmt->u.action.category,
P2P: Use cleaner way of generating pointer to a field (CID 68095) The Action code field is in a fixed location, so the IEEE80211_HDRLEN can be used here to clean up bounds checking to avoid false reports from static analyzer. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-12 19:13:50 +02:00
buf + IEEE80211_HDRLEN + 1,
len - IEEE80211_HDRLEN - 1, freq);
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02: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
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;
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
if (wpa_s->p2pdev && wpa_s->p2pdev != wpa_s &&
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
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.
*/
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_msg(wpa_s->p2pdev, MSG_INFO, WPS_EVENT_FAIL
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
"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: Maintain list of per-client PSKs for persistent groups Record all generated per-client PSKs in the persistent group network block and configure these for the GO Authenticator whenever re-starting the persistent group. This completes per-client PSK support for persistent groups. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-09-01 12:40:33 +02:00
#ifdef CONFIG_P2P
static void ap_new_psk_cb(void *ctx, const u8 *mac_addr, const u8 *p2p_dev_addr,
const u8 *psk, size_t psk_len)
{
struct wpa_supplicant *wpa_s = ctx;
if (wpa_s->ap_iface == NULL || wpa_s->current_ssid == NULL)
return;
wpas_p2p_new_psk_cb(wpa_s, mac_addr, p2p_dev_addr, psk, psk_len);
}
#endif /* CONFIG_P2P */
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;
mgmt = (const struct ieee80211_mgmt *) buf;
P2P: Use cleaner way of generating pointer to a field (CID 68096) The Action code field is in a fixed location, so the IEEE80211_HDRLEN can be used here to clean up bounds checking to avoid false reports from static analyzer. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-12 19:18:15 +02:00
if (len < IEEE80211_HDRLEN + 1)
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
return -1;
wpas_p2p_rx_action(wpa_s, mgmt->da, mgmt->sa, mgmt->bssid,
mgmt->u.action.category,
P2P: Use cleaner way of generating pointer to a field (CID 68096) The Action code field is in a fixed location, so the IEEE80211_HDRLEN can be used here to clean up bounds checking to avoid false reports from static analyzer. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-12 19:18:15 +02:00
buf + IEEE80211_HDRLEN + 1,
len - IEEE80211_HDRLEN - 1, freq);
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
#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
struct wpa_supplicant *wpa_s = ctx;
P2P: Specify frequency when sending Probe Response frame If the RX frequency of the Probe Request frame is known, specify it when sending the Probe Response frame. This is needed when the Probe Request frame is received on another virtual interface, for example, when a GO or P2PS client are discoverable on the group operating channel. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-06-10 10:43:35 +02:00
unsigned int freq = 0;
if (wpa_s->ap_iface)
freq = wpa_s->ap_iface->freq;
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,
P2P: Specify frequency when sending Probe Response frame If the RX frequency of the Probe Request frame is known, specify it when sending the Probe Response frame. This is needed when the Probe Request frame is received on another virtual interface, for example, when a GO or P2PS client are discoverable on the group operating channel. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-06-10 10:43:35 +02:00
freq, ssi_signal);
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
struct wpa_supplicant *wpa_s = ctx;
wpas_p2p_wps_success(wpa_s, mac_addr, 1);
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: Enable Automatic Channel Selection support for AP mode Since hostapd supports ACS now, let's enable its support in wpa_supplicant as well when starting AP mode. Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com> [u.oelmann@pengutronix.de: rebased series from hostap_2_1~944 to master] [u.oelmann@pengutronix.de: adjusted added text in defconfig] Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
2015-11-27 12:40:37 +01:00
#ifdef CONFIG_ACS
if (wpa_s->current_ssid && wpa_s->current_ssid->acs)
wpa_s->assoc_freq = wpa_s->ap_iface->freq;
#endif /* CONFIG_ACS */
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
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_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;
Remove dead code from AP setup wpa_supplicant_create_ap() is only called for AP mode, so there is no point in trying to address station (infra/IBSS) modes. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-02-03 20:11:46 +01:00
default:
return -1;
Define struct wpa_ssid::mode as an enum with more readable values
2009-12-28 15:00:36 +01:00
}
wpa_supplicant: Fix AP mode frequency initialization In AP mode the frequency was initialized only after trying to set up the AP which caused failure. Move AP frequency initialization to the right place. This allows an AP mode network block without the frequency parameter to be used with the default channel 11 being selected in that case. Signed-hostap: Avraham Stern <avraham.stern@intel.com>
2013-08-25 10:24:29 +02:00
if (ssid->frequency == 0)
ssid->frequency = 2462; /* default channel 11 */
wpa_supplicant: Use hostapd_freq_params in assoc_params Use hostapd_freq_params instead of simple frequency parameter for driver commands. This is preparation for IBSS configuration to allow use of HT/VHT in IBSS. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2014-10-01 09:52:53 +02:00
params.freq.freq = ssid->frequency;
Add Beacon configuration for wpa_supplicant AP mode
2009-04-02 15:09:48 +02:00
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;
Get rid of duplicated cipher suite and AKM definitions WPA_CIPHER_* and CIPHER_* are used for the exact same set of cipher suites with the main difference being that the WPA_CIPHER_* version is suitable to be used as a bitfield. Similarly, WPA_KEY_MGMT_* and KEY_MGMT_* have similar design for AKMs. There is no need to maintain two separate copies of the definitions since the bitfield compatible version can be used for both needs. Get rid of the CIPHER_* and KEY_MGMT_* versions to clean up the implementation by getting rid of unnecessary mapping functions. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-30 18:33:39 +01:00
params.key_mgmt_suite = wpa_s->key_mgmt;
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
Move cipher suite selection into common helper functions Signed-hostap: Jouni Malinen <j@w1.fi>
2013-01-13 15:58:54 +01:00
wpa_s->pairwise_cipher = wpa_pick_pairwise_cipher(ssid->pairwise_cipher,
1);
if (wpa_s->pairwise_cipher < 0) {
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
wpa_printf(MSG_WARNING, "WPA: Failed to select pairwise "
"cipher.");
return -1;
}
Get rid of duplicated cipher suite and AKM definitions WPA_CIPHER_* and CIPHER_* are used for the exact same set of cipher suites with the main difference being that the WPA_CIPHER_* version is suitable to be used as a bitfield. Similarly, WPA_KEY_MGMT_* and KEY_MGMT_* have similar design for AKMs. There is no need to maintain two separate copies of the definitions since the bitfield compatible version can be used for both needs. Get rid of the CIPHER_* and KEY_MGMT_* versions to clean up the implementation by getting rid of unnecessary mapping functions. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-30 18:33:39 +01:00
params.pairwise_suite = wpa_s->pairwise_cipher;
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
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 a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
if (wpa_s->p2pdev->set_ap_uapsd)
params.uapsd = wpa_s->p2pdev->ap_uapsd;
P2P: Enable U-APSD support on GO automatically Since P2P specification mandates P2P GO to support WMM-PS with legacy STAs, enable this automatically if the driver indicates support for U-APSD in AP mode. The "P2P_SET go_apsd 0" command can still be used to disable this if needed. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-02-17 12:15:29 +01:00
else if (params.p2p && (wpa_s->drv_flags & WPA_DRIVER_FLAGS_AP_UAPSD))
params.uapsd = 1; /* mandatory for P2P GO */
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
else
params.uapsd = -1;
DFS: Allow wpa_supplicant AP mode to use non-offloaded DFS This extends the hostapd-like setup of DFS-in-userspace for wpa_supplicant AP mode operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-03-05 15:20:03 +01:00
if (ieee80211_is_dfs(params.freq.freq))
params.freq.freq = 0; /* set channel after CAC */
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;
HT: Let the driver advertise its supported SMPS modes for AP mode Add smps_modes field, and let the driver fill it with its supported SMPS modes (static/dynamic). This will let us start an AP with specific SMPS mode (e.g., dynamic) that will allow it to reduce its power usage. Signed-off-by: Eliad Peller <eliad@wizery.com>
2014-10-20 05:21:39 +02:00
hapd_iface->smps_modes = wpa_s->drv_smps_modes;
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;
hostapd/wpa_s: Use driver's extended capabilities Some extended capabilities (I'm currently interested in "Operating Mode Notification" for VHT) are implemented by the kernel driver and exported in nl80211. Use these in hostapd/wpa_supplicant. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-03-31 20:51:44 +02:00
hapd_iface->extended_capa = wpa_s->extended_capa;
hapd_iface->extended_capa_mask = wpa_s->extended_capa_mask;
hapd_iface->extended_capa_len = wpa_s->extended_capa_len;
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
P2P: Add support for VHT 80+80 MHz and 160 MHz The new max_oper_chwidth and freq2 arguments to P2P_CONNECT, P2P_INVITE, and P2P_GROUP_ADD control interface commands can be used to request larger VHT operating channel bandwidth to be used than the previously used maximum 80 MHz. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-28 22:14:10 +01:00
/* Use the maximum oper channel width if it's given. */
if (ssid->max_oper_chwidth)
conf->vht_oper_chwidth = ssid->max_oper_chwidth;
ieee80211_freq_to_chan(ssid->vht_center_freq2,
&conf->vht_oper_centr_freq_seg1_idx);
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) {
hostapd: Make hostapd_config::bss array of pointers This makes it more convenient to move BSS configuration entries between struct hostapd_config instances to clean up per-BSS configuration file design. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 15:23:23 +01:00
conf->bss[0]->wmm_enabled = 1;
conf->bss[0]->wmm_uapsd = 1;
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
}
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)
hostapd: Make hostapd_config::bss array of pointers This makes it more convenient to move BSS configuration entries between struct hostapd_config instances to clean up per-BSS configuration file design. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 15:23:23 +01:00
conf->bss[0]->p2p = P2P_ENABLED | P2P_GROUP_OWNER;
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
else if (ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION)
hostapd: Make hostapd_config::bss array of pointers This makes it more convenient to move BSS configuration entries between struct hostapd_config instances to clean up per-BSS configuration file design. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 15:23:23 +01:00
conf->bss[0]->p2p = P2P_ENABLED | P2P_GROUP_OWNER |
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
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,
hostapd: Make hostapd_config::bss array of pointers This makes it more convenient to move BSS configuration entries between struct hostapd_config instances to clean up per-BSS configuration file design. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 15:23:23 +01:00
conf->bss[i]);
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 (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: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
hapd_iface->bss[i]->msg_ctx_parent = wpa_s->p2pdev;
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
P2P: Maintain list of per-client PSKs for persistent groups Record all generated per-client PSKs in the persistent group network block and configure these for the GO Authenticator whenever re-starting the persistent group. This completes per-client PSK support for persistent groups. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-09-01 12:40:33 +02:00
hapd_iface->bss[i]->new_psk_cb = ap_new_psk_cb;
hapd_iface->bss[i]->new_psk_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]->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 external EAPOL transmission option for testing purposes The new ext_eapol_frame_io parameter can be used to configure hostapd and wpa_supplicant to use control interface for receiving and transmitting EAPOL frames. This makes it easier to implement automated test cases for protocol testing. This functionality is included only in CONFIG_TESTING_OPTIONS=y builds. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-10 17:01:15 +02:00
#ifdef CONFIG_TESTING_OPTIONS
hapd_iface->bss[i]->ext_eapol_frame_io =
wpa_s->ext_eapol_frame_io;
#endif /* CONFIG_TESTING_OPTIONS */
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;
Clear EAPOL supplicant configuration info on current_ssid changes There were some code paths that allowed obsolete configuration data pointer to be maintained within EAPOL supplicant in case a network was removed while not connection to it (i.e., wpa_s->current_ssid not pointing to the network that was removed). This could result in use of freed memory, e.g., from eap_sm_notify_ctrl_attached() when a new control interface connected prior to the EAPOL supplicant configuration pointer got updated. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-08-25 18:46:57 +02:00
eapol_sm_notify_config(wpa_s->eapol, NULL, NULL);
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
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;
Clear EAPOL supplicant configuration info on current_ssid changes There were some code paths that allowed obsolete configuration data pointer to be maintained within EAPOL supplicant in case a network was removed while not connection to it (i.e., wpa_s->current_ssid not pointing to the network that was removed). This could result in use of freed memory, e.g., from eap_sm_notify_ctrl_attached() when a new control interface connected prior to the EAPOL supplicant configuration pointer got updated. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-08-25 18:46:57 +02:00
eapol_sm_notify_config(wpa_s->eapol, NULL, 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: Clean up by moving ifdef CONFIG_P2P to p2p_suppplicant.h This removes number of unnecessary #ifdef CONFIG_P2P blocks from generic code by hiding the conditional build into p2p_supplicant.h with empty inline functions. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-15 18:31:53 +02:00
wpas_p2p_ap_deinit(wpa_s);
AP/GO interface teardown optimization This commit adds an option to optimize AP teardown by leaving the deletion of keys (including group keys) and stations to the driver. This optimization option should be used if the driver supports stations and keys removal when stopping an AP. For example, the optimization option will always be used for cfg80211 drivers since cfg80211 shall always remove stations and keys when stopping an AP (in order to support cases where the AP is disabled without the knowledge of wpa_supplicant/hostapd). Signed-off-by: Moshe Benji <moshe.benji@intel.com>
2014-03-05 13:55:29 +01:00
wpa_s->ap_iface->driver_ap_teardown =
!!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_AP_TEARDOWN_SUPPORT);
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);
Send CTRL-EVENT-DISCONNECTED on wpa_supplicant AP deinit This makes the AP mode more consistent with other modes by providing a matching pair of CTRL-EVENT-CONNECTED and CTRL-EVENT-DISCONNECTED event messages. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-14 09:05:05 +01:00
wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_DISCONNECTED "bssid=" MACSTR
" reason=%d locally_generated=1",
MAC2STR(wpa_s->own_addr), WLAN_REASON_DEAUTH_LEAVING);
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;
Fix TX status processing during AP mode shutdown in wpa_supplicant A TX status event could be received after the AP interface has already been deinitialized. This needs to check for NULL pointer before trying to indicate the event to AP functions. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-06 16:54:16 +01:00
if (!wpa_s->ap_iface)
return;
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
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) {
WPS: Use only os_get_random() for PIN generation Remove the fallback dependency on os_random() when generating a WPS pin. This is exceptionally unlikely to ever be called as the call to os_get_random() is unlikely to fail. The intention is to facilitate future removal of os_random() as it uses a low quality PRNG. Signed-off-by: Nick Lowe <nick.lowe@lugatech.com>
2016-02-09 15:47:47 +01:00
unsigned int rpin;
if (wps_generate_pin(&rpin) < 0)
return -1;
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);
Check os_snprintf() result more consistently - more checks Add more os_snprintf() result validation checks. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-07 14:45:02 +01:00
if (os_snprintf_error(buflen, ret_len))
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
pin = buf;
Check os_snprintf() result more consistently - more checks Add more os_snprintf() result validation checks. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-07 14:45:02 +01:00
} else if (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
ret_len = os_snprintf(buf, buflen, "%s", pin);
Check os_snprintf() result more consistently - more checks Add more os_snprintf() result validation checks. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-07 14:45:02 +01:00
if (os_snprintf_error(buflen, ret_len))
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
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];
WPS: Use only os_get_random() for PIN generation Remove the fallback dependency on os_random() when generating a WPS pin. This is exceptionally unlikely to ever be called as the call to os_get_random() is unlikely to fail. The intention is to facilitate future removal of os_random() as it uses a low quality PRNG. Signed-off-by: Nick Lowe <nick.lowe@lugatech.com>
2016-02-09 15:47:47 +01:00
if (wps_generate_pin(&pin) < 0)
return NULL;
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);
Check os_snprintf() result more consistently - automatic 1 This converts os_snprintf() result validation cases to use os_snprintf_error() where the exact rule used in os_snprintf_error() was used. These changes were done automatically with spatch using the following semantic patch: @@ identifier E1; expression E2,E3,E4,E5,E6; statement S1; @@ ( E1 = os_snprintf(E2, E3, ...); | int E1 = os_snprintf(E2, E3, ...); | if (E5) E1 = os_snprintf(E2, E3, ...); else E1 = os_snprintf(E2, E3, ...); | if (E5) E1 = os_snprintf(E2, E3, ...); else if (E6) E1 = os_snprintf(E2, E3, ...); else E1 = 0; | if (E5) { ... E1 = os_snprintf(E2, E3, ...); } else { ... return -1; } | if (E5) { ... E1 = os_snprintf(E2, E3, ...); } else if (E6) { ... E1 = os_snprintf(E2, E3, ...); } else { ... return -1; } | if (E5) { ... E1 = os_snprintf(E2, E3, ...); } else { ... E1 = os_snprintf(E2, E3, ...); } ) ? os_free(E4); - if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \)) + if (os_snprintf_error(E3, E1)) ( S1 | { ... } ) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 10:15:51 +01:00
if (os_snprintf_error(sizeof(pin_txt), ret))
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
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;
}
WPS: Add support for config token generation with wpa_supplicant When wpa_supplicant is controlling an AP mode interface, it can generate the NFC configuration token similarly to the way this is done in hostapd. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 10:45:29 +01:00
WPS: Fix build without CONFIG_WPS_NFC Commit bbf41865c90c2e16510712fa32290729c194422d added calls to functions that are only defined if CONFIG_WPS_NFC=y. Protect those calls properly to avoid build issues. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 16:09:24 +01:00
#ifdef CONFIG_WPS_NFC
WPS: Add support for config token generation with wpa_supplicant When wpa_supplicant is controlling an AP mode interface, it can generate the NFC configuration token similarly to the way this is done in hostapd. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 10:45:29 +01:00
struct wpabuf * wpas_ap_wps_nfc_config_token(struct wpa_supplicant *wpa_s,
int ndef)
{
struct hostapd_data *hapd;
if (wpa_s->ap_iface == NULL)
return NULL;
hapd = wpa_s->ap_iface->bss[0];
return hostapd_wps_nfc_config_token(hapd, ndef);
}
WPS: Add support for NFC handover select generation with wpa_supplicant When wpa_supplicant is controlling an AP mode interface, it can generate the alternative carrier record for NFC connection handover select message similarly to the way this is done in hostapd. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 11:34:55 +01:00
struct wpabuf * wpas_ap_wps_nfc_handover_sel(struct wpa_supplicant *wpa_s,
int ndef)
{
struct hostapd_data *hapd;
if (wpa_s->ap_iface == NULL)
return NULL;
hapd = wpa_s->ap_iface->bss[0];
return hostapd_wps_nfc_hs_cr(hapd, ndef);
}
WPS NFC: Add support for wpa_supplicant AP/GO mode to use handover New functionality is needed for this with the update NFC connection handover design that depends on the AP side using the public key hash from the handover request. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-04 15:43:12 +02:00
int wpas_ap_wps_nfc_report_handover(struct wpa_supplicant *wpa_s,
const struct wpabuf *req,
const struct wpabuf *sel)
{
struct hostapd_data *hapd;
if (wpa_s->ap_iface == NULL)
return -1;
hapd = wpa_s->ap_iface->bss[0];
return hostapd_wps_nfc_report_handover(hapd, req, sel);
}
WPS: Fix build without CONFIG_WPS_NFC Commit bbf41865c90c2e16510712fa32290729c194422d added calls to functions that are only defined if CONFIG_WPS_NFC=y. Protect those calls properly to avoid build issues. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 16:09:24 +01:00
#endif /* CONFIG_WPS_NFC */
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)
{
Extend wpa_supplicant STA* ctrl_iface commands for mesh Since mesh functionality uses struct hostapd_data to maintain peer state, the existing STA* control interface commands can be used to display information about the peers. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-14 19:03:54 +01:00
struct hostapd_data *hapd;
if (wpa_s->ap_iface)
hapd = wpa_s->ap_iface->bss[0];
else if (wpa_s->ifmsh)
hapd = wpa_s->ifmsh->bss[0];
else
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
return -1;
Extend wpa_supplicant STA* ctrl_iface commands for mesh Since mesh functionality uses struct hostapd_data to maintain peer state, the existing STA* control interface commands can be used to display information about the peers. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-14 19:03:54 +01:00
return hostapd_ctrl_iface_sta_first(hapd, buf, buflen);
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(struct wpa_supplicant *wpa_s, const char *txtaddr,
char *buf, size_t buflen)
{
Extend wpa_supplicant STA* ctrl_iface commands for mesh Since mesh functionality uses struct hostapd_data to maintain peer state, the existing STA* control interface commands can be used to display information about the peers. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-14 19:03:54 +01:00
struct hostapd_data *hapd;
if (wpa_s->ap_iface)
hapd = wpa_s->ap_iface->bss[0];
else if (wpa_s->ifmsh)
hapd = wpa_s->ifmsh->bss[0];
else
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
return -1;
Extend wpa_supplicant STA* ctrl_iface commands for mesh Since mesh functionality uses struct hostapd_data to maintain peer state, the existing STA* control interface commands can be used to display information about the peers. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-14 19:03:54 +01:00
return hostapd_ctrl_iface_sta(hapd, txtaddr, buf, buflen);
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_next(struct wpa_supplicant *wpa_s, const char *txtaddr,
char *buf, size_t buflen)
{
Extend wpa_supplicant STA* ctrl_iface commands for mesh Since mesh functionality uses struct hostapd_data to maintain peer state, the existing STA* control interface commands can be used to display information about the peers. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-14 19:03:54 +01:00
struct hostapd_data *hapd;
if (wpa_s->ap_iface)
hapd = wpa_s->ap_iface->bss[0];
else if (wpa_s->ifmsh)
hapd = wpa_s->ifmsh->bss[0];
else
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
return -1;
Extend wpa_supplicant STA* ctrl_iface commands for mesh Since mesh functionality uses struct hostapd_data to maintain peer state, the existing STA* control interface commands can be used to display information about the peers. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-14 19:03:54 +01:00
return hostapd_ctrl_iface_sta_next(hapd, txtaddr, buf, buflen);
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
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));
Check os_snprintf() result more consistently - automatic 1 This converts os_snprintf() result validation cases to use os_snprintf_error() where the exact rule used in os_snprintf_error() was used. These changes were done automatically with spatch using the following semantic patch: @@ identifier E1; expression E2,E3,E4,E5,E6; statement S1; @@ ( E1 = os_snprintf(E2, E3, ...); | int E1 = os_snprintf(E2, E3, ...); | if (E5) E1 = os_snprintf(E2, E3, ...); else E1 = os_snprintf(E2, E3, ...); | if (E5) E1 = os_snprintf(E2, E3, ...); else if (E6) E1 = os_snprintf(E2, E3, ...); else E1 = 0; | if (E5) { ... E1 = os_snprintf(E2, E3, ...); } else { ... return -1; } | if (E5) { ... E1 = os_snprintf(E2, E3, ...); } else if (E6) { ... E1 = os_snprintf(E2, E3, ...); } else { ... return -1; } | if (E5) { ... E1 = os_snprintf(E2, E3, ...); } else { ... E1 = os_snprintf(E2, E3, ...); } ) ? os_free(E4); - if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \)) + if (os_snprintf_error(E3, E1)) ( S1 | { ... } ) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 10:15:51 +01:00
if (os_snprintf_error(end - pos, ret))
Add AP mode WPA status into ctrl_iface
2009-10-16 17:35:45 +02:00
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)
hostapd: Make hostapd_config::bss array of pointers This makes it more convenient to move BSS configuration entries between struct hostapd_config instances to clean up per-BSS configuration file design. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 15:23:23 +01:00
iface->conf->bss[0]->p2p = P2P_ENABLED | P2P_GROUP_OWNER;
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
else if (ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION)
hostapd: Make hostapd_config::bss array of pointers This makes it more convenient to move BSS configuration entries between struct hostapd_config instances to clean up per-BSS configuration file design. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 15:23:23 +01:00
iface->conf->bss[0]->p2p = P2P_ENABLED | P2P_GROUP_OWNER |
P2P: Add P2P configuration and callbacks in hostapd code
2010-07-18 23:30:25 +02:00
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;
}
Add AP channel switch mechanism Build CSA settings and call the driver to perform the switch. Construct Beacon, Probe Response, and (Re)Association Response frames both for CSA period and for the new channel. These frames are built based on the current configuration. Add CSA IE in Beacon and Probe Response frames. Signed-hostap: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2013-11-14 11:28:31 +01:00
int ap_switch_channel(struct wpa_supplicant *wpa_s,
struct csa_settings *settings)
{
#ifdef NEED_AP_MLME
if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
return -1;
return hostapd_switch_channel(wpa_s->ap_iface->bss[0], settings);
#else /* NEED_AP_MLME */
return -1;
#endif /* NEED_AP_MLME */
}
Fix CONFIG_AP=y build without CONFIG_CTRL_IFACE Signed-off-by: Jouni Malinen <j@w1.fi>
2015-04-04 10:56:53 +02:00
#ifdef CONFIG_CTRL_IFACE
Add chan_switch to ctrl interface of wpa_supplicant and hostapd Add chan_switch to the control interface of wpa_supplicant and hostapd, and also to wpa_cli and hostapd_cli. Signed-hostap: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2013-11-14 11:28:32 +01:00
int ap_ctrl_iface_chanswitch(struct wpa_supplicant *wpa_s, const char *pos)
{
struct csa_settings settings;
int ret = hostapd_parse_csa_settings(pos, &settings);
if (ret)
return ret;
return ap_switch_channel(wpa_s, &settings);
}
Fix CONFIG_AP=y build without CONFIG_CTRL_IFACE Signed-off-by: Jouni Malinen <j@w1.fi>
2015-04-04 10:56:53 +02:00
#endif /* CONFIG_CTRL_IFACE */
Add chan_switch to ctrl interface of wpa_supplicant and hostapd Add chan_switch to the control interface of wpa_supplicant and hostapd, and also to wpa_cli and hostapd_cli. Signed-hostap: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2013-11-14 11:28:32 +01:00
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,
nl80211/hostapd: Extend channel switch notify handling Adds support for VHT by parsing bandwidth and center_freq{1,2}. Signed-hostap: Michal Kazior <michal.kazior@tieto.com> Signed-hostap: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2013-11-25 20:16:12 +01:00
int offset, int width, int cf1, int cf2)
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
{
if (!wpa_s->ap_iface)
return;
wpa_s->assoc_freq = freq;
Update wpa_s->current_ssid->frequency on CS event Update wpa_s->current_ssid->frequency when EVENT_CH_SWITCH is received. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-09-08 11:46:10 +02:00
if (wpa_s->current_ssid)
wpa_s->current_ssid->frequency = freq;
wpa_supplicant: Fix channel switch notification with VHT Fix a bug in wpas_ap_ch_switch() function, which didn't pass VHT frequencies correctly to hostapd_event_ch_switch(). Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-09-08 11:46:23 +02:00
hostapd_event_ch_switch(wpa_s->ap_iface->bss[0], freq, ht,
offset, width, cf1, cf2);
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
}
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;
}
P2P NFC: Report connection handover as trigger for P2P "NFC_REPORT_HANDOVER {INIT,RESP} P2P <req> <sel>" can now be used to report completed NFC negotiated connection handover in which the P2P alternative carrier was selected. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-27 17:50:14 +02:00
#ifdef CONFIG_WPS_NFC
int wpas_ap_wps_add_nfc_pw(struct wpa_supplicant *wpa_s, u16 pw_id,
const struct wpabuf *pw, const u8 *pubkey_hash)
{
struct hostapd_data *hapd;
struct wps_context *wps;
if (!wpa_s->ap_iface)
return -1;
hapd = wpa_s->ap_iface->bss[0];
wps = hapd->wps;
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
if (wpa_s->p2pdev->conf->wps_nfc_dh_pubkey == NULL ||
wpa_s->p2pdev->conf->wps_nfc_dh_privkey == NULL) {
P2P NFC: Report connection handover as trigger for P2P "NFC_REPORT_HANDOVER {INIT,RESP} P2P <req> <sel>" can now be used to report completed NFC negotiated connection handover in which the P2P alternative carrier was selected. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-27 17:50:14 +02:00
wpa_printf(MSG_DEBUG, "P2P: No NFC DH key known");
return -1;
}
dh5_free(wps->dh_ctx);
wpabuf_free(wps->dh_pubkey);
wpabuf_free(wps->dh_privkey);
wps->dh_privkey = wpabuf_dup(
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev->conf->wps_nfc_dh_privkey);
P2P NFC: Report connection handover as trigger for P2P "NFC_REPORT_HANDOVER {INIT,RESP} P2P <req> <sel>" can now be used to report completed NFC negotiated connection handover in which the P2P alternative carrier was selected. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-27 17:50:14 +02:00
wps->dh_pubkey = wpabuf_dup(
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev->conf->wps_nfc_dh_pubkey);
P2P NFC: Report connection handover as trigger for P2P "NFC_REPORT_HANDOVER {INIT,RESP} P2P <req> <sel>" can now be used to report completed NFC negotiated connection handover in which the P2P alternative carrier was selected. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-27 17:50:14 +02:00
if (wps->dh_privkey == NULL || wps->dh_pubkey == NULL) {
wps->dh_ctx = NULL;
wpabuf_free(wps->dh_pubkey);
wps->dh_pubkey = NULL;
wpabuf_free(wps->dh_privkey);
wps->dh_privkey = NULL;
return -1;
}
wps->dh_ctx = dh5_init_fixed(wps->dh_privkey, wps->dh_pubkey);
if (wps->dh_ctx == NULL)
return -1;
return wps_registrar_add_nfc_pw_token(hapd->wps->registrar, pubkey_hash,
pw_id,
pw ? wpabuf_head(pw) : NULL,
pw ? wpabuf_len(pw) : 0, 1);
}
#endif /* CONFIG_WPS_NFC */
Add STOP_AP control interface command This is mainly for testing purposes to allow beaconing to be stopped without clearing AP state in hostapd. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 11:16:13 +01:00
Fix CONFIG_AP=y build without CONFIG_CTRL_IFACE Signed-off-by: Jouni Malinen <j@w1.fi>
2015-04-04 10:56:53 +02:00
#ifdef CONFIG_CTRL_IFACE
Add STOP_AP control interface command This is mainly for testing purposes to allow beaconing to be stopped without clearing AP state in hostapd. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 11:16:13 +01:00
int wpas_ap_stop_ap(struct wpa_supplicant *wpa_s)
{
struct hostapd_data *hapd;
if (!wpa_s->ap_iface)
return -1;
hapd = wpa_s->ap_iface->bss[0];
return hostapd_ctrl_iface_stop_ap(hapd);
}
Fix CONFIG_AP=y build without CONFIG_CTRL_IFACE Signed-off-by: Jouni Malinen <j@w1.fi>
2015-04-04 10:56:53 +02:00
#endif /* CONFIG_CTRL_IFACE */
DFS: wpa_supplicant event processing Add radar event processing logic for AP/P2P GO. The DFS processing functions from hostapd are now used for these wpa_supplicant cases as well for both offloaded and non-offloaded DFS. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-03-05 03:03:39 +01:00
PMKSA: Show AP/mesh PMKSA list in PMKSA command This extends the wpa_supplicant PMKSA control interface command to allow the PMKSA list from the authenticator side to be listed for AP and mesh mode. In addition, this adds a hostapd PMKSA control interface command to show the same list for the AP case. Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
2016-03-09 10:16:12 +01:00
int wpas_ap_pmksa_cache_list(struct wpa_supplicant *wpa_s, char *buf,
size_t len)
{
size_t reply_len = 0, i;
char ap_delimiter[] = "---- AP ----\n";
char mesh_delimiter[] = "---- mesh ----\n";
size_t dlen;
if (wpa_s->ap_iface) {
dlen = os_strlen(ap_delimiter);
if (dlen > len - reply_len)
return reply_len;
os_memcpy(&buf[reply_len], ap_delimiter, dlen);
reply_len += dlen;
for (i = 0; i < wpa_s->ap_iface->num_bss; i++) {
reply_len += hostapd_ctrl_iface_pmksa_list(
wpa_s->ap_iface->bss[i],
&buf[reply_len], len - reply_len);
}
}
if (wpa_s->ifmsh) {
dlen = os_strlen(mesh_delimiter);
if (dlen > len - reply_len)
return reply_len;
os_memcpy(&buf[reply_len], mesh_delimiter, dlen);
reply_len += dlen;
reply_len += hostapd_ctrl_iface_pmksa_list(
wpa_s->ifmsh->bss[0], &buf[reply_len],
len - reply_len);
}
return reply_len;
}
PMKSA: Flush AP/mesh PMKSA cache by PMKSA_FLUSH command This extends the wpa_supplicant PMKSA_FLUSH control interface command to allow the PMKSA list from the authenticator side to be flushed for AP and mesh mode. In addition, this adds a hostapd PMKSA_FLUSH control interface command to flush the PMKSA entries. Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
2016-03-09 10:16:13 +01:00
void wpas_ap_pmksa_cache_flush(struct wpa_supplicant *wpa_s)
{
size_t i;
if (wpa_s->ap_iface) {
for (i = 0; i < wpa_s->ap_iface->num_bss; i++)
hostapd_ctrl_iface_pmksa_flush(wpa_s->ap_iface->bss[i]);
}
if (wpa_s->ifmsh)
hostapd_ctrl_iface_pmksa_flush(wpa_s->ifmsh->bss[0]);
}
DFS: wpa_supplicant event processing Add radar event processing logic for AP/P2P GO. The DFS processing functions from hostapd are now used for these wpa_supplicant cases as well for both offloaded and non-offloaded DFS. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-03-05 03:03:39 +01:00
#ifdef NEED_AP_MLME
void wpas_event_dfs_radar_detected(struct wpa_supplicant *wpa_s,
struct dfs_event *radar)
{
if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
return;
wpa_printf(MSG_DEBUG, "DFS radar detected on %d MHz", radar->freq);
hostapd_dfs_radar_detected(wpa_s->ap_iface, radar->freq,
radar->ht_enabled, radar->chan_offset,
radar->chan_width,
radar->cf1, radar->cf2);
}
void wpas_event_dfs_cac_started(struct wpa_supplicant *wpa_s,
struct dfs_event *radar)
{
if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
return;
wpa_printf(MSG_DEBUG, "DFS CAC started on %d MHz", radar->freq);
hostapd_dfs_start_cac(wpa_s->ap_iface, radar->freq,
radar->ht_enabled, radar->chan_offset,
radar->chan_width, radar->cf1, radar->cf2);
}
void wpas_event_dfs_cac_finished(struct wpa_supplicant *wpa_s,
struct dfs_event *radar)
{
if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
return;
wpa_printf(MSG_DEBUG, "DFS CAC finished on %d MHz", radar->freq);
hostapd_dfs_complete_cac(wpa_s->ap_iface, 1, radar->freq,
radar->ht_enabled, radar->chan_offset,
radar->chan_width, radar->cf1, radar->cf2);
}
void wpas_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s,
struct dfs_event *radar)
{
if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
return;
wpa_printf(MSG_DEBUG, "DFS CAC aborted on %d MHz", radar->freq);
hostapd_dfs_complete_cac(wpa_s->ap_iface, 0, radar->freq,
radar->ht_enabled, radar->chan_offset,
radar->chan_width, radar->cf1, radar->cf2);
}
void wpas_event_dfs_cac_nop_finished(struct wpa_supplicant *wpa_s,
struct dfs_event *radar)
{
if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
return;
wpa_printf(MSG_DEBUG, "DFS NOP finished on %d MHz", radar->freq);
hostapd_dfs_nop_finished(wpa_s->ap_iface, radar->freq,
radar->ht_enabled, radar->chan_offset,
radar->chan_width, radar->cf1, radar->cf2);
}
#endif /* NEED_AP_MLME */
Add shared periodic cleanup function for AP mode This new mechanism can be used to combine multiple periodic AP (including P2P GO) task into a single eloop timeout to minimize number of wakeups for the process. hostapd gets its own periodic caller and wpa_supplicant uses the previously added timer to trigger these calls. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-20 12:33:30 +02:00
void ap_periodic(struct wpa_supplicant *wpa_s)
{
if (wpa_s->ap_iface)
hostapd_periodic_iface(wpa_s->ap_iface);
}
Reference in a new issue Copy permalink