DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions
hostapd/wpa_supplicant/scan.c

3099 lines
82 KiB
C
Raw Normal View History

Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
/*
* WPA Supplicant - Scanning
UBSan: Avoid unsigned integer overflow is throughput estimation wpa_scan_result_compar() would return wb->est_throughput - wa->est_throughput in case the comparison is done based on the throughput estimates. While the return value from this function is a signed integer, these est_throughput values are unsigned integers and need to be explicitly typecast to avoid an UBSan warning. scan.c:1996:30: runtime error: unsigned integer overflow: 54000 - 135000 cannot be represented in type 'unsigned int' Signed-off-by: Jouni Malinen <j@w1.fi>
2019-02-23 11:42:20 +01:00
* Copyright (c) 2003-2019, Jouni Malinen <j@w1.fi>
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
*
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.
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
*/
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
#include "utils/includes.h"
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
#include "utils/common.h"
#include "utils/eloop.h"
#include "common/ieee802_11_defs.h"
Add 'SCAN TYPE=ONLY' functionality Usual manual scan request may cause reassociation due to several reasons. New command is intended to perform pure scan without taking any automatic action based on the results. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-02-07 17:06:51 +01:00
#include "common/wpa_ctrl.h"
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
#include "config.h"
#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"
WPS: Set Request Type properly into WPS IE in ProbeReq/AssocReq
2008-11-29 12:38:03 +01:00
#include "wps_supplicant.h"
P2P: Add P2P IE into Probe Request frames
2010-07-18 23:30:25 +02:00
#include "p2p_supplicant.h"
#include "p2p/p2p.h"
HS 2.0: Add Hotspot 2.0 indication into Probe Request Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-09-08 19:52:23 +02:00
#include "hs20_supplicant.h"
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
#include "notify.h"
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
#include "bss.h"
#include "scan.h"
mesh: Implement mesh scanning When mesh is configured in, include the wildcard mesh id so that mesh networks are returned. Signed-off-by: Javier Lopez <jlopex@gmail.com> Signed-off-by: Jason Abele <jason.abele@gmail.com>
2014-09-01 06:23:32 +02:00
#include "mesh.h"
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
static void wpa_supplicant_gen_assoc_event(struct wpa_supplicant *wpa_s)
{
struct wpa_ssid *ssid;
union wpa_event_data data;
ssid = wpa_supplicant_get_ssid(wpa_s);
if (ssid == NULL)
return;
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
if (wpa_s->current_ssid == NULL) {
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_s->current_ssid = ssid;
scan: Clean up code a bit - ssid cannot be NULL here wpa_s->current_ssid is set to a non-NULL ssid pointer value here, so there is no need for the extra if statement. Signed-off-by: Jouni Malinen <j@w1.fi>
2016-05-22 15:23:28 +02:00
wpas_notify_network_changed(wpa_s);
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
}
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_supplicant_initiate_eapol(wpa_s);
Use wpa_msg() instead of wpa_printf() This converts number of debugging messages to use wpa_msg() in order to allow the interface name to be shown with the messages. A new function, wpa_dbg(), is introduced to allow CONFIG_NO_STDOUT_DEBUG=y builds to remove the debug strings. This is otherwise identical with wpa_msg(), but it gets compiled out if stdout debugging is disabled.
2011-02-10 19:14:46 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "Already associated with a configured "
"network - generating associated event");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
os_memset(&data, 0, sizeof(data));
wpa_supplicant_event(wpa_s, EVENT_ASSOC, &data);
}
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
#ifdef CONFIG_WPS
Reorganize P2P and WPS scan code Move some code to separate functions to reorganize the P2P and WPS handling during scans. This makes the code a bit cleaner and is needed for the scheduled scan implementation to avoid duplicated code. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-10-15 16:35:04 +02:00
static int wpas_wps_in_use(struct wpa_supplicant *wpa_s,
Added Doxygen documentation for WPS code
2009-01-03 18:50:49 +01:00
enum wps_request_type *req_type)
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
{
struct wpa_ssid *ssid;
int wps = 0;
Reorganize P2P and WPS scan code Move some code to separate functions to reorganize the P2P and WPS handling during scans. This makes the code a bit cleaner and is needed for the scheduled scan implementation to avoid duplicated code. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-10-15 16:35:04 +02:00
for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next) {
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
if (!(ssid->key_mgmt & WPA_KEY_MGMT_WPS))
continue;
wps = 1;
WPS: Set Request Type properly into WPS IE in ProbeReq/AssocReq
2008-11-29 12:38:03 +01:00
*req_type = wpas_wps_get_req_type(ssid);
scan: Clean up code a bit - phase1 is used in all WPS cases There is no need to have a separate if statement to skip the cases where phase1 is not set. Just check it with the strstr comparison since this case is not really used in practice. Signed-off-by: Jouni Malinen <j@w1.fi>
2016-05-22 16:44:28 +02:00
if (ssid->eap.phase1 && os_strstr(ssid->eap.phase1, "pbc=1"))
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
return 2;
}
Reorganize P2P and WPS scan code Move some code to separate functions to reorganize the P2P and WPS handling during scans. This makes the code a bit cleaner and is needed for the scheduled scan implementation to avoid duplicated code. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-10-15 16:35:04 +02:00
#ifdef CONFIG_P2P
P2P: Allow P2P functionality to be disabled per interface By default, P2P is enabled globally for all virtual interfaces and this makes wpa_supplicant include WSC and P2P IEs in Probe Request frames for all scans even if this is for a non-P2P station connection to speed up device discovery. If an interface is dedicated for non-P2P station mode operations, it is now possible to disable addition of WSC and P2P IEs into Probe Request frames with a per-interface p2p_disabled parameter. This can be set either in the configuration file (p2p_disabled=1) or at run time ("wpa_cli -i wlan0 set p2p_disabled 1"). Unlike the previous mechanism ("wpa_cli p2p_set disabled 1"), the new parameter changes the behavior only for the specified interface while other interfaces continue to follow the global P2P enabled/disabled state. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-10-10 12:08:23 +02:00
if (!wpa_s->global->p2p_disabled && wpa_s->global->p2p &&
!wpa_s->conf->p2p_disabled) {
P2P: Fix WSC IE inclusion for P2P disabled case wpas_wps_in_use() was forcing WPS to be enabled unconditionally if P2P support was included in the build. This is not really the correct behavior for the case when P2P has been disabled at runtime. Change the code here to verify runtime configuration of P2P before forcing WPS to be enabled. This allows WSC IE to be left out from Probe Request frames when scanning for APs without P2P or WPS being in use. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-01-27 20:09:34 +01:00
wpa_s->wps->dev.p2p = 1;
if (!wps) {
wps = 1;
*req_type = WPS_REQ_ENROLLEE_INFO;
}
Reorganize P2P and WPS scan code Move some code to separate functions to reorganize the P2P and WPS handling during scans. This makes the code a bit cleaner and is needed for the scheduled scan implementation to avoid duplicated code. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-10-15 16:35:04 +02:00
}
#endif /* CONFIG_P2P */
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
return wps;
}
#endif /* CONFIG_WPS */
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
Move ownership of MAC address randomization mask to scan params This array can be freed either from the scan parameters or from clearing the MAC address randomization parameters from the wpa_supplicant struct. To make this ownership more clear, we have each struct own its own copy of the parameters. Signed-off-by: Eric Caruso <ejcaruso@chromium.org>
2019-10-18 01:03:50 +02:00
static int wpa_setup_mac_addr_rand_params(struct wpa_driver_scan_params *params,
const u8 *mac_addr)
{
u8 *tmp;
if (params->mac_addr) {
params->mac_addr_mask = NULL;
os_free(params->mac_addr);
params->mac_addr = NULL;
}
params->mac_addr_rand = 1;
if (!mac_addr)
return 0;
tmp = os_malloc(2 * ETH_ALEN);
if (!tmp)
return -1;
os_memcpy(tmp, mac_addr, 2 * ETH_ALEN);
params->mac_addr = tmp;
params->mac_addr_mask = tmp + ETH_ALEN;
return 0;
}
Add Doxygen documentation for functionality related to scanning Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 11:29:05 +01:00
/**
* wpa_supplicant_enabled_networks - Check whether there are enabled networks
* @wpa_s: Pointer to wpa_supplicant data
* Returns: 0 if no networks are enabled, >0 if networks are enabled
*
* This function is used to figure out whether any networks (or Interworking
* with enabled credentials and auto_interworking) are present in the current
* configuration.
*/
Validate WEP key lengths based on driver capabilities The nl80211 driver interface does not allow 128-bit WEP to be used without a vendor specific cipher suite and no such suite is defined for this purpose. Do not accept WEP key length 16 for nl80211 driver interface forn ow. wext-interface can still try to use these for backwards compatibility. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-10 13:34:46 +02:00
int wpa_supplicant_enabled_networks(struct wpa_supplicant *wpa_s)
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
{
Validate WEP key lengths based on driver capabilities The nl80211 driver interface does not allow 128-bit WEP to be used without a vendor specific cipher suite and no such suite is defined for this purpose. Do not accept WEP key length 16 for nl80211 driver interface forn ow. wext-interface can still try to use these for backwards compatibility. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-10 13:34:46 +02:00
struct wpa_ssid *ssid = wpa_s->conf->ssid;
Add debug print for no-enabled-networks case If there are any disabled networks, show a debug print with the count of those networks when no enabled networks are found. This can be helpful in trying to figure out why scans are being skipped. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-24 00:04:00 +02:00
int count = 0, disabled = 0;
P2P: Do not allow scan or normal association on cfg80211 P2P Device The dedicated P2P management instance (wpas->p2p_mgmt == 1) using cfg80211 P2P Device cannot be used for non-P2P uses or connection (there is no netdev). Reject or ignore such operations to avoid unexpected operations if enabled network blocks are configured in the wpa_supplicant instance used to control this interface. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 10:23:09 +01:00
if (wpa_s->p2p_mgmt)
return 0; /* no normal network profiles on p2p_mgmt interface */
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
while (ssid) {
Validate WEP key lengths based on driver capabilities The nl80211 driver interface does not allow 128-bit WEP to be used without a vendor specific cipher suite and no such suite is defined for this purpose. Do not accept WEP key length 16 for nl80211 driver interface forn ow. wext-interface can still try to use these for backwards compatibility. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-10 13:34:46 +02:00
if (!wpas_network_disabled(wpa_s, ssid))
Blacklist BSS on first failure if only a single network is enabled The special case of requiring blacklisting count to be 2 or higher is only needed when more than a single network is currently enabled. As such, we should not do that when only a single network is enabled. This make the station more likely to follow network side load balancing attempts where the current AP may disassociate us with an assumption that we would move to another AP.
2010-11-26 10:23:50 +01:00
count++;
Add debug print for no-enabled-networks case If there are any disabled networks, show a debug print with the count of those networks when no enabled networks are found. This can be helpful in trying to figure out why scans are being skipped. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-24 00:04:00 +02:00
else
disabled++;
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
ssid = ssid->next;
}
Interworking: Add optional use of network selection on normal scans auto_interworking=1 configuration parameter can be used to request wpa_supplicant to use Interworking network selection automatically as a part of the normal (non-Interworking) network selection if the scan results do not match with enabled networks. This makes scanning work similarly to the "interworking_select auto" command. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-28 15:14:13 +02:00
if (wpa_s->conf->cred && wpa_s->conf->interworking &&
wpa_s->conf->auto_interworking)
count++;
Add debug print for no-enabled-networks case If there are any disabled networks, show a debug print with the count of those networks when no enabled networks are found. This can be helpful in trying to figure out why scans are being skipped. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-24 00:04:00 +02:00
if (count == 0 && disabled > 0) {
wpa_dbg(wpa_s, MSG_DEBUG, "No enabled networks (%d disabled "
"networks)", disabled);
}
Blacklist BSS on first failure if only a single network is enabled The special case of requiring blacklisting count to be 2 or higher is only needed when more than a single network is currently enabled. As such, we should not do that when only a single network is enabled. This make the station more likely to follow network side load balancing attempts where the current AP may disassociate us with an assumption that we would move to another AP.
2010-11-26 10:23:50 +01:00
return count;
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
}
static void wpa_supplicant_assoc_try(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid)
{
wpa_supplicant: Avoid associating to temp disabled SSID in ap_scan=2 In ap_scan=2 mode, wpa_supplicant_assoc_try() did not check whether the SSID is temporarily disabled before trying to associate and this may result in an infinite connect/disconnect loop. If the association succeeds while the SSID is temporarily disabled, wpa_supplicant will request to deauthenticate and that in turn will cause the SSID to be temporarily disabled again. Fix that by postponing the association until the SSID is no longer temporarily disabled. Signed-off-by: Shaul Triebitz <shaul.triebitz@intel.com>
2017-03-28 14:26:38 +02:00
int min_temp_disabled = 0;
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
while (ssid) {
wpa_supplicant: Avoid associating to temp disabled SSID in ap_scan=2 In ap_scan=2 mode, wpa_supplicant_assoc_try() did not check whether the SSID is temporarily disabled before trying to associate and this may result in an infinite connect/disconnect loop. If the association succeeds while the SSID is temporarily disabled, wpa_supplicant will request to deauthenticate and that in turn will cause the SSID to be temporarily disabled again. Fix that by postponing the association until the SSID is no longer temporarily disabled. Signed-off-by: Shaul Triebitz <shaul.triebitz@intel.com>
2017-03-28 14:26:38 +02:00
if (!wpas_network_disabled(wpa_s, ssid)) {
int temp_disabled = wpas_temp_disabled(wpa_s, ssid);
if (temp_disabled <= 0)
break;
if (!min_temp_disabled ||
temp_disabled < min_temp_disabled)
min_temp_disabled = temp_disabled;
}
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
ssid = ssid->next;
}
/* ap_scan=2 mode - try to associate with each SSID. */
if (ssid == NULL) {
Use wpa_msg() instead of wpa_printf() This converts number of debugging messages to use wpa_msg() in order to allow the interface name to be shown with the messages. A new function, wpa_dbg(), is introduced to allow CONFIG_NO_STDOUT_DEBUG=y builds to remove the debug strings. This is otherwise identical with wpa_msg(), but it gets compiled out if stdout debugging is disabled.
2011-02-10 19:14:46 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "wpa_supplicant_assoc_try: Reached "
"end of scan list - go back to beginning");
Rename "broadcast SSID" to "wildcard SSID" "Wildcard SSID" is the term used in IEEE Std 802.11-2007, so it is a better name for the zero-length SSID used in Probe Request.
2009-02-14 21:21:17 +01:00
wpa_s->prev_scan_ssid = WILDCARD_SSID_SCAN;
wpa_supplicant: Avoid associating to temp disabled SSID in ap_scan=2 In ap_scan=2 mode, wpa_supplicant_assoc_try() did not check whether the SSID is temporarily disabled before trying to associate and this may result in an infinite connect/disconnect loop. If the association succeeds while the SSID is temporarily disabled, wpa_supplicant will request to deauthenticate and that in turn will cause the SSID to be temporarily disabled again. Fix that by postponing the association until the SSID is no longer temporarily disabled. Signed-off-by: Shaul Triebitz <shaul.triebitz@intel.com>
2017-03-28 14:26:38 +02:00
wpa_supplicant_req_scan(wpa_s, min_temp_disabled, 0);
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
return;
}
if (ssid->next) {
/* Continue from the next SSID on the next attempt. */
wpa_s->prev_scan_ssid = ssid;
} else {
/* Start from the beginning of the SSID list. */
Rename "broadcast SSID" to "wildcard SSID" "Wildcard SSID" is the term used in IEEE Std 802.11-2007, so it is a better name for the zero-length SSID used in Probe Request.
2009-02-14 21:21:17 +01:00
wpa_s->prev_scan_ssid = WILDCARD_SSID_SCAN;
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
}
wpa_supplicant_associate(wpa_s, NULL, ssid);
}
Use radio work for scan requests Avoid concurrent scan requests by using the radio work queuing mechanism. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 21:07:05 +01:00
static void wpas_trigger_scan_cb(struct wpa_radio_work *work, int deinit)
Add preliminary background scan and roaming module design This allows background scanning and roaming decisions to be contained in a single place based on a defined set of notification events which will hopefully make it easier to experiment with roaming improvements. In addition, this allows multiple intra-ESS roaming policies to be used (each network configuration block can configure its own bgscan module). The beacon loss and signal strength notifications are implemented for the bgscan API, but the actual events are not yet available from the driver. The included sample bgscan module ("simple") is an example of what can be done with the new bgscan mechanism. It requests periodic background scans when the device remains associated with an ESS and has couple of notes on what a more advanced bgscan module could do to optimize background scanning and roaming. The periodic scans will cause the scan result handler to pick a better AP if one becomes available. This bgscan module can be taken into use by adding bgscan="simple" (or bgscan="simple:<bgscan interval in seconds>") into the network configuration block.
2009-09-14 23:08:24 +02:00
{
Use radio work for scan requests Avoid concurrent scan requests by using the radio work queuing mechanism. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 21:07:05 +01:00
struct wpa_supplicant *wpa_s = work->wpa_s;
struct wpa_driver_scan_params *params = work->ctx;
Add preliminary background scan and roaming module design This allows background scanning and roaming decisions to be contained in a single place based on a defined set of notification events which will hopefully make it easier to experiment with roaming improvements. In addition, this allows multiple intra-ESS roaming policies to be used (each network configuration block can configure its own bgscan module). The beacon loss and signal strength notifications are implemented for the bgscan API, but the actual events are not yet available from the driver. The included sample bgscan module ("simple") is an example of what can be done with the new bgscan mechanism. It requests periodic background scans when the device remains associated with an ESS and has couple of notes on what a more advanced bgscan module could do to optimize background scanning and roaming. The periodic scans will cause the scan result handler to pick a better AP if one becomes available. This bgscan module can be taken into use by adding bgscan="simple" (or bgscan="simple:<bgscan interval in seconds>") into the network configuration block.
2009-09-14 23:08:24 +02:00
int ret;
Use radio work for scan requests Avoid concurrent scan requests by using the radio work queuing mechanism. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 21:07:05 +01:00
if (deinit) {
wpa_supplicant: Complete radio works on disable event While testing rfkill blocking of a scanning interface, it was seen that the ongoing scan never completes. This happens since EVENT_SCAN_RESULTS is discarded on a disabled interface. Fix this and also other possible radio work completion issues by removing all the radio works (including started) of the disabled interface. To be able to remove already started radio works, make their callbacks be reentrant with deinit flag (when the work is started), so each radio work should be able to handle its own termination. Signed-hostap: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2014-02-13 10:24:00 +01:00
if (!work->started) {
wpa_scan_free_params(params);
return;
}
wpa_supplicant_notify_scanning(wpa_s, 0);
wpas_notify_scan_done(wpa_s, 0);
wpa_s->scan_work = NULL;
Use radio work for scan requests Avoid concurrent scan requests by using the radio work queuing mechanism. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 21:07:05 +01:00
return;
}
Allow scans triggered by D-Bus to use MAC address randomization wpas_dbus_handler_scan() constructs a set of 'params' each time, but it doesn't acknowledge the existing randomization settings when doing so. That means that any D-Bus initiated scans weren't going to follow the configured settings. Signed-off-by: Eric Caruso <ejcaruso@chromium.org>
2019-10-18 01:03:52 +02:00
if ((wpa_s->mac_addr_rand_enable & MAC_ADDR_RAND_SCAN) &&
wpa_s->wpa_state <= WPA_SCANNING)
wpa_setup_mac_addr_rand_params(params, wpa_s->mac_addr_scan);
Add support for using random local MAC address This adds experimental support for wpa_supplicant to assign random local MAC addresses for both pre-association cases (scan, GAS/ANQP) and for connections. MAC address policy for each part can be controlled separately and the connection part can be set per network block. This requires support from the driver to allow local MAC address to be changed if random address policy is enabled. It should also be noted that number of drivers would not support concurrent operations (e.g., P2P and station association) with random addresses in use for one or both. This functionality can be controlled with the global configuration parameters mac_addr and preassoc_mac_addr which set the default MAC address policies for connections and pre-association operations (scan and GAS/ANQP while not connected). The global rand_addr_lifetime parameter can be used to set the lifetime of a random MAC address in seconds (default: 60 seconds). This is used to avoid unnecessarily frequent MAC address changes since those are likely to result in driver clearing most of its state. It should be noted that the random MAC address does not expire during an ESS connection, i.e., this lifetime is only for the case where the device is disconnected. The mac_addr parameter can also be set in the network blocks to define different behavior per network. For example, the global mac_addr=1 and preassoc_mac_addr=1 settings and mac_addr=0 in a home network profile would result in behavior where all scanning is performed using a random MAC address while connections to new networks (e.g., Interworking/Hotspot 2.0) would use random address and connections to the home network would use the permanent MAC address. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-09-27 18:12:41 +02:00
if (wpas_update_random_addr_disassoc(wpa_s) < 0) {
wpa_msg(wpa_s, MSG_INFO,
"Failed to assign random MAC address for a scan");
scan: Fix a memory leak on an error path If preassoc_mac_addr is used and updating the MAC address fails in wpas_trigger_scan_cb(), the cloned scan parameters were leaked. Fix that and also send a CTRL-EVENT-SCAN-FAILED event in this and another error case. Signed-off-by: Jouni Malinen <j@w1.fi>
2016-05-22 17:09:23 +02:00
wpa_scan_free_params(params);
wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_SCAN_FAILED "ret=-1");
Add support for using random local MAC address This adds experimental support for wpa_supplicant to assign random local MAC addresses for both pre-association cases (scan, GAS/ANQP) and for connections. MAC address policy for each part can be controlled separately and the connection part can be set per network block. This requires support from the driver to allow local MAC address to be changed if random address policy is enabled. It should also be noted that number of drivers would not support concurrent operations (e.g., P2P and station association) with random addresses in use for one or both. This functionality can be controlled with the global configuration parameters mac_addr and preassoc_mac_addr which set the default MAC address policies for connections and pre-association operations (scan and GAS/ANQP while not connected). The global rand_addr_lifetime parameter can be used to set the lifetime of a random MAC address in seconds (default: 60 seconds). This is used to avoid unnecessarily frequent MAC address changes since those are likely to result in driver clearing most of its state. It should be noted that the random MAC address does not expire during an ESS connection, i.e., this lifetime is only for the case where the device is disconnected. The mac_addr parameter can also be set in the network blocks to define different behavior per network. For example, the global mac_addr=1 and preassoc_mac_addr=1 settings and mac_addr=0 in a home network profile would result in behavior where all scanning is performed using a random MAC address while connections to new networks (e.g., Interworking/Hotspot 2.0) would use random address and connections to the home network would use the permanent MAC address. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-09-27 18:12:41 +02:00
radio_work_done(work);
return;
}
Add preliminary background scan and roaming module design This allows background scanning and roaming decisions to be contained in a single place based on a defined set of notification events which will hopefully make it easier to experiment with roaming improvements. In addition, this allows multiple intra-ESS roaming policies to be used (each network configuration block can configure its own bgscan module). The beacon loss and signal strength notifications are implemented for the bgscan API, but the actual events are not yet available from the driver. The included sample bgscan module ("simple") is an example of what can be done with the new bgscan mechanism. It requests periodic background scans when the device remains associated with an ESS and has couple of notes on what a more advanced bgscan module could do to optimize background scanning and roaming. The periodic scans will cause the scan result handler to pick a better AP if one becomes available. This bgscan module can be taken into use by adding bgscan="simple" (or bgscan="simple:<bgscan interval in seconds>") into the network configuration block.
2009-09-14 23:08:24 +02:00
wpa_supplicant_notify_scanning(wpa_s, 1);
Write reason for scan only_new_results into debug log This can be helpful in figuring out why the driver was requested to flush its scan results prior to starting a new scan. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-17 12:54:16 +01:00
if (wpa_s->clear_driver_scan_cache) {
wpa_printf(MSG_DEBUG,
"Request driver to clear scan cache due to local BSS flush");
Ask driver to report only new scan results if requested If the BSS table within wpa_supplicant is flushed, request the driver to flush its own scan result table during the next scan. This can avoid unexpected old BSS entries showing up after BSS_FLUSH or FLUSH command in cases where the driver may maintain its internal cache of scan results (e.g., cfg80211 BSS table persists at least for 15 seconds). In addition to doing this automatically on BSS_FLUSH/FLUSH, a new SCAN command argument, only_new=1, can be used to request a manual scan request to do same. Though, it should be noted that this maintains the BSS table within wpa_supplicant. BSS_FLUSH followed by SCAN command can be used to clear all BSS entries from both the driver and wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-02 22:03:31 +01:00
params->only_new_results = 1;
Write reason for scan only_new_results into debug log This can be helpful in figuring out why the driver was requested to flush its scan results prior to starting a new scan. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-17 12:54:16 +01:00
}
Remove user space client MLME This code was used only with driver_test.c to allow MLME operations in hostapd to be tested without having to use a real radio. There are no plans on extending this to any other use than testing and mac80211_hwsim has now obsoled the need for this type of testing. As such, we can drop this code from wpa_supplicant to clean up the implementation of unnecessary complexity.
2011-10-22 21:45:38 +02:00
ret = wpa_drv_scan(wpa_s, params);
Add support to abort vendor scan This commit enhances the existing implementation of abort scan to also abort concurrent active vendor scans. This is achieved by passing the the scan_cookie to the driver interface with the intention to abort the specific scan request. This scan_cookie is returned from the driver interface when the scan request is scheduled. This scan_cookie is 0 if the scan is triggered through the upstream cfg80211 interface. Thus, the scan_cookie is used to determine whether to abort the cfg80211 or vendor scan request. Also, the previous implementation of relying on scan_work/p2p_scan_work for the active work to trigger the abort scan is enhanced to check for the started state of either of these work operations. This should also help to abort the concurrent active scan/p2p-scan operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-11-30 05:39:38 +01:00
/*
* Store the obtained vendor scan cookie (if any) in wpa_s context.
* The current design is to allow only one scan request on each
* interface, hence having this scan cookie stored in wpa_s context is
* fine for now.
*
* Revisit this logic if concurrent scan operations per interface
* is supported.
*/
if (ret == 0)
wpa_s->curr_scan_cookie = params->scan_cookie;
Use radio work for scan requests Avoid concurrent scan requests by using the radio work queuing mechanism. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 21:07:05 +01:00
wpa_scan_free_params(params);
work->ctx = NULL;
Add preliminary background scan and roaming module design This allows background scanning and roaming decisions to be contained in a single place based on a defined set of notification events which will hopefully make it easier to experiment with roaming improvements. In addition, this allows multiple intra-ESS roaming policies to be used (each network configuration block can configure its own bgscan module). The beacon loss and signal strength notifications are implemented for the bgscan API, but the actual events are not yet available from the driver. The included sample bgscan module ("simple") is an example of what can be done with the new bgscan mechanism. It requests periodic background scans when the device remains associated with an ESS and has couple of notes on what a more advanced bgscan module could do to optimize background scanning and roaming. The periodic scans will cause the scan result handler to pick a better AP if one becomes available. This bgscan module can be taken into use by adding bgscan="simple" (or bgscan="simple:<bgscan interval in seconds>") into the network configuration block.
2009-09-14 23:08:24 +02:00
if (ret) {
RRM: Send Radio Measurement response when beacon report scan fails When failing to trigger scan for beacon report (e.g., when the requested duration is not supported by the driver), send a Radio Measurement response with the mode set to refused and don't retry the scan. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2017-06-11 14:41:20 +02:00
int retry = wpa_s->last_scan_req != MANUAL_SCAN_REQ &&
!wpa_s->beacon_rep_data.token;
Retry scan-for-connect if driver trigger fails This restores some of the pre-radio work behavior for scanning by retrying scan trigger if the driver rejects it (most likely returning EBUSY in case of nl80211-drivers). Retry is indicated in the CTRL-EVENT-SCAN-FAILED event with "retry=1". For manual scans (e.g., triggered through "SCAN" control interface command), no additional retries are performed. In other words, if upper layers want to retry, they can do so based on the CTRL-EVENT-SCAN-FAILED event. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-01-19 19:10:00 +01:00
if (wpa_s->disconnected)
retry = 0;
wpa_supplicant: Do not retry scan if operation is not supported When using NetworkManager to set up an access point, there seems to be a race condition which can lead to a new log message every second. The following message appears in AP mode: CTRL-EVENT-SCAN-FAILED ret=-95 retry=1 Normally, this log message only appears once. But then (and only then) the race is triggered and they appear every second, the following log messages are also present: Reject scan trigger since one is already pending Failed to initiate AP scan This patch just disables the retry for requests where the operation is not supported anyway. Signed-off-by: Georg Müller <georgmueller@gmx.net>
2020-06-18 16:39:12 +02:00
/* do not retry if operation is not supported */
if (ret == -EOPNOTSUPP)
retry = 0;
Add preliminary background scan and roaming module design This allows background scanning and roaming decisions to be contained in a single place based on a defined set of notification events which will hopefully make it easier to experiment with roaming improvements. In addition, this allows multiple intra-ESS roaming policies to be used (each network configuration block can configure its own bgscan module). The beacon loss and signal strength notifications are implemented for the bgscan API, but the actual events are not yet available from the driver. The included sample bgscan module ("simple") is an example of what can be done with the new bgscan mechanism. It requests periodic background scans when the device remains associated with an ESS and has couple of notes on what a more advanced bgscan module could do to optimize background scanning and roaming. The periodic scans will cause the scan result handler to pick a better AP if one becomes available. This bgscan module can be taken into use by adding bgscan="simple" (or bgscan="simple:<bgscan interval in seconds>") into the network configuration block.
2009-09-14 23:08:24 +02:00
wpa_supplicant_notify_scanning(wpa_s, 0);
wpas_notify_scan_done(wpa_s, 0);
Retry scan-for-connect if driver trigger fails This restores some of the pre-radio work behavior for scanning by retrying scan trigger if the driver rejects it (most likely returning EBUSY in case of nl80211-drivers). Retry is indicated in the CTRL-EVENT-SCAN-FAILED event with "retry=1". For manual scans (e.g., triggered through "SCAN" control interface command), no additional retries are performed. In other words, if upper layers want to retry, they can do so based on the CTRL-EVENT-SCAN-FAILED event. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-01-19 19:10:00 +01:00
if (wpa_s->wpa_state == WPA_SCANNING)
wpa_supplicant_set_state(wpa_s,
wpa_s->scan_prev_wpa_state);
wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_SCAN_FAILED "ret=%d%s",
ret, retry ? " retry=1" : "");
Use radio work for scan requests Avoid concurrent scan requests by using the radio work queuing mechanism. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 21:07:05 +01:00
radio_work_done(work);
Retry scan-for-connect if driver trigger fails This restores some of the pre-radio work behavior for scanning by retrying scan trigger if the driver rejects it (most likely returning EBUSY in case of nl80211-drivers). Retry is indicated in the CTRL-EVENT-SCAN-FAILED event with "retry=1". For manual scans (e.g., triggered through "SCAN" control interface command), no additional retries are performed. In other words, if upper layers want to retry, they can do so based on the CTRL-EVENT-SCAN-FAILED event. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-01-19 19:10:00 +01:00
if (retry) {
/* Restore scan_req since we will try to scan again */
wpa_s->scan_req = wpa_s->last_scan_req;
wpa_supplicant_req_scan(wpa_s, 1, 0);
Clear scan_res_handler on no-retry failure Previously it was possible for wpa_s->scan_res_handler to remain set to its old value in case wpa_drv_scan() failed and no retry for the scan trigger was scheduled (i.e., when last_scan_req == MANUAL_SCAN_REQ). This could result in getting stuck with the next connection attempt after a failed "SCAN TYPE=ONLY" operation when wpa_s->scan_res_handler was set to scan_only_handler(). Fix this by clearing wpa_s->scan_res_handler if wpa_drv_scan() fails and no retry is scheduled. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2017-03-01 15:39:30 +01:00
} else if (wpa_s->scan_res_handler) {
/* Clear the scan_res_handler */
wpa_s->scan_res_handler = NULL;
Retry scan-for-connect if driver trigger fails This restores some of the pre-radio work behavior for scanning by retrying scan trigger if the driver rejects it (most likely returning EBUSY in case of nl80211-drivers). Retry is indicated in the CTRL-EVENT-SCAN-FAILED event with "retry=1". For manual scans (e.g., triggered through "SCAN" control interface command), no additional retries are performed. In other words, if upper layers want to retry, they can do so based on the CTRL-EVENT-SCAN-FAILED event. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-01-19 19:10:00 +01:00
}
RRM: Send Radio Measurement response when beacon report scan fails When failing to trigger scan for beacon report (e.g., when the requested duration is not supported by the driver), send a Radio Measurement response with the mode set to refused and don't retry the scan. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2017-06-11 14:41:20 +02:00
if (wpa_s->beacon_rep_data.token)
wpas_rrm_refuse_request(wpa_s);
Use radio work for scan requests Avoid concurrent scan requests by using the radio work queuing mechanism. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 21:07:05 +01:00
return;
Use normal scan before sched_scan if that can speed up connection When normal scan can speed up operations, use that for the first three scan runs before starting the sched_scan to allow user space sleep more. We do this only if the normal scan has functionality that is suitable for this or if the sched_scan does not have better support for multiple SSIDs. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-28 17:36:36 +01:00
}
Add preliminary background scan and roaming module design This allows background scanning and roaming decisions to be contained in a single place based on a defined set of notification events which will hopefully make it easier to experiment with roaming improvements. In addition, this allows multiple intra-ESS roaming policies to be used (each network configuration block can configure its own bgscan module). The beacon loss and signal strength notifications are implemented for the bgscan API, but the actual events are not yet available from the driver. The included sample bgscan module ("simple") is an example of what can be done with the new bgscan mechanism. It requests periodic background scans when the device remains associated with an ESS and has couple of notes on what a more advanced bgscan module could do to optimize background scanning and roaming. The periodic scans will cause the scan result handler to pick a better AP if one becomes available. This bgscan module can be taken into use by adding bgscan="simple" (or bgscan="simple:<bgscan interval in seconds>") into the network configuration block.
2009-09-14 23:08:24 +02:00
Use radio work for scan requests Avoid concurrent scan requests by using the radio work queuing mechanism. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 21:07:05 +01:00
os_get_reltime(&wpa_s->scan_trigger_time);
wpa_s->scan_runs++;
wpa_s->normal_scans++;
wpa_s->own_scan_requested = 1;
wpa_s->clear_driver_scan_cache = 0;
wpa_s->scan_work = work;
}
/**
* wpa_supplicant_trigger_scan - Request driver to start a scan
* @wpa_s: Pointer to wpa_supplicant data
* @params: Scan parameters
* Returns: 0 on success, -1 on failure
*/
int wpa_supplicant_trigger_scan(struct wpa_supplicant *wpa_s,
struct wpa_driver_scan_params *params)
{
struct wpa_driver_scan_params *ctx;
if (wpa_s->scan_work) {
wpa_dbg(wpa_s, MSG_INFO, "Reject scan trigger since one is already pending");
return -1;
}
ctx = wpa_scan_clone_params(params);
Indicate scan failure event on parameter cloning failure This is more consistent with the radio_add_work() error case. Signed-off-by: Jouni Malinen <j@w1.fi>
2016-05-28 21:35:30 +02:00
if (!ctx ||
radio_add_work(wpa_s, 0, "scan", 0, wpas_trigger_scan_cb, ctx) < 0)
Use radio work for scan requests Avoid concurrent scan requests by using the radio work queuing mechanism. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 21:07:05 +01:00
{
wpa_scan_free_params(ctx);
scan: Fix a memory leak on an error path If preassoc_mac_addr is used and updating the MAC address fails in wpas_trigger_scan_cb(), the cloned scan parameters were leaked. Fix that and also send a CTRL-EVENT-SCAN-FAILED event in this and another error case. Signed-off-by: Jouni Malinen <j@w1.fi>
2016-05-22 17:09:23 +02:00
wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_SCAN_FAILED "ret=-1");
Use radio work for scan requests Avoid concurrent scan requests by using the radio work queuing mechanism. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 21:07:05 +01:00
return -1;
}
return 0;
Add preliminary background scan and roaming module design This allows background scanning and roaming decisions to be contained in a single place based on a defined set of notification events which will hopefully make it easier to experiment with roaming improvements. In addition, this allows multiple intra-ESS roaming policies to be used (each network configuration block can configure its own bgscan module). The beacon loss and signal strength notifications are implemented for the bgscan API, but the actual events are not yet available from the driver. The included sample bgscan module ("simple") is an example of what can be done with the new bgscan mechanism. It requests periodic background scans when the device remains associated with an ESS and has couple of notes on what a more advanced bgscan module could do to optimize background scanning and roaming. The periodic scans will cause the scan result handler to pick a better AP if one becomes available. This bgscan module can be taken into use by adding bgscan="simple" (or bgscan="simple:<bgscan interval in seconds>") into the network configuration block.
2009-09-14 23:08:24 +02:00
}
Add delayed scheduled scan request When initializing, the scheduled scan code was being called before everything is ready. With normal scans, the first scan round is delayed, so the initialization is finished by the time it really starts. Add a function that can be used to request a delayed scheduled scan. The scan will only start after the specified time has elapsed. Call this function instead of starting the scheduled scan directly during driver initialization. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:38 +02:00
static void
wpa_supplicant_delayed_sched_scan_timeout(void *eloop_ctx, void *timeout_ctx)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
wpa_dbg(wpa_s, MSG_DEBUG, "Starting delayed sched scan");
if (wpa_supplicant_req_sched_scan(wpa_s))
wpa_supplicant_req_scan(wpa_s, 0, 0);
}
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
static void
wpa_supplicant_sched_scan_timeout(void *eloop_ctx, void *timeout_ctx)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
wpa_dbg(wpa_s, MSG_DEBUG, "Sched scan timeout - stopping it");
wpa_s->sched_scan_timed_out = 1;
wpa_supplicant_cancel_sched_scan(wpa_s);
}
Mark wpa_supplicant_{start,stop}_sched_scan() static With the only callers in wpas_{start,stop}_pno() moved into scan.c, there is no need to call these helper functions from outside scan.c anymore. Signed-off-by: Jouni Malinen <j@w1.fi>
2016-04-07 10:45:01 +02:00
static int
wpa_supplicant_start_sched_scan(struct wpa_supplicant *wpa_s,
struct wpa_driver_scan_params *params)
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
{
int ret;
wpa_supplicant_notify_scanning(wpa_s, 1);
nl80211: Add support for multiple scan plans for scheduled scan Add 'scan plans' to driver scan parameters for scheduled scan. Each 'scan plan' specifies the number of iterations to run the scan request and the interval between iterations. When a scan plan finishes (i.e., it was run for the specified number of iterations), the next scan plan is executed. The last scan plan will run infinitely. The maximum number of supported scan plans, the maximum number of iterations for a single scan plan and the maximum scan interval are advertised by the driver. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2015-11-17 14:08:23 +01:00
ret = wpa_drv_sched_scan(wpa_s, params);
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
if (ret)
wpa_supplicant_notify_scanning(wpa_s, 0);
else
wpa_s->sched_scanning = 1;
return ret;
}
Mark wpa_supplicant_{start,stop}_sched_scan() static With the only callers in wpas_{start,stop}_pno() moved into scan.c, there is no need to call these helper functions from outside scan.c anymore. Signed-off-by: Jouni Malinen <j@w1.fi>
2016-04-07 10:45:01 +02:00
static int wpa_supplicant_stop_sched_scan(struct wpa_supplicant *wpa_s)
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
{
int ret;
ret = wpa_drv_stop_sched_scan(wpa_s);
if (ret) {
wpa_dbg(wpa_s, MSG_DEBUG, "stopping sched_scan failed!");
/* TODO: what to do if stopping fails? */
return -1;
}
return ret;
}
Add optional scan result filter based on SSID filter_ssids=1 global configuration parameter can now be used to enable scan result filtering (with -Dnl80211 only for now) based on the configured SSIDs. In other words, only the scan results that have an SSID matching with one of the configured networks are included in the BSS table. This can be used to reduce memory needs in environments that have huge number of APs.
2010-03-05 20:42:06 +01:00
static struct wpa_driver_scan_filter *
wpa_supplicant_build_filter_ssids(struct wpa_config *conf, size_t *num_ssids)
{
struct wpa_driver_scan_filter *ssids;
struct wpa_ssid *ssid;
size_t count;
*num_ssids = 0;
if (!conf->filter_ssids)
return NULL;
for (count = 0, ssid = conf->ssid; ssid; ssid = ssid->next) {
if (ssid->ssid && ssid->ssid_len)
count++;
}
if (count == 0)
return NULL;
Use os_calloc() instead of os_zalloc() Automatic changes with spatch using the following semantic patch: @@ constant C; type T; @@ - os_zalloc(C*sizeof(T)) + os_calloc(C,sizeof(T)) @@ expression E; type T; @@ - os_zalloc((E)*sizeof(T)) + os_calloc(E,sizeof(T)) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-07 15:51:38 +01:00
ssids = os_calloc(count, sizeof(struct wpa_driver_scan_filter));
Add optional scan result filter based on SSID filter_ssids=1 global configuration parameter can now be used to enable scan result filtering (with -Dnl80211 only for now) based on the configured SSIDs. In other words, only the scan results that have an SSID matching with one of the configured networks are included in the BSS table. This can be used to reduce memory needs in environments that have huge number of APs.
2010-03-05 20:42:06 +01:00
if (ssids == NULL)
return NULL;
for (ssid = conf->ssid; ssid; ssid = ssid->next) {
if (!ssid->ssid || !ssid->ssid_len)
continue;
os_memcpy(ssids[*num_ssids].ssid, ssid->ssid, ssid->ssid_len);
ssids[*num_ssids].ssid_len = ssid->ssid_len;
(*num_ssids)++;
}
return ssids;
}
Reorganize P2P and WPS scan code Move some code to separate functions to reorganize the P2P and WPS handling during scans. This makes the code a bit cleaner and is needed for the scheduled scan implementation to avoid duplicated code. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-10-15 16:35:04 +02:00
static void wpa_supplicant_optimize_freqs(
struct wpa_supplicant *wpa_s, struct wpa_driver_scan_params *params)
{
#ifdef CONFIG_P2P
if (params->freqs == NULL && wpa_s->p2p_in_provisioning &&
wpa_s->go_params) {
/* Optimize provisioning state scan based on GO information */
if (wpa_s->p2p_in_provisioning < 5 &&
wpa_s->go_params->freq > 0) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Scan only GO "
"preferred frequency %d MHz",
wpa_s->go_params->freq);
Use os_calloc() instead of os_zalloc() Automatic changes with spatch using the following semantic patch: @@ constant C; type T; @@ - os_zalloc(C*sizeof(T)) + os_calloc(C,sizeof(T)) @@ expression E; type T; @@ - os_zalloc((E)*sizeof(T)) + os_calloc(E,sizeof(T)) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-07 15:51:38 +01:00
params->freqs = os_calloc(2, sizeof(int));
Reorganize P2P and WPS scan code Move some code to separate functions to reorganize the P2P and WPS handling during scans. This makes the code a bit cleaner and is needed for the scheduled scan implementation to avoid duplicated code. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-10-15 16:35:04 +02:00
if (params->freqs)
params->freqs[0] = wpa_s->go_params->freq;
} else if (wpa_s->p2p_in_provisioning < 8 &&
wpa_s->go_params->freq_list[0]) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Scan only common "
"channels");
int_array_concat(&params->freqs,
wpa_s->go_params->freq_list);
if (params->freqs)
int_array_sort_unique(params->freqs);
}
wpa_s->p2p_in_provisioning++;
}
P2P: Optimize scan for GO during persistent group invocation Scan for GO on the negotiated operating channel for few iterations before searching on all the supported channels during persistent group reinvocation. In addition, use the already known SSID of the group in the scans. These optimizations reduce group formation time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-21 13:56:02 +01:00
if (params->freqs == NULL && wpa_s->p2p_in_invitation) {
/*
* Optimize scan based on GO information during persistent
* group reinvocation
*/
P2P: Fix scan optimization for GO during persistent group invocation Commit 41d5ce9e0b7b37dd84fbf3c1aa5ed571c32321d4 was intended to scan for GO on the negotiated channel for few iterations, but it did not work correctly due to incorrect operator being used. Fix this by requiring both conditions to be met for the single channel scan. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-05-13 12:44:18 +02:00
if (wpa_s->p2p_in_invitation < 5 &&
P2P: Optimize scan for GO during persistent group invocation Scan for GO on the negotiated operating channel for few iterations before searching on all the supported channels during persistent group reinvocation. In addition, use the already known SSID of the group in the scans. These optimizations reduce group formation time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-21 13:56:02 +01:00
wpa_s->p2p_invite_go_freq > 0) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Scan only GO preferred frequency %d MHz during invitation",
wpa_s->p2p_invite_go_freq);
Use os_calloc() instead of os_zalloc() Automatic changes with spatch using the following semantic patch: @@ constant C; type T; @@ - os_zalloc(C*sizeof(T)) + os_calloc(C,sizeof(T)) @@ expression E; type T; @@ - os_zalloc((E)*sizeof(T)) + os_calloc(E,sizeof(T)) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-07 15:51:38 +01:00
params->freqs = os_calloc(2, sizeof(int));
P2P: Optimize scan for GO during persistent group invocation Scan for GO on the negotiated operating channel for few iterations before searching on all the supported channels during persistent group reinvocation. In addition, use the already known SSID of the group in the scans. These optimizations reduce group formation time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-21 13:56:02 +01:00
if (params->freqs)
params->freqs[0] = wpa_s->p2p_invite_go_freq;
}
wpa_s->p2p_in_invitation++;
if (wpa_s->p2p_in_invitation > 20) {
/*
* This should not really happen since the variable is
* cleared on group removal, but if it does happen, make
* sure we do not get stuck in special invitation scan
* mode.
*/
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Clear p2p_in_invitation");
wpa_s->p2p_in_invitation = 0;
}
}
Reorganize P2P and WPS scan code Move some code to separate functions to reorganize the P2P and WPS handling during scans. This makes the code a bit cleaner and is needed for the scheduled scan implementation to avoid duplicated code. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-10-15 16:35:04 +02:00
#endif /* CONFIG_P2P */
#ifdef CONFIG_WPS
if (params->freqs == NULL && wpa_s->after_wps && wpa_s->wps_freq) {
/*
* Optimize post-provisioning scan based on channel used
* during provisioning.
*/
wpa_dbg(wpa_s, MSG_DEBUG, "WPS: Scan only frequency %u MHz "
"that was used during provisioning", wpa_s->wps_freq);
Use os_calloc() instead of os_zalloc() Automatic changes with spatch using the following semantic patch: @@ constant C; type T; @@ - os_zalloc(C*sizeof(T)) + os_calloc(C,sizeof(T)) @@ expression E; type T; @@ - os_zalloc((E)*sizeof(T)) + os_calloc(E,sizeof(T)) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-07 15:51:38 +01:00
params->freqs = os_calloc(2, sizeof(int));
Reorganize P2P and WPS scan code Move some code to separate functions to reorganize the P2P and WPS handling during scans. This makes the code a bit cleaner and is needed for the scheduled scan implementation to avoid duplicated code. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-10-15 16:35:04 +02:00
if (params->freqs)
params->freqs[0] = wpa_s->wps_freq;
wpa_s->after_wps--;
WPS: Reduce scan wait time during WPS processing Since the AP is expected to be available, there is no need to wait for the full five second wait between scans during WPS connection. This speeds up cases where the first scan misses the AP for some reason. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-28 11:56:21 +01:00
} else if (wpa_s->after_wps)
wpa_s->after_wps--;
Reorganize P2P and WPS scan code Move some code to separate functions to reorganize the P2P and WPS handling during scans. This makes the code a bit cleaner and is needed for the scheduled scan implementation to avoid duplicated code. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-10-15 16:35:04 +02:00
WPS: Use single channel scan if AP channel already known If the BSSID of the AP is specified in the WPS command, the target AP is likely already in the BSS table and its operating channel is known. Use this information to speed up connection by only scanning the known channel. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-31 12:17:20 +01:00
if (params->freqs == NULL && wpa_s->known_wps_freq && wpa_s->wps_freq)
{
/* Optimize provisioning scan based on already known channel */
wpa_dbg(wpa_s, MSG_DEBUG, "WPS: Scan only frequency %u MHz",
wpa_s->wps_freq);
Use os_calloc() instead of os_zalloc() Automatic changes with spatch using the following semantic patch: @@ constant C; type T; @@ - os_zalloc(C*sizeof(T)) + os_calloc(C,sizeof(T)) @@ expression E; type T; @@ - os_zalloc((E)*sizeof(T)) + os_calloc(E,sizeof(T)) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-07 15:51:38 +01:00
params->freqs = os_calloc(2, sizeof(int));
WPS: Use single channel scan if AP channel already known If the BSSID of the AP is specified in the WPS command, the target AP is likely already in the BSS table and its operating channel is known. Use this information to speed up connection by only scanning the known channel. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-31 12:17:20 +01:00
if (params->freqs)
params->freqs[0] = wpa_s->wps_freq;
wpa_s->known_wps_freq = 0; /* only do this once */
}
Reorganize P2P and WPS scan code Move some code to separate functions to reorganize the P2P and WPS handling during scans. This makes the code a bit cleaner and is needed for the scheduled scan implementation to avoid duplicated code. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-10-15 16:35:04 +02:00
#endif /* CONFIG_WPS */
}
IEEE 802.11u: Allow Interworking and HESSID to be configured The new wpa_supplicant.conf file global parameters interworking and hessid can be used to configure wpa_supplicant to include Interworking element in Probe Request frames.
2011-09-27 22:15:05 +02:00
#ifdef CONFIG_INTERWORKING
static void wpas_add_interworking_elements(struct wpa_supplicant *wpa_s,
struct wpabuf *buf)
{
wpabuf_put_u8(buf, WLAN_EID_INTERWORKING);
wpabuf_put_u8(buf, is_zero_ether_addr(wpa_s->conf->hessid) ? 1 :
1 + ETH_ALEN);
Interworking: Allow ANT to be configured for Probe Request frames Access Network Type can now be configured (default: 15 = wildcard) to limit which APs reply to the scan.
2011-10-21 11:44:29 +02:00
wpabuf_put_u8(buf, wpa_s->conf->access_network_type);
IEEE 802.11u: Allow Interworking and HESSID to be configured The new wpa_supplicant.conf file global parameters interworking and hessid can be used to configure wpa_supplicant to include Interworking element in Probe Request frames.
2011-09-27 22:15:05 +02:00
/* No Venue Info */
if (!is_zero_ether_addr(wpa_s->conf->hessid))
wpabuf_put_data(buf, wpa_s->conf->hessid, ETH_ALEN);
}
#endif /* CONFIG_INTERWORKING */
OCE: Send scan parameters when OCE_STA functionality is enabled If the device supports OCE features and OCE is enabled, set the relevant scan parameters and FILS Request Parameters element with Max Channel Time. Signed-off-by: Roee Zamir <roee.zamir@intel.com>
2018-08-26 19:45:03 +02:00
#ifdef CONFIG_MBO
static void wpas_fils_req_param_add_max_channel(struct wpa_supplicant *wpa_s,
struct wpabuf **ie)
{
if (wpabuf_resize(ie, 5)) {
wpa_printf(MSG_DEBUG,
"Failed to allocate space for FILS Request Parameters element");
return;
}
/* FILS Request Parameters element */
wpabuf_put_u8(*ie, WLAN_EID_EXTENSION);
wpabuf_put_u8(*ie, 3); /* FILS Request attribute length */
wpabuf_put_u8(*ie, WLAN_EID_EXT_FILS_REQ_PARAMS);
/* Parameter control bitmap */
wpabuf_put_u8(*ie, 0);
/* Max Channel Time field - contains the value of MaxChannelTime
* parameter of the MLME-SCAN.request primitive represented in units of
* TUs, as an unsigned integer. A Max Channel Time field value of 255
* is used to indicate any duration of more than 254 TUs, or an
* unspecified or unknown duration. (IEEE Std 802.11ai-2016, 9.4.2.178)
*/
wpabuf_put_u8(*ie, 255);
}
#endif /* CONFIG_MBO */
Set default scan IEs to the driver (QCA vendor extension) This makes wpa_supplicant set default scan IEs to the driver (if the vendor command is supported). The driver can use these IEs in the scan requests initiated by the driver itself. Also the driver can merge these IEs into further scan requests that it receives, in case if the scan request doesn't carry any of the IEs sent in this command. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-07-19 09:11:15 +02:00
void wpa_supplicant_set_default_scan_ies(struct wpa_supplicant *wpa_s)
{
struct wpabuf *default_ies = NULL;
u8 ext_capab[18];
int ext_capab_len;
enum wpa_driver_if_type type = WPA_IF_STATION;
#ifdef CONFIG_P2P
if (wpa_s->p2p_group_interface == P2P_GROUP_INTERFACE_CLIENT)
type = WPA_IF_P2P_CLIENT;
#endif /* CONFIG_P2P */
wpa_drv_get_ext_capa(wpa_s, type);
ext_capab_len = wpas_build_ext_capab(wpa_s, ext_capab,
sizeof(ext_capab));
if (ext_capab_len > 0 &&
wpabuf_resize(&default_ies, ext_capab_len) == 0)
wpabuf_put_data(default_ies, ext_capab, ext_capab_len);
#ifdef CONFIG_MBO
OCE: Send scan parameters when OCE_STA functionality is enabled If the device supports OCE features and OCE is enabled, set the relevant scan parameters and FILS Request Parameters element with Max Channel Time. Signed-off-by: Roee Zamir <roee.zamir@intel.com>
2018-08-26 19:45:03 +02:00
if (wpa_s->enable_oce & OCE_STA)
wpas_fils_req_param_add_max_channel(wpa_s, &default_ies);
STA: Add OCE capability indication attribute Add OCE capability indication attribute in Probe Request and (Re)Association Request frames. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2017-07-10 14:05:31 +02:00
/* Send MBO and OCE capabilities */
if (wpabuf_resize(&default_ies, 12) == 0)
Set default scan IEs to the driver (QCA vendor extension) This makes wpa_supplicant set default scan IEs to the driver (if the vendor command is supported). The driver can use these IEs in the scan requests initiated by the driver itself. Also the driver can merge these IEs into further scan requests that it receives, in case if the scan request doesn't carry any of the IEs sent in this command. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-07-19 09:11:15 +02:00
wpas_mbo_scan_ie(wpa_s, default_ies);
#endif /* CONFIG_MBO */
if (default_ies)
wpa_drv_set_default_scan_ies(wpa_s, wpabuf_head(default_ies),
wpabuf_len(default_ies));
wpabuf_free(default_ies);
}
Fix adding extra IEs in sched scan Refactoring done in commit 46ee0427b13d64dc4695fda24f4f228c99822c11 (IEEE 802.11u: Allow Interworking and HESSID to be configured) broke adding extra IEs in sched scan. The IEs stopped being added to the scan params within wpa_supplicant_extra_ies() but no code was added to add them in wpa_supplicant_req_sched_scan(). Fix this and remove unused params arg in wpa_supplicant_extra_ies(). Signed-hostap: Eyal Shapira <eyal@wizery.com> intended-for: hostap-1
2012-08-13 20:48:55 +02:00
static struct wpabuf * wpa_supplicant_extra_ies(struct wpa_supplicant *wpa_s)
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
{
IEEE 802.11u: Allow Interworking and HESSID to be configured The new wpa_supplicant.conf file global parameters interworking and hessid can be used to configure wpa_supplicant to include Interworking element in Probe Request frames.
2011-09-27 22:15:05 +02:00
struct wpabuf *extra_ie = NULL;
Add Extended Capabilities element to all Probe Request frames Always add the Extended Capabilities element to Probe Request frames (in case it is not all zeros) to publish support for driver advertised capabilities and wpa_supplicant specific capabilities. This also fixes the case where Extended Capabilities element was added for Interworking cases, but did not use the driver advertised ones and did not handle other capabilities supported by wpa_supplicant. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-03-16 06:20:48 +01:00
u8 ext_capab[18];
int ext_capab_len;
WPS: Set Request Type properly into WPS IE in ProbeReq/AssocReq
2008-11-29 12:38:03 +01:00
#ifdef CONFIG_WPS
WPS: Fix unused variable warning The wpa_supplicant compilation without CONFIG_WPS option results in messages below. scan.c: In function 'wpa_supplicant_scan': scan.c:246: warning: unused variable 'wps' This trivial patch erases this warning.
2010-08-20 08:44:50 +02:00
int wps = 0;
Added Doxygen documentation for WPS code
2009-01-03 18:50:49 +01:00
enum wps_request_type req_type = WPS_REQ_ENROLLEE_INFO;
IEEE 802.11u: Allow Interworking and HESSID to be configured The new wpa_supplicant.conf file global parameters interworking and hessid can be used to configure wpa_supplicant to include Interworking element in Probe Request frames.
2011-09-27 22:15:05 +02:00
#endif /* CONFIG_WPS */
nl80211: Use extended capabilities per interface type This adds the necessary changes to support extraction and use of the extended capabilities specified per interface type (a recent cfg80211/nl80211 extension). If that information is available, per-interface values will be used to override the global per-radio value. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-04-12 10:01:42 +02:00
#ifdef CONFIG_P2P
if (wpa_s->p2p_group_interface == P2P_GROUP_INTERFACE_CLIENT)
wpa_drv_get_ext_capa(wpa_s, WPA_IF_P2P_CLIENT);
else
#endif /* CONFIG_P2P */
wpa_drv_get_ext_capa(wpa_s, WPA_IF_STATION);
Add Extended Capabilities element to all Probe Request frames Always add the Extended Capabilities element to Probe Request frames (in case it is not all zeros) to publish support for driver advertised capabilities and wpa_supplicant specific capabilities. This also fixes the case where Extended Capabilities element was added for Interworking cases, but did not use the driver advertised ones and did not handle other capabilities supported by wpa_supplicant. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-03-16 06:20:48 +01:00
ext_capab_len = wpas_build_ext_capab(wpa_s, ext_capab,
sizeof(ext_capab));
if (ext_capab_len > 0 &&
wpabuf_resize(&extra_ie, ext_capab_len) == 0)
wpabuf_put_data(extra_ie, ext_capab, ext_capab_len);
IEEE 802.11u: Allow Interworking and HESSID to be configured The new wpa_supplicant.conf file global parameters interworking and hessid can be used to configure wpa_supplicant to include Interworking element in Probe Request frames.
2011-09-27 22:15:05 +02:00
#ifdef CONFIG_INTERWORKING
if (wpa_s->conf->interworking &&
wpabuf_resize(&extra_ie, 100) == 0)
wpas_add_interworking_elements(wpa_s, extra_ie);
#endif /* CONFIG_INTERWORKING */
Reorganize P2P and WPS scan code Move some code to separate functions to reorganize the P2P and WPS handling during scans. This makes the code a bit cleaner and is needed for the scheduled scan implementation to avoid duplicated code. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-10-15 16:35:04 +02:00
OCE: Send scan parameters when OCE_STA functionality is enabled If the device supports OCE features and OCE is enabled, set the relevant scan parameters and FILS Request Parameters element with Max Channel Time. Signed-off-by: Roee Zamir <roee.zamir@intel.com>
2018-08-26 19:45:03 +02:00
#ifdef CONFIG_MBO
if (wpa_s->enable_oce & OCE_STA)
wpas_fils_req_param_add_max_channel(wpa_s, &extra_ie);
#endif /* CONFIG_MBO */
IEEE 802.11u: Allow Interworking and HESSID to be configured The new wpa_supplicant.conf file global parameters interworking and hessid can be used to configure wpa_supplicant to include Interworking element in Probe Request frames.
2011-09-27 22:15:05 +02:00
#ifdef CONFIG_WPS
Reorganize P2P and WPS scan code Move some code to separate functions to reorganize the P2P and WPS handling during scans. This makes the code a bit cleaner and is needed for the scheduled scan implementation to avoid duplicated code. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-10-15 16:35:04 +02:00
wps = wpas_wps_in_use(wpa_s, &req_type);
if (wps) {
IEEE 802.11u: Allow Interworking and HESSID to be configured The new wpa_supplicant.conf file global parameters interworking and hessid can be used to configure wpa_supplicant to include Interworking element in Probe Request frames.
2011-09-27 22:15:05 +02:00
struct wpabuf *wps_ie;
P2P: Advertise immediate availability of WPS credential Use Device Password ID in WSC IE of Probe Request and Probe Response frames to advertise immediate availability of WPS credentials per P2P specification sections 3.1.2.1.1 (Listen State), 3.1.2.1.2 (Scan Phase), and 3.1.2.1.3 (Find Phase). For now, the Device Password ID is set only for the case where we are active GO Negotiation with a specific peer. In practice, this means that the Probe Response frames during pending GO Negotiation (whenever in Listen state) indicate availability of the credential. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-27 22:14:35 +01:00
wps_ie = wps_build_probe_req_ie(wps == 2 ? DEV_PW_PUSHBUTTON :
DEV_PW_DEFAULT,
&wpa_s->wps->dev,
Reorganize P2P and WPS scan code Move some code to separate functions to reorganize the P2P and WPS handling during scans. This makes the code a bit cleaner and is needed for the scheduled scan implementation to avoid duplicated code. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-10-15 16:35:04 +02:00
wpa_s->wps->uuid, req_type,
0, NULL);
if (wps_ie) {
IEEE 802.11u: Allow Interworking and HESSID to be configured The new wpa_supplicant.conf file global parameters interworking and hessid can be used to configure wpa_supplicant to include Interworking element in Probe Request frames.
2011-09-27 22:15:05 +02:00
if (wpabuf_resize(&extra_ie, wpabuf_len(wps_ie)) == 0)
wpabuf_put_buf(extra_ie, wps_ie);
wpabuf_free(wps_ie);
Reorganize P2P and WPS scan code Move some code to separate functions to reorganize the P2P and WPS handling during scans. This makes the code a bit cleaner and is needed for the scheduled scan implementation to avoid duplicated code. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-10-15 16:35:04 +02:00
}
}
#ifdef CONFIG_P2P
IEEE 802.11u: Allow Interworking and HESSID to be configured The new wpa_supplicant.conf file global parameters interworking and hessid can be used to configure wpa_supplicant to include Interworking element in Probe Request frames.
2011-09-27 22:15:05 +02:00
if (wps) {
Reorganize P2P and WPS scan code Move some code to separate functions to reorganize the P2P and WPS handling during scans. This makes the code a bit cleaner and is needed for the scheduled scan implementation to avoid duplicated code. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-10-15 16:35:04 +02:00
size_t ielen = p2p_scan_ie_buf_len(wpa_s->global->p2p);
IEEE 802.11u: Allow Interworking and HESSID to be configured The new wpa_supplicant.conf file global parameters interworking and hessid can be used to configure wpa_supplicant to include Interworking element in Probe Request frames.
2011-09-27 22:15:05 +02:00
if (wpabuf_resize(&extra_ie, ielen) == 0)
wpas_p2p_scan_ie(wpa_s, extra_ie);
Reorganize P2P and WPS scan code Move some code to separate functions to reorganize the P2P and WPS handling during scans. This makes the code a bit cleaner and is needed for the scheduled scan implementation to avoid duplicated code. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-10-15 16:35:04 +02:00
}
#endif /* CONFIG_P2P */
mesh: Implement mesh scanning When mesh is configured in, include the wildcard mesh id so that mesh networks are returned. Signed-off-by: Javier Lopez <jlopex@gmail.com> Signed-off-by: Jason Abele <jason.abele@gmail.com>
2014-09-01 06:23:32 +02:00
wpa_supplicant_mesh_add_scan_ie(wpa_s, &extra_ie);
WPS: Set Request Type properly into WPS IE in ProbeReq/AssocReq
2008-11-29 12:38:03 +01:00
#endif /* CONFIG_WPS */
Reorganize P2P and WPS scan code Move some code to separate functions to reorganize the P2P and WPS handling during scans. This makes the code a bit cleaner and is needed for the scheduled scan implementation to avoid duplicated code. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-10-15 16:35:04 +02:00
HS 2.0: Move Probe Request Indication IE addition to proper place This needs to be in wpa_supplicant_extra_ies() to get consistent behavior for both scan and sched_scan cases. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-04 10:57:56 +02:00
#ifdef CONFIG_HS20
HS 2.0: Allocate enough buffer for HS 2.0 Indication element for scan The HS 2.0 Indication element can be up to 9 octets in length, so add two more octets to the minimum extra_ie buffer size for scanning. Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
2018-12-08 00:11:44 +01:00
if (wpa_s->conf->hs20 && wpabuf_resize(&extra_ie, 9) == 0)
HS 2.0: As a STA, do not indicate release number greater than the AP Hotspot 2.0 tech spec mandates mobile device to not indicate a release number that is greater than the release number advertised by the AP. Add this constraint to the HS 2.0 Indication element when adding this into (Re)Association Request frame. The element in the Probe Request frame continues to show the station's latest supported release number. Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
2018-12-07 23:51:04 +01:00
wpas_hs20_add_indication(extra_ie, -1, 0);
HS 2.0: Move Probe Request Indication IE addition to proper place This needs to be in wpa_supplicant_extra_ies() to get consistent behavior for both scan and sched_scan cases. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-04 10:57:56 +02:00
#endif /* CONFIG_HS20 */
FST: Integration into wpa_supplicant This commit integrates the FST into the wpa_supplicant. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-11-16 16:28:53 +01:00
#ifdef CONFIG_FST
if (wpa_s->fst_ies &&
wpabuf_resize(&extra_ie, wpabuf_len(wpa_s->fst_ies)) == 0)
wpabuf_put_buf(extra_ie, wpa_s->fst_ies);
#endif /* CONFIG_FST */
MBO: Add cellular capability to MBO IE Add cellular capability attribute to MBO IE and add MBO IE with cellular capabilities to Probe Request frames. By default, cellular capability value is set to Not Cellular capable (3). Signed-off-by: David Spinadel <david.spinadel@intel.com>
2016-02-15 15:53:28 +01:00
#ifdef CONFIG_MBO
STA: Add OCE capability indication attribute Add OCE capability indication attribute in Probe Request and (Re)Association Request frames. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2017-07-10 14:05:31 +02:00
/* Send MBO and OCE capabilities */
if (wpabuf_resize(&extra_ie, 12) == 0)
MBO: Add cellular capability to MBO IE Add cellular capability attribute to MBO IE and add MBO IE with cellular capabilities to Probe Request frames. By default, cellular capability value is set to Not Cellular capable (3). Signed-off-by: David Spinadel <david.spinadel@intel.com>
2016-02-15 15:53:28 +01:00
wpas_mbo_scan_ie(wpa_s, extra_ie);
#endif /* CONFIG_MBO */
Extend VENDOR_ELEM parameters to cover non-P2P Probe Request frame The new VENDOR_ELEM value 14 can now be used to add a vendor element into Probe Request frames used by non-P2P active scans. For example: VENDOR_ELEM_ADD 14 dd05001122330a and to clear that: VENDOR_ELEM_REMOVE 14 * Signed-off-by: Jouni Malinen <j@w1.fi>
2016-04-08 16:28:23 +02:00
if (wpa_s->vendor_elem[VENDOR_ELEM_PROBE_REQ]) {
struct wpabuf *buf = wpa_s->vendor_elem[VENDOR_ELEM_PROBE_REQ];
if (wpabuf_resize(&extra_ie, wpabuf_len(buf)) == 0)
wpabuf_put_buf(extra_ie, buf);
}
IEEE 802.11u: Allow Interworking and HESSID to be configured The new wpa_supplicant.conf file global parameters interworking and hessid can be used to configure wpa_supplicant to include Interworking element in Probe Request frames.
2011-09-27 22:15:05 +02:00
return extra_ie;
Reorganize P2P and WPS scan code Move some code to separate functions to reorganize the P2P and WPS handling during scans. This makes the code a bit cleaner and is needed for the scheduled scan implementation to avoid duplicated code. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-10-15 16:35:04 +02:00
}
P2P: Avoid multi-channel scans when they are not needed If the driver does not support multi-channel concurrency and a virtual interface that shares the same radio with the current interface is operating there may not be need to scan other channels apart from the current operating channel on the other virtual interface. Filter out other channels in case we are trying to find a connection for a station interface when we are not configured to prefer station connection and a concurrent operation is already in process. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-25 11:47:43 +01:00
#ifdef CONFIG_P2P
/*
* Check whether there are any enabled networks or credentials that could be
* used for a non-P2P connection.
*/
static int non_p2p_network_enabled(struct wpa_supplicant *wpa_s)
{
struct wpa_ssid *ssid;
for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next) {
if (wpas_network_disabled(wpa_s, ssid))
continue;
if (!ssid->p2p_group)
return 1;
}
if (wpa_s->conf->cred && wpa_s->conf->interworking &&
wpa_s->conf->auto_interworking)
return 1;
return 0;
}
wpa_supplicant: Allow vifs to scan only current channel If a VIF is already associated, then only scan on the associated frequency if user requests such. This is a big help when using lots of virtual stations. Signed-hostap: Ben Greear <greearb@candelatech.com> Signed-off-by: Ben Greear <greearb@candelatech.com>
2013-05-09 11:43:40 +02:00
#endif /* CONFIG_P2P */
P2P: Avoid multi-channel scans when they are not needed If the driver does not support multi-channel concurrency and a virtual interface that shares the same radio with the current interface is operating there may not be need to scan other channels apart from the current operating channel on the other virtual interface. Filter out other channels in case we are trying to find a connection for a station interface when we are not configured to prefer station connection and a concurrent operation is already in process. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-25 11:47:43 +01:00
scan: Add a helper function to append supported freqs from a given band This functionality was repeated for couple of times. Use a shared helper function to avoid code duplication. Signed-off-by: Veerendranath Jakkam <vjakkam@codeaurora.org>
2020-11-20 15:28:50 +01:00
int wpa_add_scan_freqs_list(struct wpa_supplicant *wpa_s,
enum hostapd_hw_mode band,
struct wpa_driver_scan_params *params, int is_6ghz)
Add band option (2.4 vs. 5) for filtering scans This can be used to implement filtering of channels for scan and based on that, for connection, purposes. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-09 06:28:13 +01:00
{
/* Include only supported channels for the specified band */
struct hostapd_hw_modes *mode;
scan: Add a helper function to append supported freqs from a given band This functionality was repeated for couple of times. Use a shared helper function to avoid code duplication. Signed-off-by: Veerendranath Jakkam <vjakkam@codeaurora.org>
2020-11-20 15:28:50 +01:00
int num_chans = 0;
int *freqs, i;
Add band option (2.4 vs. 5) for filtering scans This can be used to implement filtering of channels for scan and based on that, for connection, purposes. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-09 06:28:13 +01:00
Enhance get_mode() to return correct hw_mode with 6 GHz support The 5 GHz channels are stored in one hw_features set with mode HOSTAPD_MODE_IEEE80211A while the 6 GHz channels will need to be stored in a separate hw_features set (but with same mode HOSTAPD_MODE_IEEE80211A) due to possibility of different HT/VHT/HE capabilities being available between the 5 GHz and 6 GHz bands. Iterate through all hw_features sets and check and match the band of channel supported by the hw_features set while getting the hw_features set in get_mode(). This allows both the 5 GHz and 6 GHz channels to be found and correct capabilities to be used in cases where the driver reports different capability values between 5 and 6 GHz channels. Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
2019-12-30 10:42:12 +01:00
mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes, band, is_6ghz);
scan: Add a helper function to append supported freqs from a given band This functionality was repeated for couple of times. Use a shared helper function to avoid code duplication. Signed-off-by: Veerendranath Jakkam <vjakkam@codeaurora.org>
2020-11-20 15:28:50 +01:00
if (!mode)
return -1;
if (params->freqs) {
while (params->freqs[num_chans])
num_chans++;
Add band option (2.4 vs. 5) for filtering scans This can be used to implement filtering of channels for scan and based on that, for connection, purposes. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-09 06:28:13 +01:00
}
scan: Add a helper function to append supported freqs from a given band This functionality was repeated for couple of times. Use a shared helper function to avoid code duplication. Signed-off-by: Veerendranath Jakkam <vjakkam@codeaurora.org>
2020-11-20 15:28:50 +01:00
freqs = os_realloc(params->freqs,
(num_chans + mode->num_channels + 1) * sizeof(int));
if (!freqs)
return -1;
params->freqs = freqs;
for (i = 0; i < mode->num_channels; i++) {
Add band option (2.4 vs. 5) for filtering scans This can be used to implement filtering of channels for scan and based on that, for connection, purposes. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-09 06:28:13 +01:00
if (mode->channels[i].flag & HOSTAPD_CHAN_DISABLED)
continue;
scan: Add a helper function to append supported freqs from a given band This functionality was repeated for couple of times. Use a shared helper function to avoid code duplication. Signed-off-by: Veerendranath Jakkam <vjakkam@codeaurora.org>
2020-11-20 15:28:50 +01:00
params->freqs[num_chans++] = mode->channels[i].freq;
Add band option (2.4 vs. 5) for filtering scans This can be used to implement filtering of channels for scan and based on that, for connection, purposes. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-09 06:28:13 +01:00
}
scan: Add a helper function to append supported freqs from a given band This functionality was repeated for couple of times. Use a shared helper function to avoid code duplication. Signed-off-by: Veerendranath Jakkam <vjakkam@codeaurora.org>
2020-11-20 15:28:50 +01:00
params->freqs[num_chans] = 0;
return 0;
Add band option (2.4 vs. 5) for filtering scans This can be used to implement filtering of channels for scan and based on that, for connection, purposes. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-09 06:28:13 +01:00
}
static void wpa_setband_scan_freqs(struct wpa_supplicant *wpa_s,
struct wpa_driver_scan_params *params)
{
if (wpa_s->hw.modes == NULL)
return; /* unknown what channels the driver supports */
if (params->freqs)
return; /* already using a limited channel set */
scan: Add a helper function to append supported freqs from a given band This functionality was repeated for couple of times. Use a shared helper function to avoid code duplication. Signed-off-by: Veerendranath Jakkam <vjakkam@codeaurora.org>
2020-11-20 15:28:50 +01:00
Add band option (2.4 vs. 5) for filtering scans This can be used to implement filtering of channels for scan and based on that, for connection, purposes. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-09 06:28:13 +01:00
if (wpa_s->setband == WPA_SETBAND_5G)
scan: Add a helper function to append supported freqs from a given band This functionality was repeated for couple of times. Use a shared helper function to avoid code duplication. Signed-off-by: Veerendranath Jakkam <vjakkam@codeaurora.org>
2020-11-20 15:28:50 +01:00
wpa_add_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211A, params,
0);
Add band option (2.4 vs. 5) for filtering scans This can be used to implement filtering of channels for scan and based on that, for connection, purposes. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-09 06:28:13 +01:00
else if (wpa_s->setband == WPA_SETBAND_2G)
scan: Add a helper function to append supported freqs from a given band This functionality was repeated for couple of times. Use a shared helper function to avoid code duplication. Signed-off-by: Veerendranath Jakkam <vjakkam@codeaurora.org>
2020-11-20 15:28:50 +01:00
wpa_add_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211G, params,
0);
Add band option (2.4 vs. 5) for filtering scans This can be used to implement filtering of channels for scan and based on that, for connection, purposes. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-09 06:28:13 +01:00
}
OWE: Improve discovery of OWE transition mode AP An OWE AP device that supports transition mode does not transmit the SSID of the OWE AP in its Beacon frames and in addition the OWE AP does not reply to broadcast Probe Request frames. Thus, the scan results matching relies only on Beacon frames from the OWE open AP which can be missed in case the AP's frequency is actively scanned. To improve the discovery of transition mode APs, include their SSID in the scan command to perform an active scan for the SSIDs learned from the open mode BSSs. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2018-08-22 18:49:04 +02:00
static void wpa_add_scan_ssid(struct wpa_supplicant *wpa_s,
struct wpa_driver_scan_params *params,
size_t max_ssids, const u8 *ssid, size_t ssid_len)
{
unsigned int j;
for (j = 0; j < params->num_ssids; j++) {
if (params->ssids[j].ssid_len == ssid_len &&
params->ssids[j].ssid &&
os_memcmp(params->ssids[j].ssid, ssid, ssid_len) == 0)
return; /* already in the list */
}
if (params->num_ssids + 1 > max_ssids) {
wpa_printf(MSG_DEBUG, "Over max scan SSIDs for manual request");
return;
}
wpa_printf(MSG_DEBUG, "Scan SSID (manual request): %s",
wpa_ssid_txt(ssid, ssid_len));
params->ssids[params->num_ssids].ssid = ssid;
params->ssids[params->num_ssids].ssid_len = ssid_len;
params->num_ssids++;
}
static void wpa_add_owe_scan_ssid(struct wpa_supplicant *wpa_s,
struct wpa_driver_scan_params *params,
struct wpa_ssid *ssid, size_t max_ssids)
{
#ifdef CONFIG_OWE
struct wpa_bss *bss;
if (!(ssid->key_mgmt & WPA_KEY_MGMT_OWE))
return;
wpa_printf(MSG_DEBUG, "OWE: Look for transition mode AP. ssid=%s",
wpa_ssid_txt(ssid->ssid, ssid->ssid_len));
dl_list_for_each(bss, &wpa_s->bss, struct wpa_bss, list) {
const u8 *owe, *pos, *end;
const u8 *owe_ssid;
size_t owe_ssid_len;
if (bss->ssid_len != ssid->ssid_len ||
os_memcmp(bss->ssid, ssid->ssid, ssid->ssid_len) != 0)
continue;
owe = wpa_bss_get_vendor_ie(bss, OWE_IE_VENDOR_TYPE);
if (!owe || owe[1] < 4)
continue;
pos = owe + 6;
end = owe + 2 + owe[1];
/* Must include BSSID and ssid_len */
if (end - pos < ETH_ALEN + 1)
return;
/* Skip BSSID */
pos += ETH_ALEN;
owe_ssid_len = *pos++;
owe_ssid = pos;
if ((size_t) (end - pos) < owe_ssid_len ||
owe_ssid_len > SSID_MAX_LEN)
return;
wpa_printf(MSG_DEBUG,
"OWE: scan_ssids: transition mode OWE ssid=%s",
wpa_ssid_txt(owe_ssid, owe_ssid_len));
wpa_add_scan_ssid(wpa_s, params, max_ssids,
owe_ssid, owe_ssid_len);
return;
}
#endif /* CONFIG_OWE */
}
Allow SCAN command to specify scan_ssid=1 SSIDs The new "scan_id=<comma separated list of network ids>" parameter can now be used to specify a list of network ids that have scan_ssid=1 to indicate active scanning of the SSID. This adds the listed SSIDs to the scan command to allow manual scan requests to perform active scans for hidden SSIDs. For example, "SCAN scan_id=1,7,11" would run a scan with the SSID fetched from the configured network blocks 1, 7, and 11 (assuming those are set with scan_ssid=1). The SSIDs will be included even from network blocks that are currently disabled. The maximum number of SSIDs added to the request is limited by the driver support. If more than supported values are specified, the command will fail (returns "FAIL"). Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-07-01 17:22:56 +02:00
static void wpa_set_scan_ssids(struct wpa_supplicant *wpa_s,
struct wpa_driver_scan_params *params,
size_t max_ssids)
{
unsigned int i;
struct wpa_ssid *ssid;
Do not exceed scan ssid max size advertised by driver Previously, wpa_set_scan_ssids() fully exhausted wpa_driver_scan_params.ssid list when hidden network IDs are provided via the control interface. This results in us exceeding the max size for the list advertised by the driver when we add the "wildcard" scan SSID entry. So, ensure that we leave space for one more scan SSID entry in the list when we exit out of wpa_set_scan_ssids(). Signed-off-by: Roshan Pius <rpius@google.com>
2016-07-01 00:26:07 +02:00
/*
* For devices with max_ssids greater than 1, leave the last slot empty
* for adding the wildcard scan entry.
*/
max_ssids = max_ssids > 1 ? max_ssids - 1 : max_ssids;
Allow SCAN command to specify scan_ssid=1 SSIDs The new "scan_id=<comma separated list of network ids>" parameter can now be used to specify a list of network ids that have scan_ssid=1 to indicate active scanning of the SSID. This adds the listed SSIDs to the scan command to allow manual scan requests to perform active scans for hidden SSIDs. For example, "SCAN scan_id=1,7,11" would run a scan with the SSID fetched from the configured network blocks 1, 7, and 11 (assuming those are set with scan_ssid=1). The SSIDs will be included even from network blocks that are currently disabled. The maximum number of SSIDs added to the request is limited by the driver support. If more than supported values are specified, the command will fail (returns "FAIL"). Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-07-01 17:22:56 +02:00
for (i = 0; i < wpa_s->scan_id_count; i++) {
ssid = wpa_config_get_network(wpa_s->conf, wpa_s->scan_id[i]);
OWE: Improve discovery of OWE transition mode AP An OWE AP device that supports transition mode does not transmit the SSID of the OWE AP in its Beacon frames and in addition the OWE AP does not reply to broadcast Probe Request frames. Thus, the scan results matching relies only on Beacon frames from the OWE open AP which can be missed in case the AP's frequency is actively scanned. To improve the discovery of transition mode APs, include their SSID in the scan command to perform an active scan for the SSIDs learned from the open mode BSSs. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2018-08-22 18:49:04 +02:00
if (!ssid)
Allow SCAN command to specify scan_ssid=1 SSIDs The new "scan_id=<comma separated list of network ids>" parameter can now be used to specify a list of network ids that have scan_ssid=1 to indicate active scanning of the SSID. This adds the listed SSIDs to the scan command to allow manual scan requests to perform active scans for hidden SSIDs. For example, "SCAN scan_id=1,7,11" would run a scan with the SSID fetched from the configured network blocks 1, 7, and 11 (assuming those are set with scan_ssid=1). The SSIDs will be included even from network blocks that are currently disabled. The maximum number of SSIDs added to the request is limited by the driver support. If more than supported values are specified, the command will fail (returns "FAIL"). Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-07-01 17:22:56 +02:00
continue;
OWE: Improve discovery of OWE transition mode AP An OWE AP device that supports transition mode does not transmit the SSID of the OWE AP in its Beacon frames and in addition the OWE AP does not reply to broadcast Probe Request frames. Thus, the scan results matching relies only on Beacon frames from the OWE open AP which can be missed in case the AP's frequency is actively scanned. To improve the discovery of transition mode APs, include their SSID in the scan command to perform an active scan for the SSIDs learned from the open mode BSSs. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2018-08-22 18:49:04 +02:00
if (ssid->scan_ssid)
wpa_add_scan_ssid(wpa_s, params, max_ssids,
ssid->ssid, ssid->ssid_len);
/*
* Also add the SSID of the OWE BSS, to allow discovery of
* transition mode APs more quickly.
*/
wpa_add_owe_scan_ssid(wpa_s, params, ssid, max_ssids);
Allow SCAN command to specify scan_ssid=1 SSIDs The new "scan_id=<comma separated list of network ids>" parameter can now be used to specify a list of network ids that have scan_ssid=1 to indicate active scanning of the SSID. This adds the listed SSIDs to the scan command to allow manual scan requests to perform active scans for hidden SSIDs. For example, "SCAN scan_id=1,7,11" would run a scan with the SSID fetched from the configured network blocks 1, 7, and 11 (assuming those are set with scan_ssid=1). The SSIDs will be included even from network blocks that are currently disabled. The maximum number of SSIDs added to the request is limited by the driver support. If more than supported values are specified, the command will fail (returns "FAIL"). Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-07-01 17:22:56 +02:00
}
wpa_s->scan_id_count = 0;
}
Add support to request a scan with specific SSIDs Support a request to scan specific SSIDs given by user with the SCAN command. The SSID list can be suffixed to the scan command as follows. For example, if SSIDs "ABC" and "abc123" need to be specifically scanned, the command should be "SCAN ssid 414243 ssid 616263313233". The value of the SSID is passed in hexadecimal representation. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-05-21 15:59:31 +02:00
static int wpa_set_ssids_from_scan_req(struct wpa_supplicant *wpa_s,
struct wpa_driver_scan_params *params,
size_t max_ssids)
{
unsigned int i;
if (wpa_s->ssids_from_scan_req == NULL ||
wpa_s->num_ssids_from_scan_req == 0)
return 0;
if (wpa_s->num_ssids_from_scan_req > max_ssids) {
wpa_s->num_ssids_from_scan_req = max_ssids;
wpa_printf(MSG_DEBUG, "Over max scan SSIDs from scan req: %u",
(unsigned int) max_ssids);
}
for (i = 0; i < wpa_s->num_ssids_from_scan_req; i++) {
params->ssids[i].ssid = wpa_s->ssids_from_scan_req[i].ssid;
params->ssids[i].ssid_len =
wpa_s->ssids_from_scan_req[i].ssid_len;
wpa_hexdump_ascii(MSG_DEBUG, "specific SSID",
params->ssids[i].ssid,
params->ssids[i].ssid_len);
}
params->num_ssids = wpa_s->num_ssids_from_scan_req;
wpa_s->num_ssids_from_scan_req = 0;
return 1;
}
Reorganize P2P and WPS scan code Move some code to separate functions to reorganize the P2P and WPS handling during scans. This makes the code a bit cleaner and is needed for the scheduled scan implementation to avoid duplicated code. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-10-15 16:35:04 +02:00
static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
struct wpa_ssid *ssid;
Avoid -Wshadow warnings from older gcc versions It looks like gcc 4.8.2 would warn about these with -Wshadow, but 4.6.3 did. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-25 12:02:29 +01:00
int ret, p2p_in_prog;
autoscan: Fix potential freeing of uninitialized pointer Commit 7c865c68536825d91e64e1545a1f6ed51526ebff introduced a code path that can skip extra_ie initialization in wpa_supplicant_scan(). This could result in semi-random crashes when using the autoscan mechanism. Fix this by initializing extra_ie to NULL. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-07-03 19:54:40 +02:00
struct wpabuf *extra_ie = NULL;
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
struct wpa_driver_scan_params params;
Add automatic scanning support Like bgscan, autoscan is an optional module based feature to automate scanning but while disconnected or inactive. Instead of requesting directly a scan, it only sets the scan_interval and the sched_scan_interval. So, if the driver supports sched_scan, autoscan will be able to tweak its interval. Otherwise, the tweaked scan_interval will be used. If scan parameters needs to be tweaked, an autoscan_params pointer in wpa_s will provide those. So req_scan / req_sched_scan will not set the scan parameters as they usually do, but instead will use this pointer. Modules will not have to request a scan directly, like bgscan does. Instead, it will need to return the interval it wants after each notification. Signed-hostap: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2012-06-26 17:55:41 +02:00
struct wpa_driver_scan_params *scan_params;
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
size_t max_ssids;
P2P: Allow AP/GO interface to be started while P2P-in-progress Do not delay the "station mode scan" that is not really a scan, but a request to start AP/GO mode operation. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 19:53:32 +01:00
int connect_without_scan = 0;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
Ignore scan results from ongoing scan when FLUSH command is issued This makes wpa_supplicant behavior more consistent with FLUSH command to clear all state. Previously, it was possible for an ongoing scan to be aborted when the FLUSH command is issued and the scan results from that aborted scan would still be processed and that would update the BSS table which was supposed to cleared by the FLUSH command. This could result in hwsim test case failures due to unexpected BSS table entries being present after the FLUSH command. Signed-off-by: Jouni Malinen <j@w1.fi>
2016-12-10 18:00:47 +01:00
wpa_s->ignore_post_flush_scan_res = 0;
Add Linux rfkill support Add a new wpa_supplicant state: interface disabled. This can be used to allow wpa_supplicant to be running with the network interface even when the driver does not actually allow any radio operations (e.g., due to rfkill). Allow driver_nl80211.c and driver_wext.c to start while rfkill is in blocked state (i.e., when ifconfig up fails) and process rfkill events to block/unblock WLAN.
2010-05-23 09:27:32 +02:00
if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED) {
Use wpa_msg() instead of wpa_printf() This converts number of debugging messages to use wpa_msg() in order to allow the interface name to be shown with the messages. A new function, wpa_dbg(), is introduced to allow CONFIG_NO_STDOUT_DEBUG=y builds to remove the debug strings. This is otherwise identical with wpa_msg(), but it gets compiled out if stdout debugging is disabled.
2011-02-10 19:14:46 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "Skip scan - interface disabled");
Add Linux rfkill support Add a new wpa_supplicant state: interface disabled. This can be used to allow wpa_supplicant to be running with the network interface even when the driver does not actually allow any radio operations (e.g., due to rfkill). Allow driver_nl80211.c and driver_wext.c to start while rfkill is in blocked state (i.e., when ifconfig up fails) and process rfkill events to block/unblock WLAN.
2010-05-23 09:27:32 +02:00
return;
}
Document wpa_s->scan_req Use an enum with documented values to make it easier to understand how wpa_s->scan_req is used. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-25 14:55:32 +01:00
if (wpa_s->disconnected && wpa_s->scan_req == NORMAL_SCAN_REQ) {
P2P: Add more debug prints for GO start routines This makes it easier to debug issues in starting GO mode. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-24 00:05:51 +02:00
wpa_dbg(wpa_s, MSG_DEBUG, "Disconnected - do not scan");
Getting back to DISCONNECTED afer SCANNING After transitioning from DISCONNECTED to SCANNING, we never go back to DISCONNECTED even though scanning is done or failed. We're thus stuck in SCANNING while scanning is actually done.
2009-09-14 16:25:03 +02:00
wpa_supplicant_set_state(wpa_s, WPA_DISCONNECTED);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return;
Getting back to DISCONNECTED afer SCANNING After transitioning from DISCONNECTED to SCANNING, we never go back to DISCONNECTED even though scanning is done or failed. We're thus stuck in SCANNING while scanning is actually done.
2009-09-14 16:25:03 +02:00
}
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
Handle legacy scan interruption of sched_scan/PNO While starting from PNO start context, the scheduled scan was not setting the flag wpa_s->scanning. This was resulting in the subsequent SCAN command to proceed further and send command to nl80211/cfg80211. The expected behavior of cancelling sched_scan was not happening here. While sched_scan is in progress and a legacy scan comes on the cli/socket, the sched_scan is cancelled and normal scan is allowed to continue. However, sometimes sched_scan cancelled event comes a bit delayed and we will send out the scan command before the wpa_s->scanning is cleared. Instead, reschedule the incoming scan req if the wpa_s->scanning shows that it is still in progress. Signed-hostap: Jithu Jance <jithu@broadcom.com>
2013-10-17 08:26:02 +02:00
if (wpa_s->scanning) {
/*
* If we are already in scanning state, we shall reschedule the
* the incoming scan request.
*/
wpa_dbg(wpa_s, MSG_DEBUG, "Already scanning - Reschedule the incoming scan req");
wpa_supplicant_req_scan(wpa_s, 1, 0);
return;
}
Validate WEP key lengths based on driver capabilities The nl80211 driver interface does not allow 128-bit WEP to be used without a vendor specific cipher suite and no such suite is defined for this purpose. Do not accept WEP key length 16 for nl80211 driver interface forn ow. wext-interface can still try to use these for backwards compatibility. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-10 13:34:46 +02:00
if (!wpa_supplicant_enabled_networks(wpa_s) &&
Document wpa_s->scan_req Use an enum with documented values to make it easier to understand how wpa_s->scan_req is used. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-25 14:55:32 +01:00
wpa_s->scan_req == NORMAL_SCAN_REQ) {
Use wpa_msg() instead of wpa_printf() This converts number of debugging messages to use wpa_msg() in order to allow the interface name to be shown with the messages. A new function, wpa_dbg(), is introduced to allow CONFIG_NO_STDOUT_DEBUG=y builds to remove the debug strings. This is otherwise identical with wpa_msg(), but it gets compiled out if stdout debugging is disabled.
2011-02-10 19:14:46 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "No enabled networks - do not scan");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_supplicant_set_state(wpa_s, WPA_INACTIVE);
return;
}
Add SME support (separate authentication and association) This can be used, e.g., with mac80211-based Linux drivers with nl80211. This allows over-the-air FT protocol to be used (IEEE 802.11r). Since the nl80211 interface needed for this is very recent (added today into wireless-testing.git), driver_nl80211.c has backwards compatibility code that uses WEXT for association if the kernel does not support the new commands. This compatibility code can be disabled by defining NO_WEXT_COMPAT. That code will also be removed at some point to clean up driver_nl80211.c.
2009-03-20 21:26:41 +01:00
if (wpa_s->conf->ap_scan != 0 &&
(wpa_s->drv_flags & WPA_DRIVER_FLAGS_WIRED)) {
Use wpa_msg() instead of wpa_printf() This converts number of debugging messages to use wpa_msg() in order to allow the interface name to be shown with the messages. A new function, wpa_dbg(), is introduced to allow CONFIG_NO_STDOUT_DEBUG=y builds to remove the debug strings. This is otherwise identical with wpa_msg(), but it gets compiled out if stdout debugging is disabled.
2011-02-10 19:14:46 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "Using wired authentication - "
"overriding ap_scan configuration");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_s->conf->ap_scan = 0;
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
wpas_notify_ap_scan_changed(wpa_s);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
if (wpa_s->conf->ap_scan == 0) {
wpa_supplicant_gen_assoc_event(wpa_s);
return;
}
P2P: Allow AP/GO interface to be started while P2P-in-progress Do not delay the "station mode scan" that is not really a scan, but a request to start AP/GO mode operation. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 19:53:32 +01:00
ssid = NULL;
P2P: Fix regression in start-GO/AP through a "fake" scan Commit 3f9ebc439c9468bf51219c931a05028aa8a3d3a7 ('P2P: Allow AP/GO interface to be started while P2P-in-progress') moved the wpa_s->connect_without_scan and wpa_s->last_scan_req checks to an earlier place within the wpa_supplicant_scan() function without adjusting wpa_s->last_scan_req. This variable was set between the old and new location, so the new location needs to use wpa_s->scan_req. This fixes an issue where AP/GO operations were not properly started in some operation sequence. Instead, a station mode scan was executed. This issue could be triggered, e.g., by running the no_go_freq test case followed by autogo_random_channel. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-03-02 15:45:51 +01:00
if (wpa_s->scan_req != MANUAL_SCAN_REQ &&
P2P: Allow AP/GO interface to be started while P2P-in-progress Do not delay the "station mode scan" that is not really a scan, but a request to start AP/GO mode operation. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 19:53:32 +01:00
wpa_s->connect_without_scan) {
connect_without_scan = 1;
for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next) {
if (ssid == wpa_s->connect_without_scan)
break;
}
}
Avoid -Wshadow warnings from older gcc versions It looks like gcc 4.8.2 would warn about these with -Wshadow, but 4.6.3 did. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-25 12:02:29 +01:00
p2p_in_prog = wpas_p2p_in_progress(wpa_s);
P2P: Allow AP/GO interface to be started while P2P-in-progress Do not delay the "station mode scan" that is not really a scan, but a request to start AP/GO mode operation. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 19:53:32 +01:00
if (p2p_in_prog && p2p_in_prog != 2 &&
(!ssid ||
(ssid->mode != WPAS_MODE_AP && ssid->mode != WPAS_MODE_P2P_GO))) {
Use radio work for P2P scan requests Avoid concurrent P2P scan requests with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 10:57:57 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "Delay station mode scan while P2P operation is in progress");
wpa_supplicant_req_scan(wpa_s, 5, 0);
return;
P2P: Do not request station mode scans during P2P operations The P2P search mechanism depends on the same scan functionality that is used for station mode scans. If these operations are being used at the same time, scan result processing is not handled properly. Avoid unexpected behavior by delaying station mode scan requests if a P2P operation is in progress. Among other things, this allows the station mode connection attempt to be continued after a P2P find or group formation has been completed if the interface is available (i.e., when the P2P group uses a separate virtual interface).
2011-09-29 15:53:55 +02:00
}
Defer scans while PNO is in progress instead of skipping them Skipping the scan altogether will hurt auto-reconnect. Also move the PNO check down since the scan might be canceled for other reasons before we defer it. Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
2014-04-24 07:45:35 +02:00
/*
* Don't cancel the scan based on ongoing PNO; defer it. Some scans are
* used for changing modes inside wpa_supplicant (roaming,
* auto-reconnect, etc). Discarding the scan might hurt these processes.
* The normal use case for PNO is to suspend the host immediately after
* starting PNO, so the periodic 100 ms attempts to run the scan do not
* normally happen in practice multiple times, i.e., this is simply
* restarting scanning once the host is woken up and PNO stopped.
*/
if (wpa_s->pno || wpa_s->pno_sched_pending) {
wpa_dbg(wpa_s, MSG_DEBUG, "Defer scan - PNO is in progress");
wpa_supplicant_req_scan(wpa_s, 0, 100000);
return;
}
Remove user space client MLME This code was used only with driver_test.c to allow MLME operations in hostapd to be tested without having to use a real radio. There are no plans on extending this to any other use than testing and mac80211_hwsim has now obsoled the need for this type of testing. As such, we can drop this code from wpa_supplicant to clean up the implementation of unnecessary complexity.
2011-10-22 21:45:38 +02:00
if (wpa_s->conf->ap_scan == 2)
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
max_ssids = 1;
else {
max_ssids = wpa_s->max_scan_ssids;
if (max_ssids > WPAS_MAX_SCAN_SSIDS)
max_ssids = WPAS_MAX_SCAN_SSIDS;
}
Restore scan_req if sta scan is rescheduled in the scan results event On scan results event if a concurrent P2P scan was triggered previously, scan results processing is canceled, p2p_find executed, and a new sta scan is triggered (pending scan). However, this new sta scan does not restore the scan_req value of the previous scan (whose scan result has been canceled). If we are currently connected to an AP and use ap_scan=2, the new triggered scan will cause an associtation-without-scan in wpa_supplicant_scan: (ap_scan == 2 & scan_req != MANUAL_SCAN_REQ) => wpa_supplicant_assoc_try() causing an association error and a disconnection. This patch fixes this issue by restoring the previous scan_req value. Signed-off-by: Loic Poulain <loicx.poulain@intel.com>
2013-05-31 12:15:56 +02:00
wpa_s->last_scan_req = wpa_s->scan_req;
Document wpa_s->scan_req Use an enum with documented values to make it easier to understand how wpa_s->scan_req is used. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-25 14:55:32 +01:00
wpa_s->scan_req = NORMAL_SCAN_REQ;
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
P2P: Allow AP/GO interface to be started while P2P-in-progress Do not delay the "station mode scan" that is not really a scan, but a request to start AP/GO mode operation. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 19:53:32 +01:00
if (connect_without_scan) {
wpa_s->connect_without_scan = NULL;
if (ssid) {
wpa_printf(MSG_DEBUG, "Start a pre-selected network "
"without scan step");
wpa_supplicant_associate(wpa_s, NULL, ssid);
return;
}
}
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
os_memset(&params, 0, sizeof(params));
Retry scan-for-connect if driver trigger fails This restores some of the pre-radio work behavior for scanning by retrying scan trigger if the driver rejects it (most likely returning EBUSY in case of nl80211-drivers). Retry is indicated in the CTRL-EVENT-SCAN-FAILED event with "retry=1". For manual scans (e.g., triggered through "SCAN" control interface command), no additional retries are performed. In other words, if upper layers want to retry, they can do so based on the CTRL-EVENT-SCAN-FAILED event. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-01-19 19:10:00 +01:00
wpa_s->scan_prev_wpa_state = wpa_s->wpa_state;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (wpa_s->wpa_state == WPA_DISCONNECTED ||
wpa_s->wpa_state == WPA_INACTIVE)
wpa_supplicant_set_state(wpa_s, WPA_SCANNING);
Add automatic scanning support Like bgscan, autoscan is an optional module based feature to automate scanning but while disconnected or inactive. Instead of requesting directly a scan, it only sets the scan_interval and the sched_scan_interval. So, if the driver supports sched_scan, autoscan will be able to tweak its interval. Otherwise, the tweaked scan_interval will be used. If scan parameters needs to be tweaked, an autoscan_params pointer in wpa_s will provide those. So req_scan / req_sched_scan will not set the scan parameters as they usually do, but instead will use this pointer. Modules will not have to request a scan directly, like bgscan does. Instead, it will need to return the interval it wants after each notification. Signed-hostap: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2012-06-26 17:55:41 +02:00
/*
* If autoscan has set its own scanning parameters
*/
if (wpa_s->autoscan_params != NULL) {
scan_params = wpa_s->autoscan_params;
goto scan;
}
Add support to request a scan with specific SSIDs Support a request to scan specific SSIDs given by user with the SCAN command. The SSID list can be suffixed to the scan command as follows. For example, if SSIDs "ABC" and "abc123" need to be specifically scanned, the command should be "SCAN ssid 414243 ssid 616263313233". The value of the SSID is passed in hexadecimal representation. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-05-21 15:59:31 +02:00
if (wpa_s->last_scan_req == MANUAL_SCAN_REQ &&
wpa_set_ssids_from_scan_req(wpa_s, &params, max_ssids)) {
wpa_printf(MSG_DEBUG, "Use specific SSIDs from SCAN command");
goto ssid_list_set;
}
P2P: Use specific SSID in scan for provisioning step Since the P2P client learns the SSID of the group during GO Negotiation, use the specific SSID in the Probe Request frames during the provisioning step. This helps in avoiding unnecessary Probe Response frames from other P2P GOs or APs. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-28 23:02:34 +01:00
#ifdef CONFIG_P2P
P2P: Use scan optimization for post-provisioning connection Since P2P GO cannot change the SSID after WPS provisioning step, we can use the specific SSID for the scan for data connection. In addition, mark this as p2p_probe to avoid unnecessary use of 802.11b rates. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-28 23:34:53 +01:00
if ((wpa_s->p2p_in_provisioning || wpa_s->show_group_started) &&
Add passive_scan configuration parameter This new wpa_supplicant configuration parameter can be used to force passive scanning to be used for most scanning cases at the cost of increased latency and less reliably scans. This may be of use for both testing purposes and somewhat increased privacy due to no Probe Request frames with fixed MAC address being sent out. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-01-22 19:50:01 +01:00
wpa_s->go_params && !wpa_s->conf->passive_scan) {
P2P: Debug print reason for specific SSID for scan It can be useful to see whether the specific P2P SSID was used for scan based on p2p_in_provisioning or show_group_started when debugging issues where this case shows up unexpectedly. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-01 09:30:50 +01:00
wpa_printf(MSG_DEBUG, "P2P: Use specific SSID for scan during P2P group formation (p2p_in_provisioning=%d show_group_started=%d)",
wpa_s->p2p_in_provisioning,
wpa_s->show_group_started);
P2P: Use specific SSID in scan for provisioning step Since the P2P client learns the SSID of the group during GO Negotiation, use the specific SSID in the Probe Request frames during the provisioning step. This helps in avoiding unnecessary Probe Response frames from other P2P GOs or APs. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-28 23:02:34 +01:00
params.ssids[0].ssid = wpa_s->go_params->ssid;
params.ssids[0].ssid_len = wpa_s->go_params->ssid_len;
params.num_ssids = 1;
goto ssid_list_set;
}
P2P: Optimize scan for GO during persistent group invocation Scan for GO on the negotiated operating channel for few iterations before searching on all the supported channels during persistent group reinvocation. In addition, use the already known SSID of the group in the scans. These optimizations reduce group formation time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-21 13:56:02 +01:00
if (wpa_s->p2p_in_invitation) {
if (wpa_s->current_ssid) {
wpa_printf(MSG_DEBUG, "P2P: Use specific SSID for scan during invitation");
params.ssids[0].ssid = wpa_s->current_ssid->ssid;
params.ssids[0].ssid_len =
wpa_s->current_ssid->ssid_len;
params.num_ssids = 1;
} else {
wpa_printf(MSG_DEBUG, "P2P: No specific SSID known for scan during invitation");
}
goto ssid_list_set;
}
P2P: Use specific SSID in scan for provisioning step Since the P2P client learns the SSID of the group during GO Negotiation, use the specific SSID in the Probe Request frames during the provisioning step. This helps in avoiding unnecessary Probe Response frames from other P2P GOs or APs. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-28 23:02:34 +01:00
#endif /* CONFIG_P2P */
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
/* Find the starting point from which to continue scanning */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
ssid = wpa_s->conf->ssid;
Rename "broadcast SSID" to "wildcard SSID" "Wildcard SSID" is the term used in IEEE Std 802.11-2007, so it is a better name for the zero-length SSID used in Probe Request.
2009-02-14 21:21:17 +01:00
if (wpa_s->prev_scan_ssid != WILDCARD_SSID_SCAN) {
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
while (ssid) {
if (ssid == wpa_s->prev_scan_ssid) {
ssid = ssid->next;
break;
}
ssid = ssid->next;
}
}
Restore scan_req if sta scan is rescheduled in the scan results event On scan results event if a concurrent P2P scan was triggered previously, scan results processing is canceled, p2p_find executed, and a new sta scan is triggered (pending scan). However, this new sta scan does not restore the scan_req value of the previous scan (whose scan result has been canceled). If we are currently connected to an AP and use ap_scan=2, the new triggered scan will cause an associtation-without-scan in wpa_supplicant_scan: (ap_scan == 2 & scan_req != MANUAL_SCAN_REQ) => wpa_supplicant_assoc_try() causing an association error and a disconnection. This patch fixes this issue by restoring the previous scan_req value. Signed-off-by: Loic Poulain <loicx.poulain@intel.com>
2013-05-31 12:15:56 +02:00
if (wpa_s->last_scan_req != MANUAL_SCAN_REQ &&
Do not allow ap_scan=2 scan processing to stop AP mode operation wpa_supplicant_assoc_try() would result in the currently operating AP to get stopped if wpa_supplicant_scan() ends up getting triggered without MANUAL_SCAN_REQ while operating an AP. With ap_scan=2, this could resulted in unintentional stopping of AP mode operations, so check explicitly for that case and skip the wpa_supplicant_assoc_try() call if needed to avoid this. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-08-11 20:46:38 +02:00
#ifdef CONFIG_AP
!wpa_s->ap_iface &&
#endif /* CONFIG_AP */
Restore scan_req if sta scan is rescheduled in the scan results event On scan results event if a concurrent P2P scan was triggered previously, scan results processing is canceled, p2p_find executed, and a new sta scan is triggered (pending scan). However, this new sta scan does not restore the scan_req value of the previous scan (whose scan result has been canceled). If we are currently connected to an AP and use ap_scan=2, the new triggered scan will cause an associtation-without-scan in wpa_supplicant_scan: (ap_scan == 2 & scan_req != MANUAL_SCAN_REQ) => wpa_supplicant_assoc_try() causing an association error and a disconnection. This patch fixes this issue by restoring the previous scan_req value. Signed-off-by: Loic Poulain <loicx.poulain@intel.com>
2013-05-31 12:15:56 +02:00
wpa_s->conf->ap_scan == 2) {
P2P: Start GO without extra scan step There are some corner cases, where the wpa_supplicant_req_scan() call may end up scheduling a scan even if we are about to start a GO. Avoid this by explicitly marking the GO network to be selected for the next connection.
2011-06-21 10:47:03 +02:00
wpa_s->connect_without_scan = NULL;
Interleave wildcard and specific SSID scans when max_ssids=1 For drivers limited to scan a single SSID at a time, this prevents waiting too long for a wildcard scan in case there are several scan_ssid networks in the configuration. Signed-hostap: Eyal Shapira <eyal@wizery.com>
2012-01-29 16:39:08 +01:00
wpa_s->prev_scan_wildcard = 0;
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
wpa_supplicant_assoc_try(wpa_s, ssid);
return;
} else if (wpa_s->conf->ap_scan == 2) {
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
/*
Rename "broadcast SSID" to "wildcard SSID" "Wildcard SSID" is the term used in IEEE Std 802.11-2007, so it is a better name for the zero-length SSID used in Probe Request.
2009-02-14 21:21:17 +01:00
* User-initiated scan request in ap_scan == 2; scan with
* wildcard SSID.
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
*/
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
ssid = NULL;
Add a reattach command for fast reassociate-back-to-same-BSS Add "reattach" command to perform single-channel single-ssid scan instead of full scan when trying to reconnect to the currently "connected" network (assuming old scan results are not current enough to skip the scan completely). This allows the scan result to come back in much faster time. In ath9k, the scan took around 12 seconds with full background scan, and only 0.1 second with the single-channel single-ssid scan. Thus, take much less time for the client to re-establish connection with the currently "connected" network. Signed-hostap: Peter Qiu <zqiu@chromium.org>
2014-03-06 19:06:04 +01:00
} else if (wpa_s->reattach && wpa_s->current_ssid != NULL) {
/*
* Perform single-channel single-SSID scan for
* reassociate-to-same-BSS operation.
*/
/* Setup SSID */
ssid = wpa_s->current_ssid;
wpa_hexdump_ascii(MSG_DEBUG, "Scan SSID",
ssid->ssid, ssid->ssid_len);
params.ssids[0].ssid = ssid->ssid;
params.ssids[0].ssid_len = ssid->ssid_len;
params.num_ssids = 1;
/*
* Allocate memory for frequency array, allocate one extra
* slot for the zero-terminator.
*/
params.freqs = os_malloc(sizeof(int) * 2);
Improve reattach scan OOM failure handling Instead of reporting the memory allocation failure and stopping, run the scan even if the frequency list cannot be created due to allocation failure. This allows the wpa_s->reattach flag to be cleared and the scan to be completed even if it takes a bit longer time due to all channels getting scanned. Signed-off-by: Jouni Malinen <j@w1.fi>
2016-05-28 21:16:47 +02:00
if (params.freqs) {
params.freqs[0] = wpa_s->assoc_freq;
params.freqs[1] = 0;
Add a reattach command for fast reassociate-back-to-same-BSS Add "reattach" command to perform single-channel single-ssid scan instead of full scan when trying to reconnect to the currently "connected" network (assuming old scan results are not current enough to skip the scan completely). This allows the scan result to come back in much faster time. In ath9k, the scan took around 12 seconds with full background scan, and only 0.1 second with the single-channel single-ssid scan. Thus, take much less time for the client to re-establish connection with the currently "connected" network. Signed-hostap: Peter Qiu <zqiu@chromium.org>
2014-03-06 19:06:04 +01:00
}
/*
* Reset the reattach flag so that we fall back to full scan if
* this scan fails.
*/
wpa_s->reattach = 0;
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
} else {
Fix per-SSID scan (scan_ssid=1) Commit d3a9822542166e7adec16e24622486ba90359ef5 broke per-SSID scan by using the ssid variable for internal loop and by doing so, overriding the value that was needed below to figure out whether the scan is for a specific SSID. Fix this by using a temporary variable instead when looping over network finding which frequencies to scan for.
2009-11-10 17:00:57 +01:00
struct wpa_ssid *start = ssid, *tssid;
Add support for specifying subset of enabled frequencies to scan A new network block parameter, scan_freq, can be used to specify subset of frequencies to scan. This can speed up scanning process considerably if it is known that only a small subset of channels is actually used in the network. A union of configured frequencies for all enabled network blocks is used in scan requests. Currently, only driver_nl80211.c has support for this functionality. For example, following parameter marks 2.4 GHz channels 1, 6, 11 to be scanned: scan_freq=2412 2437 2462
2009-03-26 20:55:01 +01:00
int freqs_set = 0;
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
if (ssid == NULL && max_ssids > 1)
ssid = wpa_s->conf->ssid;
while (ssid) {
Validate WEP key lengths based on driver capabilities The nl80211 driver interface does not allow 128-bit WEP to be used without a vendor specific cipher suite and no such suite is defined for this purpose. Do not accept WEP key length 16 for nl80211 driver interface forn ow. wext-interface can still try to use these for backwards compatibility. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-10 13:34:46 +02:00
if (!wpas_network_disabled(wpa_s, ssid) &&
ssid->scan_ssid) {
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
wpa_hexdump_ascii(MSG_DEBUG, "Scan SSID",
ssid->ssid, ssid->ssid_len);
params.ssids[params.num_ssids].ssid =
ssid->ssid;
params.ssids[params.num_ssids].ssid_len =
ssid->ssid_len;
params.num_ssids++;
if (params.num_ssids + 1 >= max_ssids)
break;
}
OWE: Improve discovery of OWE transition mode AP An OWE AP device that supports transition mode does not transmit the SSID of the OWE AP in its Beacon frames and in addition the OWE AP does not reply to broadcast Probe Request frames. Thus, the scan results matching relies only on Beacon frames from the OWE open AP which can be missed in case the AP's frequency is actively scanned. To improve the discovery of transition mode APs, include their SSID in the scan command to perform an active scan for the SSIDs learned from the open mode BSSs. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2018-08-22 18:49:04 +02:00
if (!wpas_network_disabled(wpa_s, ssid)) {
/*
* Also add the SSID of the OWE BSS, to allow
* discovery of transition mode APs more
* quickly.
*/
wpa_add_owe_scan_ssid(wpa_s, &params, ssid,
max_ssids);
}
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
ssid = ssid->next;
if (ssid == start)
break;
if (ssid == NULL && max_ssids > 1 &&
start != wpa_s->conf->ssid)
ssid = wpa_s->conf->ssid;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
Add support for specifying subset of enabled frequencies to scan A new network block parameter, scan_freq, can be used to specify subset of frequencies to scan. This can speed up scanning process considerably if it is known that only a small subset of channels is actually used in the network. A union of configured frequencies for all enabled network blocks is used in scan requests. Currently, only driver_nl80211.c has support for this functionality. For example, following parameter marks 2.4 GHz channels 1, 6, 11 to be scanned: scan_freq=2412 2437 2462
2009-03-26 20:55:01 +01:00
Allow SCAN command to specify scan_ssid=1 SSIDs The new "scan_id=<comma separated list of network ids>" parameter can now be used to specify a list of network ids that have scan_ssid=1 to indicate active scanning of the SSID. This adds the listed SSIDs to the scan command to allow manual scan requests to perform active scans for hidden SSIDs. For example, "SCAN scan_id=1,7,11" would run a scan with the SSID fetched from the configured network blocks 1, 7, and 11 (assuming those are set with scan_ssid=1). The SSIDs will be included even from network blocks that are currently disabled. The maximum number of SSIDs added to the request is limited by the driver support. If more than supported values are specified, the command will fail (returns "FAIL"). Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-07-01 17:22:56 +02:00
if (wpa_s->scan_id_count &&
wpa_s->last_scan_req == MANUAL_SCAN_REQ)
wpa_set_scan_ssids(wpa_s, &params, max_ssids);
Do not allow network block scan_freq override SCAN command frequencies The manual scan operations with the SCAN command are supposed to have independent set of scan frequencies, so do not allow scan_freq parameters to override scanned frequencies for scans that were triggered with a SCAN command. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-14 23:55:56 +01:00
for (tssid = wpa_s->conf->ssid;
wpa_s->last_scan_req != MANUAL_SCAN_REQ && tssid;
tssid = tssid->next) {
Validate WEP key lengths based on driver capabilities The nl80211 driver interface does not allow 128-bit WEP to be used without a vendor specific cipher suite and no such suite is defined for this purpose. Do not accept WEP key length 16 for nl80211 driver interface forn ow. wext-interface can still try to use these for backwards compatibility. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-10 13:34:46 +02:00
if (wpas_network_disabled(wpa_s, tssid))
Add support for specifying subset of enabled frequencies to scan A new network block parameter, scan_freq, can be used to specify subset of frequencies to scan. This can speed up scanning process considerably if it is known that only a small subset of channels is actually used in the network. A union of configured frequencies for all enabled network blocks is used in scan requests. Currently, only driver_nl80211.c has support for this functionality. For example, following parameter marks 2.4 GHz channels 1, 6, 11 to be scanned: scan_freq=2412 2437 2462
2009-03-26 20:55:01 +01:00
continue;
Limit scan frequency list to 100 entries There is no real use case for the scan to be requested on more than 100 channels individually. To avoid excessively long lists with invalid configuration, use 100 entry limit for the list before dropping to the fallback scan-all-channels option. Signed-off-by: Jouni Malinen <j@w1.fi>
2020-03-22 17:51:41 +01:00
if (((params.freqs || !freqs_set) &&
tssid->scan_freq) &&
int_array_len(params.freqs) < 100) {
Add support for specifying subset of enabled frequencies to scan A new network block parameter, scan_freq, can be used to specify subset of frequencies to scan. This can speed up scanning process considerably if it is known that only a small subset of channels is actually used in the network. A union of configured frequencies for all enabled network blocks is used in scan requests. Currently, only driver_nl80211.c has support for this functionality. For example, following parameter marks 2.4 GHz channels 1, 6, 11 to be scanned: scan_freq=2412 2437 2462
2009-03-26 20:55:01 +01:00
int_array_concat(&params.freqs,
Fix per-SSID scan (scan_ssid=1) Commit d3a9822542166e7adec16e24622486ba90359ef5 broke per-SSID scan by using the ssid variable for internal loop and by doing so, overriding the value that was needed below to figure out whether the scan is for a specific SSID. Fix this by using a temporary variable instead when looping over network finding which frequencies to scan for.
2009-11-10 17:00:57 +01:00
tssid->scan_freq);
Add support for specifying subset of enabled frequencies to scan A new network block parameter, scan_freq, can be used to specify subset of frequencies to scan. This can speed up scanning process considerably if it is known that only a small subset of channels is actually used in the network. A union of configured frequencies for all enabled network blocks is used in scan requests. Currently, only driver_nl80211.c has support for this functionality. For example, following parameter marks 2.4 GHz channels 1, 6, 11 to be scanned: scan_freq=2412 2437 2462
2009-03-26 20:55:01 +01:00
} else {
os_free(params.freqs);
params.freqs = NULL;
}
freqs_set = 1;
}
int_array_sort_unique(params.freqs);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
Interleave wildcard and specific SSID scans when max_ssids=1 For drivers limited to scan a single SSID at a time, this prevents waiting too long for a wildcard scan in case there are several scan_ssid networks in the configuration. Signed-hostap: Eyal Shapira <eyal@wizery.com>
2012-01-29 16:39:08 +01:00
if (ssid && max_ssids == 1) {
/*
* If the driver is limited to 1 SSID at a time interleave
* wildcard SSID scans with specific SSID scans to avoid
* waiting a long time for a wildcard scan.
*/
if (!wpa_s->prev_scan_wildcard) {
params.ssids[0].ssid = NULL;
params.ssids[0].ssid_len = 0;
wpa_s->prev_scan_wildcard = 1;
wpa_dbg(wpa_s, MSG_DEBUG, "Starting AP scan for "
"wildcard SSID (Interleave with specific)");
} else {
wpa_s->prev_scan_ssid = ssid;
wpa_s->prev_scan_wildcard = 0;
wpa_dbg(wpa_s, MSG_DEBUG,
"Starting AP scan for specific SSID: %s",
wpa_ssid_txt(ssid->ssid, ssid->ssid_len));
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
}
Interleave wildcard and specific SSID scans when max_ssids=1 For drivers limited to scan a single SSID at a time, this prevents waiting too long for a wildcard scan in case there are several scan_ssid networks in the configuration. Signed-hostap: Eyal Shapira <eyal@wizery.com>
2012-01-29 16:39:08 +01:00
} else if (ssid) {
/* max_ssids > 1 */
wpa_s->prev_scan_ssid = ssid;
wpa_dbg(wpa_s, MSG_DEBUG, "Include wildcard SSID in "
"the scan request");
params.num_ssids++;
Allow passive scan to be requested with SCAN passive=1 This allows external programs to request wpa_supplicant to execute a passive scan (i.e., do not send any Probe Request frames). Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-26 15:52:55 +01:00
} else if (wpa_s->last_scan_req == MANUAL_SCAN_REQ &&
wpa_s->manual_scan_passive && params.num_ssids == 0) {
wpa_dbg(wpa_s, MSG_DEBUG, "Use passive scan based on manual request");
Add passive_scan configuration parameter This new wpa_supplicant configuration parameter can be used to force passive scanning to be used for most scanning cases at the cost of increased latency and less reliably scans. This may be of use for both testing purposes and somewhat increased privacy due to no Probe Request frames with fixed MAC address being sent out. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-01-22 19:50:01 +01:00
} else if (wpa_s->conf->passive_scan) {
wpa_dbg(wpa_s, MSG_DEBUG,
"Use passive scan based on configuration");
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
} else {
Rename "broadcast SSID" to "wildcard SSID" "Wildcard SSID" is the term used in IEEE Std 802.11-2007, so it is a better name for the zero-length SSID used in Probe Request.
2009-02-14 21:21:17 +01:00
wpa_s->prev_scan_ssid = WILDCARD_SSID_SCAN;
Add support for multi-SSID scan requests If the driver reports support for more than one SSID per scan request, optimize scan_ssid=1 operations in ap_scan=1 mode. This speeds up scanning whenever scan_ssid=1 is used since the broadcast SSID can be included in every scan request and if driver supports more than two SSIDs in the scan request, the benefits are even larger when multiple networks have been configured with ap_scan=1. This is also cleaning up wpa_supplicant_scan() function by moving code around so that the SSID list is not processed unnecessarily if the operation mode does not need this.
2009-02-14 19:59:26 +01:00
params.num_ssids++;
Use wpa_msg() instead of wpa_printf() This converts number of debugging messages to use wpa_msg() in order to allow the interface name to be shown with the messages. A new function, wpa_dbg(), is introduced to allow CONFIG_NO_STDOUT_DEBUG=y builds to remove the debug strings. This is otherwise identical with wpa_msg(), but it gets compiled out if stdout debugging is disabled.
2011-02-10 19:14:46 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "Starting AP scan for wildcard "
"SSID");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
Add support to request a scan with specific SSIDs Support a request to scan specific SSIDs given by user with the SCAN command. The SSID list can be suffixed to the scan command as follows. For example, if SSIDs "ABC" and "abc123" need to be specifically scanned, the command should be "SCAN ssid 414243 ssid 616263313233". The value of the SSID is passed in hexadecimal representation. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-05-21 15:59:31 +02:00
ssid_list_set:
Reorganize P2P and WPS scan code Move some code to separate functions to reorganize the P2P and WPS handling during scans. This makes the code a bit cleaner and is needed for the scheduled scan implementation to avoid duplicated code. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-10-15 16:35:04 +02:00
wpa_supplicant_optimize_freqs(wpa_s, &params);
Fix adding extra IEs in sched scan Refactoring done in commit 46ee0427b13d64dc4695fda24f4f228c99822c11 (IEEE 802.11u: Allow Interworking and HESSID to be configured) broke adding extra IEs in sched scan. The IEs stopped being added to the scan params within wpa_supplicant_extra_ies() but no code was added to add them in wpa_supplicant_req_sched_scan(). Fix this and remove unused params arg in wpa_supplicant_extra_ies(). Signed-hostap: Eyal Shapira <eyal@wizery.com> intended-for: hostap-1
2012-08-13 20:48:55 +02:00
extra_ie = wpa_supplicant_extra_ies(wpa_s);
P2P: Add P2P IE into Probe Request frames
2010-07-18 23:30:25 +02:00
Ask driver to report only new scan results if requested If the BSS table within wpa_supplicant is flushed, request the driver to flush its own scan result table during the next scan. This can avoid unexpected old BSS entries showing up after BSS_FLUSH or FLUSH command in cases where the driver may maintain its internal cache of scan results (e.g., cfg80211 BSS table persists at least for 15 seconds). In addition to doing this automatically on BSS_FLUSH/FLUSH, a new SCAN command argument, only_new=1, can be used to request a manual scan request to do same. Though, it should be noted that this maintains the BSS table within wpa_supplicant. BSS_FLUSH followed by SCAN command can be used to clear all BSS entries from both the driver and wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-02 22:03:31 +01:00
if (wpa_s->last_scan_req == MANUAL_SCAN_REQ &&
Write reason for scan only_new_results into debug log This can be helpful in figuring out why the driver was requested to flush its scan results prior to starting a new scan. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-17 12:54:16 +01:00
wpa_s->manual_scan_only_new) {
wpa_printf(MSG_DEBUG,
"Request driver to clear scan cache due to manual only_new=1 scan");
Ask driver to report only new scan results if requested If the BSS table within wpa_supplicant is flushed, request the driver to flush its own scan result table during the next scan. This can avoid unexpected old BSS entries showing up after BSS_FLUSH or FLUSH command in cases where the driver may maintain its internal cache of scan results (e.g., cfg80211 BSS table persists at least for 15 seconds). In addition to doing this automatically on BSS_FLUSH/FLUSH, a new SCAN command argument, only_new=1, can be used to request a manual scan request to do same. Though, it should be noted that this maintains the BSS table within wpa_supplicant. BSS_FLUSH followed by SCAN command can be used to clear all BSS entries from both the driver and wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-02 22:03:31 +01:00
params.only_new_results = 1;
Write reason for scan only_new_results into debug log This can be helpful in figuring out why the driver was requested to flush its scan results prior to starting a new scan. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-17 12:54:16 +01:00
}
Ask driver to report only new scan results if requested If the BSS table within wpa_supplicant is flushed, request the driver to flush its own scan result table during the next scan. This can avoid unexpected old BSS entries showing up after BSS_FLUSH or FLUSH command in cases where the driver may maintain its internal cache of scan results (e.g., cfg80211 BSS table persists at least for 15 seconds). In addition to doing this automatically on BSS_FLUSH/FLUSH, a new SCAN command argument, only_new=1, can be used to request a manual scan request to do same. Though, it should be noted that this maintains the BSS table within wpa_supplicant. BSS_FLUSH followed by SCAN command can be used to clear all BSS entries from both the driver and wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-02 22:03:31 +01:00
Allow channel list to be specified for SCAN command The new freq=<frequency ranges> parameter to the SCAN command can be used to request a scan to be performed on the specified set of channels instead of on all channels. For example, "wpa_cli scan freq=2400-2500,5180" would scan channels 1-14 and 36. Only the channels that the driver indicates as enabled and that are within the specified ranges are included in the request. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-25 19:04:52 +01:00
if (wpa_s->last_scan_req == MANUAL_SCAN_REQ && params.freqs == NULL &&
wpa_s->manual_scan_freqs) {
wpa_dbg(wpa_s, MSG_DEBUG, "Limit manual scan to specified channels");
params.freqs = wpa_s->manual_scan_freqs;
wpa_s->manual_scan_freqs = NULL;
}
Fix SELECT_NETWORK freq parameter This functionality was originally added in commit 204c9ac4eed9f0ad69497f2efcd0d095dfd6e61c ('Extend select_network command with freq= to reduce scan time') re-using wpa_s->manual_scan_freqs and MANUAL_SCAN_REQ. That got broken when commit 35d403096eb63c787bd736dd8ba0902c34398fa8 ('Set NORMAL_SCAN_REQ on SELECT_NETWORK/ENABLE_NETWORK') started overriding wpa_s->scan_req for SELECT_NETWORK. Fix this by adding a new scan frequency list specifically for SELECT_NETWORK so that this does not need to depend on any specific wpa_s->scan_req value. Signed-off-by: Jouni Malinen <j@w1.fi>
2017-02-25 18:15:24 +01:00
if (params.freqs == NULL && wpa_s->select_network_scan_freqs) {
wpa_dbg(wpa_s, MSG_DEBUG,
"Limit select_network scan to specified channels");
params.freqs = wpa_s->select_network_scan_freqs;
wpa_s->select_network_scan_freqs = NULL;
}
SME: Optimize recovery from common load balancing mechanisms When authentication or association fails when trying to connect to a BSS in an ESS that has multiple BSSes based on previous scans, limit the first recovery scan to only the known channels that has been seen previously. This speeds up recovery in some of the most commonly used load balancing mechanisms in enterprise WLAN networks.
2010-11-25 21:51:56 +01:00
if (params.freqs == NULL && wpa_s->next_scan_freqs) {
Use wpa_msg() instead of wpa_printf() This converts number of debugging messages to use wpa_msg() in order to allow the interface name to be shown with the messages. A new function, wpa_dbg(), is introduced to allow CONFIG_NO_STDOUT_DEBUG=y builds to remove the debug strings. This is otherwise identical with wpa_msg(), but it gets compiled out if stdout debugging is disabled.
2011-02-10 19:14:46 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "Optimize scan based on previously "
"generated frequency list");
SME: Optimize recovery from common load balancing mechanisms When authentication or association fails when trying to connect to a BSS in an ESS that has multiple BSSes based on previous scans, limit the first recovery scan to only the known channels that has been seen previously. This speeds up recovery in some of the most commonly used load balancing mechanisms in enterprise WLAN networks.
2010-11-25 21:51:56 +01:00
params.freqs = wpa_s->next_scan_freqs;
} else
os_free(wpa_s->next_scan_freqs);
wpa_s->next_scan_freqs = NULL;
Add band option (2.4 vs. 5) for filtering scans This can be used to implement filtering of channels for scan and based on that, for connection, purposes. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-09 06:28:13 +01:00
wpa_setband_scan_freqs(wpa_s, &params);
SME: Optimize recovery from common load balancing mechanisms When authentication or association fails when trying to connect to a BSS in an ESS that has multiple BSSes based on previous scans, limit the first recovery scan to only the known channels that has been seen previously. This speeds up recovery in some of the most commonly used load balancing mechanisms in enterprise WLAN networks.
2010-11-25 21:51:56 +01:00
wpa_supplicant: Allow global scan frequencies configuration This allows one to limit the channels that wpa_supplicant will scan. This is a useful addition to the freq_list configurable in the network {} section. Signed-hostap: Ben Greear <greearb@candelatech.com>
2013-05-05 10:46:54 +02:00
/* See if user specified frequencies. If so, scan only those. */
wpa_supplicant: Initial connection speedup Add initial_freq_list to wpa_supplicant configuration. This option allows wpa_supplicant to scan a smaller list of frequencies when it starts. This in turn allows for a faster connection to an already known network. This limit applies only for the initial scan operation and does not restrict other channels from being used in consecutive scans. Tests have shown this to reduce the amount of time for connecting to a network from roughly 3 seconds to roughly 0.1 second. Signed-off-by: Frederik Juul <frederik.juul@3shape.com>
2020-07-23 10:39:41 +02:00
if (wpa_s->last_scan_req == INITIAL_SCAN_REQ &&
wpa_s->conf->initial_freq_list && !params.freqs) {
wpa_dbg(wpa_s, MSG_DEBUG,
"Optimize scan based on conf->initial_freq_list");
int_array_concat(&params.freqs, wpa_s->conf->initial_freq_list);
} else if (wpa_s->conf->freq_list && !params.freqs) {
wpa_supplicant: Allow global scan frequencies configuration This allows one to limit the channels that wpa_supplicant will scan. This is a useful addition to the freq_list configurable in the network {} section. Signed-hostap: Ben Greear <greearb@candelatech.com>
2013-05-05 10:46:54 +02:00
wpa_dbg(wpa_s, MSG_DEBUG,
"Optimize scan based on conf->freq_list");
int_array_concat(&params.freqs, wpa_s->conf->freq_list);
}
wpa_supplicant: Allow vifs to scan only current channel If a VIF is already associated, then only scan on the associated frequency if user requests such. This is a big help when using lots of virtual stations. Signed-hostap: Ben Greear <greearb@candelatech.com> Signed-off-by: Ben Greear <greearb@candelatech.com>
2013-05-09 11:43:40 +02:00
/* Use current associated channel? */
if (wpa_s->conf->scan_cur_freq && !params.freqs) {
Change share_vif_oper_freq() to handle multiple freqs There are devices that can operate several channels concurrently. Change shared_vif_oper_freq() to get_shared_radio_freqs() that can return an array of frequencies currently used by all the virtual interfaces that share the same radio. In addition, move it to wpa_supplicant.c, so it can be used by other modules. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:03:53 +02:00
unsigned int num = wpa_s->num_multichan_concurrent;
params.freqs = os_calloc(num + 1, sizeof(int));
if (params.freqs) {
num = get_shared_radio_freqs(wpa_s, params.freqs, num);
if (num > 0) {
wpa_dbg(wpa_s, MSG_DEBUG, "Scan only the "
"current operating channels since "
"scan_cur_freq is enabled");
} else {
os_free(params.freqs);
params.freqs = NULL;
}
wpa_supplicant: Allow vifs to scan only current channel If a VIF is already associated, then only scan on the associated frequency if user requests such. This is a big help when using lots of virtual stations. Signed-hostap: Ben Greear <greearb@candelatech.com> Signed-off-by: Ben Greear <greearb@candelatech.com>
2013-05-09 11:43:40 +02:00
}
}
OCE: Send scan parameters when OCE_STA functionality is enabled If the device supports OCE features and OCE is enabled, set the relevant scan parameters and FILS Request Parameters element with Max Channel Time. Signed-off-by: Roee Zamir <roee.zamir@intel.com>
2018-08-26 19:45:03 +02:00
#ifdef CONFIG_MBO
if (wpa_s->enable_oce & OCE_STA)
params.oce_scan = 1;
#endif /* CONFIG_MBO */
Add optional scan result filter based on SSID filter_ssids=1 global configuration parameter can now be used to enable scan result filtering (with -Dnl80211 only for now) based on the configured SSIDs. In other words, only the scan results that have an SSID matching with one of the configured networks are included in the BSS table. This can be used to reduce memory needs in environments that have huge number of APs.
2010-03-05 20:42:06 +01:00
params.filter_ssids = wpa_supplicant_build_filter_ssids(
wpa_s->conf, &params.num_filter_ssids);
IEEE 802.11u: Allow Interworking and HESSID to be configured The new wpa_supplicant.conf file global parameters interworking and hessid can be used to configure wpa_supplicant to include Interworking element in Probe Request frames.
2011-09-27 22:15:05 +02:00
if (extra_ie) {
params.extra_ies = wpabuf_head(extra_ie);
params.extra_ies_len = wpabuf_len(extra_ie);
}
Add optional scan result filter based on SSID filter_ssids=1 global configuration parameter can now be used to enable scan result filtering (with -Dnl80211 only for now) based on the configured SSIDs. In other words, only the scan results that have an SSID matching with one of the configured networks are included in the BSS table. This can be used to reduce memory needs in environments that have huge number of APs.
2010-03-05 20:42:06 +01:00
P2P: Indicate scan during group formation as P2P probe The interface may not yet have been set to P2P client mode immediately after GO Negotiation when doing the scan before association request. Consequently, the scan request in this state has to specify that the specific P2P probe mode is used to disable IEEE 802.11b rates. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-10-29 22:02:47 +02:00
#ifdef CONFIG_P2P
P2P: Mark the scan in p2p_in_invitation as p2p_probe Mark the scan performed by the P2P Client in search of the GO during the persistant reinvocation as a p2p_probe to avoid unnecessary use of 802.11b rates. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-04-09 11:12:08 +02:00
if (wpa_s->p2p_in_provisioning || wpa_s->p2p_in_invitation ||
P2P: Use scan optimization for post-provisioning connection Since P2P GO cannot change the SSID after WPS provisioning step, we can use the specific SSID for the scan for data connection. In addition, mark this as p2p_probe to avoid unnecessary use of 802.11b rates. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-28 23:34:53 +01:00
(wpa_s->show_group_started && wpa_s->go_params)) {
P2P: Indicate scan during group formation as P2P probe The interface may not yet have been set to P2P client mode immediately after GO Negotiation when doing the scan before association request. Consequently, the scan request in this state has to specify that the specific P2P probe mode is used to disable IEEE 802.11b rates. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-10-29 22:02:47 +02:00
/*
* The interface may not yet be in P2P mode, so we have to
* explicitly request P2P probe to disable CCK rates.
*/
params.p2p_probe = 1;
}
#endif /* CONFIG_P2P */
Use random MAC address for scanning only in non-connected state cfg80211 rejects the scans issued with random MAC address if the STA is in connected state. This resulted in failures when using MAC_RAND_SCAN while connected (CTRL-EVENT-SCAN-FAILED ret=-95). Enable random MAC address functionality only if the STA is not in connected state to avoid this. The real MAC address of the STA is already revealed in the association, so this is an acceptable fallback mechanism for now. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-11-21 13:10:36 +01:00
if ((wpa_s->mac_addr_rand_enable & MAC_ADDR_RAND_SCAN) &&
Move ownership of MAC address randomization mask to scan params This array can be freed either from the scan parameters or from clearing the MAC address randomization parameters from the wpa_supplicant struct. To make this ownership more clear, we have each struct own its own copy of the parameters. Signed-off-by: Eric Caruso <ejcaruso@chromium.org>
2019-10-18 01:03:50 +02:00
wpa_s->wpa_state <= WPA_SCANNING)
wpa_setup_mac_addr_rand_params(&params, wpa_s->mac_addr_scan);
scan: Add MAC address randomization in scan handling 1. Supported MAC address randomization for scan. 2. Supported MAC address randomization for scheduled scan. 2. Supported MAC address randomization for pno. 4. Add functions to set and clear the MAC address randomization state variables. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-12-29 07:41:06 +01:00
WNM: Optimize a single BSS transition management candidate scan If the BSS Transition Management Request frame includes only a single candidate and we need to scan for the BSS to get up-to-date information, use a scan for the known BSSID instead of wildcard BSSID. In addition, set the SSID in the scan if it is known based on old scan results in the BSS table. This removes unnecessary Probe Response frames when we are interested in results from only a single BSS. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-02-26 16:16:35 +01:00
if (!is_zero_ether_addr(wpa_s->next_scan_bssid)) {
struct wpa_bss *bss;
params.bssid = wpa_s->next_scan_bssid;
bss = wpa_bss_get_bssid_latest(wpa_s, params.bssid);
Allow wildcard SSID to be enforced for a specific BSSID scan Specific BSSID scan was replacing wildcard SSID with the known SSID if any BSS with the specified BSSID is available in the known BSSes list. Add control interface support to force use of a wildcard SSID in a specific BSSID scan by user with the new "wildcard_ssid=1" argument to the SCAN command. Signed-off-by: Veerendranath Jakkam <vjakkam@codeaurora.org>
2020-02-29 07:56:36 +01:00
if (!wpa_s->next_scan_bssid_wildcard_ssid &&
bss && bss->ssid_len && params.num_ssids == 1 &&
WNM: Optimize a single BSS transition management candidate scan If the BSS Transition Management Request frame includes only a single candidate and we need to scan for the BSS to get up-to-date information, use a scan for the known BSSID instead of wildcard BSSID. In addition, set the SSID in the scan if it is known based on old scan results in the BSS table. This removes unnecessary Probe Response frames when we are interested in results from only a single BSS. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-02-26 16:16:35 +01:00
params.ssids[0].ssid_len == 0) {
params.ssids[0].ssid = bss->ssid;
params.ssids[0].ssid_len = bss->ssid_len;
wpa_dbg(wpa_s, MSG_DEBUG,
"Scan a previously specified BSSID " MACSTR
" and SSID %s",
MAC2STR(params.bssid),
wpa_ssid_txt(bss->ssid, bss->ssid_len));
} else {
wpa_dbg(wpa_s, MSG_DEBUG,
"Scan a previously specified BSSID " MACSTR,
MAC2STR(params.bssid));
}
}
Add automatic scanning support Like bgscan, autoscan is an optional module based feature to automate scanning but while disconnected or inactive. Instead of requesting directly a scan, it only sets the scan_interval and the sched_scan_interval. So, if the driver supports sched_scan, autoscan will be able to tweak its interval. Otherwise, the tweaked scan_interval will be used. If scan parameters needs to be tweaked, an autoscan_params pointer in wpa_s will provide those. So req_scan / req_sched_scan will not set the scan parameters as they usually do, but instead will use this pointer. Modules will not have to request a scan directly, like bgscan does. Instead, it will need to return the interval it wants after each notification. Signed-hostap: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2012-06-26 17:55:41 +02:00
scan_params = &params;
scan:
P2P: Avoid multi-channel scans when they are not needed If the driver does not support multi-channel concurrency and a virtual interface that shares the same radio with the current interface is operating there may not be need to scan other channels apart from the current operating channel on the other virtual interface. Filter out other channels in case we are trying to find a connection for a station interface when we are not configured to prefer station connection and a concurrent operation is already in process. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-25 11:47:43 +01:00
#ifdef CONFIG_P2P
/*
* If the driver does not support multi-channel concurrency and a
* virtual interface that shares the same radio with the wpa_s interface
* is operating there may not be need to scan other channels apart from
* the current operating channel on the other virtual interface. Filter
* out other channels in case we are trying to find a connection for a
* station interface when we are not configured to prefer station
* connection and a concurrent operation is already in process.
*/
Restore scan_req if sta scan is rescheduled in the scan results event On scan results event if a concurrent P2P scan was triggered previously, scan results processing is canceled, p2p_find executed, and a new sta scan is triggered (pending scan). However, this new sta scan does not restore the scan_req value of the previous scan (whose scan result has been canceled). If we are currently connected to an AP and use ap_scan=2, the new triggered scan will cause an associtation-without-scan in wpa_supplicant_scan: (ap_scan == 2 & scan_req != MANUAL_SCAN_REQ) => wpa_supplicant_assoc_try() causing an association error and a disconnection. This patch fixes this issue by restoring the previous scan_req value. Signed-off-by: Loic Poulain <loicx.poulain@intel.com>
2013-05-31 12:15:56 +02:00
if (wpa_s->scan_for_connection &&
wpa_s->last_scan_req == NORMAL_SCAN_REQ &&
P2P: Avoid multi-channel scans when they are not needed If the driver does not support multi-channel concurrency and a virtual interface that shares the same radio with the current interface is operating there may not be need to scan other channels apart from the current operating channel on the other virtual interface. Filter out other channels in case we are trying to find a connection for a station interface when we are not configured to prefer station connection and a concurrent operation is already in process. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-25 11:47:43 +01:00
!scan_params->freqs && !params.freqs &&
wpas_is_p2p_prioritized(wpa_s) &&
wpa_s->p2p_group_interface == NOT_P2P_GROUP_INTERFACE &&
non_p2p_network_enabled(wpa_s)) {
Change share_vif_oper_freq() to handle multiple freqs There are devices that can operate several channels concurrently. Change shared_vif_oper_freq() to get_shared_radio_freqs() that can return an array of frequencies currently used by all the virtual interfaces that share the same radio. In addition, move it to wpa_supplicant.c, so it can be used by other modules. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:03:53 +02:00
unsigned int num = wpa_s->num_multichan_concurrent;
params.freqs = os_calloc(num + 1, sizeof(int));
if (params.freqs) {
num = get_shared_radio_freqs(wpa_s, params.freqs, num);
if (num > 0 && num == wpa_s->num_multichan_concurrent) {
wpa_dbg(wpa_s, MSG_DEBUG, "Scan only the current operating channels since all channels are already used");
} else {
os_free(params.freqs);
params.freqs = NULL;
}
P2P: Avoid multi-channel scans when they are not needed If the driver does not support multi-channel concurrency and a virtual interface that shares the same radio with the current interface is operating there may not be need to scan other channels apart from the current operating channel on the other virtual interface. Filter out other channels in case we are trying to find a connection for a station interface when we are not configured to prefer station connection and a concurrent operation is already in process. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-25 11:47:43 +01:00
}
}
#endif /* CONFIG_P2P */
Add automatic scanning support Like bgscan, autoscan is an optional module based feature to automate scanning but while disconnected or inactive. Instead of requesting directly a scan, it only sets the scan_interval and the sched_scan_interval. So, if the driver supports sched_scan, autoscan will be able to tweak its interval. Otherwise, the tweaked scan_interval will be used. If scan parameters needs to be tweaked, an autoscan_params pointer in wpa_s will provide those. So req_scan / req_sched_scan will not set the scan parameters as they usually do, but instead will use this pointer. Modules will not have to request a scan directly, like bgscan does. Instead, it will need to return the interval it wants after each notification. Signed-hostap: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2012-06-26 17:55:41 +02:00
ret = wpa_supplicant_trigger_scan(wpa_s, scan_params);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
Allow channel list to be specified for SCAN command The new freq=<frequency ranges> parameter to the SCAN command can be used to request a scan to be performed on the specified set of channels instead of on all channels. For example, "wpa_cli scan freq=2400-2500,5180" would scan channels 1-14 and 36. Only the channels that the driver indicates as enabled and that are within the specified ranges are included in the request. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-25 19:04:52 +01:00
if (ret && wpa_s->last_scan_req == MANUAL_SCAN_REQ && params.freqs &&
!wpa_s->manual_scan_freqs) {
/* Restore manual_scan_freqs for the next attempt */
wpa_s->manual_scan_freqs = params.freqs;
params.freqs = NULL;
}
IEEE 802.11u: Allow Interworking and HESSID to be configured The new wpa_supplicant.conf file global parameters interworking and hessid can be used to configure wpa_supplicant to include Interworking element in Probe Request frames.
2011-09-27 22:15:05 +02:00
wpabuf_free(extra_ie);
Add support for specifying subset of enabled frequencies to scan A new network block parameter, scan_freq, can be used to specify subset of frequencies to scan. This can speed up scanning process considerably if it is known that only a small subset of channels is actually used in the network. A union of configured frequencies for all enabled network blocks is used in scan requests. Currently, only driver_nl80211.c has support for this functionality. For example, following parameter marks 2.4 GHz channels 1, 6, 11 to be scanned: scan_freq=2412 2437 2462
2009-03-26 20:55:01 +01:00
os_free(params.freqs);
Add optional scan result filter based on SSID filter_ssids=1 global configuration parameter can now be used to enable scan result filtering (with -Dnl80211 only for now) based on the configured SSIDs. In other words, only the scan results that have an SSID matching with one of the configured networks are included in the BSS table. This can be used to reduce memory needs in environments that have huge number of APs.
2010-03-05 20:42:06 +01:00
os_free(params.filter_ssids);
Move ownership of MAC address randomization mask to scan params This array can be freed either from the scan parameters or from clearing the MAC address randomization parameters from the wpa_supplicant struct. To make this ownership more clear, we have each struct own its own copy of the parameters. Signed-off-by: Eric Caruso <ejcaruso@chromium.org>
2019-10-18 01:03:50 +02:00
os_free(params.mac_addr);
Added preliminary Wi-Fi Protected Setup (WPS) implementation This adds WPS support for both hostapd and wpa_supplicant. Both programs can be configured to act as WPS Enrollee and Registrar. Both PBC and PIN methods are supported. Currently, hostapd has more complete configuration option for WPS parameters and wpa_supplicant configuration style will likely change in the future. External Registrars are not yet supported in hostapd or wpa_supplicant. While wpa_supplicant has initial support for acting as an Registrar to configure an AP, this is still using number of hardcoded parameters which will need to be made configurable for proper operation.
2008-11-23 18:34:26 +01:00
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (ret) {
Use wpa_msg() instead of wpa_printf() This converts number of debugging messages to use wpa_msg() in order to allow the interface name to be shown with the messages. A new function, wpa_dbg(), is introduced to allow CONFIG_NO_STDOUT_DEBUG=y builds to remove the debug strings. This is otherwise identical with wpa_msg(), but it gets compiled out if stdout debugging is disabled.
2011-02-10 19:14:46 +01:00
wpa_msg(wpa_s, MSG_WARNING, "Failed to initiate AP scan");
Retry scan-for-connect if driver trigger fails This restores some of the pre-radio work behavior for scanning by retrying scan trigger if the driver rejects it (most likely returning EBUSY in case of nl80211-drivers). Retry is indicated in the CTRL-EVENT-SCAN-FAILED event with "retry=1". For manual scans (e.g., triggered through "SCAN" control interface command), no additional retries are performed. In other words, if upper layers want to retry, they can do so based on the CTRL-EVENT-SCAN-FAILED event. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-01-19 19:10:00 +01:00
if (wpa_s->scan_prev_wpa_state != wpa_s->wpa_state)
wpa_supplicant_set_state(wpa_s,
wpa_s->scan_prev_wpa_state);
Restore wpa_s->scan_req if scan trigger fails If the driver rejects the scan request while handling an external requested scan (e.g., SCAN command on ctrl_iface), wpa_s->scan_req gets cleared in wpa_supplicant_scan(). This can results in issues when the scheduled re-try of the scan in one seconds trigger another call to this function. If ap_scan==2 mode is used, this would result in new association attempt instead of a new scan. Avoid this by restoring value of wpa_s->scan_req in case the scan trigger fails and a new scan attempt is scheduled. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-10-30 11:27:05 +01:00
/* Restore scan_req since we will try to scan again */
Restore scan_req if sta scan is rescheduled in the scan results event On scan results event if a concurrent P2P scan was triggered previously, scan results processing is canceled, p2p_find executed, and a new sta scan is triggered (pending scan). However, this new sta scan does not restore the scan_req value of the previous scan (whose scan result has been canceled). If we are currently connected to an AP and use ap_scan=2, the new triggered scan will cause an associtation-without-scan in wpa_supplicant_scan: (ap_scan == 2 & scan_req != MANUAL_SCAN_REQ) => wpa_supplicant_assoc_try() causing an association error and a disconnection. This patch fixes this issue by restoring the previous scan_req value. Signed-off-by: Loic Poulain <loicx.poulain@intel.com>
2013-05-31 12:15:56 +02:00
wpa_s->scan_req = wpa_s->last_scan_req;
Try to start a new scan more quickly after driver rejection This speeds up recovery from some cases where the driver may refuse a new scan request command temporarily.
2010-04-11 18:56:23 +02:00
wpa_supplicant_req_scan(wpa_s, 1, 0);
P2P: Avoid multi-channel scans when they are not needed If the driver does not support multi-channel concurrency and a virtual interface that shares the same radio with the current interface is operating there may not be need to scan other channels apart from the current operating channel on the other virtual interface. Filter out other channels in case we are trying to find a connection for a station interface when we are not configured to prefer station connection and a concurrent operation is already in process. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-25 11:47:43 +01:00
} else {
wpa_s->scan_for_connection = 0;
Interworking: Avoid busy loop in scan result mismatch corner cases It was possible for interworking_find_network_match() to find a possible BSS match in a case where more thorough checks in wpa_supplicant_select_bss() reject network. This itself is fine, in general, but when combined with wpa_supplicant_fast_associate() optimization and auto_interworking=1, this resulted in a busy loop of up to five seconds and a possible stack overflow due to recursion in that loop. Fix this by limiting the Interworking wpa_supplicant_fast_associate() call to be used only once per scan iteration, so that new scan operations can be completed before going through the scan results again. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-17 00:43:00 +01:00
#ifdef CONFIG_INTERWORKING
wpa_s->interworking_fast_assoc_tried = 0;
#endif /* CONFIG_INTERWORKING */
Allow wildcard SSID to be enforced for a specific BSSID scan Specific BSSID scan was replacing wildcard SSID with the known SSID if any BSS with the specified BSSID is available in the known BSSes list. Add control interface support to force use of a wildcard SSID in a specific BSSID scan by user with the new "wildcard_ssid=1" argument to the SCAN command. Signed-off-by: Veerendranath Jakkam <vjakkam@codeaurora.org>
2020-02-29 07:56:36 +01:00
wpa_s->next_scan_bssid_wildcard_ssid = 0;
WNM: Optimize a single BSS transition management candidate scan If the BSS Transition Management Request frame includes only a single candidate and we need to scan for the BSS to get up-to-date information, use a scan for the known BSSID instead of wildcard BSSID. In addition, set the SSID in the scan if it is known based on old scan results in the BSS table. This removes unnecessary Probe Response frames when we are interested in results from only a single BSS. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-02-26 16:16:35 +01:00
if (params.bssid)
os_memset(wpa_s->next_scan_bssid, 0, ETH_ALEN);
Fix scan_runs counting Addition of the background scanning mechanism in commit 60b94c9819199c0427e623080ebae27fe44be6b5 moved the scan trigger into a new function that was also incrementing the scan_runs counter, but the removal of the previous scan_runs incrementation was forgotten from that patch. This counter should only be updated into a single location, so remove the old one. This improves AP selection for WPS provisioning by not skipping some of the initial scans.
2010-06-11 20:15:16 +02:00
}
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
Update scan interval gracefully When the scan interval is changed the new interval is effective after the old interval timer fires off one last time. This can cause an unacceptable long delay when updating the interval. Change this behaviour to use MIN(left of old interval, new interval) for the scan interval following the interval change. Signed-hostap: Pontus Fuchs <pontus.fuchs@gmail.com>
2013-02-03 17:14:05 +01:00
void wpa_supplicant_update_scan_int(struct wpa_supplicant *wpa_s, int sec)
{
Use monotonic clock for relative time for eloop if available Relative time shouldn't be calculated based on gettimeofday because that clock can jump (e.g., when the time is adjusted by the system administrator.) On systems where that is available, use CLOCK_BOOTTIME (on fairly recent Linux systems, this clock takes into account the time spend suspended) or CLOCK_MONOTONIC (on Linux and some POSIX systems, this clock is just freely running with no adjustments.) Reported-by: Holger Schurig <holgerschurig@gmail.com> Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-11-20 11:01:09 +01:00
struct os_reltime remaining, new_int;
Update scan interval gracefully When the scan interval is changed the new interval is effective after the old interval timer fires off one last time. This can cause an unacceptable long delay when updating the interval. Change this behaviour to use MIN(left of old interval, new interval) for the scan interval following the interval change. Signed-hostap: Pontus Fuchs <pontus.fuchs@gmail.com>
2013-02-03 17:14:05 +01:00
int cancelled;
cancelled = eloop_cancel_timeout_one(wpa_supplicant_scan, wpa_s, NULL,
&remaining);
new_int.sec = sec;
new_int.usec = 0;
Use monotonic clock for relative time for eloop if available Relative time shouldn't be calculated based on gettimeofday because that clock can jump (e.g., when the time is adjusted by the system administrator.) On systems where that is available, use CLOCK_BOOTTIME (on fairly recent Linux systems, this clock takes into account the time spend suspended) or CLOCK_MONOTONIC (on Linux and some POSIX systems, this clock is just freely running with no adjustments.) Reported-by: Holger Schurig <holgerschurig@gmail.com> Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-11-20 11:01:09 +01:00
if (cancelled && os_reltime_before(&remaining, &new_int)) {
Update scan interval gracefully When the scan interval is changed the new interval is effective after the old interval timer fires off one last time. This can cause an unacceptable long delay when updating the interval. Change this behaviour to use MIN(left of old interval, new interval) for the scan interval following the interval change. Signed-hostap: Pontus Fuchs <pontus.fuchs@gmail.com>
2013-02-03 17:14:05 +01:00
new_int.sec = remaining.sec;
new_int.usec = remaining.usec;
}
Don't start second scan when changing scan interval If a scan is currently running and the scan interval is changed, a second scan will be started before the current has finished. This will in turn, if no networks are configured, cause wpa_s->state to be forced to WPA_INACTIVE before the first scan has finished. Signed-hostap: Pontus Fuchs <pontus.fuchs@gmail.com>
2013-10-22 14:57:21 +02:00
if (cancelled) {
eloop_register_timeout(new_int.sec, new_int.usec,
wpa_supplicant_scan, wpa_s, NULL);
}
Update scan interval gracefully When the scan interval is changed the new interval is effective after the old interval timer fires off one last time. This can cause an unacceptable long delay when updating the interval. Change this behaviour to use MIN(left of old interval, new interval) for the scan interval following the interval change. Signed-hostap: Pontus Fuchs <pontus.fuchs@gmail.com>
2013-02-03 17:14:05 +01:00
wpa_s->scan_interval = sec;
}
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
/**
* wpa_supplicant_req_scan - Schedule a scan for neighboring access points
* @wpa_s: Pointer to wpa_supplicant data
* @sec: Number of seconds after which to scan
* @usec: Number of microseconds after which to scan
*
* This function is used to schedule a scan for neighboring access points after
* the specified time.
*/
void wpa_supplicant_req_scan(struct wpa_supplicant *wpa_s, int sec, int usec)
{
P2P: Do not allow scan or normal association on cfg80211 P2P Device The dedicated P2P management instance (wpas->p2p_mgmt == 1) using cfg80211 P2P Device cannot be used for non-P2P uses or connection (there is no netdev). Reject or ignore such operations to avoid unexpected operations if enabled network blocks are configured in the wpa_supplicant instance used to control this interface. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 10:23:09 +01:00
int res;
if (wpa_s->p2p_mgmt) {
wpa_dbg(wpa_s, MSG_DEBUG,
"Ignore scan request (%d.%06d sec) on p2p_mgmt interface",
sec, usec);
return;
}
res = eloop_deplete_timeout(sec, usec, wpa_supplicant_scan, wpa_s,
NULL);
Fix req_scan-deplete-timeout and update eloop API for this Commit e2f5a9889a3a2bb8f1eed0cf274c7fbbabe3e9de was supposed to prevent new scan request from pushing out the old one. However, it did not really do that since eloop_deplete_timeout() returned 0 both for the case where the old timeout existed (and was sooner) and if the old timeout did not exist. It returned 1 only for the case where an old timeout did exist and was larger than the new requested value. That case used to result in wpa_supplicant_req_scan() rescheduling the timeout, but hew code in eloop_deplete_timeout() did the exact same thing and as such, did not really change anything apart from the debug log message. Extend the eloop_deplete_timeout() (and eloop_replenish_timeout() for that matter since it is very similar) to return three different values based on whether the timeout existed or not and if yes, whether it was modified. This allows wpa_supplicant_req_scan() to schedule a new timeout only in the case there was no old timeout. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-05 08:59:38 +01:00
if (res == 1) {
wpa_dbg(wpa_s, MSG_DEBUG, "Rescheduling scan request: %d.%06d sec",
Deplete scan request if new time is less than remaining This avoids pushing out previous scheduled scan requests based on new events. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-11-11 20:13:17 +01:00
sec, usec);
Fix req_scan-deplete-timeout and update eloop API for this Commit e2f5a9889a3a2bb8f1eed0cf274c7fbbabe3e9de was supposed to prevent new scan request from pushing out the old one. However, it did not really do that since eloop_deplete_timeout() returned 0 both for the case where the old timeout existed (and was sooner) and if the old timeout did not exist. It returned 1 only for the case where an old timeout did exist and was larger than the new requested value. That case used to result in wpa_supplicant_req_scan() rescheduling the timeout, but hew code in eloop_deplete_timeout() did the exact same thing and as such, did not really change anything apart from the debug log message. Extend the eloop_deplete_timeout() (and eloop_replenish_timeout() for that matter since it is very similar) to return three different values based on whether the timeout existed or not and if yes, whether it was modified. This allows wpa_supplicant_req_scan() to schedule a new timeout only in the case there was no old timeout. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-05 08:59:38 +01:00
} else if (res == 0) {
wpa_dbg(wpa_s, MSG_DEBUG, "Ignore new scan request for %d.%06d sec since an earlier request is scheduled to trigger sooner",
sec, usec);
} else {
wpa_dbg(wpa_s, MSG_DEBUG, "Setting scan request: %d.%06d sec",
sec, usec);
eloop_register_timeout(sec, usec, wpa_supplicant_scan, wpa_s, NULL);
Deplete scan request if new time is less than remaining This avoids pushing out previous scheduled scan requests based on new events. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-11-11 20:13:17 +01:00
}
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
Add delayed scheduled scan request When initializing, the scheduled scan code was being called before everything is ready. With normal scans, the first scan round is delayed, so the initialization is finished by the time it really starts. Add a function that can be used to request a delayed scheduled scan. The scan will only start after the specified time has elapsed. Call this function instead of starting the scheduled scan directly during driver initialization. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:38 +02:00
/**
* wpa_supplicant_delayed_sched_scan - Request a delayed scheduled scan
* @wpa_s: Pointer to wpa_supplicant data
* @sec: Number of seconds after which to scan
* @usec: Number of microseconds after which to scan
Add Doxygen documentation for functionality related to scanning Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 11:29:05 +01:00
* Returns: 0 on success or -1 otherwise
Add delayed scheduled scan request When initializing, the scheduled scan code was being called before everything is ready. With normal scans, the first scan round is delayed, so the initialization is finished by the time it really starts. Add a function that can be used to request a delayed scheduled scan. The scan will only start after the specified time has elapsed. Call this function instead of starting the scheduled scan directly during driver initialization. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:38 +02:00
*
* This function is used to schedule periodic scans for neighboring
* access points after the specified time.
*/
int wpa_supplicant_delayed_sched_scan(struct wpa_supplicant *wpa_s,
int sec, int usec)
{
if (!wpa_s->sched_scan_supported)
return -1;
eloop_register_timeout(sec, usec,
wpa_supplicant_delayed_sched_scan_timeout,
wpa_s, NULL);
return 0;
}
Add support to sched scan to report relatively better BSSs Add support to set sched scan relative RSSI parameters so that the drivers can report BSSs after relative comparision with the current connected BSS. This feature is applicable only when in connected mode. The below commands can be used to configure relative RSSI parameters SET relative_rssi <disable|rssi_value> disable - to disable the feature rssi_value - amount of relative RSSI in dB SET relative_band_adjust <band:adjust_value> band - "2G" or "5G" for 2.4 GHz or 5 GHz respectively adjust_value - amount of RSSI to be adjusted in dB Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-11-15 10:42:44 +01:00
static void
wpa_scan_set_relative_rssi_params(struct wpa_supplicant *wpa_s,
struct wpa_driver_scan_params *params)
{
if (wpa_s->wpa_state != WPA_COMPLETED ||
!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_SCHED_SCAN_RELATIVE_RSSI) ||
wpa_s->srp.relative_rssi_set == 0)
return;
params->relative_rssi_set = 1;
params->relative_rssi = wpa_s->srp.relative_rssi;
if (wpa_s->srp.relative_adjust_rssi == 0)
return;
params->relative_adjust_band = wpa_s->srp.relative_adjust_band;
params->relative_adjust_rssi = wpa_s->srp.relative_adjust_rssi;
}
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
/**
* wpa_supplicant_req_sched_scan - Start a periodic scheduled scan
* @wpa_s: Pointer to wpa_supplicant data
Add Doxygen documentation for functionality related to scanning Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 11:29:05 +01:00
* Returns: 0 is sched_scan was started or -1 otherwise
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
*
* This function is used to schedule periodic scans for neighboring
* access points repeating the scan continuously.
*/
int wpa_supplicant_req_sched_scan(struct wpa_supplicant *wpa_s)
{
struct wpa_driver_scan_params params;
Add automatic scanning support Like bgscan, autoscan is an optional module based feature to automate scanning but while disconnected or inactive. Instead of requesting directly a scan, it only sets the scan_interval and the sched_scan_interval. So, if the driver supports sched_scan, autoscan will be able to tweak its interval. Otherwise, the tweaked scan_interval will be used. If scan parameters needs to be tweaked, an autoscan_params pointer in wpa_s will provide those. So req_scan / req_sched_scan will not set the scan parameters as they usually do, but instead will use this pointer. Modules will not have to request a scan directly, like bgscan does. Instead, it will need to return the interval it wants after each notification. Signed-hostap: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2012-06-26 17:55:41 +02:00
struct wpa_driver_scan_params *scan_params;
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
enum wpa_states prev_state;
Add automatic scanning support Like bgscan, autoscan is an optional module based feature to automate scanning but while disconnected or inactive. Instead of requesting directly a scan, it only sets the scan_interval and the sched_scan_interval. So, if the driver supports sched_scan, autoscan will be able to tweak its interval. Otherwise, the tweaked scan_interval will be used. If scan parameters needs to be tweaked, an autoscan_params pointer in wpa_s will provide those. So req_scan / req_sched_scan will not set the scan parameters as they usually do, but instead will use this pointer. Modules will not have to request a scan directly, like bgscan does. Instead, it will need to return the interval it wants after each notification. Signed-hostap: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2012-06-26 17:55:41 +02:00
struct wpa_ssid *ssid = NULL;
Fix adding extra IEs in sched scan Refactoring done in commit 46ee0427b13d64dc4695fda24f4f228c99822c11 (IEEE 802.11u: Allow Interworking and HESSID to be configured) broke adding extra IEs in sched scan. The IEs stopped being added to the scan params within wpa_supplicant_extra_ies() but no code was added to add them in wpa_supplicant_req_sched_scan(). Fix this and remove unused params arg in wpa_supplicant_extra_ies(). Signed-hostap: Eyal Shapira <eyal@wizery.com> intended-for: hostap-1
2012-08-13 20:48:55 +02:00
struct wpabuf *extra_ie = NULL;
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
int ret;
unsigned int max_sched_scan_ssids;
Add broadcast SSID for sched_scan for scan_ssid=0 networks Previously, only networks with scan_ssid=1 were included in sched_scan. This needs to behave similarly to the normal scan where broadcast SSID is used to find networks that are not scanned for with a specific SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-28 17:12:38 +01:00
int wildcard = 0;
Use normal scan before sched_scan if that can speed up connection When normal scan can speed up operations, use that for the first three scan runs before starting the sched_scan to allow user space sleep more. We do this only if the normal scan has functionality that is suitable for this or if the sched_scan does not have better support for multiple SSIDs. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-28 17:36:36 +01:00
int need_ssids;
Add support for configuring scheduled scan plans Add the option to configure scheduled scan plans in the config file. Each scan plan specifies the interval between scans and the number of scan iterations. The last plan will run infinitely and thus specifies only the interval between scan iterations. usage: sched_scan_plans=<interval:iterations> <interval2:iterations2> ... <interval> Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2015-11-17 14:08:24 +01:00
struct sched_scan_plan scan_plan;
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
if (!wpa_s->sched_scan_supported)
return -1;
if (wpa_s->max_sched_scan_ssids > WPAS_MAX_SCAN_SSIDS)
max_sched_scan_ssids = WPAS_MAX_SCAN_SSIDS;
else
max_sched_scan_ssids = wpa_s->max_sched_scan_ssids;
Add disable_scan_offload parameter to disable automatic scan offloading This new configuration parameter can be used to disable automatic offloading of scan requests to the driver which was previously used by default if the driver supported sched_scan. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-17 15:30:15 +02:00
if (max_sched_scan_ssids < 1 || wpa_s->conf->disable_scan_offload)
Add broadcast SSID for sched_scan for scan_ssid=0 networks Previously, only networks with scan_ssid=1 were included in sched_scan. This needs to behave similarly to the normal scan where broadcast SSID is used to find networks that are not scanned for with a specific SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-28 17:12:38 +01:00
return -1;
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
Continue scanning if sched_scan stops unexpectedly When scheduled scan stops without the interface request (for example, driver stopped it unexpectedly), start a regular scan to continue scanning for networks and avoid being left with no scan at all. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2016-09-05 16:32:59 +02:00
wpa_s->sched_scan_stop_req = 0;
sched scan: Fix passive scanning Scan wasn't initiated in case the config contained only networks without scan_ssid. In such a case we want scan to be initiated without any SSIDs to actively scan but include all the SSIDs in the filter list. Also added some debug logs to easily see which SSIDs were included in which list. Cc: Luciano Coelho <coelho@ti.com> Signed-off-by: Eyal Shapira <eyal@wizery.com>
2011-11-18 22:05:57 +01:00
if (wpa_s->sched_scanning) {
wpa_dbg(wpa_s, MSG_DEBUG, "Already sched scanning");
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
return 0;
sched scan: Fix passive scanning Scan wasn't initiated in case the config contained only networks without scan_ssid. In such a case we want scan to be initiated without any SSIDs to actively scan but include all the SSIDs in the filter list. Also added some debug logs to easily see which SSIDs were included in which list. Cc: Luciano Coelho <coelho@ti.com> Signed-off-by: Eyal Shapira <eyal@wizery.com>
2011-11-18 22:05:57 +01:00
}
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
Use normal scan before sched_scan if that can speed up connection When normal scan can speed up operations, use that for the first three scan runs before starting the sched_scan to allow user space sleep more. We do this only if the normal scan has functionality that is suitable for this or if the sched_scan does not have better support for multiple SSIDs. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-28 17:36:36 +01:00
need_ssids = 0;
for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next) {
Validate WEP key lengths based on driver capabilities The nl80211 driver interface does not allow 128-bit WEP to be used without a vendor specific cipher suite and no such suite is defined for this purpose. Do not accept WEP key length 16 for nl80211 driver interface forn ow. wext-interface can still try to use these for backwards compatibility. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-10 13:34:46 +02:00
if (!wpas_network_disabled(wpa_s, ssid) && !ssid->scan_ssid) {
Use normal scan before sched_scan if that can speed up connection When normal scan can speed up operations, use that for the first three scan runs before starting the sched_scan to allow user space sleep more. We do this only if the normal scan has functionality that is suitable for this or if the sched_scan does not have better support for multiple SSIDs. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-28 17:36:36 +01:00
/* Use wildcard SSID to find this network */
wildcard = 1;
Validate WEP key lengths based on driver capabilities The nl80211 driver interface does not allow 128-bit WEP to be used without a vendor specific cipher suite and no such suite is defined for this purpose. Do not accept WEP key length 16 for nl80211 driver interface forn ow. wext-interface can still try to use these for backwards compatibility. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-10 13:34:46 +02:00
} else if (!wpas_network_disabled(wpa_s, ssid) &&
ssid->ssid_len)
Use normal scan before sched_scan if that can speed up connection When normal scan can speed up operations, use that for the first three scan runs before starting the sched_scan to allow user space sleep more. We do this only if the normal scan has functionality that is suitable for this or if the sched_scan does not have better support for multiple SSIDs. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-28 17:36:36 +01:00
need_ssids++;
WPS: Do not use sched_scan for provisioning step Normal scan is more reliable and faster for WPS operations and since these are for short periods of time, the benefit of trying to use sched_scan would be limited. This can fix WPS connectivity issues with some drivers. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-02-15 19:39:54 +01:00
#ifdef CONFIG_WPS
Validate WEP key lengths based on driver capabilities The nl80211 driver interface does not allow 128-bit WEP to be used without a vendor specific cipher suite and no such suite is defined for this purpose. Do not accept WEP key length 16 for nl80211 driver interface forn ow. wext-interface can still try to use these for backwards compatibility. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-10 13:34:46 +02:00
if (!wpas_network_disabled(wpa_s, ssid) &&
Ignore network blocks that have invalid WEP key length Do not try to associate with a network that has an invalid or incomplete configuration because the association or at least data connection would fail anyway. This commits adds a common function for checking whether a network block is disabled to make it easier to check network blocks without having to reject them during configuration file parsing (which would prevent wpa_supplicant from starting). The only additional check added in this commit is to verify the WEP key length. Similar checks for other parameters can be added in future commits. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-07 12:39:33 +02:00
ssid->key_mgmt == WPA_KEY_MGMT_WPS) {
WPS: Do not use sched_scan for provisioning step Normal scan is more reliable and faster for WPS operations and since these are for short periods of time, the benefit of trying to use sched_scan would be limited. This can fix WPS connectivity issues with some drivers. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-02-15 19:39:54 +01:00
/*
* Normal scan is more reliable and faster for WPS
* operations and since these are for short periods of
* time, the benefit of trying to use sched_scan would
* be limited.
*/
wpa_dbg(wpa_s, MSG_DEBUG, "Use normal scan instead of "
"sched_scan for WPS");
return -1;
}
#endif /* CONFIG_WPS */
Use normal scan before sched_scan if that can speed up connection When normal scan can speed up operations, use that for the first three scan runs before starting the sched_scan to allow user space sleep more. We do this only if the normal scan has functionality that is suitable for this or if the sched_scan does not have better support for multiple SSIDs. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-28 17:36:36 +01:00
}
if (wildcard)
need_ssids++;
if (wpa_s->normal_scans < 3 &&
(need_ssids <= wpa_s->max_scan_ssids ||
wpa_s->max_scan_ssids >= (int) max_sched_scan_ssids)) {
/*
* When normal scan can speed up operations, use that for the
* first operations before starting the sched_scan to allow
* user space sleep more. We do this only if the normal scan
* has functionality that is suitable for this or if the
* sched_scan does not have better support for multiple SSIDs.
*/
wpa_dbg(wpa_s, MSG_DEBUG, "Use normal scan instead of "
"sched_scan for initial scans (normal_scans=%d)",
wpa_s->normal_scans);
return -1;
}
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
os_memset(&params, 0, sizeof(params));
Add filter support to scheduled scans Pass SSIDs to be matched in scheduled scan results. Only the SSIDs that are included in the match lists will be reported by the driver, so the filtering can be offloaded to the hardware and the power consumption can be reduced. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:35 +02:00
/* If we can't allocate space for the filters, we just don't filter */
Use os_calloc() instead of os_zalloc() Automatic changes with spatch using the following semantic patch: @@ constant C; type T; @@ - os_zalloc(C*sizeof(T)) + os_calloc(C,sizeof(T)) @@ expression E; type T; @@ - os_zalloc((E)*sizeof(T)) + os_calloc(E,sizeof(T)) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-07 15:51:38 +01:00
params.filter_ssids = os_calloc(wpa_s->max_match_sets,
Add filter support to scheduled scans Pass SSIDs to be matched in scheduled scan results. Only the SSIDs that are included in the match lists will be reported by the driver, so the filtering can be offloaded to the hardware and the power consumption can be reduced. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:35 +02:00
sizeof(struct wpa_driver_scan_filter));
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
prev_state = wpa_s->wpa_state;
if (wpa_s->wpa_state == WPA_DISCONNECTED ||
wpa_s->wpa_state == WPA_INACTIVE)
wpa_supplicant_set_state(wpa_s, WPA_SCANNING);
Add automatic scanning support Like bgscan, autoscan is an optional module based feature to automate scanning but while disconnected or inactive. Instead of requesting directly a scan, it only sets the scan_interval and the sched_scan_interval. So, if the driver supports sched_scan, autoscan will be able to tweak its interval. Otherwise, the tweaked scan_interval will be used. If scan parameters needs to be tweaked, an autoscan_params pointer in wpa_s will provide those. So req_scan / req_sched_scan will not set the scan parameters as they usually do, but instead will use this pointer. Modules will not have to request a scan directly, like bgscan does. Instead, it will need to return the interval it wants after each notification. Signed-hostap: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2012-06-26 17:55:41 +02:00
if (wpa_s->autoscan_params != NULL) {
scan_params = wpa_s->autoscan_params;
goto scan;
}
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
/* Find the starting point from which to continue scanning */
ssid = wpa_s->conf->ssid;
if (wpa_s->prev_sched_ssid) {
while (ssid) {
if (ssid == wpa_s->prev_sched_ssid) {
ssid = ssid->next;
break;
}
ssid = ssid->next;
}
}
if (!ssid || !wpa_s->prev_sched_ssid) {
wpa_dbg(wpa_s, MSG_DEBUG, "Beginning of SSID list");
wpa_s->sched_scan_timeout = max_sched_scan_ssids * 2;
wpa_s->first_sched_scan = 1;
ssid = wpa_s->conf->ssid;
wpa_s->prev_sched_ssid = ssid;
}
Add broadcast SSID for sched_scan for scan_ssid=0 networks Previously, only networks with scan_ssid=1 were included in sched_scan. This needs to behave similarly to the normal scan where broadcast SSID is used to find networks that are not scanned for with a specific SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-28 17:12:38 +01:00
if (wildcard) {
wpa_dbg(wpa_s, MSG_DEBUG, "Add wildcard SSID to sched_scan");
params.num_ssids++;
}
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
while (ssid) {
Validate WEP key lengths based on driver capabilities The nl80211 driver interface does not allow 128-bit WEP to be used without a vendor specific cipher suite and no such suite is defined for this purpose. Do not accept WEP key length 16 for nl80211 driver interface forn ow. wext-interface can still try to use these for backwards compatibility. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-10 13:34:46 +02:00
if (wpas_network_disabled(wpa_s, ssid))
Use common code for disabled network case in sched_scan There is no need to implement two copies of the iteration code here. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-28 17:09:37 +01:00
goto next;
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
Fix sched_scan filter setting for max_match_sets == 0 The previous implementation was trying to add the first SSID to a zero-length array. Avoid this with an explicit validation of the array length. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-25 17:12:04 +01:00
if (params.num_filter_ssids < wpa_s->max_match_sets &&
params.filter_ssids && ssid->ssid && ssid->ssid_len) {
sched scan: Fix passive scanning Scan wasn't initiated in case the config contained only networks without scan_ssid. In such a case we want scan to be initiated without any SSIDs to actively scan but include all the SSIDs in the filter list. Also added some debug logs to easily see which SSIDs were included in which list. Cc: Luciano Coelho <coelho@ti.com> Signed-off-by: Eyal Shapira <eyal@wizery.com>
2011-11-18 22:05:57 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "add to filter ssid: %s",
wpa_ssid_txt(ssid->ssid, ssid->ssid_len));
Add filter support to scheduled scans Pass SSIDs to be matched in scheduled scan results. Only the SSIDs that are included in the match lists will be reported by the driver, so the filtering can be offloaded to the hardware and the power consumption can be reduced. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:35 +02:00
os_memcpy(params.filter_ssids[params.num_filter_ssids].ssid,
ssid->ssid, ssid->ssid_len);
params.filter_ssids[params.num_filter_ssids].ssid_len =
ssid->ssid_len;
params.num_filter_ssids++;
Drop sched_scan filter if not enough match sets supported Instead of including only a single SSID in the sched_scan request if the driver does not support match sets, just drop the SSID filter and configure more SSIDs up to the sched_scan limit. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-28 16:52:36 +01:00
} else if (params.filter_ssids && ssid->ssid && ssid->ssid_len)
{
wpa_dbg(wpa_s, MSG_DEBUG, "Not enough room for SSID "
"filter for sched_scan - drop filter");
os_free(params.filter_ssids);
params.filter_ssids = NULL;
params.num_filter_ssids = 0;
Add filter support to scheduled scans Pass SSIDs to be matched in scheduled scan results. Only the SSIDs that are included in the match lists will be reported by the driver, so the filtering can be offloaded to the hardware and the power consumption can be reduced. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:35 +02:00
}
Do not try to add wildcard SSID into active sched_scan Even though scan_ssid should not really be set for wildcard SSID, better verify that here explicitly insead of assuming that the SSID is set. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-11-19 16:01:53 +01:00
if (ssid->scan_ssid && ssid->ssid && ssid->ssid_len) {
Add broadcast SSID for sched_scan for scan_ssid=0 networks Previously, only networks with scan_ssid=1 were included in sched_scan. This needs to behave similarly to the normal scan where broadcast SSID is used to find networks that are not scanned for with a specific SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-28 17:12:38 +01:00
if (params.num_ssids == max_sched_scan_ssids)
break; /* only room for broadcast SSID */
Do not try to add wildcard SSID into active sched_scan Even though scan_ssid should not really be set for wildcard SSID, better verify that here explicitly insead of assuming that the SSID is set. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-11-19 16:01:53 +01:00
wpa_dbg(wpa_s, MSG_DEBUG,
"add to active scan ssid: %s",
sched scan: Fix passive scanning Scan wasn't initiated in case the config contained only networks without scan_ssid. In such a case we want scan to be initiated without any SSIDs to actively scan but include all the SSIDs in the filter list. Also added some debug logs to easily see which SSIDs were included in which list. Cc: Luciano Coelho <coelho@ti.com> Signed-off-by: Eyal Shapira <eyal@wizery.com>
2011-11-18 22:05:57 +01:00
wpa_ssid_txt(ssid->ssid, ssid->ssid_len));
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
params.ssids[params.num_ssids].ssid =
ssid->ssid;
params.ssids[params.num_ssids].ssid_len =
ssid->ssid_len;
params.num_ssids++;
Add filter support to scheduled scans Pass SSIDs to be matched in scheduled scan results. Only the SSIDs that are included in the match lists will be reported by the driver, so the filtering can be offloaded to the hardware and the power consumption can be reduced. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:35 +02:00
if (params.num_ssids >= max_sched_scan_ssids) {
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
wpa_s->prev_sched_ssid = ssid;
Fix sched_scan for max-num-of-scan_ssid=1 networks When the network configuration includes exactly the number of scan_ssid=1 networks as the driver supports for scan_sched and no networks need wildcard SSID scan, there is no need to use sched_scan timeout. Check this condition and optimize this case to avoid the extra sched_scan start/stop operations. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-17 15:51:09 +02:00
do {
ssid = ssid->next;
} while (ssid &&
Validate WEP key lengths based on driver capabilities The nl80211 driver interface does not allow 128-bit WEP to be used without a vendor specific cipher suite and no such suite is defined for this purpose. Do not accept WEP key length 16 for nl80211 driver interface forn ow. wext-interface can still try to use these for backwards compatibility. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-10 13:34:46 +02:00
(wpas_network_disabled(wpa_s, ssid) ||
Ignore network blocks that have invalid WEP key length Do not try to associate with a network that has an invalid or incomplete configuration because the association or at least data connection would fail anyway. This commits adds a common function for checking whether a network block is disabled to make it easier to check network blocks without having to reject them during configuration file parsing (which would prevent wpa_supplicant from starting). The only additional check added in this commit is to verify the WEP key length. Similar checks for other parameters can be added in future commits. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-07 12:39:33 +02:00
!ssid->scan_ssid));
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
break;
}
}
Add filter support to scheduled scans Pass SSIDs to be matched in scheduled scan results. Only the SSIDs that are included in the match lists will be reported by the driver, so the filtering can be offloaded to the hardware and the power consumption can be reduced. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:35 +02:00
Use common code for disabled network case in sched_scan There is no need to implement two copies of the iteration code here. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-28 17:09:37 +01:00
next:
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
wpa_s->prev_sched_ssid = ssid;
ssid = ssid->next;
}
Fix sched_scan filter_ssids setting for no filters case The filter_ssids pointer needs to be set to NULL if no SSID filters are set to avoid filtering out all scan results. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-28 14:19:41 +01:00
if (params.num_filter_ssids == 0) {
os_free(params.filter_ssids);
params.filter_ssids = NULL;
}
Fix adding extra IEs in sched scan Refactoring done in commit 46ee0427b13d64dc4695fda24f4f228c99822c11 (IEEE 802.11u: Allow Interworking and HESSID to be configured) broke adding extra IEs in sched scan. The IEs stopped being added to the scan params within wpa_supplicant_extra_ies() but no code was added to add them in wpa_supplicant_req_sched_scan(). Fix this and remove unused params arg in wpa_supplicant_extra_ies(). Signed-hostap: Eyal Shapira <eyal@wizery.com> intended-for: hostap-1
2012-08-13 20:48:55 +02:00
extra_ie = wpa_supplicant_extra_ies(wpa_s);
if (extra_ie) {
params.extra_ies = wpabuf_head(extra_ie);
params.extra_ies_len = wpabuf_len(extra_ie);
}
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
wpa_supplicant: Schedule PNO on completion of ongoing sched_scan When start PNO request comes from control interface, wpa_supplicant should wait until ongoing sched_scan (triggered by wpa_supplicant) gets cancelled. Issuing cancel sched_scan and start PNO scan one after another from pno_start() would lead wpa_supplicant to clear wps->sched_scanning flag while getting sched_scan stopped event from driver for cancel sched_scan request. In fact, PNO scan will be in progress in driver and wpa_s->sched_scanning will not be set in such cases. In addition to this change, RSSI threshold limit is passed as part of start sched_scan request. This was previously set only in pno_start(), but the same parameter should be available for generic sched_scan calls as well and this can now be reached through the new PNO start sequence. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-01-22 15:15:23 +01:00
if (wpa_s->conf->filter_rssi)
params.filter_rssi = wpa_s->conf->filter_rssi;
wpa_supplicant: Use freq_list scan filtar in sched_scan Global freq_list scan filtar was taken into account only by req_scan and not by req_sched_scan. We want to allow the user to limit the channels that wpa_supplicant will scan in req_sched_scan requests as well. Signed-off-by: Bojan Prtvar <bojan.prtvar@rt-rk.com>
2014-08-11 12:25:03 +02:00
/* See if user specified frequencies. If so, scan only those. */
if (wpa_s->conf->freq_list && !params.freqs) {
wpa_dbg(wpa_s, MSG_DEBUG,
"Optimize scan based on conf->freq_list");
int_array_concat(&params.freqs, wpa_s->conf->freq_list);
}
OCE: Send scan parameters when OCE_STA functionality is enabled If the device supports OCE features and OCE is enabled, set the relevant scan parameters and FILS Request Parameters element with Max Channel Time. Signed-off-by: Roee Zamir <roee.zamir@intel.com>
2018-08-26 19:45:03 +02:00
#ifdef CONFIG_MBO
if (wpa_s->enable_oce & OCE_STA)
params.oce_scan = 1;
#endif /* CONFIG_MBO */
Add automatic scanning support Like bgscan, autoscan is an optional module based feature to automate scanning but while disconnected or inactive. Instead of requesting directly a scan, it only sets the scan_interval and the sched_scan_interval. So, if the driver supports sched_scan, autoscan will be able to tweak its interval. Otherwise, the tweaked scan_interval will be used. If scan parameters needs to be tweaked, an autoscan_params pointer in wpa_s will provide those. So req_scan / req_sched_scan will not set the scan parameters as they usually do, but instead will use this pointer. Modules will not have to request a scan directly, like bgscan does. Instead, it will need to return the interval it wants after each notification. Signed-hostap: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2012-06-26 17:55:41 +02:00
scan_params = &params;
scan:
Add support for configuring scheduled scan plans Add the option to configure scheduled scan plans in the config file. Each scan plan specifies the interval between scans and the number of scan iterations. The last plan will run infinitely and thus specifies only the interval between scan iterations. usage: sched_scan_plans=<interval:iterations> <interval2:iterations2> ... <interval> Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2015-11-17 14:08:24 +01:00
wpa_s->sched_scan_timed_out = 0;
/*
* We cannot support multiple scan plans if the scan request includes
* too many SSID's, so in this case use only the last scan plan and make
* it run infinitely. It will be stopped by the timeout.
*/
if (wpa_s->sched_scan_plans_num == 1 ||
(wpa_s->sched_scan_plans_num && !ssid && wpa_s->first_sched_scan)) {
params.sched_scan_plans = wpa_s->sched_scan_plans;
params.sched_scan_plans_num = wpa_s->sched_scan_plans_num;
} else if (wpa_s->sched_scan_plans_num > 1) {
Make sched_scan debug clearer on timeout use Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-28 16:52:02 +01:00
wpa_dbg(wpa_s, MSG_DEBUG,
Add support for configuring scheduled scan plans Add the option to configure scheduled scan plans in the config file. Each scan plan specifies the interval between scans and the number of scan iterations. The last plan will run infinitely and thus specifies only the interval between scan iterations. usage: sched_scan_plans=<interval:iterations> <interval2:iterations2> ... <interval> Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2015-11-17 14:08:24 +01:00
"Too many SSIDs. Default to using single scheduled_scan plan");
params.sched_scan_plans =
&wpa_s->sched_scan_plans[wpa_s->sched_scan_plans_num -
1];
params.sched_scan_plans_num = 1;
Fix sched_scan debug print regarding timeout The debug messages were showing the opposite of what the actual implementation was doing for sched_scan timeout. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-17 15:32:40 +02:00
} else {
Add support for configuring scheduled scan plans Add the option to configure scheduled scan plans in the config file. Each scan plan specifies the interval between scans and the number of scan iterations. The last plan will run infinitely and thus specifies only the interval between scan iterations. usage: sched_scan_plans=<interval:iterations> <interval2:iterations2> ... <interval> Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2015-11-17 14:08:24 +01:00
if (wpa_s->conf->sched_scan_interval)
scan_plan.interval = wpa_s->conf->sched_scan_interval;
else
scan_plan.interval = 10;
if (scan_plan.interval > wpa_s->max_sched_scan_plan_interval) {
wpa_printf(MSG_WARNING,
"Scan interval too long(%u), use the maximum allowed(%u)",
scan_plan.interval,
wpa_s->max_sched_scan_plan_interval);
scan_plan.interval =
wpa_s->max_sched_scan_plan_interval;
}
scan_plan.iterations = 0;
params.sched_scan_plans = &scan_plan;
params.sched_scan_plans_num = 1;
}
nl80211: Add option to delay start of schedule scan plans The userspace may want to delay the the first scheduled scan. This enhances sched_scan to add initial delay (in seconds) before starting first scan cycle. The driver may optionally choose to ignore this parameter and start immediately (or at any other time). This uses NL80211_ATTR_SCHED_SCAN_DELAY to add this via user global configurable option: sched_scan_start_delay. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2017-03-06 08:53:10 +01:00
params.sched_scan_start_delay = wpa_s->conf->sched_scan_start_delay;
Add support for configuring scheduled scan plans Add the option to configure scheduled scan plans in the config file. Each scan plan specifies the interval between scans and the number of scan iterations. The last plan will run infinitely and thus specifies only the interval between scan iterations. usage: sched_scan_plans=<interval:iterations> <interval2:iterations2> ... <interval> Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2015-11-17 14:08:24 +01:00
if (ssid || !wpa_s->first_sched_scan) {
Fix sched_scan debug print regarding timeout The debug messages were showing the opposite of what the actual implementation was doing for sched_scan timeout. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-17 15:32:40 +02:00
wpa_dbg(wpa_s, MSG_DEBUG,
nl80211: Add option to delay start of schedule scan plans The userspace may want to delay the the first scheduled scan. This enhances sched_scan to add initial delay (in seconds) before starting first scan cycle. The driver may optionally choose to ignore this parameter and start immediately (or at any other time). This uses NL80211_ATTR_SCHED_SCAN_DELAY to add this via user global configurable option: sched_scan_start_delay. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2017-03-06 08:53:10 +01:00
"Starting sched scan after %u seconds: interval %u timeout %d",
params.sched_scan_start_delay,
Add support for configuring scheduled scan plans Add the option to configure scheduled scan plans in the config file. Each scan plan specifies the interval between scans and the number of scan iterations. The last plan will run infinitely and thus specifies only the interval between scan iterations. usage: sched_scan_plans=<interval:iterations> <interval2:iterations2> ... <interval> Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2015-11-17 14:08:24 +01:00
params.sched_scan_plans[0].interval,
wpa_s->sched_scan_timeout);
} else {
nl80211: Add option to delay start of schedule scan plans The userspace may want to delay the the first scheduled scan. This enhances sched_scan to add initial delay (in seconds) before starting first scan cycle. The driver may optionally choose to ignore this parameter and start immediately (or at any other time). This uses NL80211_ATTR_SCHED_SCAN_DELAY to add this via user global configurable option: sched_scan_start_delay. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2017-03-06 08:53:10 +01:00
wpa_dbg(wpa_s, MSG_DEBUG,
"Starting sched scan after %u seconds (no timeout)",
params.sched_scan_start_delay);
Make sched_scan debug clearer on timeout use Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-28 16:52:02 +01:00
}
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
Add band option (2.4 vs. 5) for filtering scans This can be used to implement filtering of channels for scan and based on that, for connection, purposes. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-09 06:28:13 +01:00
wpa_setband_scan_freqs(wpa_s, scan_params);
Use random MAC address for scanning only in non-connected state cfg80211 rejects the scans issued with random MAC address if the STA is in connected state. This resulted in failures when using MAC_RAND_SCAN while connected (CTRL-EVENT-SCAN-FAILED ret=-95). Enable random MAC address functionality only if the STA is not in connected state to avoid this. The real MAC address of the STA is already revealed in the association, so this is an acceptable fallback mechanism for now. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-11-21 13:10:36 +01:00
if ((wpa_s->mac_addr_rand_enable & MAC_ADDR_RAND_SCHED_SCAN) &&
Move ownership of MAC address randomization mask to scan params This array can be freed either from the scan parameters or from clearing the MAC address randomization parameters from the wpa_supplicant struct. To make this ownership more clear, we have each struct own its own copy of the parameters. Signed-off-by: Eric Caruso <ejcaruso@chromium.org>
2019-10-18 01:03:50 +02:00
wpa_s->wpa_state <= WPA_SCANNING)
wpa_setup_mac_addr_rand_params(&params,
wpa_s->mac_addr_sched_scan);
scan: Add MAC address randomization in scan handling 1. Supported MAC address randomization for scan. 2. Supported MAC address randomization for scheduled scan. 2. Supported MAC address randomization for pno. 4. Add functions to set and clear the MAC address randomization state variables. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-12-29 07:41:06 +01:00
Add support to sched scan to report relatively better BSSs Add support to set sched scan relative RSSI parameters so that the drivers can report BSSs after relative comparision with the current connected BSS. This feature is applicable only when in connected mode. The below commands can be used to configure relative RSSI parameters SET relative_rssi <disable|rssi_value> disable - to disable the feature rssi_value - amount of relative RSSI in dB SET relative_band_adjust <band:adjust_value> band - "2G" or "5G" for 2.4 GHz or 5 GHz respectively adjust_value - amount of RSSI to be adjusted in dB Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-11-15 10:42:44 +01:00
wpa_scan_set_relative_rssi_params(wpa_s, scan_params);
Add support for configuring scheduled scan plans Add the option to configure scheduled scan plans in the config file. Each scan plan specifies the interval between scans and the number of scan iterations. The last plan will run infinitely and thus specifies only the interval between scan iterations. usage: sched_scan_plans=<interval:iterations> <interval2:iterations2> ... <interval> Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2015-11-17 14:08:24 +01:00
ret = wpa_supplicant_start_sched_scan(wpa_s, scan_params);
Fix adding extra IEs in sched scan Refactoring done in commit 46ee0427b13d64dc4695fda24f4f228c99822c11 (IEEE 802.11u: Allow Interworking and HESSID to be configured) broke adding extra IEs in sched scan. The IEs stopped being added to the scan params within wpa_supplicant_extra_ies() but no code was added to add them in wpa_supplicant_req_sched_scan(). Fix this and remove unused params arg in wpa_supplicant_extra_ies(). Signed-hostap: Eyal Shapira <eyal@wizery.com> intended-for: hostap-1
2012-08-13 20:48:55 +02:00
wpabuf_free(extra_ie);
Add filter support to scheduled scans Pass SSIDs to be matched in scheduled scan results. Only the SSIDs that are included in the match lists will be reported by the driver, so the filtering can be offloaded to the hardware and the power consumption can be reduced. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:35 +02:00
os_free(params.filter_ssids);
Move ownership of MAC address randomization mask to scan params This array can be freed either from the scan parameters or from clearing the MAC address randomization parameters from the wpa_supplicant struct. To make this ownership more clear, we have each struct own its own copy of the parameters. Signed-off-by: Eric Caruso <ejcaruso@chromium.org>
2019-10-18 01:03:50 +02:00
os_free(params.mac_addr);
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
if (ret) {
wpa_msg(wpa_s, MSG_WARNING, "Failed to initiate sched scan");
if (prev_state != wpa_s->wpa_state)
wpa_supplicant_set_state(wpa_s, prev_state);
return ret;
}
/* If we have more SSIDs to scan, add a timeout so we scan them too */
if (ssid || !wpa_s->first_sched_scan) {
wpa_s->sched_scan_timed_out = 0;
eloop_register_timeout(wpa_s->sched_scan_timeout, 0,
wpa_supplicant_sched_scan_timeout,
wpa_s, NULL);
wpa_s->first_sched_scan = 0;
wpa_s->sched_scan_timeout /= 2;
Add support for configuring scheduled scan plans Add the option to configure scheduled scan plans in the config file. Each scan plan specifies the interval between scans and the number of scan iterations. The last plan will run infinitely and thus specifies only the interval between scan iterations. usage: sched_scan_plans=<interval:iterations> <interval2:iterations2> ... <interval> Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2015-11-17 14:08:24 +01:00
params.sched_scan_plans[0].interval *= 2;
if ((unsigned int) wpa_s->sched_scan_timeout <
params.sched_scan_plans[0].interval ||
params.sched_scan_plans[0].interval >
wpa_s->max_sched_scan_plan_interval) {
params.sched_scan_plans[0].interval = 10;
wpa_supplicant: Do not allow too short sched scan In case that the ssid list is longer than max number of ssids, ths scheduled scan aborted after timeout and rescheduled again with shorter timeout and longer interval. In case that the timeout is shorter than the interval, only one scan iteration will be run. In this case, go back to the initial values. Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-03-10 16:27:48 +01:00
wpa_s->sched_scan_timeout = max_sched_scan_ssids * 2;
}
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
}
wpa_supplicant: Save prev_sched_ssid only if needed If the whole ssid list was scanned, don't save the prev scheduled ssid since we are going to start from beginning. Thos avoids starting sched scan from prev_sched_ssid after scanning the full list, in case of adding a network to ssid during scheduled scan. Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-03-10 16:32:03 +01:00
/* If there is no more ssids, start next time from the beginning */
if (!ssid)
wpa_s->prev_sched_ssid = NULL;
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
return 0;
}
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
/**
* wpa_supplicant_cancel_scan - Cancel a scheduled scan request
* @wpa_s: Pointer to wpa_supplicant data
*
* This function is used to cancel a scan request scheduled with
* wpa_supplicant_req_scan().
*/
void wpa_supplicant_cancel_scan(struct wpa_supplicant *wpa_s)
{
Use wpa_msg() instead of wpa_printf() This converts number of debugging messages to use wpa_msg() in order to allow the interface name to be shown with the messages. A new function, wpa_dbg(), is introduced to allow CONFIG_NO_STDOUT_DEBUG=y builds to remove the debug strings. This is otherwise identical with wpa_msg(), but it gets compiled out if stdout debugging is disabled.
2011-02-10 19:14:46 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "Cancelling scan request");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
eloop_cancel_timeout(wpa_supplicant_scan, wpa_s, NULL);
}
dbus: add 'scanning' property When the supplicant is connected and performs a scan, it doesn't enter WPA_SCANNING state for various reasons. However, external programs still need to know that the supplicant is scanning since they may not wish to perform certain operations during a scan (as those operations will likely fail or yield incorrect results). Add a 'scanning' property and signal to the supplicant dbus interface to allow clients to synchronize better with the supplicant when it scans. Signed-off-by: Dan Williams <dcbw@redhat.com>
2009-05-27 20:06:40 +02:00
Cancel delayed scheduled scan when wpa_supplicant cleans up Because a delayed scheduled scan will access the members of struct wpa_supplicant which is freed and this can result in a crash, wpa_supplicant needs to cancel delayed scheduled scan during cleanups. Signed-hostap: Chengyi Zhao <chengyix.zhao@gmail.com>
2013-07-20 16:47:02 +02:00
/**
* wpa_supplicant_cancel_delayed_sched_scan - Stop a delayed scheduled scan
* @wpa_s: Pointer to wpa_supplicant data
*
* This function is used to stop a delayed scheduled scan.
*/
void wpa_supplicant_cancel_delayed_sched_scan(struct wpa_supplicant *wpa_s)
{
if (!wpa_s->sched_scan_supported)
return;
wpa_dbg(wpa_s, MSG_DEBUG, "Cancelling delayed sched scan");
eloop_cancel_timeout(wpa_supplicant_delayed_sched_scan_timeout,
wpa_s, NULL);
}
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
/**
* wpa_supplicant_cancel_sched_scan - Stop running scheduled scans
* @wpa_s: Pointer to wpa_supplicant data
*
* This function is used to stop a periodic scheduled scan.
*/
void wpa_supplicant_cancel_sched_scan(struct wpa_supplicant *wpa_s)
{
if (!wpa_s->sched_scanning)
return;
Continue scanning if sched_scan stops unexpectedly When scheduled scan stops without the interface request (for example, driver stopped it unexpectedly), start a regular scan to continue scanning for networks and avoid being left with no scan at all. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2016-09-05 16:32:59 +02:00
if (wpa_s->sched_scanning)
wpa_s->sched_scan_stop_req = 1;
Add scheduled scan driver operations In new Linux kernel versions (>=3.0), nl80211 adds scheduled scan capability. In order to use this feature to its full extent, we need to support it in the wpa_supplicant core, so that it can also be used by other drivers. This commit adds initial scheduled scan support operations and events. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:29 +02:00
wpa_dbg(wpa_s, MSG_DEBUG, "Cancelling sched scan");
eloop_cancel_timeout(wpa_supplicant_sched_scan_timeout, wpa_s, NULL);
wpa_supplicant_stop_sched_scan(wpa_s);
}
Add Doxygen documentation for functionality related to scanning Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 11:29:05 +01:00
/**
* wpa_supplicant_notify_scanning - Indicate possible scan state change
* @wpa_s: Pointer to wpa_supplicant data
* @scanning: Whether scanning is currently in progress
*
* This function is to generate scanning notifycations. It is called whenever
* there may have been a change in scanning (scan started, completed, stopped).
* wpas_notify_scanning() is called whenever the scanning state changed from the
* previously notified state.
*/
dbus: add 'scanning' property When the supplicant is connected and performs a scan, it doesn't enter WPA_SCANNING state for various reasons. However, external programs still need to know that the supplicant is scanning since they may not wish to perform certain operations during a scan (as those operations will likely fail or yield incorrect results). Add a 'scanning' property and signal to the supplicant dbus interface to allow clients to synchronize better with the supplicant when it scans. Signed-off-by: Dan Williams <dcbw@redhat.com>
2009-05-27 20:06:40 +02:00
void wpa_supplicant_notify_scanning(struct wpa_supplicant *wpa_s,
int scanning)
{
if (wpa_s->scanning != scanning) {
wpa_s->scanning = scanning;
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
wpas_notify_scanning(wpa_s);
dbus: add 'scanning' property When the supplicant is connected and performs a scan, it doesn't enter WPA_SCANNING state for various reasons. However, external programs still need to know that the supplicant is scanning since they may not wish to perform certain operations during a scan (as those operations will likely fail or yield incorrect results). Add a 'scanning' property and signal to the supplicant dbus interface to allow clients to synchronize better with the supplicant when it scans. Signed-off-by: Dan Williams <dcbw@redhat.com>
2009-05-27 20:06:40 +02:00
}
}
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
static int wpa_scan_get_max_rate(const struct wpa_scan_res *res)
{
int rate = 0;
const u8 *ie;
int i;
ie = wpa_scan_get_ie(res, WLAN_EID_SUPP_RATES);
for (i = 0; ie && i < ie[1]; i++) {
if ((ie[i + 2] & 0x7f) > rate)
rate = ie[i + 2] & 0x7f;
}
ie = wpa_scan_get_ie(res, WLAN_EID_EXT_SUPP_RATES);
for (i = 0; ie && i < ie[1]; i++) {
if ((ie[i + 2] & 0x7f) > rate)
rate = ie[i + 2] & 0x7f;
}
return rate;
}
Add Doxygen documentation for functionality related to scanning Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 11:29:05 +01:00
/**
* wpa_scan_get_ie - Fetch a specified information element from a scan result
* @res: Scan result entry
* @ie: Information element identitifier (WLAN_EID_*)
* Returns: Pointer to the information element (id field) or %NULL if not found
*
* This function returns the first matching information element in the scan
* result.
*/
Remove src/drivers/scan_helpers.c Most of this file was already moved into wpa_supplicant/scan.c and we can remove the file completely by having couple of small helper functions copied to the remaining users outside core wpa_supplicant code.
2010-01-03 19:27:32 +01:00
const u8 * wpa_scan_get_ie(const struct wpa_scan_res *res, u8 ie)
{
wpa_supplicant: Get scan_result IE also from Beacon frames No reason to require ie_len if only beacon_ie_len is given. Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
2016-10-27 14:18:26 +02:00
size_t ie_len = res->ie_len;
/* Use the Beacon frame IEs if res->ie_len is not available */
if (!ie_len)
ie_len = res->beacon_ie_len;
return get_ie((const u8 *) (res + 1), ie_len, ie);
Remove src/drivers/scan_helpers.c Most of this file was already moved into wpa_supplicant/scan.c and we can remove the file completely by having couple of small helper functions copied to the remaining users outside core wpa_supplicant code.
2010-01-03 19:27:32 +01:00
}
Add Doxygen documentation for functionality related to scanning Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 11:29:05 +01:00
/**
* wpa_scan_get_vendor_ie - Fetch vendor information element from a scan result
* @res: Scan result entry
* @vendor_type: Vendor type (four octets starting the IE payload)
* Returns: Pointer to the information element (id field) or %NULL if not found
*
* This function returns the first matching information element in the scan
* result.
*/
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
const u8 * wpa_scan_get_vendor_ie(const struct wpa_scan_res *res,
u32 vendor_type)
{
BSS/scan: More conversions to for_each_element_id() Use the common IE parsing routine in hope of trying to make the length checks easier for static analyzers. In addition, try to make the *_vendor_ie_multi() cases easier to analyze as well even though they cannot use for_each_element_id(). Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
2020-11-04 18:50:34 +01:00
const u8 *ies;
const struct element *elem;
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
BSS/scan: More conversions to for_each_element_id() Use the common IE parsing routine in hope of trying to make the length checks easier for static analyzers. In addition, try to make the *_vendor_ie_multi() cases easier to analyze as well even though they cannot use for_each_element_id(). Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
2020-11-04 18:50:34 +01:00
ies = (const u8 *) (res + 1);
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
BSS/scan: More conversions to for_each_element_id() Use the common IE parsing routine in hope of trying to make the length checks easier for static analyzers. In addition, try to make the *_vendor_ie_multi() cases easier to analyze as well even though they cannot use for_each_element_id(). Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
2020-11-04 18:50:34 +01:00
for_each_element_id(elem, WLAN_EID_VENDOR_SPECIFIC, ies, res->ie_len) {
if (elem->datalen >= 4 &&
vendor_type == WPA_GET_BE32(elem->data))
return &elem->id;
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
}
return NULL;
}
P2P: Allow GO to be discovered based on Beacon frame This fixes some P2P-join-a-group cases where GO may have been discovered based on passive scan or non-P2P scan. P2P IEs may have been received from a Beacon frame in such a case and that information can be used to create a P2P peer entry, e.g., to allow provision discovery exchange to be completed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-14 18:25:28 +02:00
/**
* wpa_scan_get_vendor_ie_beacon - Fetch vendor information from a scan result
* @res: Scan result entry
* @vendor_type: Vendor type (four octets starting the IE payload)
* Returns: Pointer to the information element (id field) or %NULL if not found
*
* This function returns the first matching information element in the scan
* result.
*
* This function is like wpa_scan_get_vendor_ie(), but uses IE buffer only
* from Beacon frames instead of either Beacon or Probe Response frames.
*/
const u8 * wpa_scan_get_vendor_ie_beacon(const struct wpa_scan_res *res,
u32 vendor_type)
{
BSS/scan: More conversions to for_each_element_id() Use the common IE parsing routine in hope of trying to make the length checks easier for static analyzers. In addition, try to make the *_vendor_ie_multi() cases easier to analyze as well even though they cannot use for_each_element_id(). Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
2020-11-04 18:50:34 +01:00
const u8 *ies;
const struct element *elem;
P2P: Allow GO to be discovered based on Beacon frame This fixes some P2P-join-a-group cases where GO may have been discovered based on passive scan or non-P2P scan. P2P IEs may have been received from a Beacon frame in such a case and that information can be used to create a P2P peer entry, e.g., to allow provision discovery exchange to be completed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-14 18:25:28 +02:00
if (res->beacon_ie_len == 0)
return NULL;
BSS/scan: More conversions to for_each_element_id() Use the common IE parsing routine in hope of trying to make the length checks easier for static analyzers. In addition, try to make the *_vendor_ie_multi() cases easier to analyze as well even though they cannot use for_each_element_id(). Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
2020-11-04 18:50:34 +01:00
ies = (const u8 *) (res + 1);
ies += res->ie_len;
P2P: Allow GO to be discovered based on Beacon frame This fixes some P2P-join-a-group cases where GO may have been discovered based on passive scan or non-P2P scan. P2P IEs may have been received from a Beacon frame in such a case and that information can be used to create a P2P peer entry, e.g., to allow provision discovery exchange to be completed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-14 18:25:28 +02:00
BSS/scan: More conversions to for_each_element_id() Use the common IE parsing routine in hope of trying to make the length checks easier for static analyzers. In addition, try to make the *_vendor_ie_multi() cases easier to analyze as well even though they cannot use for_each_element_id(). Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
2020-11-04 18:50:34 +01:00
for_each_element_id(elem, WLAN_EID_VENDOR_SPECIFIC, ies,
res->beacon_ie_len) {
if (elem->datalen >= 4 &&
vendor_type == WPA_GET_BE32(elem->data))
return &elem->id;
P2P: Allow GO to be discovered based on Beacon frame This fixes some P2P-join-a-group cases where GO may have been discovered based on passive scan or non-P2P scan. P2P IEs may have been received from a Beacon frame in such a case and that information can be used to create a P2P peer entry, e.g., to allow provision discovery exchange to be completed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-14 18:25:28 +02:00
}
return NULL;
}
Add Doxygen documentation for functionality related to scanning Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 11:29:05 +01:00
/**
* wpa_scan_get_vendor_ie_multi - Fetch vendor IE data from a scan result
* @res: Scan result entry
* @vendor_type: Vendor type (four octets starting the IE payload)
* Returns: Pointer to the information element payload or %NULL if not found
*
* This function returns concatenated payload of possibly fragmented vendor
* specific information elements in the scan result. The caller is responsible
* for freeing the returned buffer.
*/
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
struct wpabuf * wpa_scan_get_vendor_ie_multi(const struct wpa_scan_res *res,
u32 vendor_type)
{
struct wpabuf *buf;
const u8 *end, *pos;
buf = wpabuf_alloc(res->ie_len);
if (buf == NULL)
return NULL;
pos = (const u8 *) (res + 1);
end = pos + res->ie_len;
Avoid undefined behavior in pointer arithmetic in scan result IE parsing Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 10:52:32 +02:00
while (end - pos > 1) {
BSS/scan: More conversions to for_each_element_id() Use the common IE parsing routine in hope of trying to make the length checks easier for static analyzers. In addition, try to make the *_vendor_ie_multi() cases easier to analyze as well even though they cannot use for_each_element_id(). Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
2020-11-04 18:50:34 +01:00
u8 ie, len;
ie = pos[0];
len = pos[1];
if (len > end - pos - 2)
WPS 2.0: Validate WPS attributes in management frames and WSC messages If CONFIG_WPS_STRICT is set, validate WPS IE(s) in management frames and reject the frames if any of the mandatory attributes is missing or if an included attribute uses an invalid value. In addition, verify that all mandatory attributes are included and have valid values in the WSC messages.
2010-05-26 16:16:14 +02:00
break;
BSS/scan: More conversions to for_each_element_id() Use the common IE parsing routine in hope of trying to make the length checks easier for static analyzers. In addition, try to make the *_vendor_ie_multi() cases easier to analyze as well even though they cannot use for_each_element_id(). Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
2020-11-04 18:50:34 +01:00
pos += 2;
if (ie == WLAN_EID_VENDOR_SPECIFIC && len >= 4 &&
vendor_type == WPA_GET_BE32(pos))
wpabuf_put_data(buf, pos + 4, len - 4);
pos += len;
WPS 2.0: Validate WPS attributes in management frames and WSC messages If CONFIG_WPS_STRICT is set, validate WPS IE(s) in management frames and reject the frames if any of the mandatory attributes is missing or if an included attribute uses an invalid value. In addition, verify that all mandatory attributes are included and have valid values in the WSC messages.
2010-05-26 16:16:14 +02:00
}
if (wpabuf_len(buf) == 0) {
wpabuf_free(buf);
buf = NULL;
}
return buf;
}
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
/* Compare function for sorting scan results. Return >0 if @b is considered
* better. */
static int wpa_scan_result_compar(const void *a, const void *b)
{
Prefer 5 GHz networks over 2.4 GHz networks In scan.c, merge a channel's noise value into the scan results. When comparing scan results, compute the signal-to-noise ratio and use it when available. Prefer a 5 GHz network if its SNR is really big (> 30) or if its SNR is relatively close to the other network's.
2011-08-06 01:23:12 +02:00
#define MIN(a,b) a < b ? a : b
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
struct wpa_scan_res **_wa = (void *) a;
struct wpa_scan_res **_wb = (void *) b;
struct wpa_scan_res *wa = *_wa;
struct wpa_scan_res *wb = *_wb;
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
int wpa_a, wpa_b;
int snr_a, snr_b, snr_a_full, snr_b_full;
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
/* WPA/WPA2 support preferred */
wpa_a = wpa_scan_get_vendor_ie(wa, WPA_IE_VENDOR_TYPE) != NULL ||
wpa_scan_get_ie(wa, WLAN_EID_RSN) != NULL;
wpa_b = wpa_scan_get_vendor_ie(wb, WPA_IE_VENDOR_TYPE) != NULL ||
wpa_scan_get_ie(wb, WLAN_EID_RSN) != NULL;
if (wpa_b && !wpa_a)
return 1;
if (!wpa_b && wpa_a)
return -1;
/* privacy support preferred */
if ((wa->caps & IEEE80211_CAP_PRIVACY) == 0 &&
(wb->caps & IEEE80211_CAP_PRIVACY))
return 1;
if ((wa->caps & IEEE80211_CAP_PRIVACY) &&
(wb->caps & IEEE80211_CAP_PRIVACY) == 0)
return -1;
Improve BSS selection with default noise floor values When noise floor measurements are not available, compute SNR using default values for the noise floor. This helps steer us towards 5 GHz BSSes in high signal strength environments. In more detail... Existing code prefers a 5 GHz BSS when the 5 GHz BSS's signal strength is "close" to that of the 2.4 GHz BSS, or when both SNRs are large. However, the mwifiex driver does not provide noise floor measurements, so we can't compute SNRs. Because mwifiex doesn't provide NF measurements, the "large SNR" code wasn't effective. By using default values for the noise floor, we can again compute SNRs, and decide that the SNR is high enough that we shouldn't worry about the exact difference in SNR. The default noise floor values (one for 2.4 GHz, and one for 5 GHz) were chosen by measurement in a noisy environment, so they should be conservative. Note that while this patch is motivated by mwifiex, it affects ath9k as well. Although ath9k provides noise floor measurements in general, it will sometimes fail to provide a measurement for one or more specific channels. As a result of this patch, we'll always compare BSSes based on SNR (either measured or estimated), rather than sometimes comparing based on signal strength. ("Always" assumes that the WPA_SCAN_LEVEL_DBM flag is set. It is for mwifiex and ath9k.) While there: - fix a whitespace issue (spaces -> tab) - clean up existing comments - update dump_scan_res to indicate whether the noise floor is measured, or default Signed-hostap: mukesh agrawal <quiche@chromium.org>
2014-04-09 02:54:49 +02:00
if (wa->flags & wb->flags & WPA_SCAN_LEVEL_DBM) {
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
snr_a_full = wa->snr;
snr_a = MIN(wa->snr, GREAT_SNR);
snr_b_full = wb->snr;
wpa_supplicant: Fix a typo in wpa_scan_result_compar() A typo in wpa_scan_result_compar() caused wrong scan results sorting (and wrong roaming decision). This fixes a copy-paste regression introduced by commit a1b790eb9d7514d1a6e0582a07f695a1564caa59 ('Select AP based on estimated maximum throughput'). Signed-off-by: Maital Hahn <maitalm@ti.com>
2015-07-08 15:13:11 +02:00
snr_b = MIN(wb->snr, GREAT_SNR);
Prefer 5 GHz networks over 2.4 GHz networks In scan.c, merge a channel's noise value into the scan results. When comparing scan results, compute the signal-to-noise ratio and use it when available. Prefer a 5 GHz network if its SNR is really big (> 30) or if its SNR is relatively close to the other network's.
2011-08-06 01:23:12 +02:00
} else {
Improve BSS selection with default noise floor values When noise floor measurements are not available, compute SNR using default values for the noise floor. This helps steer us towards 5 GHz BSSes in high signal strength environments. In more detail... Existing code prefers a 5 GHz BSS when the 5 GHz BSS's signal strength is "close" to that of the 2.4 GHz BSS, or when both SNRs are large. However, the mwifiex driver does not provide noise floor measurements, so we can't compute SNRs. Because mwifiex doesn't provide NF measurements, the "large SNR" code wasn't effective. By using default values for the noise floor, we can again compute SNRs, and decide that the SNR is high enough that we shouldn't worry about the exact difference in SNR. The default noise floor values (one for 2.4 GHz, and one for 5 GHz) were chosen by measurement in a noisy environment, so they should be conservative. Note that while this patch is motivated by mwifiex, it affects ath9k as well. Although ath9k provides noise floor measurements in general, it will sometimes fail to provide a measurement for one or more specific channels. As a result of this patch, we'll always compare BSSes based on SNR (either measured or estimated), rather than sometimes comparing based on signal strength. ("Always" assumes that the WPA_SCAN_LEVEL_DBM flag is set. It is for mwifiex and ath9k.) While there: - fix a whitespace issue (spaces -> tab) - clean up existing comments - update dump_scan_res to indicate whether the noise floor is measured, or default Signed-hostap: mukesh agrawal <quiche@chromium.org>
2014-04-09 02:54:49 +02:00
/* Level is not in dBm, so we can't calculate
* SNR. Just use raw level (units unknown). */
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
snr_a = snr_a_full = wa->level;
snr_b = snr_b_full = wb->level;
Prefer 5 GHz networks over 2.4 GHz networks In scan.c, merge a channel's noise value into the scan results. When comparing scan results, compute the signal-to-noise ratio and use it when available. Prefer a 5 GHz network if its SNR is really big (> 30) or if its SNR is relatively close to the other network's.
2011-08-06 01:23:12 +02:00
}
Improve BSS selection with default noise floor values When noise floor measurements are not available, compute SNR using default values for the noise floor. This helps steer us towards 5 GHz BSSes in high signal strength environments. In more detail... Existing code prefers a 5 GHz BSS when the 5 GHz BSS's signal strength is "close" to that of the 2.4 GHz BSS, or when both SNRs are large. However, the mwifiex driver does not provide noise floor measurements, so we can't compute SNRs. Because mwifiex doesn't provide NF measurements, the "large SNR" code wasn't effective. By using default values for the noise floor, we can again compute SNRs, and decide that the SNR is high enough that we shouldn't worry about the exact difference in SNR. The default noise floor values (one for 2.4 GHz, and one for 5 GHz) were chosen by measurement in a noisy environment, so they should be conservative. Note that while this patch is motivated by mwifiex, it affects ath9k as well. Although ath9k provides noise floor measurements in general, it will sometimes fail to provide a measurement for one or more specific channels. As a result of this patch, we'll always compare BSSes based on SNR (either measured or estimated), rather than sometimes comparing based on signal strength. ("Always" assumes that the WPA_SCAN_LEVEL_DBM flag is set. It is for mwifiex and ath9k.) While there: - fix a whitespace issue (spaces -> tab) - clean up existing comments - update dump_scan_res to indicate whether the noise floor is measured, or default Signed-hostap: mukesh agrawal <quiche@chromium.org>
2014-04-09 02:54:49 +02:00
/* if SNR is close, decide by max rate or frequency band */
Use throughput estimate-based BSS selection with larger SNR difference Previously, the est_throughput comparison was done only when SNR difference was less than 5 dB. Since the throughput estimation take into account SNR, this can be done in more cases. For now, add a conservative 2 dB more to the difference so that any SNR difference below 7 dB results in BSS selection based on throughput estimates. In addition, the throughput estimates require SNR values to be available, so separate this from the 5 GHz preference that can be done based on either SNR or qual values. Signed-off-by: Jouni Malinen <j@w1.fi>
2017-02-16 10:09:04 +01:00
if (snr_a && snr_b && abs(snr_b - snr_a) < 7) {
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
if (wa->est_throughput != wb->est_throughput)
UBSan: Avoid unsigned integer overflow is throughput estimation wpa_scan_result_compar() would return wb->est_throughput - wa->est_throughput in case the comparison is done based on the throughput estimates. While the return value from this function is a signed integer, these est_throughput values are unsigned integers and need to be explicitly typecast to avoid an UBSan warning. scan.c:1996:30: runtime error: unsigned integer overflow: 54000 - 135000 cannot be represented in type 'unsigned int' Signed-off-by: Jouni Malinen <j@w1.fi>
2019-02-23 11:42:20 +01:00
return (int) wb->est_throughput -
(int) wa->est_throughput;
Use throughput estimate-based BSS selection with larger SNR difference Previously, the est_throughput comparison was done only when SNR difference was less than 5 dB. Since the throughput estimation take into account SNR, this can be done in more cases. For now, add a conservative 2 dB more to the difference so that any SNR difference below 7 dB results in BSS selection based on throughput estimates. In addition, the throughput estimates require SNR values to be available, so separate this from the 5 GHz preference that can be done based on either SNR or qual values. Signed-off-by: Jouni Malinen <j@w1.fi>
2017-02-16 10:09:04 +01:00
}
if ((snr_a && snr_b && abs(snr_b - snr_a) < 5) ||
(wa->qual && wb->qual && abs(wb->qual - wa->qual) < 10)) {
Prefer 5 GHz networks over 2.4 GHz networks In scan.c, merge a channel's noise value into the scan results. When comparing scan results, compute the signal-to-noise ratio and use it when available. Prefer a 5 GHz network if its SNR is really big (> 30) or if its SNR is relatively close to the other network's.
2011-08-06 01:23:12 +02:00
if (IS_5GHZ(wa->freq) ^ IS_5GHZ(wb->freq))
return IS_5GHZ(wa->freq) ? -1 : 1;
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
}
Prefer 5 GHz networks over 2.4 GHz networks In scan.c, merge a channel's noise value into the scan results. When comparing scan results, compute the signal-to-noise ratio and use it when available. Prefer a 5 GHz network if its SNR is really big (> 30) or if its SNR is relatively close to the other network's.
2011-08-06 01:23:12 +02:00
/* all things being equal, use SNR; if SNRs are
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
* identical, use quality values since some drivers may only report
* that value and leave the signal level zero */
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
if (snr_b_full == snr_a_full)
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
return wb->qual - wa->qual;
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
return snr_b_full - snr_a_full;
Prefer 5 GHz networks over 2.4 GHz networks In scan.c, merge a channel's noise value into the scan results. When comparing scan results, compute the signal-to-noise ratio and use it when available. Prefer a 5 GHz network if its SNR is really big (> 30) or if its SNR is relatively close to the other network's.
2011-08-06 01:23:12 +02:00
#undef MIN
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
}
WPS: Use different scan result sorting rules when doing WPS provisioning The AP configuration may change after provisioning, so it is better not to use the current security policy to prioritize results. Instead, use WPS Selected Registrar attribute as the main sorting key and use signal strength next without considering security policy or rate sets. The non-WPS provisioning case remains as-is, i.e., this change applies only when trying to find an AP for WPS provisioning.
2010-06-11 22:50:13 +02:00
#ifdef CONFIG_WPS
/* Compare function for sorting scan results when searching a WPS AP for
* provisioning. Return >0 if @b is considered better. */
static int wpa_scan_result_wps_compar(const void *a, const void *b)
{
struct wpa_scan_res **_wa = (void *) a;
struct wpa_scan_res **_wb = (void *) b;
struct wpa_scan_res *wa = *_wa;
struct wpa_scan_res *wb = *_wb;
int uses_wps_a, uses_wps_b;
struct wpabuf *wps_a, *wps_b;
int res;
/* Optimization - check WPS IE existence before allocated memory and
* doing full reassembly. */
uses_wps_a = wpa_scan_get_vendor_ie(wa, WPS_IE_VENDOR_TYPE) != NULL;
uses_wps_b = wpa_scan_get_vendor_ie(wb, WPS_IE_VENDOR_TYPE) != NULL;
if (uses_wps_a && !uses_wps_b)
return -1;
if (!uses_wps_a && uses_wps_b)
return 1;
if (uses_wps_a && uses_wps_b) {
wps_a = wpa_scan_get_vendor_ie_multi(wa, WPS_IE_VENDOR_TYPE);
wps_b = wpa_scan_get_vendor_ie_multi(wb, WPS_IE_VENDOR_TYPE);
res = wps_ap_priority_compar(wps_a, wps_b);
wpabuf_free(wps_a);
wpabuf_free(wps_b);
if (res)
return res;
}
/*
* Do not use current AP security policy as a sorting criteria during
* WPS provisioning step since the AP may get reconfigured at the
* completion of provisioning.
*/
/* all things being equal, use signal level; if signal levels are
* identical, use quality values since some drivers may only report
* that value and leave the signal level zero */
if (wb->level == wa->level)
return wb->qual - wa->qual;
return wb->level - wa->level;
}
#endif /* CONFIG_WPS */
Clean up debug dump for scan results sorting There is not much need for showing the interim qsort steps, so just show the ordered results. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-10-30 19:33:08 +01:00
static void dump_scan_res(struct wpa_scan_results *scan_res)
{
Fix compiler warning with CONFIG_NO_STDOUT_DEBUG=y Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-11 17:13:51 +01:00
#ifndef CONFIG_NO_STDOUT_DEBUG
Clean up debug dump for scan results sorting There is not much need for showing the interim qsort steps, so just show the ordered results. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-10-30 19:33:08 +01:00
size_t i;
if (scan_res->res == NULL || scan_res->num == 0)
return;
wpa_printf(MSG_EXCESSIVE, "Sorted scan results");
for (i = 0; i < scan_res->num; i++) {
struct wpa_scan_res *r = scan_res->res[i];
Add debug prints of scan result IEs Excessive debug level can now be used to dump the IEs received in scan results from both Beacon and Probe Response frames. This makes it easier to debug issues where the driver (or well, more likely cfg80211) does not update the IEs based on Beacon frames if even a single Probe Response frame has been received. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-11 14:30:05 +02:00
u8 *pos;
Improve BSS selection with default noise floor values When noise floor measurements are not available, compute SNR using default values for the noise floor. This helps steer us towards 5 GHz BSSes in high signal strength environments. In more detail... Existing code prefers a 5 GHz BSS when the 5 GHz BSS's signal strength is "close" to that of the 2.4 GHz BSS, or when both SNRs are large. However, the mwifiex driver does not provide noise floor measurements, so we can't compute SNRs. Because mwifiex doesn't provide NF measurements, the "large SNR" code wasn't effective. By using default values for the noise floor, we can again compute SNRs, and decide that the SNR is high enough that we shouldn't worry about the exact difference in SNR. The default noise floor values (one for 2.4 GHz, and one for 5 GHz) were chosen by measurement in a noisy environment, so they should be conservative. Note that while this patch is motivated by mwifiex, it affects ath9k as well. Although ath9k provides noise floor measurements in general, it will sometimes fail to provide a measurement for one or more specific channels. As a result of this patch, we'll always compare BSSes based on SNR (either measured or estimated), rather than sometimes comparing based on signal strength. ("Always" assumes that the WPA_SCAN_LEVEL_DBM flag is set. It is for mwifiex and ath9k.) While there: - fix a whitespace issue (spaces -> tab) - clean up existing comments - update dump_scan_res to indicate whether the noise floor is measured, or default Signed-hostap: mukesh agrawal <quiche@chromium.org>
2014-04-09 02:54:49 +02:00
if (r->flags & WPA_SCAN_LEVEL_DBM) {
int noise_valid = !(r->flags & WPA_SCAN_NOISE_INVALID);
Clean up debug dump for scan results sorting There is not much need for showing the interim qsort steps, so just show the ordered results. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-10-30 19:33:08 +01:00
wpa_printf(MSG_EXCESSIVE, MACSTR " freq=%d qual=%d "
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
"noise=%d%s level=%d snr=%d%s flags=0x%x age=%u est=%u",
Clean up debug dump for scan results sorting There is not much need for showing the interim qsort steps, so just show the ordered results. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-10-30 19:33:08 +01:00
MAC2STR(r->bssid), r->freq, r->qual,
Improve BSS selection with default noise floor values When noise floor measurements are not available, compute SNR using default values for the noise floor. This helps steer us towards 5 GHz BSSes in high signal strength environments. In more detail... Existing code prefers a 5 GHz BSS when the 5 GHz BSS's signal strength is "close" to that of the 2.4 GHz BSS, or when both SNRs are large. However, the mwifiex driver does not provide noise floor measurements, so we can't compute SNRs. Because mwifiex doesn't provide NF measurements, the "large SNR" code wasn't effective. By using default values for the noise floor, we can again compute SNRs, and decide that the SNR is high enough that we shouldn't worry about the exact difference in SNR. The default noise floor values (one for 2.4 GHz, and one for 5 GHz) were chosen by measurement in a noisy environment, so they should be conservative. Note that while this patch is motivated by mwifiex, it affects ath9k as well. Although ath9k provides noise floor measurements in general, it will sometimes fail to provide a measurement for one or more specific channels. As a result of this patch, we'll always compare BSSes based on SNR (either measured or estimated), rather than sometimes comparing based on signal strength. ("Always" assumes that the WPA_SCAN_LEVEL_DBM flag is set. It is for mwifiex and ath9k.) While there: - fix a whitespace issue (spaces -> tab) - clean up existing comments - update dump_scan_res to indicate whether the noise floor is measured, or default Signed-hostap: mukesh agrawal <quiche@chromium.org>
2014-04-09 02:54:49 +02:00
r->noise, noise_valid ? "" : "~", r->level,
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
r->snr, r->snr >= GREAT_SNR ? "*" : "",
r->flags,
r->age, r->est_throughput);
Clean up debug dump for scan results sorting There is not much need for showing the interim qsort steps, so just show the ordered results. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-10-30 19:33:08 +01:00
} else {
wpa_printf(MSG_EXCESSIVE, MACSTR " freq=%d qual=%d "
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
"noise=%d level=%d flags=0x%x age=%u est=%u",
Clean up debug dump for scan results sorting There is not much need for showing the interim qsort steps, so just show the ordered results. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-10-30 19:33:08 +01:00
MAC2STR(r->bssid), r->freq, r->qual,
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
r->noise, r->level, r->flags, r->age,
r->est_throughput);
Clean up debug dump for scan results sorting There is not much need for showing the interim qsort steps, so just show the ordered results. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-10-30 19:33:08 +01:00
}
Add debug prints of scan result IEs Excessive debug level can now be used to dump the IEs received in scan results from both Beacon and Probe Response frames. This makes it easier to debug issues where the driver (or well, more likely cfg80211) does not update the IEs based on Beacon frames if even a single Probe Response frame has been received. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-11 14:30:05 +02:00
pos = (u8 *) (r + 1);
if (r->ie_len)
wpa_hexdump(MSG_EXCESSIVE, "IEs", pos, r->ie_len);
pos += r->ie_len;
if (r->beacon_ie_len)
wpa_hexdump(MSG_EXCESSIVE, "Beacon IEs",
pos, r->beacon_ie_len);
Clean up debug dump for scan results sorting There is not much need for showing the interim qsort steps, so just show the ordered results. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-10-30 19:33:08 +01:00
}
Fix compiler warning with CONFIG_NO_STDOUT_DEBUG=y Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-11 17:13:51 +01:00
#endif /* CONFIG_NO_STDOUT_DEBUG */
Clean up debug dump for scan results sorting There is not much need for showing the interim qsort steps, so just show the ordered results. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-10-30 19:33:08 +01:00
}
Add Doxygen documentation for functionality related to scanning Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 11:29:05 +01:00
/**
* wpa_supplicant_filter_bssid_match - Is the specified BSSID allowed
* @wpa_s: Pointer to wpa_supplicant data
* @bssid: BSSID to check
* Returns: 0 if the BSSID is filtered or 1 if not
*
* This function is used to filter out specific BSSIDs from scan reslts mainly
* for testing purposes (SET bssid_filter ctrl_iface command).
*/
Add BSSID filter for testing purposes wpa_supplicant can now be configured to filter out scan results based on a BSSID filter. Space-separated set of allowed BSSIDs can be set with wpa_cli set bssid_filter command. Filtering mechanism can be disabled by setting this variable to an empty list. When set, only the BSSes that have a matching entry in this list will be accepted from scan results. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:30:13 +01:00
int wpa_supplicant_filter_bssid_match(struct wpa_supplicant *wpa_s,
const u8 *bssid)
{
size_t i;
if (wpa_s->bssid_filter == NULL)
return 1;
for (i = 0; i < wpa_s->bssid_filter_count; i++) {
if (os_memcmp(wpa_s->bssid_filter + i * ETH_ALEN, bssid,
ETH_ALEN) == 0)
return 1;
}
return 0;
}
WNM: Fetch scan results before checking transition candidates On receiving a WNM BSS Transition Management Request frame with a candidate list, fetch the latest scan results from the kernel to see if there are any recent scan results for the candidates and initiate a connection if found. This helps to avoid triggering a new scan in cases where a scan initiated by something else (e.g., an internal beacon measurement report functionality in a driver) has processed Beacon or Probe Response frames without wpa_supplicant having received a notification of such an update yet. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-04-21 13:29:56 +02:00
void filter_scan_res(struct wpa_supplicant *wpa_s,
struct wpa_scan_results *res)
Add BSSID filter for testing purposes wpa_supplicant can now be configured to filter out scan results based on a BSSID filter. Space-separated set of allowed BSSIDs can be set with wpa_cli set bssid_filter command. Filtering mechanism can be disabled by setting this variable to an empty list. When set, only the BSSes that have a matching entry in this list will be accepted from scan results. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:30:13 +01:00
{
size_t i, j;
if (wpa_s->bssid_filter == NULL)
return;
for (i = 0, j = 0; i < res->num; i++) {
if (wpa_supplicant_filter_bssid_match(wpa_s,
res->res[i]->bssid)) {
res->res[j++] = res->res[i];
} else {
os_free(res->res[i]);
res->res[i] = NULL;
}
}
if (res->num != j) {
wpa_printf(MSG_DEBUG, "Filtered out %d scan results",
(int) (res->num - j));
res->num = j;
}
}
WNM: Fetch scan results before checking transition candidates On receiving a WNM BSS Transition Management Request frame with a candidate list, fetch the latest scan results from the kernel to see if there are any recent scan results for the candidates and initiate a connection if found. This helps to avoid triggering a new scan in cases where a scan initiated by something else (e.g., an internal beacon measurement report functionality in a driver) has processed Beacon or Probe Response frames without wpa_supplicant having received a notification of such an update yet. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-04-21 13:29:56 +02:00
void scan_snr(struct wpa_scan_res *res)
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
{
if (res->flags & WPA_SCAN_NOISE_INVALID) {
res->noise = IS_5GHZ(res->freq) ?
DEFAULT_NOISE_FLOOR_5GHZ :
DEFAULT_NOISE_FLOOR_2GHZ;
}
if (res->flags & WPA_SCAN_LEVEL_DBM) {
res->snr = res->level - res->noise;
} else {
/* Level is not in dBm, so we can't calculate
* SNR. Just use raw level (units unknown). */
res->snr = res->level;
}
}
Use lookup-table instead of macro for TX rate estimates Change INTERPOLATE_RATE() macro to a lookup-table instead for the sake of readability. Signed-off-by: Matthew Wang <matthewmwang@chromium.org>
2020-06-02 02:10:13 +02:00
/* Minimum SNR required to achieve a certain bitrate. */
struct minsnr_bitrate_entry {
int minsnr;
unsigned int bitrate; /* in Mbps */
};
/* VHT needs to be enabled in order to achieve MCS8 and MCS9 rates. */
static const int vht_mcs = 8;
static const struct minsnr_bitrate_entry vht20_table[] = {
{ 0, 0 },
{ 2, 6500 }, /* HT20 MCS0 */
{ 5, 13000 }, /* HT20 MCS1 */
{ 9, 19500 }, /* HT20 MCS2 */
{ 11, 26000 }, /* HT20 MCS3 */
{ 15, 39000 }, /* HT20 MCS4 */
{ 18, 52000 }, /* HT20 MCS5 */
{ 20, 58500 }, /* HT20 MCS6 */
{ 25, 65000 }, /* HT20 MCS7 */
{ 29, 78000 }, /* VHT20 MCS8 */
{ -1, 78000 } /* SNR > 29 */
};
static const struct minsnr_bitrate_entry vht40_table[] = {
{ 0, 0 },
{ 5, 13500 }, /* HT40 MCS0 */
{ 8, 27000 }, /* HT40 MCS1 */
{ 12, 40500 }, /* HT40 MCS2 */
{ 14, 54000 }, /* HT40 MCS3 */
{ 18, 81000 }, /* HT40 MCS4 */
{ 21, 108000 }, /* HT40 MCS5 */
{ 23, 121500 }, /* HT40 MCS6 */
{ 28, 135000 }, /* HT40 MCS7 */
{ 32, 162000 }, /* VHT40 MCS8 */
{ 34, 180000 }, /* VHT40 MCS9 */
{ -1, 180000 } /* SNR > 34 */
};
static const struct minsnr_bitrate_entry vht80_table[] = {
{ 0, 0 },
{ 8, 29300 }, /* VHT80 MCS0 */
{ 11, 58500 }, /* VHT80 MCS1 */
{ 15, 87800 }, /* VHT80 MCS2 */
{ 17, 117000 }, /* VHT80 MCS3 */
{ 21, 175500 }, /* VHT80 MCS4 */
{ 24, 234000 }, /* VHT80 MCS5 */
{ 26, 263300 }, /* VHT80 MCS6 */
{ 31, 292500 }, /* VHT80 MCS7 */
{ 35, 351000 }, /* VHT80 MCS8 */
{ 37, 390000 }, /* VHT80 MCS9 */
{ -1, 390000 } /* SNR > 37 */
};
Interpolate rate calculation functions Make max_*_rate() functions and rate calculation at the beginning of wpas_get_est_tpt() more continuous. In wpa_supplicant_need_to_roam(), we compare these values to make a roaming decision. However, at certain SNRs, we see unrealistically large jumps in estimated throughput according to these functions, leading us to make incorrect roaming decisions. Perform linear interpolation where applicable to more accurately reflect actual throughput. Example: wlan0: Current BSS: 88:3d:24:b4:95:d2 freq=2412 level=-69 snr=20 est_throughput=54000 wlan0: Selected BSS: 88:3d:24:b4:89:9e freq=2417 level=-67 snr=22 est_throughput=63500 wlan0: Using signal poll values for the current BSS: level=-69 snr=20 est_throughput=54000 wlan0: Allow reassociation - selected BSS has better estimated throughput 2 dB increase in RSSI likely isn't responsible for a 17% increase in throughput. Signed-off-by: Matthew Wang <matthewmwang@chromium.org>
2020-03-16 22:11:06 +01:00
static unsigned int interpolate_rate(int snr, int snr0, int snr1,
int rate0, int rate1)
{
return rate0 + (snr - snr0) * (rate1 - rate0) / (snr1 - snr0);
}
Use lookup-table instead of macro for TX rate estimates Change INTERPOLATE_RATE() macro to a lookup-table instead for the sake of readability. Signed-off-by: Matthew Wang <matthewmwang@chromium.org>
2020-06-02 02:10:13 +02:00
static unsigned int max_rate(const struct minsnr_bitrate_entry table[],
Convert int to bool for throughput estimate tables Signed-off-by: Jouni Malinen <j@w1.fi>
2020-06-19 16:28:25 +02:00
int snr, bool vht)
Use lookup-table instead of macro for TX rate estimates Change INTERPOLATE_RATE() macro to a lookup-table instead for the sake of readability. Signed-off-by: Matthew Wang <matthewmwang@chromium.org>
2020-06-02 02:10:13 +02:00
{
const struct minsnr_bitrate_entry *prev, *entry = table;
while ((entry->minsnr != -1) &&
(snr >= entry->minsnr) &&
(vht || entry - table <= vht_mcs))
entry++;
if (entry == table)
return entry->bitrate;
prev = entry - 1;
if (entry->minsnr == -1 || (!vht && entry - table > vht_mcs))
return prev->bitrate;
return interpolate_rate(snr, prev->minsnr, entry->minsnr, prev->bitrate,
entry->bitrate);
}
Interpolate rate calculation functions Make max_*_rate() functions and rate calculation at the beginning of wpas_get_est_tpt() more continuous. In wpa_supplicant_need_to_roam(), we compare these values to make a roaming decision. However, at certain SNRs, we see unrealistically large jumps in estimated throughput according to these functions, leading us to make incorrect roaming decisions. Perform linear interpolation where applicable to more accurately reflect actual throughput. Example: wlan0: Current BSS: 88:3d:24:b4:95:d2 freq=2412 level=-69 snr=20 est_throughput=54000 wlan0: Selected BSS: 88:3d:24:b4:89:9e freq=2417 level=-67 snr=22 est_throughput=63500 wlan0: Using signal poll values for the current BSS: level=-69 snr=20 est_throughput=54000 wlan0: Allow reassociation - selected BSS has better estimated throughput 2 dB increase in RSSI likely isn't responsible for a 17% increase in throughput. Signed-off-by: Matthew Wang <matthewmwang@chromium.org>
2020-03-16 22:11:06 +01:00
Convert int to bool for throughput estimate tables Signed-off-by: Jouni Malinen <j@w1.fi>
2020-06-19 16:28:25 +02:00
static unsigned int max_ht20_rate(int snr, bool vht)
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
{
Use lookup-table instead of macro for TX rate estimates Change INTERPOLATE_RATE() macro to a lookup-table instead for the sake of readability. Signed-off-by: Matthew Wang <matthewmwang@chromium.org>
2020-06-02 02:10:13 +02:00
return max_rate(vht20_table, snr, vht);
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
}
Convert int to bool for throughput estimate tables Signed-off-by: Jouni Malinen <j@w1.fi>
2020-06-19 16:28:25 +02:00
static unsigned int max_ht40_rate(int snr, bool vht)
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
{
Use lookup-table instead of macro for TX rate estimates Change INTERPOLATE_RATE() macro to a lookup-table instead for the sake of readability. Signed-off-by: Matthew Wang <matthewmwang@chromium.org>
2020-06-02 02:10:13 +02:00
return max_rate(vht40_table, snr, vht);
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
}
static unsigned int max_vht80_rate(int snr)
{
Use lookup-table instead of macro for TX rate estimates Change INTERPOLATE_RATE() macro to a lookup-table instead for the sake of readability. Signed-off-by: Matthew Wang <matthewmwang@chromium.org>
2020-06-02 02:10:13 +02:00
return max_rate(vht80_table, snr, 1);
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
}
Move throughput estimation into a helper function This is a step towards allowing this functionality to update the scan result -based values with the values from a signal poll for the current BSS. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
2019-12-06 23:27:47 +01:00
unsigned int wpas_get_est_tpt(const struct wpa_supplicant *wpa_s,
const u8 *ies, size_t ies_len, int rate,
int snr)
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
{
enum local_hw_capab capab = wpa_s->hw_capab;
unsigned int est, tmp;
Move throughput estimation into a helper function This is a step towards allowing this functionality to update the scan result -based values with the values from a signal poll for the current BSS. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
2019-12-06 23:27:47 +01:00
const u8 *ie;
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
/* Limit based on estimated SNR */
if (rate > 1 * 2 && snr < 1)
rate = 1 * 2;
else if (rate > 2 * 2 && snr < 4)
rate = 2 * 2;
else if (rate > 6 * 2 && snr < 5)
rate = 6 * 2;
else if (rate > 9 * 2 && snr < 6)
rate = 9 * 2;
else if (rate > 12 * 2 && snr < 7)
rate = 12 * 2;
Interpolate rate calculation functions Make max_*_rate() functions and rate calculation at the beginning of wpas_get_est_tpt() more continuous. In wpa_supplicant_need_to_roam(), we compare these values to make a roaming decision. However, at certain SNRs, we see unrealistically large jumps in estimated throughput according to these functions, leading us to make incorrect roaming decisions. Perform linear interpolation where applicable to more accurately reflect actual throughput. Example: wlan0: Current BSS: 88:3d:24:b4:95:d2 freq=2412 level=-69 snr=20 est_throughput=54000 wlan0: Selected BSS: 88:3d:24:b4:89:9e freq=2417 level=-67 snr=22 est_throughput=63500 wlan0: Using signal poll values for the current BSS: level=-69 snr=20 est_throughput=54000 wlan0: Allow reassociation - selected BSS has better estimated throughput 2 dB increase in RSSI likely isn't responsible for a 17% increase in throughput. Signed-off-by: Matthew Wang <matthewmwang@chromium.org>
2020-03-16 22:11:06 +01:00
else if (rate > 12 * 2 && snr < 8)
rate = 14 * 2;
else if (rate > 12 * 2 && snr < 9)
rate = 16 * 2;
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
else if (rate > 18 * 2 && snr < 10)
rate = 18 * 2;
else if (rate > 24 * 2 && snr < 11)
rate = 24 * 2;
Interpolate rate calculation functions Make max_*_rate() functions and rate calculation at the beginning of wpas_get_est_tpt() more continuous. In wpa_supplicant_need_to_roam(), we compare these values to make a roaming decision. However, at certain SNRs, we see unrealistically large jumps in estimated throughput according to these functions, leading us to make incorrect roaming decisions. Perform linear interpolation where applicable to more accurately reflect actual throughput. Example: wlan0: Current BSS: 88:3d:24:b4:95:d2 freq=2412 level=-69 snr=20 est_throughput=54000 wlan0: Selected BSS: 88:3d:24:b4:89:9e freq=2417 level=-67 snr=22 est_throughput=63500 wlan0: Using signal poll values for the current BSS: level=-69 snr=20 est_throughput=54000 wlan0: Allow reassociation - selected BSS has better estimated throughput 2 dB increase in RSSI likely isn't responsible for a 17% increase in throughput. Signed-off-by: Matthew Wang <matthewmwang@chromium.org>
2020-03-16 22:11:06 +01:00
else if (rate > 24 * 2 && snr < 12)
rate = 27 * 2;
else if (rate > 24 * 2 && snr < 13)
rate = 30 * 2;
else if (rate > 24 * 2 && snr < 14)
rate = 33 * 2;
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
else if (rate > 36 * 2 && snr < 15)
rate = 36 * 2;
Interpolate rate calculation functions Make max_*_rate() functions and rate calculation at the beginning of wpas_get_est_tpt() more continuous. In wpa_supplicant_need_to_roam(), we compare these values to make a roaming decision. However, at certain SNRs, we see unrealistically large jumps in estimated throughput according to these functions, leading us to make incorrect roaming decisions. Perform linear interpolation where applicable to more accurately reflect actual throughput. Example: wlan0: Current BSS: 88:3d:24:b4:95:d2 freq=2412 level=-69 snr=20 est_throughput=54000 wlan0: Selected BSS: 88:3d:24:b4:89:9e freq=2417 level=-67 snr=22 est_throughput=63500 wlan0: Using signal poll values for the current BSS: level=-69 snr=20 est_throughput=54000 wlan0: Allow reassociation - selected BSS has better estimated throughput 2 dB increase in RSSI likely isn't responsible for a 17% increase in throughput. Signed-off-by: Matthew Wang <matthewmwang@chromium.org>
2020-03-16 22:11:06 +01:00
else if (rate > 36 * 2 && snr < 16)
rate = 39 * 2;
else if (rate > 36 * 2 && snr < 17)
rate = 42 * 2;
else if (rate > 36 * 2 && snr < 18)
rate = 45 * 2;
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
else if (rate > 48 * 2 && snr < 19)
rate = 48 * 2;
Interpolate rate calculation functions Make max_*_rate() functions and rate calculation at the beginning of wpas_get_est_tpt() more continuous. In wpa_supplicant_need_to_roam(), we compare these values to make a roaming decision. However, at certain SNRs, we see unrealistically large jumps in estimated throughput according to these functions, leading us to make incorrect roaming decisions. Perform linear interpolation where applicable to more accurately reflect actual throughput. Example: wlan0: Current BSS: 88:3d:24:b4:95:d2 freq=2412 level=-69 snr=20 est_throughput=54000 wlan0: Selected BSS: 88:3d:24:b4:89:9e freq=2417 level=-67 snr=22 est_throughput=63500 wlan0: Using signal poll values for the current BSS: level=-69 snr=20 est_throughput=54000 wlan0: Allow reassociation - selected BSS has better estimated throughput 2 dB increase in RSSI likely isn't responsible for a 17% increase in throughput. Signed-off-by: Matthew Wang <matthewmwang@chromium.org>
2020-03-16 22:11:06 +01:00
else if (rate > 48 * 2 && snr < 20)
rate = 51 * 2;
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
else if (rate > 54 * 2 && snr < 21)
rate = 54 * 2;
est = rate * 500;
if (capab == CAPAB_HT || capab == CAPAB_HT40 || capab == CAPAB_VHT) {
Move throughput estimation into a helper function This is a step towards allowing this functionality to update the scan result -based values with the values from a signal poll for the current BSS. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
2019-12-06 23:27:47 +01:00
ie = get_ie(ies, ies_len, WLAN_EID_HT_CAP);
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
if (ie) {
Convert int to bool for throughput estimate tables Signed-off-by: Jouni Malinen <j@w1.fi>
2020-06-19 16:28:25 +02:00
tmp = max_ht20_rate(snr, false);
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
if (tmp > est)
est = tmp;
}
}
if (capab == CAPAB_HT40 || capab == CAPAB_VHT) {
Move throughput estimation into a helper function This is a step towards allowing this functionality to update the scan result -based values with the values from a signal poll for the current BSS. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
2019-12-06 23:27:47 +01:00
ie = get_ie(ies, ies_len, WLAN_EID_HT_OPERATION);
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
if (ie && ie[1] >= 2 &&
(ie[3] & HT_INFO_HT_PARAM_SECONDARY_CHNL_OFF_MASK)) {
Convert int to bool for throughput estimate tables Signed-off-by: Jouni Malinen <j@w1.fi>
2020-06-19 16:28:25 +02:00
tmp = max_ht40_rate(snr, false);
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
if (tmp > est)
est = tmp;
}
}
if (capab == CAPAB_VHT) {
/* Use +1 to assume VHT is always faster than HT */
Move throughput estimation into a helper function This is a step towards allowing this functionality to update the scan result -based values with the values from a signal poll for the current BSS. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
2019-12-06 23:27:47 +01:00
ie = get_ie(ies, ies_len, WLAN_EID_VHT_CAP);
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
if (ie) {
Convert int to bool for throughput estimate tables Signed-off-by: Jouni Malinen <j@w1.fi>
2020-06-19 16:28:25 +02:00
tmp = max_ht20_rate(snr, true) + 1;
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
if (tmp > est)
est = tmp;
Move throughput estimation into a helper function This is a step towards allowing this functionality to update the scan result -based values with the values from a signal poll for the current BSS. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
2019-12-06 23:27:47 +01:00
ie = get_ie(ies, ies_len, WLAN_EID_HT_OPERATION);
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
if (ie && ie[1] >= 2 &&
(ie[3] &
HT_INFO_HT_PARAM_SECONDARY_CHNL_OFF_MASK)) {
Convert int to bool for throughput estimate tables Signed-off-by: Jouni Malinen <j@w1.fi>
2020-06-19 16:28:25 +02:00
tmp = max_ht40_rate(snr, true) + 1;
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
if (tmp > est)
est = tmp;
}
Move throughput estimation into a helper function This is a step towards allowing this functionality to update the scan result -based values with the values from a signal poll for the current BSS. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
2019-12-06 23:27:47 +01:00
ie = get_ie(ies, ies_len, WLAN_EID_VHT_OPERATION);
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
if (ie && ie[1] >= 1 &&
(ie[2] & VHT_OPMODE_CHANNEL_WIDTH_MASK)) {
tmp = max_vht80_rate(snr) + 1;
if (tmp > est)
est = tmp;
}
}
}
Move throughput estimation into a helper function This is a step towards allowing this functionality to update the scan result -based values with the values from a signal poll for the current BSS. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
2019-12-06 23:27:47 +01:00
return est;
}
void scan_est_throughput(struct wpa_supplicant *wpa_s,
struct wpa_scan_res *res)
{
int rate; /* max legacy rate in 500 kb/s units */
int snr = res->snr;
const u8 *ies = (const void *) (res + 1);
size_t ie_len = res->ie_len;
if (res->est_throughput)
return;
/* Get maximum legacy rate */
rate = wpa_scan_get_max_rate(res);
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
Move throughput estimation into a helper function This is a step towards allowing this functionality to update the scan result -based values with the values from a signal poll for the current BSS. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
2019-12-06 23:27:47 +01:00
if (!ie_len)
ie_len = res->beacon_ie_len;
res->est_throughput =
scan_est_throughput: Use ie_len instead of res->ie_len Local variable should be used. This fixes an issue where IEs are available only from a Beacon frame. Fixes: ad06ac0b0 ("Move throughput estimation into a helper function") Signed-off-by: Matthew Wang <matthewmwang@chromium.org>
2020-01-23 23:18:17 +01:00
wpas_get_est_tpt(wpa_s, ies, ie_len, rate, snr);
Move throughput estimation into a helper function This is a step towards allowing this functionality to update the scan result -based values with the values from a signal poll for the current BSS. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
2019-12-06 23:27:47 +01:00
/* TODO: channel utilization and AP load (e.g., from AP Beacon) */
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
}
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
/**
* wpa_supplicant_get_scan_results - Get scan results
* @wpa_s: Pointer to wpa_supplicant data
* @info: Information about what was scanned or %NULL if not available
* @new_scan: Whether a new scan was performed
* Returns: Scan results, %NULL on failure
*
* This function request the current scan results from the driver and updates
* the local BSS list wpa_s->bss. The caller is responsible for freeing the
* results with wpa_scan_results_free().
*/
struct wpa_scan_results *
wpa_supplicant_get_scan_results(struct wpa_supplicant *wpa_s,
struct scan_info *info, int new_scan)
{
struct wpa_scan_results *scan_res;
size_t i;
WPS: Use different scan result sorting rules when doing WPS provisioning The AP configuration may change after provisioning, so it is better not to use the current security policy to prioritize results. Instead, use WPS Selected Registrar attribute as the main sorting key and use signal strength next without considering security policy or rate sets. The non-WPS provisioning case remains as-is, i.e., this change applies only when trying to find an AP for WPS provisioning.
2010-06-11 22:50:13 +02:00
int (*compar)(const void *, const void *) = wpa_scan_result_compar;
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
Remove user space client MLME This code was used only with driver_test.c to allow MLME operations in hostapd to be tested without having to use a real radio. There are no plans on extending this to any other use than testing and mac80211_hwsim has now obsoled the need for this type of testing. As such, we can drop this code from wpa_supplicant to clean up the implementation of unnecessary complexity.
2011-10-22 21:45:38 +02:00
scan_res = wpa_drv_get_scan_results2(wpa_s);
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
if (scan_res == NULL) {
Use wpa_msg() instead of wpa_printf() This converts number of debugging messages to use wpa_msg() in order to allow the interface name to be shown with the messages. A new function, wpa_dbg(), is introduced to allow CONFIG_NO_STDOUT_DEBUG=y builds to remove the debug strings. This is otherwise identical with wpa_msg(), but it gets compiled out if stdout debugging is disabled.
2011-02-10 19:14:46 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "Failed to get scan results");
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
return NULL;
}
Use more accurate timestamps for scan results For various P2P use cases, it is useful to have more accurate timestamp for the peer information update. This commit improves scan result handling by using a single timestamp that is taken immediately after fetching the results from the driver and then using that value to calculate the time when the driver last updated the BSS entry. In addition, more debug information is added for P2P peer updates to be able to clearly see how old information is being used here. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-12 18:14:32 +01:00
if (scan_res->fetch_time.sec == 0) {
/*
* Make sure we have a valid timestamp if the driver wrapper
* does not set this.
*/
wpa_supplicant: Use monotonic time for RX/BSS times The BSS table, scan timeout, and related functionality should use monotonic time since they care about relative values (age) only. Unfortunately, these are all connected, so the patch can't be split further. Another problem with this is that it changes the driver wrapper API. Though, it seems only the test driver is using this. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-12-16 21:08:28 +01:00
os_get_reltime(&scan_res->fetch_time);
Use more accurate timestamps for scan results For various P2P use cases, it is useful to have more accurate timestamp for the peer information update. This commit improves scan result handling by using a single timestamp that is taken immediately after fetching the results from the driver and then using that value to calculate the time when the driver last updated the BSS entry. In addition, more debug information is added for P2P peer updates to be able to clearly see how old information is being used here. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-12 18:14:32 +01:00
}
Add BSSID filter for testing purposes wpa_supplicant can now be configured to filter out scan results based on a BSSID filter. Space-separated set of allowed BSSIDs can be set with wpa_cli set bssid_filter command. Filtering mechanism can be disabled by setting this variable to an empty list. When set, only the BSSes that have a matching entry in this list will be accepted from scan results. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:30:13 +01:00
filter_scan_res(wpa_s, scan_res);
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
Improve BSS selection with default noise floor values When noise floor measurements are not available, compute SNR using default values for the noise floor. This helps steer us towards 5 GHz BSSes in high signal strength environments. In more detail... Existing code prefers a 5 GHz BSS when the 5 GHz BSS's signal strength is "close" to that of the 2.4 GHz BSS, or when both SNRs are large. However, the mwifiex driver does not provide noise floor measurements, so we can't compute SNRs. Because mwifiex doesn't provide NF measurements, the "large SNR" code wasn't effective. By using default values for the noise floor, we can again compute SNRs, and decide that the SNR is high enough that we shouldn't worry about the exact difference in SNR. The default noise floor values (one for 2.4 GHz, and one for 5 GHz) were chosen by measurement in a noisy environment, so they should be conservative. Note that while this patch is motivated by mwifiex, it affects ath9k as well. Although ath9k provides noise floor measurements in general, it will sometimes fail to provide a measurement for one or more specific channels. As a result of this patch, we'll always compare BSSes based on SNR (either measured or estimated), rather than sometimes comparing based on signal strength. ("Always" assumes that the WPA_SCAN_LEVEL_DBM flag is set. It is for mwifiex and ath9k.) While there: - fix a whitespace issue (spaces -> tab) - clean up existing comments - update dump_scan_res to indicate whether the noise floor is measured, or default Signed-hostap: mukesh agrawal <quiche@chromium.org>
2014-04-09 02:54:49 +02:00
for (i = 0; i < scan_res->num; i++) {
struct wpa_scan_res *scan_res_item = scan_res->res[i];
Select AP based on estimated maximum throughput This modifies the BSS selection routines to calculate SNR and estimated throughput for each scan result and then use the estimated throughput as a criteria for sorting the results. This extends the earlier design by taking into account higher throughput rates if both the AP and local device supports HT20, HT40, or VHT80. In addition, the maximum rate is restricted based on SNR. In practice, this gives significantly higher probability of selecting HT/VHT APs when there are multiple BSSes in the same ESS and SNR is not low enough to prevent higher MCS use. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-21 21:53:42 +01:00
scan_snr(scan_res_item);
scan_est_throughput(wpa_s, scan_res_item);
Improve BSS selection with default noise floor values When noise floor measurements are not available, compute SNR using default values for the noise floor. This helps steer us towards 5 GHz BSSes in high signal strength environments. In more detail... Existing code prefers a 5 GHz BSS when the 5 GHz BSS's signal strength is "close" to that of the 2.4 GHz BSS, or when both SNRs are large. However, the mwifiex driver does not provide noise floor measurements, so we can't compute SNRs. Because mwifiex doesn't provide NF measurements, the "large SNR" code wasn't effective. By using default values for the noise floor, we can again compute SNRs, and decide that the SNR is high enough that we shouldn't worry about the exact difference in SNR. The default noise floor values (one for 2.4 GHz, and one for 5 GHz) were chosen by measurement in a noisy environment, so they should be conservative. Note that while this patch is motivated by mwifiex, it affects ath9k as well. Although ath9k provides noise floor measurements in general, it will sometimes fail to provide a measurement for one or more specific channels. As a result of this patch, we'll always compare BSSes based on SNR (either measured or estimated), rather than sometimes comparing based on signal strength. ("Always" assumes that the WPA_SCAN_LEVEL_DBM flag is set. It is for mwifiex and ath9k.) While there: - fix a whitespace issue (spaces -> tab) - clean up existing comments - update dump_scan_res to indicate whether the noise floor is measured, or default Signed-hostap: mukesh agrawal <quiche@chromium.org>
2014-04-09 02:54:49 +02:00
}
WPS: Use different scan result sorting rules when doing WPS provisioning The AP configuration may change after provisioning, so it is better not to use the current security policy to prioritize results. Instead, use WPS Selected Registrar attribute as the main sorting key and use signal strength next without considering security policy or rate sets. The non-WPS provisioning case remains as-is, i.e., this change applies only when trying to find an AP for WPS provisioning.
2010-06-11 22:50:13 +02:00
#ifdef CONFIG_WPS
WPS: Replace wpas_wps_in_progress with identical wpas_wps_searching There is no point in maintaining two different functions that do practically the same check of WPS state. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-29 16:59:12 +01:00
if (wpas_wps_searching(wpa_s)) {
Use wpa_msg() instead of wpa_printf() This converts number of debugging messages to use wpa_msg() in order to allow the interface name to be shown with the messages. A new function, wpa_dbg(), is introduced to allow CONFIG_NO_STDOUT_DEBUG=y builds to remove the debug strings. This is otherwise identical with wpa_msg(), but it gets compiled out if stdout debugging is disabled.
2011-02-10 19:14:46 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "WPS: Order scan results with WPS "
"provisioning rules");
WPS: Use different scan result sorting rules when doing WPS provisioning The AP configuration may change after provisioning, so it is better not to use the current security policy to prioritize results. Instead, use WPS Selected Registrar attribute as the main sorting key and use signal strength next without considering security policy or rate sets. The non-WPS provisioning case remains as-is, i.e., this change applies only when trying to find an AP for WPS provisioning.
2010-06-11 22:50:13 +02:00
compar = wpa_scan_result_wps_compar;
}
#endif /* CONFIG_WPS */
Check for NULL qsort() base pointers There are a couple of places in wpa_supplicant/hostapd where qsort() can be called with a NULL base pointer. This results in undefined behavior according to the C standard and with some standard C libraries (ARM RVCT 2.2) results in a data abort/memory exception. Fix this by skipping such calls since there is nothing needing to be sorted. Signed-off-by: Joel Cunningham <joel.cunningham@me.com>
2016-10-08 19:04:15 +02:00
if (scan_res->res) {
qsort(scan_res->res, scan_res->num,
sizeof(struct wpa_scan_res *), compar);
}
Clean up debug dump for scan results sorting There is not much need for showing the interim qsort steps, so just show the ordered results. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-10-30 19:33:08 +01:00
dump_scan_res(scan_res);
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
Ignore scan results from ongoing scan when FLUSH command is issued This makes wpa_supplicant behavior more consistent with FLUSH command to clear all state. Previously, it was possible for an ongoing scan to be aborted when the FLUSH command is issued and the scan results from that aborted scan would still be processed and that would update the BSS table which was supposed to cleared by the FLUSH command. This could result in hwsim test case failures due to unexpected BSS table entries being present after the FLUSH command. Signed-off-by: Jouni Malinen <j@w1.fi>
2016-12-10 18:00:47 +01:00
if (wpa_s->ignore_post_flush_scan_res) {
/* FLUSH command aborted an ongoing scan and these are the
* results from the aborted scan. Do not process the results to
* maintain flushed state. */
wpa_dbg(wpa_s, MSG_DEBUG,
"Do not update BSS table based on pending post-FLUSH scan results");
wpa_s->ignore_post_flush_scan_res = 0;
return scan_res;
}
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
wpa_bss_update_start(wpa_s);
for (i = 0; i < scan_res->num; i++)
Use more accurate timestamps for scan results For various P2P use cases, it is useful to have more accurate timestamp for the peer information update. This commit improves scan result handling by using a single timestamp that is taken immediately after fetching the results from the driver and then using that value to calculate the time when the driver last updated the BSS entry. In addition, more debug information is added for P2P peer updates to be able to clearly see how old information is being used here. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-12 18:14:32 +01:00
wpa_bss_update_scan_res(wpa_s, scan_res->res[i],
&scan_res->fetch_time);
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
wpa_bss_update_end(wpa_s, info, new_scan);
return scan_res;
}
Add Doxygen documentation for functionality related to scanning Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 11:29:05 +01:00
/**
* wpa_supplicant_update_scan_results - Update scan results from the driver
* @wpa_s: Pointer to wpa_supplicant data
* Returns: 0 on success, -1 on failure
*
* This function updates the BSS table within wpa_supplicant based on the
* currently available scan results from the driver without requesting a new
* scan. This is used in cases where the driver indicates an association
* (including roaming within ESS) and wpa_supplicant does not yet have the
* needed information to complete the connection (e.g., to perform validation
* steps in 4-way handshake).
*/
Move wpa_supplicant specific scan code away from src/drivers This fits better in wpa_supplicant/scan.c. Couple of remaining scan_helpers.c functions are currently used in driver wrappers, but they can likely be removed in the future.
2010-01-03 17:48:11 +01:00
int wpa_supplicant_update_scan_results(struct wpa_supplicant *wpa_s)
{
struct wpa_scan_results *scan_res;
scan_res = wpa_supplicant_get_scan_results(wpa_s, NULL, 0);
if (scan_res == NULL)
return -1;
wpa_scan_results_free(scan_res);
return 0;
}
Add 'SCAN TYPE=ONLY' functionality Usual manual scan request may cause reassociation due to several reasons. New command is intended to perform pure scan without taking any automatic action based on the results. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-02-07 17:06:51 +01:00
/**
* scan_only_handler - Reports scan results
*/
void scan_only_handler(struct wpa_supplicant *wpa_s,
struct wpa_scan_results *scan_res)
{
wpa_dbg(wpa_s, MSG_DEBUG, "Scan-only results received");
Optional scan id for ctrl_iface SCAN requests This allows users of wpa_supplicant control interface to figure out when their specific scan command has been started and completed. For example: CTRL-EVENT-SCAN-STARTED > scan freq=2412,2417 passive=1 use_id=1 3 CTRL-EVENT-SCAN-RESULTS CTRL-EVENT-SCAN-STARTED id=3 CTRL-EVENT-SCAN-RESULTS id=3 Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-26 16:35:48 +01:00
if (wpa_s->last_scan_req == MANUAL_SCAN_REQ &&
wpa_s->manual_scan_use_id && wpa_s->own_scan_running) {
wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS "id=%u",
wpa_s->manual_scan_id);
wpa_s->manual_scan_use_id = 0;
} else {
wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS);
}
Add 'SCAN TYPE=ONLY' functionality Usual manual scan request may cause reassociation due to several reasons. New command is intended to perform pure scan without taking any automatic action based on the results. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-02-07 17:06:51 +01:00
wpas_notify_scan_results(wpa_s);
wpas_notify_scan_done(wpa_s, 1);
Use radio work for scan requests Avoid concurrent scan requests by using the radio work queuing mechanism. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 21:07:05 +01:00
if (wpa_s->scan_work) {
struct wpa_radio_work *work = wpa_s->scan_work;
wpa_s->scan_work = NULL;
radio_work_done(work);
}
Restore previous wpa_state in scan-only result handler The SCAN TYPE=ONLY results do not trigger a connection operation automatically. As such, there was no explicit operation that would change wpa_state after such a scan-only operation and WPA_SCANNING state could have been left in effect until the next operation is triggered by an external command. This is not desirable, so restore the wpa_state that was in use when the scan was started in case WPA_SCANNING state is still set when the scan operation completes. This was triggered by the following mac80211_hwsim test sequence: dbus_wps_oom scan_trigger_failure Signed-off-by: Jouni Malinen <j@w1.fi>
2015-11-01 19:26:35 +01:00
if (wpa_s->wpa_state == WPA_SCANNING)
wpa_supplicant_set_state(wpa_s, wpa_s->scan_prev_wpa_state);
Add 'SCAN TYPE=ONLY' functionality Usual manual scan request may cause reassociation due to several reasons. New command is intended to perform pure scan without taking any automatic action based on the results. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-02-07 17:06:51 +01:00
}
P2P: Postpone P2P scan only if station mode scan is pending sta_scan_pending was supposed to be accurate enough for determining whether a P2P scan needs to be postponed. However, it has turned out that there were cases where sta_scan_pending was not cleared properly. While the known cases have now been addressed, it is possible that some other cases may still exist. To avoid issues with P2P operationg getting stuck, verify more carefully that there is a real pending station mode scan (either in progress or scheduled to be requested). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-18 16:11:15 +01:00
int wpas_scan_scheduled(struct wpa_supplicant *wpa_s)
{
return eloop_is_timeout_registered(wpa_supplicant_scan, wpa_s, NULL);
}
Add helper functions for cloning and freeing scan parameters Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 08:48:00 +01:00
struct wpa_driver_scan_params *
wpa_scan_clone_params(const struct wpa_driver_scan_params *src)
{
struct wpa_driver_scan_params *params;
size_t i;
u8 *n;
params = os_zalloc(sizeof(*params));
if (params == NULL)
return NULL;
for (i = 0; i < src->num_ssids; i++) {
if (src->ssids[i].ssid) {
Use os_memdup() This leads to cleaner code overall, and also reduces the size of the hostapd and wpa_supplicant binaries (in hwsim test build on x86_64) by about 2.5 and 3.5KiB respectively. The mechanical conversions all over the code were done with the following spatch: @@ expression SIZE, SRC; expression a; @@ -a = os_malloc(SIZE); +a = os_memdup(SRC, SIZE); <... if (!a) {...} ...> -os_memcpy(a, SRC, SIZE); Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2017-03-07 10:17:23 +01:00
n = os_memdup(src->ssids[i].ssid,
src->ssids[i].ssid_len);
Add helper functions for cloning and freeing scan parameters Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 08:48:00 +01:00
if (n == NULL)
goto failed;
params->ssids[i].ssid = n;
params->ssids[i].ssid_len = src->ssids[i].ssid_len;
}
}
params->num_ssids = src->num_ssids;
if (src->extra_ies) {
Use os_memdup() This leads to cleaner code overall, and also reduces the size of the hostapd and wpa_supplicant binaries (in hwsim test build on x86_64) by about 2.5 and 3.5KiB respectively. The mechanical conversions all over the code were done with the following spatch: @@ expression SIZE, SRC; expression a; @@ -a = os_malloc(SIZE); +a = os_memdup(SRC, SIZE); <... if (!a) {...} ...> -os_memcpy(a, SRC, SIZE); Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2017-03-07 10:17:23 +01:00
n = os_memdup(src->extra_ies, src->extra_ies_len);
Add helper functions for cloning and freeing scan parameters Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 08:48:00 +01:00
if (n == NULL)
goto failed;
params->extra_ies = n;
params->extra_ies_len = src->extra_ies_len;
}
if (src->freqs) {
int len = int_array_len(src->freqs);
Use os_memdup() This leads to cleaner code overall, and also reduces the size of the hostapd and wpa_supplicant binaries (in hwsim test build on x86_64) by about 2.5 and 3.5KiB respectively. The mechanical conversions all over the code were done with the following spatch: @@ expression SIZE, SRC; expression a; @@ -a = os_malloc(SIZE); +a = os_memdup(SRC, SIZE); <... if (!a) {...} ...> -os_memcpy(a, SRC, SIZE); Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2017-03-07 10:17:23 +01:00
params->freqs = os_memdup(src->freqs, (len + 1) * sizeof(int));
Add helper functions for cloning and freeing scan parameters Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 08:48:00 +01:00
if (params->freqs == NULL)
goto failed;
}
if (src->filter_ssids) {
Use os_memdup() This leads to cleaner code overall, and also reduces the size of the hostapd and wpa_supplicant binaries (in hwsim test build on x86_64) by about 2.5 and 3.5KiB respectively. The mechanical conversions all over the code were done with the following spatch: @@ expression SIZE, SRC; expression a; @@ -a = os_malloc(SIZE); +a = os_memdup(SRC, SIZE); <... if (!a) {...} ...> -os_memcpy(a, SRC, SIZE); Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2017-03-07 10:17:23 +01:00
params->filter_ssids = os_memdup(src->filter_ssids,
sizeof(*params->filter_ssids) *
Add helper functions for cloning and freeing scan parameters Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 08:48:00 +01:00
src->num_filter_ssids);
if (params->filter_ssids == NULL)
goto failed;
params->num_filter_ssids = src->num_filter_ssids;
}
params->filter_rssi = src->filter_rssi;
params->p2p_probe = src->p2p_probe;
params->only_new_results = src->only_new_results;
nl80211: Use low-priority scan for OBSS scan Some drivers may support low-priority scans, if they do then use that for OBSS scanning. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2014-06-04 11:21:40 +02:00
params->low_priority = src->low_priority;
driver: Add scan support to beacon report Add the following parameters to scan request: 1. Dwell time on each channel. 2. Whether the specified dwell time is mandatory. In addition, add to scan results info the time that the scan actually started, and to each scan result the time the beacon/probe was received, both in terms of TSF of the BSS that the interface that requested the scan is connected to (if available). Add flags to indicate whether the driver supports dwell time configuration and scan information reporting. This scan configuration and information is required to support beacon report radio measurement. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2016-12-28 14:06:40 +01:00
params->duration = src->duration;
params->duration_mandatory = src->duration_mandatory;
driver: Add OCE scan parameters Add a flag to scan parameters that enables OCE scan features. If this flag is set the device should enable the following features as defined in the Optimized Connectivity Experience Technical Specification v1.0: - Overwrite FILS request Max Channel Time with actual value (clause 3.8) - Send Probe Request frame in high rate (at least 5.5 Mbps) (clause 3.12) - Probe Request frame Transmission Deferral and Suppression (clause 3.5) - Accept broadcast Probe Response frame (clause 3.6) Signed-off-by: Roee Zamir <roee.zamir@intel.com>
2018-08-26 19:45:00 +02:00
params->oce_scan = src->oce_scan;
Add helper functions for cloning and freeing scan parameters Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 08:48:00 +01:00
nl80211: Add support for multiple scan plans for scheduled scan Add 'scan plans' to driver scan parameters for scheduled scan. Each 'scan plan' specifies the number of iterations to run the scan request and the interval between iterations. When a scan plan finishes (i.e., it was run for the specified number of iterations), the next scan plan is executed. The last scan plan will run infinitely. The maximum number of supported scan plans, the maximum number of iterations for a single scan plan and the maximum scan interval are advertised by the driver. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2015-11-17 14:08:23 +01:00
if (src->sched_scan_plans_num > 0) {
params->sched_scan_plans =
Use os_memdup() This leads to cleaner code overall, and also reduces the size of the hostapd and wpa_supplicant binaries (in hwsim test build on x86_64) by about 2.5 and 3.5KiB respectively. The mechanical conversions all over the code were done with the following spatch: @@ expression SIZE, SRC; expression a; @@ -a = os_malloc(SIZE); +a = os_memdup(SRC, SIZE); <... if (!a) {...} ...> -os_memcpy(a, SRC, SIZE); Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2017-03-07 10:17:23 +01:00
os_memdup(src->sched_scan_plans,
sizeof(*src->sched_scan_plans) *
nl80211: Add support for multiple scan plans for scheduled scan Add 'scan plans' to driver scan parameters for scheduled scan. Each 'scan plan' specifies the number of iterations to run the scan request and the interval between iterations. When a scan plan finishes (i.e., it was run for the specified number of iterations), the next scan plan is executed. The last scan plan will run infinitely. The maximum number of supported scan plans, the maximum number of iterations for a single scan plan and the maximum scan interval are advertised by the driver. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2015-11-17 14:08:23 +01:00
src->sched_scan_plans_num);
if (!params->sched_scan_plans)
goto failed;
params->sched_scan_plans_num = src->sched_scan_plans_num;
}
Move ownership of MAC address randomization mask to scan params This array can be freed either from the scan parameters or from clearing the MAC address randomization parameters from the wpa_supplicant struct. To make this ownership more clear, we have each struct own its own copy of the parameters. Signed-off-by: Eric Caruso <ejcaruso@chromium.org>
2019-10-18 01:03:50 +02:00
if (src->mac_addr_rand &&
wpa_setup_mac_addr_rand_params(params, src->mac_addr))
goto failed;
nl80211: Add an option to specify the BSSID to scan for This allows scans to be optimized when a response is needed only from a single, known BSS. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-02-26 15:31:33 +01:00
if (src->bssid) {
u8 *bssid;
Use os_memdup() This leads to cleaner code overall, and also reduces the size of the hostapd and wpa_supplicant binaries (in hwsim test build on x86_64) by about 2.5 and 3.5KiB respectively. The mechanical conversions all over the code were done with the following spatch: @@ expression SIZE, SRC; expression a; @@ -a = os_malloc(SIZE); +a = os_memdup(SRC, SIZE); <... if (!a) {...} ...> -os_memcpy(a, SRC, SIZE); Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2017-03-07 10:17:23 +01:00
bssid = os_memdup(src->bssid, ETH_ALEN);
nl80211: Add an option to specify the BSSID to scan for This allows scans to be optimized when a response is needed only from a single, known BSS. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-02-26 15:31:33 +01:00
if (!bssid)
goto failed;
params->bssid = bssid;
}
Add support to sched scan to report relatively better BSSs Add support to set sched scan relative RSSI parameters so that the drivers can report BSSs after relative comparision with the current connected BSS. This feature is applicable only when in connected mode. The below commands can be used to configure relative RSSI parameters SET relative_rssi <disable|rssi_value> disable - to disable the feature rssi_value - amount of relative RSSI in dB SET relative_band_adjust <band:adjust_value> band - "2G" or "5G" for 2.4 GHz or 5 GHz respectively adjust_value - amount of RSSI to be adjusted in dB Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-11-15 10:42:44 +01:00
params->relative_rssi_set = src->relative_rssi_set;
params->relative_rssi = src->relative_rssi;
params->relative_adjust_band = src->relative_adjust_band;
params->relative_adjust_rssi = src->relative_adjust_rssi;
Add helper functions for cloning and freeing scan parameters Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 08:48:00 +01:00
return params;
failed:
wpa_scan_free_params(params);
return NULL;
}
void wpa_scan_free_params(struct wpa_driver_scan_params *params)
{
size_t i;
if (params == NULL)
return;
for (i = 0; i < params->num_ssids; i++)
os_free((u8 *) params->ssids[i].ssid);
os_free((u8 *) params->extra_ies);
os_free(params->freqs);
os_free(params->filter_ssids);
nl80211: Add support for multiple scan plans for scheduled scan Add 'scan plans' to driver scan parameters for scheduled scan. Each 'scan plan' specifies the number of iterations to run the scan request and the interval between iterations. When a scan plan finishes (i.e., it was run for the specified number of iterations), the next scan plan is executed. The last scan plan will run infinitely. The maximum number of supported scan plans, the maximum number of iterations for a single scan plan and the maximum scan interval are advertised by the driver. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2015-11-17 14:08:23 +01:00
os_free(params->sched_scan_plans);
scan: Add MAC address randomization in scan handling 1. Supported MAC address randomization for scan. 2. Supported MAC address randomization for scheduled scan. 2. Supported MAC address randomization for pno. 4. Add functions to set and clear the MAC address randomization state variables. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-12-29 07:41:06 +01:00
/*
* Note: params->mac_addr_mask points to same memory allocation and
* must not be freed separately.
*/
os_free((u8 *) params->mac_addr);
nl80211: Add an option to specify the BSSID to scan for This allows scans to be optimized when a response is needed only from a single, known BSS. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-02-26 15:31:33 +01:00
os_free((u8 *) params->bssid);
Add helper functions for cloning and freeing scan parameters Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 08:48:00 +01:00
os_free(params);
}
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
int wpas_start_pno(struct wpa_supplicant *wpa_s)
{
Use size_t instead of int or unsigned int for configuration items While int and unsigned int are not going overflow in practice as 32-bit values, these could at least in theory hit an integer overflow with 16-bit int. Use size_t to avoid such potential issue cases. Signed-off-by: Jouni Malinen <j@w1.fi>
2020-03-22 16:46:45 +01:00
int ret;
size_t prio, i, num_ssid, num_match_ssid;
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
struct wpa_ssid *ssid;
struct wpa_driver_scan_params params;
Add support for configuring scheduled scan plans Add the option to configure scheduled scan plans in the config file. Each scan plan specifies the interval between scans and the number of scan iterations. The last plan will run infinitely and thus specifies only the interval between scan iterations. usage: sched_scan_plans=<interval:iterations> <interval2:iterations2> ... <interval> Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2015-11-17 14:08:24 +01:00
struct sched_scan_plan scan_plan;
Android: Fix max number of sched scan SSIDs based on driver capability This adds use of the driver capability (instead of hardcoded WPAS_MAX_SCAN_SSIDS) in wpas_start_pno() similarly to what was already done in wpa_supplicant_req_sched_scan(). Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2016-03-28 19:58:53 +02:00
unsigned int max_sched_scan_ssids;
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
PNO: Change sched_scan_stopped event to handle pending PNO properly When a sched_scan_stopped event is received and there is a pending PNO, it used regular scheduled scan parameters instead of PNO specific parameters. Change it by calling wpas_start_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:11 +01:00
if (!wpa_s->sched_scan_supported)
return -1;
Android: Fix max number of sched scan SSIDs based on driver capability This adds use of the driver capability (instead of hardcoded WPAS_MAX_SCAN_SSIDS) in wpas_start_pno() similarly to what was already done in wpa_supplicant_req_sched_scan(). Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2016-03-28 19:58:53 +02:00
if (wpa_s->max_sched_scan_ssids > WPAS_MAX_SCAN_SSIDS)
max_sched_scan_ssids = WPAS_MAX_SCAN_SSIDS;
else
max_sched_scan_ssids = wpa_s->max_sched_scan_ssids;
if (max_sched_scan_ssids < 1)
return -1;
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
if (wpa_s->pno || wpa_s->pno_sched_pending)
return 0;
if ((wpa_s->wpa_state > WPA_SCANNING) &&
Allow PNO scan also in connection completed state Sched scan is supported by the kernel also in the connected state, so allow PNO scan to be issued in the connected state from wpa_supplicant as well. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2017-02-08 13:10:34 +01:00
(wpa_s->wpa_state < WPA_COMPLETED)) {
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
wpa_printf(MSG_ERROR, "PNO: In assoc process");
return -EAGAIN;
}
if (wpa_s->wpa_state == WPA_SCANNING) {
wpa_supplicant_cancel_scan(wpa_s);
if (wpa_s->sched_scanning) {
wpa_printf(MSG_DEBUG, "Schedule PNO on completion of "
"ongoing sched scan");
wpa_supplicant_cancel_sched_scan(wpa_s);
wpa_s->pno_sched_pending = 1;
return 0;
}
}
Fix PNO restart flow PNO is sometimes restarted due to changes in scan parameters (e.g., selected network changed or MAC randomization being enabled/disabled). Restart is done by stopping PNO and immediately starting it again. This may result in the SCHED_SCAN_STOPPED event being received after the request for new PNO, which will make wpa_supplicant believe PNO is not active although it is actually is. As a result, the next request to start PNO will fail because PNO is active and should be stopped first. Fix this by deferring the request to start PNO until the SCHED_SCAN_STOPPED event is received in case sched_scan is being stopped. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2016-09-05 16:33:03 +02:00
if (wpa_s->sched_scan_stop_req) {
wpa_printf(MSG_DEBUG,
"Schedule PNO after previous sched scan has stopped");
wpa_s->pno_sched_pending = 1;
return 0;
}
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
os_memset(&params, 0, sizeof(params));
PNO: Send Probe Request frames only for hidden SSIDs Previously, offloaded scanning (PNO) on Android was including SSIDs from all enabled networks regardless of the scan_ssid parameter which resulted in different behavior for the offloaded case when comparing to wpa_supplicant initiated scans. Use the sched_scan match filter to allow broadcast SSID to be used for scan_ssid=1 networks also with PNO to avoid running active scans for SSIDs that have not been explicitly marked as requiring an SSID-specific scan. This reduces exposure of configured network names on the device when running offloaded scans while the host device is in sleep. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-07-02 21:31:38 +02:00
num_ssid = num_match_ssid = 0;
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
ssid = wpa_s->conf->ssid;
while (ssid) {
PNO: Send Probe Request frames only for hidden SSIDs Previously, offloaded scanning (PNO) on Android was including SSIDs from all enabled networks regardless of the scan_ssid parameter which resulted in different behavior for the offloaded case when comparing to wpa_supplicant initiated scans. Use the sched_scan match filter to allow broadcast SSID to be used for scan_ssid=1 networks also with PNO to avoid running active scans for SSIDs that have not been explicitly marked as requiring an SSID-specific scan. This reduces exposure of configured network names on the device when running offloaded scans while the host device is in sleep. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-07-02 21:31:38 +02:00
if (!wpas_network_disabled(wpa_s, ssid)) {
num_match_ssid++;
if (ssid->scan_ssid)
num_ssid++;
}
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
ssid = ssid->next;
}
PNO: Send Probe Request frames only for hidden SSIDs Previously, offloaded scanning (PNO) on Android was including SSIDs from all enabled networks regardless of the scan_ssid parameter which resulted in different behavior for the offloaded case when comparing to wpa_supplicant initiated scans. Use the sched_scan match filter to allow broadcast SSID to be used for scan_ssid=1 networks also with PNO to avoid running active scans for SSIDs that have not been explicitly marked as requiring an SSID-specific scan. This reduces exposure of configured network names on the device when running offloaded scans while the host device is in sleep. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-07-02 21:31:38 +02:00
if (num_match_ssid == 0) {
wpa_printf(MSG_DEBUG, "PNO: No configured SSIDs");
return -1;
}
if (num_match_ssid > num_ssid) {
params.num_ssids++; /* wildcard */
num_ssid++;
}
Android: Fix max number of sched scan SSIDs based on driver capability This adds use of the driver capability (instead of hardcoded WPAS_MAX_SCAN_SSIDS) in wpas_start_pno() similarly to what was already done in wpa_supplicant_req_sched_scan(). Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2016-03-28 19:58:53 +02:00
if (num_ssid > max_sched_scan_ssids) {
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
wpa_printf(MSG_DEBUG, "PNO: Use only the first %u SSIDs from "
Android: Fix max number of sched scan SSIDs based on driver capability This adds use of the driver capability (instead of hardcoded WPAS_MAX_SCAN_SSIDS) in wpas_start_pno() similarly to what was already done in wpa_supplicant_req_sched_scan(). Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2016-03-28 19:58:53 +02:00
"%u", max_sched_scan_ssids, (unsigned int) num_ssid);
num_ssid = max_sched_scan_ssids;
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
}
PNO: Send Probe Request frames only for hidden SSIDs Previously, offloaded scanning (PNO) on Android was including SSIDs from all enabled networks regardless of the scan_ssid parameter which resulted in different behavior for the offloaded case when comparing to wpa_supplicant initiated scans. Use the sched_scan match filter to allow broadcast SSID to be used for scan_ssid=1 networks also with PNO to avoid running active scans for SSIDs that have not been explicitly marked as requiring an SSID-specific scan. This reduces exposure of configured network names on the device when running offloaded scans while the host device is in sleep. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-07-02 21:31:38 +02:00
if (num_match_ssid > wpa_s->max_match_sets) {
num_match_ssid = wpa_s->max_match_sets;
wpa_dbg(wpa_s, MSG_DEBUG, "PNO: Too many SSIDs to match");
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
}
PNO: Send Probe Request frames only for hidden SSIDs Previously, offloaded scanning (PNO) on Android was including SSIDs from all enabled networks regardless of the scan_ssid parameter which resulted in different behavior for the offloaded case when comparing to wpa_supplicant initiated scans. Use the sched_scan match filter to allow broadcast SSID to be used for scan_ssid=1 networks also with PNO to avoid running active scans for SSIDs that have not been explicitly marked as requiring an SSID-specific scan. This reduces exposure of configured network names on the device when running offloaded scans while the host device is in sleep. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-07-02 21:31:38 +02:00
params.filter_ssids = os_calloc(num_match_ssid,
sizeof(struct wpa_driver_scan_filter));
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
if (params.filter_ssids == NULL)
return -1;
Use priority list instead of global for PNO Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2015-02-12 19:25:15 +01:00
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
i = 0;
Use priority list instead of global for PNO Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2015-02-12 19:25:15 +01:00
prio = 0;
ssid = wpa_s->conf->pssid[prio];
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
while (ssid) {
if (!wpas_network_disabled(wpa_s, ssid)) {
PNO: Send Probe Request frames only for hidden SSIDs Previously, offloaded scanning (PNO) on Android was including SSIDs from all enabled networks regardless of the scan_ssid parameter which resulted in different behavior for the offloaded case when comparing to wpa_supplicant initiated scans. Use the sched_scan match filter to allow broadcast SSID to be used for scan_ssid=1 networks also with PNO to avoid running active scans for SSIDs that have not been explicitly marked as requiring an SSID-specific scan. This reduces exposure of configured network names on the device when running offloaded scans while the host device is in sleep. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-07-02 21:31:38 +02:00
if (ssid->scan_ssid && params.num_ssids < num_ssid) {
params.ssids[params.num_ssids].ssid =
ssid->ssid;
params.ssids[params.num_ssids].ssid_len =
ssid->ssid_len;
params.num_ssids++;
}
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
os_memcpy(params.filter_ssids[i].ssid, ssid->ssid,
ssid->ssid_len);
params.filter_ssids[i].ssid_len = ssid->ssid_len;
params.num_filter_ssids++;
i++;
PNO: Send Probe Request frames only for hidden SSIDs Previously, offloaded scanning (PNO) on Android was including SSIDs from all enabled networks regardless of the scan_ssid parameter which resulted in different behavior for the offloaded case when comparing to wpa_supplicant initiated scans. Use the sched_scan match filter to allow broadcast SSID to be used for scan_ssid=1 networks also with PNO to avoid running active scans for SSIDs that have not been explicitly marked as requiring an SSID-specific scan. This reduces exposure of configured network names on the device when running offloaded scans while the host device is in sleep. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-07-02 21:31:38 +02:00
if (i == num_match_ssid)
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
break;
}
Use priority list instead of global for PNO Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2015-02-12 19:25:15 +01:00
if (ssid->pnext)
ssid = ssid->pnext;
else if (prio + 1 == wpa_s->conf->num_prio)
break;
else
ssid = wpa_s->conf->pssid[++prio];
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
}
if (wpa_s->conf->filter_rssi)
params.filter_rssi = wpa_s->conf->filter_rssi;
Add support for configuring scheduled scan plans Add the option to configure scheduled scan plans in the config file. Each scan plan specifies the interval between scans and the number of scan iterations. The last plan will run infinitely and thus specifies only the interval between scan iterations. usage: sched_scan_plans=<interval:iterations> <interval2:iterations2> ... <interval> Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2015-11-17 14:08:24 +01:00
if (wpa_s->sched_scan_plans_num) {
params.sched_scan_plans = wpa_s->sched_scan_plans;
params.sched_scan_plans_num = wpa_s->sched_scan_plans_num;
} else {
/* Set one scan plan that will run infinitely */
if (wpa_s->conf->sched_scan_interval)
scan_plan.interval = wpa_s->conf->sched_scan_interval;
else
scan_plan.interval = 10;
scan_plan.iterations = 0;
params.sched_scan_plans = &scan_plan;
params.sched_scan_plans_num = 1;
}
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
nl80211: Add option to delay start of schedule scan plans The userspace may want to delay the the first scheduled scan. This enhances sched_scan to add initial delay (in seconds) before starting first scan cycle. The driver may optionally choose to ignore this parameter and start immediately (or at any other time). This uses NL80211_ATTR_SCHED_SCAN_DELAY to add this via user global configurable option: sched_scan_start_delay. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2017-03-06 08:53:10 +01:00
params.sched_scan_start_delay = wpa_s->conf->sched_scan_start_delay;
Add freq= parameter to 'set pno' command This allows channels-to-be-scanned to be specified for PNO similarly to the scan command. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-03-14 21:55:25 +01:00
if (params.freqs == NULL && wpa_s->manual_sched_scan_freqs) {
wpa_dbg(wpa_s, MSG_DEBUG, "Limit sched scan to specified channels");
params.freqs = wpa_s->manual_sched_scan_freqs;
}
Use random MAC address for scanning only in non-connected state cfg80211 rejects the scans issued with random MAC address if the STA is in connected state. This resulted in failures when using MAC_RAND_SCAN while connected (CTRL-EVENT-SCAN-FAILED ret=-95). Enable random MAC address functionality only if the STA is not in connected state to avoid this. The real MAC address of the STA is already revealed in the association, so this is an acceptable fallback mechanism for now. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-11-21 13:10:36 +01:00
if ((wpa_s->mac_addr_rand_enable & MAC_ADDR_RAND_PNO) &&
Move ownership of MAC address randomization mask to scan params This array can be freed either from the scan parameters or from clearing the MAC address randomization parameters from the wpa_supplicant struct. To make this ownership more clear, we have each struct own its own copy of the parameters. Signed-off-by: Eric Caruso <ejcaruso@chromium.org>
2019-10-18 01:03:50 +02:00
wpa_s->wpa_state <= WPA_SCANNING)
wpa_setup_mac_addr_rand_params(&params, wpa_s->mac_addr_pno);
scan: Add MAC address randomization in scan handling 1. Supported MAC address randomization for scan. 2. Supported MAC address randomization for scheduled scan. 2. Supported MAC address randomization for pno. 4. Add functions to set and clear the MAC address randomization state variables. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-12-29 07:41:06 +01:00
Add support to sched scan to report relatively better BSSs Add support to set sched scan relative RSSI parameters so that the drivers can report BSSs after relative comparision with the current connected BSS. This feature is applicable only when in connected mode. The below commands can be used to configure relative RSSI parameters SET relative_rssi <disable|rssi_value> disable - to disable the feature rssi_value - amount of relative RSSI in dB SET relative_band_adjust <band:adjust_value> band - "2G" or "5G" for 2.4 GHz or 5 GHz respectively adjust_value - amount of RSSI to be adjusted in dB Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-11-15 10:42:44 +01:00
wpa_scan_set_relative_rssi_params(wpa_s, &params);
Add support for configuring scheduled scan plans Add the option to configure scheduled scan plans in the config file. Each scan plan specifies the interval between scans and the number of scan iterations. The last plan will run infinitely and thus specifies only the interval between scan iterations. usage: sched_scan_plans=<interval:iterations> <interval2:iterations2> ... <interval> Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2015-11-17 14:08:24 +01:00
ret = wpa_supplicant_start_sched_scan(wpa_s, &params);
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
os_free(params.filter_ssids);
Move ownership of MAC address randomization mask to scan params This array can be freed either from the scan parameters or from clearing the MAC address randomization parameters from the wpa_supplicant struct. To make this ownership more clear, we have each struct own its own copy of the parameters. Signed-off-by: Eric Caruso <ejcaruso@chromium.org>
2019-10-18 01:03:50 +02:00
os_free(params.mac_addr);
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
if (ret == 0)
wpa_s->pno = 1;
PNO: Change sched_scan_stopped event to handle pending PNO properly When a sched_scan_stopped event is received and there is a pending PNO, it used regular scheduled scan parameters instead of PNO specific parameters. Change it by calling wpas_start_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:11 +01:00
else
wpa_msg(wpa_s, MSG_ERROR, "Failed to schedule PNO");
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
return ret;
}
int wpas_stop_pno(struct wpa_supplicant *wpa_s)
{
int ret = 0;
PNO: Change sched_scan_stopped event to handle pending PNO properly When a sched_scan_stopped event is received and there is a pending PNO, it used regular scheduled scan parameters instead of PNO specific parameters. Change it by calling wpas_start_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:11 +01:00
if (!wpa_s->pno)
return 0;
ret = wpa_supplicant_stop_sched_scan(wpa_s);
Continue scanning if sched_scan stops unexpectedly When scheduled scan stops without the interface request (for example, driver stopped it unexpectedly), start a regular scan to continue scanning for networks and avoid being left with no scan at all. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2016-09-05 16:32:59 +02:00
wpa_s->sched_scan_stop_req = 1;
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
PNO: Change sched_scan_stopped event to handle pending PNO properly When a sched_scan_stopped event is received and there is a pending PNO, it used regular scheduled scan parameters instead of PNO specific parameters. Change it by calling wpas_start_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:11 +01:00
wpa_s->pno = 0;
PNO: Move and rename pno_start()/pno_stop() Move pno_start() and pno_stop() to scan.c as a more relevant location and rename them to wpas_start_pno()/wpas_stop_pno(). Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-02-26 07:04:10 +01:00
wpa_s->pno_sched_pending = 0;
if (wpa_s->wpa_state == WPA_SCANNING)
wpa_supplicant_req_scan(wpa_s, 0, 0);
return ret;
}
scan: Add MAC address randomization in scan handling 1. Supported MAC address randomization for scan. 2. Supported MAC address randomization for scheduled scan. 2. Supported MAC address randomization for pno. 4. Add functions to set and clear the MAC address randomization state variables. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-12-29 07:41:06 +01:00
void wpas_mac_addr_rand_scan_clear(struct wpa_supplicant *wpa_s,
unsigned int type)
{
type &= MAC_ADDR_RAND_ALL;
wpa_s->mac_addr_rand_enable &= ~type;
if (type & MAC_ADDR_RAND_SCAN) {
os_free(wpa_s->mac_addr_scan);
wpa_s->mac_addr_scan = NULL;
}
if (type & MAC_ADDR_RAND_SCHED_SCAN) {
os_free(wpa_s->mac_addr_sched_scan);
wpa_s->mac_addr_sched_scan = NULL;
}
if (type & MAC_ADDR_RAND_PNO) {
os_free(wpa_s->mac_addr_pno);
wpa_s->mac_addr_pno = NULL;
}
}
int wpas_mac_addr_rand_scan_set(struct wpa_supplicant *wpa_s,
unsigned int type, const u8 *addr,
const u8 *mask)
{
u8 *tmp = NULL;
Check supported types in wpas_mac_addr_rand_scan_set() When setting scan with randomized MAC, check the requested scan type against supported types, to ensure callers will not set an unsupported type, since this can cause scan/connect failures later. It is better to do this in wpas_mac_addr_rand_scan_set() instead of control interface specific code to apply the constraint on all possible interfaces using this setting. Signed-off-by: Lior David <liord@codeaurora.org>
2019-01-21 17:28:42 +01:00
if ((wpa_s->mac_addr_rand_supported & type) != type ) {
wpa_printf(MSG_INFO,
"scan: MAC randomization type %u != supported=%u",
type, wpa_s->mac_addr_rand_supported);
return -1;
}
scan: Add MAC address randomization in scan handling 1. Supported MAC address randomization for scan. 2. Supported MAC address randomization for scheduled scan. 2. Supported MAC address randomization for pno. 4. Add functions to set and clear the MAC address randomization state variables. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-12-29 07:41:06 +01:00
wpas_mac_addr_rand_scan_clear(wpa_s, type);
if (addr) {
tmp = os_malloc(2 * ETH_ALEN);
if (!tmp)
return -1;
os_memcpy(tmp, addr, ETH_ALEN);
os_memcpy(tmp + ETH_ALEN, mask, ETH_ALEN);
}
if (type == MAC_ADDR_RAND_SCAN) {
wpa_s->mac_addr_scan = tmp;
} else if (type == MAC_ADDR_RAND_SCHED_SCAN) {
wpa_s->mac_addr_sched_scan = tmp;
} else if (type == MAC_ADDR_RAND_PNO) {
wpa_s->mac_addr_pno = tmp;
} else {
wpa_printf(MSG_INFO,
"scan: Invalid MAC randomization type=0x%x",
type);
os_free(tmp);
return -1;
}
wpa_s->mac_addr_rand_enable |= type;
return 0;
}
Abort an ongoing scan before connect Connect radio work is sometimes delayed for a considerable duration if there is an ongoing scan radio work. To avoid these delays abort the ongoing scan on that interface before queuing a connect request. Upon a scan done indication from the driver, connect radio work will be scheduled. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-19 16:00:34 +02:00
D-Bus: Add MAC address randomization endpoints Add D-Bus property: * MACAddressRandomizationMask: a{say} which configure random MAC address functionality in the Wi-Fi driver via netlink. Signed-off-by: Eric Caruso <ejcaruso@chromium.org>
2019-10-18 01:03:51 +02:00
int wpas_mac_addr_rand_scan_get_mask(struct wpa_supplicant *wpa_s,
unsigned int type, u8 *mask)
{
const u8 *to_copy;
if ((wpa_s->mac_addr_rand_enable & type) != type)
return -1;
if (type == MAC_ADDR_RAND_SCAN) {
to_copy = wpa_s->mac_addr_scan;
} else if (type == MAC_ADDR_RAND_SCHED_SCAN) {
to_copy = wpa_s->mac_addr_sched_scan;
} else if (type == MAC_ADDR_RAND_PNO) {
to_copy = wpa_s->mac_addr_pno;
} else {
wpa_printf(MSG_DEBUG,
"scan: Invalid MAC randomization type=0x%x",
type);
return -1;
}
os_memcpy(mask, to_copy + ETH_ALEN, ETH_ALEN);
return 0;
}
Abort an ongoing scan before connect Connect radio work is sometimes delayed for a considerable duration if there is an ongoing scan radio work. To avoid these delays abort the ongoing scan on that interface before queuing a connect request. Upon a scan done indication from the driver, connect radio work will be scheduled. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-19 16:00:34 +02:00
int wpas_abort_ongoing_scan(struct wpa_supplicant *wpa_s)
{
Add support to abort vendor scan This commit enhances the existing implementation of abort scan to also abort concurrent active vendor scans. This is achieved by passing the the scan_cookie to the driver interface with the intention to abort the specific scan request. This scan_cookie is returned from the driver interface when the scan request is scheduled. This scan_cookie is 0 if the scan is triggered through the upstream cfg80211 interface. Thus, the scan_cookie is used to determine whether to abort the cfg80211 or vendor scan request. Also, the previous implementation of relying on scan_work/p2p_scan_work for the active work to trigger the abort scan is enhanced to check for the started state of either of these work operations. This should also help to abort the concurrent active scan/p2p-scan operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-11-30 05:39:38 +01:00
struct wpa_radio_work *work;
struct wpa_radio *radio = wpa_s->radio;
P2P: Abort ongoing scan when p2p_find is stopped When p2p_find is stopped, send request to the driver in order to cancel an ongoing scan if there is one. Signed-off-by: Ben Rosenfeld <ben.rosenfeld@intel.com>
2016-02-29 13:30:04 +01:00
Add support to abort vendor scan This commit enhances the existing implementation of abort scan to also abort concurrent active vendor scans. This is achieved by passing the the scan_cookie to the driver interface with the intention to abort the specific scan request. This scan_cookie is returned from the driver interface when the scan request is scheduled. This scan_cookie is 0 if the scan is triggered through the upstream cfg80211 interface. Thus, the scan_cookie is used to determine whether to abort the cfg80211 or vendor scan request. Also, the previous implementation of relying on scan_work/p2p_scan_work for the active work to trigger the abort scan is enhanced to check for the started state of either of these work operations. This should also help to abort the concurrent active scan/p2p-scan operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-11-30 05:39:38 +01:00
dl_list_for_each(work, &radio->work, struct wpa_radio_work, list) {
if (work->wpa_s != wpa_s || !work->started ||
(os_strcmp(work->type, "scan") != 0 &&
os_strcmp(work->type, "p2p-scan") != 0))
continue;
Abort an ongoing scan before connect Connect radio work is sometimes delayed for a considerable duration if there is an ongoing scan radio work. To avoid these delays abort the ongoing scan on that interface before queuing a connect request. Upon a scan done indication from the driver, connect radio work will be scheduled. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-19 16:00:34 +02:00
wpa_dbg(wpa_s, MSG_DEBUG, "Abort an ongoing scan");
Add support to abort vendor scan This commit enhances the existing implementation of abort scan to also abort concurrent active vendor scans. This is achieved by passing the the scan_cookie to the driver interface with the intention to abort the specific scan request. This scan_cookie is returned from the driver interface when the scan request is scheduled. This scan_cookie is 0 if the scan is triggered through the upstream cfg80211 interface. Thus, the scan_cookie is used to determine whether to abort the cfg80211 or vendor scan request. Also, the previous implementation of relying on scan_work/p2p_scan_work for the active work to trigger the abort scan is enhanced to check for the started state of either of these work operations. This should also help to abort the concurrent active scan/p2p-scan operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-11-30 05:39:38 +01:00
return wpa_drv_abort_scan(wpa_s, wpa_s->curr_scan_cookie);
Abort an ongoing scan before connect Connect radio work is sometimes delayed for a considerable duration if there is an ongoing scan radio work. To avoid these delays abort the ongoing scan on that interface before queuing a connect request. Upon a scan done indication from the driver, connect radio work will be scheduled. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-19 16:00:34 +02:00
}
Add support to abort vendor scan This commit enhances the existing implementation of abort scan to also abort concurrent active vendor scans. This is achieved by passing the the scan_cookie to the driver interface with the intention to abort the specific scan request. This scan_cookie is returned from the driver interface when the scan request is scheduled. This scan_cookie is 0 if the scan is triggered through the upstream cfg80211 interface. Thus, the scan_cookie is used to determine whether to abort the cfg80211 or vendor scan request. Also, the previous implementation of relying on scan_work/p2p_scan_work for the active work to trigger the abort scan is enhanced to check for the started state of either of these work operations. This should also help to abort the concurrent active scan/p2p-scan operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-11-30 05:39:38 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "No ongoing scan/p2p-scan found to abort");
return -1;
Abort an ongoing scan before connect Connect radio work is sometimes delayed for a considerable duration if there is an ongoing scan radio work. To avoid these delays abort the ongoing scan on that interface before queuing a connect request. Upon a scan done indication from the driver, connect radio work will be scheduled. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-19 16:00:34 +02:00
}
Add support for configuring scheduled scan plans Add the option to configure scheduled scan plans in the config file. Each scan plan specifies the interval between scans and the number of scan iterations. The last plan will run infinitely and thus specifies only the interval between scan iterations. usage: sched_scan_plans=<interval:iterations> <interval2:iterations2> ... <interval> Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2015-11-17 14:08:24 +01:00
int wpas_sched_scan_plans_set(struct wpa_supplicant *wpa_s, const char *cmd)
{
struct sched_scan_plan *scan_plans = NULL;
const char *token, *context = NULL;
unsigned int num = 0;
if (!cmd)
return -1;
Allow sched_scan_plans to be updated at runtime This allows the control interface SET command to be used to update the sched_scan_plans parameter at runtime. In addition, an empty string can be used to clear the previously configured plan. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-11-30 13:00:41 +01:00
if (!cmd[0]) {
wpa_printf(MSG_DEBUG, "Clear sched scan plans");
os_free(wpa_s->sched_scan_plans);
wpa_s->sched_scan_plans = NULL;
wpa_s->sched_scan_plans_num = 0;
return 0;
}
Add support for configuring scheduled scan plans Add the option to configure scheduled scan plans in the config file. Each scan plan specifies the interval between scans and the number of scan iterations. The last plan will run infinitely and thus specifies only the interval between scan iterations. usage: sched_scan_plans=<interval:iterations> <interval2:iterations2> ... <interval> Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2015-11-17 14:08:24 +01:00
while ((token = cstr_token(cmd, " ", &context))) {
int ret;
struct sched_scan_plan *scan_plan, *n;
n = os_realloc_array(scan_plans, num + 1, sizeof(*scan_plans));
if (!n)
goto fail;
scan_plans = n;
scan_plan = &scan_plans[num];
num++;
ret = sscanf(token, "%u:%u", &scan_plan->interval,
&scan_plan->iterations);
if (ret <= 0 || ret > 2 || !scan_plan->interval) {
wpa_printf(MSG_ERROR,
"Invalid sched scan plan input: %s", token);
goto fail;
}
if (scan_plan->interval > wpa_s->max_sched_scan_plan_interval) {
wpa_printf(MSG_WARNING,
"scan plan %u: Scan interval too long(%u), use the maximum allowed(%u)",
num, scan_plan->interval,
wpa_s->max_sched_scan_plan_interval);
scan_plan->interval =
wpa_s->max_sched_scan_plan_interval;
}
if (ret == 1) {
scan_plan->iterations = 0;
break;
}
if (!scan_plan->iterations) {
wpa_printf(MSG_ERROR,
"scan plan %u: Number of iterations cannot be zero",
num);
goto fail;
}
if (scan_plan->iterations >
wpa_s->max_sched_scan_plan_iterations) {
wpa_printf(MSG_WARNING,
"scan plan %u: Too many iterations(%u), use the maximum allowed(%u)",
num, scan_plan->iterations,
wpa_s->max_sched_scan_plan_iterations);
scan_plan->iterations =
wpa_s->max_sched_scan_plan_iterations;
}
wpa_printf(MSG_DEBUG,
"scan plan %u: interval=%u iterations=%u",
num, scan_plan->interval, scan_plan->iterations);
}
if (!scan_plans) {
wpa_printf(MSG_ERROR, "Invalid scan plans entry");
goto fail;
}
if (cstr_token(cmd, " ", &context) || scan_plans[num - 1].iterations) {
wpa_printf(MSG_ERROR,
"All scan plans but the last must specify a number of iterations");
goto fail;
}
wpa_printf(MSG_DEBUG, "scan plan %u (last plan): interval=%u",
num, scan_plans[num - 1].interval);
if (num > wpa_s->max_sched_scan_plans) {
wpa_printf(MSG_WARNING,
"Too many scheduled scan plans (only %u supported)",
wpa_s->max_sched_scan_plans);
wpa_printf(MSG_WARNING,
"Use only the first %u scan plans, and the last one (in infinite loop)",
wpa_s->max_sched_scan_plans - 1);
os_memcpy(&scan_plans[wpa_s->max_sched_scan_plans - 1],
&scan_plans[num - 1], sizeof(*scan_plans));
num = wpa_s->max_sched_scan_plans;
}
os_free(wpa_s->sched_scan_plans);
wpa_s->sched_scan_plans = scan_plans;
wpa_s->sched_scan_plans_num = num;
return 0;
fail:
os_free(scan_plans);
wpa_printf(MSG_ERROR, "invalid scan plans list");
return -1;
}
wpa_supplicant: Cancel sched_scan on SELECT_NETWORK initiated scan If a scheduled scan is running on select network command, cancel and reset it before kicking off a regular scan request. Signed-off-by: Max Stepanov <Max.Stepanov@intel.com>
2016-09-05 16:32:58 +02:00
/**
* wpas_scan_reset_sched_scan - Reset sched_scan state
* @wpa_s: Pointer to wpa_supplicant data
*
* This function is used to cancel a running scheduled scan and to reset an
* internal scan state to continue with a regular scan on the following
* wpa_supplicant_req_scan() calls.
*/
void wpas_scan_reset_sched_scan(struct wpa_supplicant *wpa_s)
{
wpa_s->normal_scans = 0;
if (wpa_s->sched_scanning) {
wpa_s->sched_scan_timed_out = 0;
wpa_s->prev_sched_ssid = NULL;
wpa_supplicant_cancel_sched_scan(wpa_s);
}
}
Share a common helper function for restarting sched_scan This code sequence was already used at two different places (and an additional one has been proposed), so add a common helper function to avoid having to copy-paste this functionality in multiple locations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-09-26 23:09:33 +02:00
void wpas_scan_restart_sched_scan(struct wpa_supplicant *wpa_s)
{
/* simulate timeout to restart the sched scan */
wpa_s->sched_scan_timed_out = 1;
wpa_s->prev_sched_ssid = NULL;
wpa_supplicant_cancel_sched_scan(wpa_s);
}
Reference in a new issue Copy permalink