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

6250 lines
171 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
Add Suite B 192-bit AKM WPA-EAP-SUITE-B-192 can now be used to select 192-bit level Suite B into use as the key management method. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-25 22:32:01 +01:00
* Copyright (c) 2003-2015, 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
*
* This file implements functions for registering and unregistering
* %wpa_supplicant interfaces. In addition, this file contains number of
* functions for managing network connections.
*/
#include "includes.h"
#include "common.h"
random: Read /dev/random in the background with eloop read socket This makes it more likely to be able to fetch the 20 octet seed from /dev/random in cases where other programs may also be competing for this.
2011-03-22 22:15:00 +01:00
#include "crypto/random.h"
Allow wildcard SSID to be used with WPA-PSK if bssid is set This allows the AP to be selected based on the BSSID when WPA-PSK is used with a passphrase. The PSK will be derived from the passphrase after the SSID has been learned from scan results.
2011-09-30 21:01:42 +02:00
#include "crypto/sha1.h"
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
#include "eapol_supp/eapol_supp_sm.h"
#include "eap_peer/eap.h"
Interworking: Add support for using eap_proxy offload Fetch IMSI through eap_proxy for Interworking network selection if needed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-06-19 17:42:17 +02:00
#include "eap_peer/eap_proxy.h"
wpa_supplicant AP: Add preliminary support for WPS Internal Registrar When in AP mode, wpa_supplicant is now enabling WPS (only Internal Registrar). wpa_cli wps_pbc and wps_pin commands can be used to initiate WPS negotiation similarly to how this is done in station mode (though, the BSSID parameter is ignored).
2009-04-21 15:45:16 +02:00
#include "eap_server/eap_methods.h"
Remove src/rsn_supp from default header path
2009-11-29 17:28:08 +01:00
#include "rsn_supp/wpa.h"
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
#include "eloop.h"
#include "config.h"
EXT PW: Add framework for supporting external password storage This new mechanism can be used to make wpa_supplicant using external storage (e.g., key store in the operating system) for passwords, passphrases, and PSKs. This commit is only adding the framework part needed to support this, i.e., no actual configuration parameter can yet use this new mechanism. In addition, only a simple test backend is added to allow developer testing of the functionality. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-03 20:28:42 +02:00
#include "utils/ext_password.h"
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
#include "l2_packet/l2_packet.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"
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
#include "ctrl_iface.h"
#include "pcsc_funcs.h"
Remove src/common from default header file path This makes it clearer which files are including header from src/common. Some of these cases should probably be cleaned up in the future not to do that. In addition, src/common/nl80211_copy.h and wireless_copy.h were moved into src/drivers since they are only used by driver wrappers and do not need to live in src/common.
2009-11-29 16:51:55 +01:00
#include "common/version.h"
Remove src/rsn_supp from default header path
2009-11-29 17:28:08 +01:00
#include "rsn_supp/preauth.h"
#include "rsn_supp/pmksa_cache.h"
Remove src/common from default header file path This makes it clearer which files are including header from src/common. Some of these cases should probably be cleaned up in the future not to do that. In addition, src/common/nl80211_copy.h and wireless_copy.h were moved into src/drivers since they are only used by driver wrappers and do not need to live in src/common.
2009-11-29 16:51:55 +01:00
#include "common/wpa_ctrl.h"
#include "common/ieee802_11_defs.h"
ibss/mesh: Enable HT40 if supported Setup HT40+/HT40- if supported by driver. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-01-08 12:48:36 +01:00
#include "common/hw_features_common.h"
P2P: Add support for cross connection If enabled, cross connection allows GO to forward IPv4 packets using masquerading NAT from the P2P clients in the group to an uplink WLAN connection. This is disabled by default and can be enabled with "wpa_cli p2p_set cross_connect 1" on the P2P device interface.
2010-07-10 19:19:34 +02:00
#include "p2p/p2p.h"
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
#include "fst/fst.h"
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
#include "blacklist.h"
#include "wpas_glue.h"
WPS: Moved wps_context initialization into wps_supplicant.c The wps_context data is now managed at wpa_supplicant, not EAP-WSC. This makes wpa_supplicant design for WPS match with hostapd one and also makes it easier configure whatever parameters and callbacks are needed for WPS.
2008-11-28 19:32:13 +01:00
#include "wps_supplicant.h"
Added initial step for IBSS RSN support This commit adds a new build option, CONFIG_IBSS_RSN=y, that can be used to enable RSN support for IBSS. This links in RSN Authenticator code from hostapd and adds code for managing per-peer information for IBSS. A new wpa_cli command or driver event can be used to request RSN authentication with an IBSS peer. New RSN Authenticator and Supplicant will be allocated for each peer. The basic state machine setup code is included in this commit, but the state machines are not properly started yet. In addition, some of the callback functions are not yet complete.
2009-01-15 00:21:55 +01:00
#include "ibss_rsn.h"
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
#include "sme.h"
GAS: Add a generic GAS query module This implements GAS request mechanism that is aimed at being used to replace use case specific GAS/ANQP implementations in the future. Compared to the earlier implementation in P2P SD, this implementation includes support for multiple concurrent requests and more thorough validation of frames against the pending query data. GAS header processing, including comeback and reassembly, are handled within gas_query.c and the users of this module will only need to provide the Query Request and process the (possibly reassembled) Query Response.
2011-09-28 18:44:25 +02:00
#include "gas_query.h"
Move wpa_supplicant_create_ap() into ap.c
2009-03-26 15:08:17 +01:00
#include "ap.h"
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
#include "p2p_supplicant.h"
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
#include "wifi_display.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"
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
#include "bgscan.h"
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
#include "autoscan.h"
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
#include "bss.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 "scan.h"
GAS: Use off-channel operations for requests This separates off-channel Action frame TX/RX from P2P into a generic implementation that can now be used both for P2P and GAS needs.
2011-09-29 18:22:08 +02:00
#include "offchannel.h"
HS 2.0: Add HS 2.0 Indication element into (Re)Association Request Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-10-03 17:10:23 +02:00
#include "hs20_supplicant.h"
WNM: Add neighbor report processing for BSS Transition Management Process the neighbor report received in BSS Management Request frames. Signed-hostap: Vinayak Kamath <vkamat@codeaurora.org>
2013-05-16 16:48:59 +02:00
#include "wnm_sta.h"
MACsec: wpa_supplicant integration Add MACsec to the wpa_supplicant build system and configuration file. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-25 20:39:02 +01:00
#include "wpas_kay.h"
Add mesh_group_{add,remove} control interface commands Parse MESH_GROUP_ADD/REMOVE commands on ctrl interface and call wpa_supplicant routines. These commands are used to start or join and leave a mesh network. The mesh id is given in the configuration file, therefore there is no need to scan before joining a mesh network. We reuse the connect_without_scan construct used by P2P for that same purpose. Signed-off-by: Javier Cardona <javier@cozybit.com> Signed-off-by: Javier Lopez <jlopex@gmail.com>
2014-09-01 06:23:33 +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
Declare all read only data structures as const By analysing objdump output some read only structures were found in .data section. To help compiler further optimize code declare these as const. Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
2015-04-24 09:19:53 +02:00
const char *const wpa_supplicant_version =
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
"wpa_supplicant v" VERSION_STR "\n"
Update copyright notices for the new year 2015 Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-26 01:25:22 +01:00
"Copyright (c) 2003-2015, Jouni Malinen <j@w1.fi> and contributors";
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
Declare all read only data structures as const By analysing objdump output some read only structures were found in .data section. To help compiler further optimize code declare these as const. Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
2015-04-24 09:19:53 +02:00
const char *const wpa_supplicant_license =
Select the BSD license terms as the only license alternative Simplify licensing terms for hostap.git by selecting the BSD license alternative for any future distribution. This drops the GPL v2 alternative from distribution terms and from contribution requirements. The BSD license alternative that has been used in hostap.git (the one with advertisement clause removed) is compatible with GPL and as such the software in hostap.git can still be used with GPL projects. In addition, any new contribution to hostap.git is expected to be licensed under the BSD terms that allow the changes to be merged into older hostap repositories that still include the GPL v2 alternative. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-11 13:04:12 +01:00
"This software may be distributed under the terms of the BSD license.\n"
"See README for more details.\n"
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
#ifdef EAP_TLS_OPENSSL
"\nThis product includes software developed by the OpenSSL Project\n"
"for use in the OpenSSL Toolkit (http://www.openssl.org/)\n"
#endif /* EAP_TLS_OPENSSL */
;
#ifndef CONFIG_NO_STDOUT_DEBUG
/* Long text divided into parts in order to fit in C89 strings size limits. */
Declare all read only data structures as const By analysing objdump output some read only structures were found in .data section. To help compiler further optimize code declare these as const. Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
2015-04-24 09:19:53 +02:00
const char *const wpa_supplicant_full_license1 =
Select the BSD license terms as the only license alternative Simplify licensing terms for hostap.git by selecting the BSD license alternative for any future distribution. This drops the GPL v2 alternative from distribution terms and from contribution requirements. The BSD license alternative that has been used in hostap.git (the one with advertisement clause removed) is compatible with GPL and as such the software in hostap.git can still be used with GPL projects. In addition, any new contribution to hostap.git is expected to be licensed under the BSD terms that allow the changes to be merged into older hostap repositories that still include the GPL v2 alternative. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-11 13:04:12 +01:00
"";
Declare all read only data structures as const By analysing objdump output some read only structures were found in .data section. To help compiler further optimize code declare these as const. Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
2015-04-24 09:19:53 +02:00
const char *const wpa_supplicant_full_license2 =
Select the BSD license terms as the only license alternative Simplify licensing terms for hostap.git by selecting the BSD license alternative for any future distribution. This drops the GPL v2 alternative from distribution terms and from contribution requirements. The BSD license alternative that has been used in hostap.git (the one with advertisement clause removed) is compatible with GPL and as such the software in hostap.git can still be used with GPL projects. In addition, any new contribution to hostap.git is expected to be licensed under the BSD terms that allow the changes to be merged into older hostap repositories that still include the GPL v2 alternative. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-11 13:04:12 +01:00
"This software may be distributed under the terms of the BSD license.\n"
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
"\n"
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions are\n"
"met:\n"
"\n";
Declare all read only data structures as const By analysing objdump output some read only structures were found in .data section. To help compiler further optimize code declare these as const. Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
2015-04-24 09:19:53 +02:00
const char *const wpa_supplicant_full_license3 =
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
"1. Redistributions of source code must retain the above copyright\n"
" notice, this list of conditions and the following disclaimer.\n"
"\n"
"2. Redistributions in binary form must reproduce the above copyright\n"
" notice, this list of conditions and the following disclaimer in the\n"
" documentation and/or other materials provided with the distribution.\n"
"\n";
Declare all read only data structures as const By analysing objdump output some read only structures were found in .data section. To help compiler further optimize code declare these as const. Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
2015-04-24 09:19:53 +02:00
const char *const wpa_supplicant_full_license4 =
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
"3. Neither the name(s) of the above-listed copyright holder(s) nor the\n"
" names of its contributors may be used to endorse or promote products\n"
" derived from this software without specific prior written permission.\n"
"\n"
"THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n"
"\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n"
"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n"
"A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n";
Declare all read only data structures as const By analysing objdump output some read only structures were found in .data section. To help compiler further optimize code declare these as const. Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
2015-04-24 09:19:53 +02:00
const char *const wpa_supplicant_full_license5 =
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
"OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n"
"SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n"
"LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n"
"DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n"
"THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n"
"(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n"
"OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
"\n";
#endif /* CONFIG_NO_STDOUT_DEBUG */
/* Configure default/group WEP keys for static WEP */
driver_nl80211: Fix MLME key settings for static WEP Current wpa_supplicant has a bug with WEP keys, it adds a zero-length sequence counter field to netlink which the kernel doesn't accept. Additionally, the kernel API slightly changed to accept keys only when connected, so we need to send it the keys after that. For that to work with shared key authentication, we also include the default WEP TX key in the authentication command. To upload the keys properly _after_ associating, add a new flag WPA_DRIVER_FLAGS_SET_KEYS_AFTER_ASSOC_DONE indicating that the driver needs the keys at that point and not earlier.
2009-09-15 09:48:30 +02:00
int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
{
int i, set = 0;
for (i = 0; i < NUM_WEP_KEYS; i++) {
if (ssid->wep_key_len[i] == 0)
continue;
set = 1;
Use set_key addr to distinguish default and multicast keys Previously, both NULL and ff:ff:ff:ff:ff:ff addr were used in various places to indicate default/broadcast keys. Make this more consistent and useful by defining NULL to mean default key (i.e., used both for unicast and broadcast) and ff:ff:ff:ff:ff:ff to indicate broadcast key (i.e., used only with broadcast).
2011-01-09 18:44:28 +01:00
wpa_drv_set_key(wpa_s, WPA_ALG_WEP, NULL,
Use more consistent set_key seq value when nothing is being set Use NULL instead of (u8 *) "" as the seq value and make sure the driver wrapper implementations can handle NULL value. This was previously already done in number of places, but not everywhere.
2011-01-09 11:09:04 +01:00
i, i == ssid->wep_tx_keyidx, NULL, 0,
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
ssid->wep_key[i], ssid->wep_key_len[i]);
}
return set;
}
Try to set WPA-None key after IBSS-joined event cfg80211 rejects the set_key operations before the IBSS network has been fully formed, so add one more attempt to set the key for WPA-None at IBSS joined driver event. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-05-07 17:14:56 +02:00
int wpa_supplicant_set_wpa_none_key(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid)
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
{
u8 key[32];
size_t keylen;
Get rid of unnecessary typedefs for enums.
2009-12-26 09:35:08 +01:00
enum wpa_alg alg;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
u8 seq[6] = { 0 };
Explicitly clear the temporary stack-based key for WPA-None There is no need to leave this temporary key in stack memory after having been configured to the driver. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-29 12:09:24 +01:00
int ret;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
/* IBSS/WPA-None uses only one key (Group) for both receiving and
* sending unicast and multicast packets. */
Define struct wpa_ssid::mode as an enum with more readable values
2009-12-28 15:00:36 +01:00
if (ssid->mode != WPAS_MODE_IBSS) {
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_INFO, "WPA: Invalid mode %d (not "
"IBSS/ad-hoc) for WPA-None", ssid->mode);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return -1;
}
if (!ssid->psk_set) {
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_INFO, "WPA: No PSK configured for "
"WPA-None");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return -1;
}
switch (wpa_s->group_cipher) {
case WPA_CIPHER_CCMP:
os_memcpy(key, ssid->psk, 16);
keylen = 16;
alg = WPA_ALG_CCMP;
break;
Add support for using GCMP cipher from IEEE 802.11ad This allows both hostapd and wpa_supplicant to be used to derive and configure keys for GCMP. This is quite similar to CCMP key configuration, but a different cipher suite and somewhat different rules are used in cipher selection. It should be noted that GCMP is not included in default parameters at least for now, so explicit pairwise/group configuration is needed to enable it. This may change in the future to allow GCMP to be selected automatically in cases where CCMP could have been used. This commit does not included changes to WPS or P2P to allow GCMP to be used. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-29 10:52:15 +02:00
case WPA_CIPHER_GCMP:
os_memcpy(key, ssid->psk, 16);
keylen = 16;
alg = WPA_ALG_GCMP;
break;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
case WPA_CIPHER_TKIP:
/* WPA-None uses the same Michael MIC key for both TX and RX */
os_memcpy(key, ssid->psk, 16 + 8);
os_memcpy(key + 16 + 8, ssid->psk + 16, 8);
keylen = 32;
alg = WPA_ALG_TKIP;
break;
default:
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_INFO, "WPA: Invalid group cipher %d for "
"WPA-None", wpa_s->group_cipher);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return -1;
}
/* TODO: should actually remember the previously used seq#, both for TX
* and RX from each STA.. */
Explicitly clear the temporary stack-based key for WPA-None There is no need to leave this temporary key in stack memory after having been configured to the driver. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-29 12:09:24 +01:00
ret = wpa_drv_set_key(wpa_s, alg, NULL, 0, 1, seq, 6, key, keylen);
os_memset(key, 0, sizeof(key));
return ret;
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_timeout(void *eloop_ctx, void *timeout_ctx)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
const u8 *bssid = wpa_s->bssid;
Introduced new helper function is_zero_ether_addr() Use this inline function to replace os_memcmp(addr, "\x00\x00\x00\x00\x00\x00", ETH_ALEN) == 0.
2008-06-03 17:08:48 +02:00
if (is_zero_ether_addr(bssid))
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
bssid = wpa_s->pending_bssid;
wpa_msg(wpa_s, MSG_INFO, "Authentication with " MACSTR " timed out.",
MAC2STR(bssid));
wpa_blacklist_add(wpa_s, bssid);
wpa_sm_notify_disassoc(wpa_s->wpa);
Use deauthentication instead of disassociation if not associated cfg80211/mac80211 may reject disassociation command if association has not yet been formed. Use deauthentication in cases where it is possible that we are associating at the moment the command is issued. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-05 15:55:30 +01:00
wpa_supplicant_deauthenticate(wpa_s, WLAN_REASON_DEAUTH_LEAVING);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_s->reassociate = 1;
Wait 1 second before (re)scanning on authentication timeout If we timed out, the AP or the local radio may be busy. So, wait a second until scanning again. Signed-off-by: Ben Greear <greearb@candelatech.com>
2011-02-24 16:16:16 +01:00
/*
* If we timed out, the AP or the local radio may be busy.
* So, wait a second until scanning again.
*/
wpa_supplicant_req_scan(wpa_s, 1, 0);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
/**
* wpa_supplicant_req_auth_timeout - Schedule a timeout for authentication
* @wpa_s: Pointer to wpa_supplicant data
* @sec: Number of seconds after which to time out authentication
* @usec: Number of microseconds after which to time out authentication
*
* This function is used to schedule a timeout for the current authentication
* attempt.
*/
void wpa_supplicant_req_auth_timeout(struct wpa_supplicant *wpa_s,
int sec, int usec)
{
Remove unnecessary wpa_s->conf checks wpa_s->conf cannot be NULL because wpa_supplicant_init_iface() would not allow wpa_supplicant_add_iface() to return wpa_s instance in such state. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-26 12:09:50 +02:00
if (wpa_s->conf->ap_scan == 0 &&
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
(wpa_s->drv_flags & WPA_DRIVER_FLAGS_WIRED))
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return;
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, "Setting authentication timeout: %d sec "
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
"%d usec", sec, usec);
eloop_cancel_timeout(wpa_supplicant_timeout, wpa_s, NULL);
eloop_register_timeout(sec, usec, wpa_supplicant_timeout, wpa_s, NULL);
}
/**
* wpa_supplicant_cancel_auth_timeout - Cancel authentication timeout
* @wpa_s: Pointer to wpa_supplicant data
*
* This function is used to cancel authentication timeout scheduled with
* wpa_supplicant_req_auth_timeout() and it is called when authentication has
* been completed.
*/
void wpa_supplicant_cancel_auth_timeout(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 authentication timeout");
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_timeout, wpa_s, NULL);
wpa_blacklist_del(wpa_s, wpa_s->bssid);
}
/**
* wpa_supplicant_initiate_eapol - Configure EAPOL state machine
* @wpa_s: Pointer to wpa_supplicant data
*
* This function is used to configure EAPOL state machine based on the selected
* authentication mode.
*/
void wpa_supplicant_initiate_eapol(struct wpa_supplicant *wpa_s)
{
#ifdef IEEE8021X_EAPOL
struct eapol_config eapol_conf;
struct wpa_ssid *ssid = wpa_s->current_ssid;
Disable per-BSSID authentication for RSN IBSS RSN IBSS uses authentication per-STA and that is initialized separately, so there is no need to enable the per-BSS like authentication that is used with APs.
2009-01-17 15:41:47 +01:00
#ifdef CONFIG_IBSS_RSN
Define struct wpa_ssid::mode as an enum with more readable values
2009-12-28 15:00:36 +01:00
if (ssid->mode == WPAS_MODE_IBSS &&
Disable per-BSSID authentication for RSN IBSS RSN IBSS uses authentication per-STA and that is initialized separately, so there is no need to enable the per-BSS like authentication that is used with APs.
2009-01-17 15:41:47 +01:00
wpa_s->key_mgmt != WPA_KEY_MGMT_NONE &&
wpa_s->key_mgmt != WPA_KEY_MGMT_WPA_NONE) {
/*
* RSN IBSS authentication is per-STA and we can disable the
* per-BSSID EAPOL authentication.
*/
eapol_sm_notify_portControl(wpa_s->eapol, ForceAuthorized);
eapol_sm_notify_eap_success(wpa_s->eapol, TRUE);
eapol_sm_notify_eap_fail(wpa_s->eapol, FALSE);
return;
}
#endif /* CONFIG_IBSS_RSN */
Always clear EAP altAccept and altReject variables on new association Previously, this was only done when the new connection is using WPA-Personal. However, it looks like it was possible to trigger an infinite busy loop if altAccept or altReject were left set to true and an EAPOL frame is received (eapolEap is set to true). Clearing altAccept and altReject for each association prevents this loop from happening in the beginning of the next association.
2008-11-30 15:54:16 +01:00
eapol_sm_notify_eap_success(wpa_s->eapol, FALSE);
eapol_sm_notify_eap_fail(wpa_s->eapol, FALSE);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (wpa_s->key_mgmt == WPA_KEY_MGMT_NONE ||
wpa_s->key_mgmt == WPA_KEY_MGMT_WPA_NONE)
eapol_sm_notify_portControl(wpa_s->eapol, ForceAuthorized);
else
eapol_sm_notify_portControl(wpa_s->eapol, Auto);
os_memset(&eapol_conf, 0, sizeof(eapol_conf));
if (wpa_s->key_mgmt == WPA_KEY_MGMT_IEEE8021X_NO_WPA) {
eapol_conf.accept_802_1x_keys = 1;
eapol_conf.required_keys = 0;
if (ssid->eapol_flags & EAPOL_FLAG_REQUIRE_KEY_UNICAST) {
eapol_conf.required_keys |= EAPOL_REQUIRE_KEY_UNICAST;
}
if (ssid->eapol_flags & EAPOL_FLAG_REQUIRE_KEY_BROADCAST) {
eapol_conf.required_keys |=
EAPOL_REQUIRE_KEY_BROADCAST;
}
Remove unnecessary wpa_s->conf checks wpa_s->conf cannot be NULL because wpa_supplicant_init_iface() would not allow wpa_supplicant_add_iface() to return wpa_s instance in such state. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-26 12:09:50 +02:00
if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_WIRED)
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
eapol_conf.required_keys = 0;
}
Remove unnecessary wpa_s->conf checks wpa_s->conf cannot be NULL because wpa_supplicant_init_iface() would not allow wpa_supplicant_add_iface() to return wpa_s instance in such state. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-26 12:09:50 +02:00
eapol_conf.fast_reauth = wpa_s->conf->fast_reauth;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
eapol_conf.workaround = ssid->eap_workaround;
Added support for using SHA256-based stronger key derivation for WPA2 IEEE 802.11w/D6.0 defines new AKMPs to indicate SHA256-based algorithms for key derivation (and AES-CMAC for EAPOL-Key MIC). Add support for using new AKMPs and clean up AKMP processing with helper functions in defs.h.
2008-08-31 21:57:28 +02:00
eapol_conf.eap_disabled =
!wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt) &&
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
wpa_s->key_mgmt != WPA_KEY_MGMT_IEEE8021X_NO_WPA &&
wpa_s->key_mgmt != WPA_KEY_MGMT_WPS;
EAP peer: Add framework for external SIM/USIM processing The new configuration parameter external_sim=<0/1> can now be used to configure wpa_supplicant to use external SIM/USIM processing (e.g., GSM authentication for EAP-SIM or UMTS authentication for EAP-AKA). The requests and responses for such operations are sent over the ctrl_iface CTRL-REQ-SIM and CTRL-RSP-SIM commands similarly to the existing password query mechanism. Changes to the EAP methods to use this new mechanism will be added in separate commits. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-19 16:32:05 +02:00
eapol_conf.external_sim = wpa_s->conf->external_sim;
WPS: Extend startWhen to 2 if peer AP supports WPS 2.0 Increase EAPOL startWhen to 2 for the case where the AP/GO has advertised it supports WPS 2.0. This is done to make it less likely for the EAPOL-Start frame to be sent out since that is only required for WPS 1.0. Not sending it can remove one unnecessary round trip from the EAP exchange when the AP is going to start with EAP-Request/Identity immediately based on the Association Request frame. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-13 09:40:08 +02:00
#ifdef CONFIG_WPS
if (wpa_s->key_mgmt == WPA_KEY_MGMT_WPS) {
eapol_conf.wps |= EAPOL_LOCAL_WPS_IN_USE;
if (wpa_s->current_bss) {
struct wpabuf *ie;
ie = wpa_bss_get_vendor_ie_multi(wpa_s->current_bss,
WPS_IE_VENDOR_TYPE);
if (ie) {
if (wps_is_20(ie))
eapol_conf.wps |=
EAPOL_PEER_IS_WPS20_AP;
wpabuf_free(ie);
}
}
}
#endif /* CONFIG_WPS */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
eapol_sm_notify_config(wpa_s->eapol, &ssid->eap, &eapol_conf);
MACsec: wpa_supplicant integration Add MACsec to the wpa_supplicant build system and configuration file. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-25 20:39:02 +01:00
ieee802_1x_alloc_kay_sm(wpa_s, ssid);
Fix build without IEEE8021X_EAPOL The MACsec addition placed one of the calls outside the #ifdef IEEE802X_EAPOL block while the variable needed for this was defined only within the block. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-12 15:56:23 +02:00
#endif /* IEEE8021X_EAPOL */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
/**
* wpa_supplicant_set_non_wpa_policy - Set WPA parameters to non-WPA mode
* @wpa_s: Pointer to wpa_supplicant data
* @ssid: Configuration data for the network
*
* This function is used to configure WPA state machine and related parameters
* to a mode where WPA is not enabled. This is called as part of the
* authentication configuration when the selected network does not use WPA.
*/
void wpa_supplicant_set_non_wpa_policy(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid)
{
int i;
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)
wpa_s->key_mgmt = WPA_KEY_MGMT_WPS;
else if (ssid->key_mgmt & WPA_KEY_MGMT_IEEE8021X_NO_WPA)
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_s->key_mgmt = WPA_KEY_MGMT_IEEE8021X_NO_WPA;
else
wpa_s->key_mgmt = WPA_KEY_MGMT_NONE;
wpa_sm_set_ap_wpa_ie(wpa_s->wpa, NULL, 0);
wpa_sm_set_ap_rsn_ie(wpa_s->wpa, NULL, 0);
wpa_sm_set_assoc_wpa_ie(wpa_s->wpa, NULL, 0);
wpa_s->pairwise_cipher = WPA_CIPHER_NONE;
wpa_s->group_cipher = WPA_CIPHER_NONE;
wpa_s->mgmt_group_cipher = 0;
for (i = 0; i < NUM_WEP_KEYS; i++) {
if (ssid->wep_key_len[i] > 5) {
wpa_s->pairwise_cipher = WPA_CIPHER_WEP104;
wpa_s->group_cipher = WPA_CIPHER_WEP104;
break;
} else if (ssid->wep_key_len[i] > 0) {
wpa_s->pairwise_cipher = WPA_CIPHER_WEP40;
wpa_s->group_cipher = WPA_CIPHER_WEP40;
break;
}
}
wpa_sm_set_param(wpa_s->wpa, WPA_PARAM_RSN_ENABLED, 0);
wpa_sm_set_param(wpa_s->wpa, WPA_PARAM_KEY_MGMT, wpa_s->key_mgmt);
wpa_sm_set_param(wpa_s->wpa, WPA_PARAM_PAIRWISE,
wpa_s->pairwise_cipher);
wpa_sm_set_param(wpa_s->wpa, WPA_PARAM_GROUP, wpa_s->group_cipher);
#ifdef CONFIG_IEEE80211W
wpa_sm_set_param(wpa_s->wpa, WPA_PARAM_MGMT_GROUP,
wpa_s->mgmt_group_cipher);
#endif /* CONFIG_IEEE80211W */
pmksa_cache_clear_current(wpa_s->wpa);
}
Fix processing of channel list update events Commit 6bf731e8cea4d9d41665d271b331e096c7c569e9 broke handling of EVENT_CHANNEL_LIST_CHANGED by introducing a cached copy of the driver channel list that does not get updated even if driver changes its list. Fix this by synchronizing the cacched wpa_s->hw.modes information whenever EVENT_CHANNEL_LIST_CHANGED is processed. This fixes P2P channel list updates based on regulatory domain hints that may trigger driver to change its supported channel list. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-03-01 16:53:53 +01:00
void free_hw_features(struct wpa_supplicant *wpa_s)
wpa_supplicant: Unify hardware feature data The hardware feature data is required in several different places throughout the code. Previously, the data was acquired and freed on demand, but with this patch wpa_supplicant will keep a single copy around at runtime for everyone to use. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
2011-10-23 10:58:54 +02:00
{
int i;
if (wpa_s->hw.modes == NULL)
return;
for (i = 0; i < wpa_s->hw.num_modes; i++) {
os_free(wpa_s->hw.modes[i].channels);
os_free(wpa_s->hw.modes[i].rates);
}
os_free(wpa_s->hw.modes);
wpa_s->hw.modes = NULL;
}
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_cleanup(struct wpa_supplicant *wpa_s)
{
Add generic mechanism for adding vendor elements into frames This adds following new control interface commands to allow arbitrary vendor elements to be added into number of frames: VENDOR_ELEM_ADD <frame id> <hexdump of elem(s)> VENDOR_ELEM_GET <frame id> VENDOR_ELEM_REMOVE <frame id> <hexdump of elem(s)> VENDOR_ELEM_REMOVE <frame id> * The following frames are supported in this commit (additional frames can be added in the future): 0 = Probe Request frame in P2P device discovery 1 = Probe Response frame from P2P Device role 2 = Probe Response frame from P2P GO 3 = Beacon frame from P2P GO 4 = PD Req 5 = PD Resp 6 = GO Neg Req 7 = GO Neg Resp 8 = GO Neg Conf 9 = Invitation Request 10 = Invitation Response 11 = P2P Association Request 12 = P2P Association Response One or more vendor element can be added/removed with the commands. The hexdump of the element(s) needs to contain the full element (id, len, payload) and the buffer needs to pass IE parsing requirements to be accepted. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-07-04 17:23:43 +02:00
int i;
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
bgscan_deinit(wpa_s);
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
autoscan_deinit(wpa_s);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
scard_deinit(wpa_s->scard);
wpa_s->scard = NULL;
wpa_sm_set_scard_ctx(wpa_s->wpa, NULL);
eapol_sm_register_scard_ctx(wpa_s->eapol, NULL);
l2_packet_deinit(wpa_s->l2);
wpa_s->l2 = NULL;
if (wpa_s->l2_br) {
l2_packet_deinit(wpa_s->l2_br);
wpa_s->l2_br = NULL;
}
Add data test functionality It is now possible to run hwsim_test like data connectivity test through wpa_supplicant/hostapd control interface if CONFIG_TESTING_OPTIONS=y is used for the build. Test functionality is enabled/disabled at runtime with "DATA_TEST_CONFIG <1/0>". The "DATA_TEST_TX <dst> <src> <tos>" command can be used to request a test frame to be transmitted. "DATA-TEST-RX <dst> <src>" event is generated when the test frame is received. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-19 19:51:45 +02:00
#ifdef CONFIG_TESTING_OPTIONS
l2_packet_deinit(wpa_s->l2_test);
wpa_s->l2_test = NULL;
#endif /* CONFIG_TESTING_OPTIONS */
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 != NULL) {
dbus: Fix D-Bus network and BSS object registration/unregistration Do not try to unregister BSS objects twice (the latter one with invalid path) and make sure all network objects get added and removed properly (the ones read from configuration file were not being registered, but were tried to be unregistered).
2009-12-29 21:17:18 +01:00
struct wpa_ssid *ssid;
for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next)
wpas_notify_network_removed(wpa_s, ssid);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
os_free(wpa_s->confname);
wpa_s->confname = NULL;
wpa_supplicant: Add option -I for additional config file This option can be used only for global parameters that are not going to be changed from settings. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
2013-04-23 16:38:57 +02:00
os_free(wpa_s->confanother);
wpa_s->confanother = NULL;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_sm_set_eapol(wpa_s->wpa, NULL);
eapol_sm_deinit(wpa_s->eapol);
wpa_s->eapol = NULL;
rsn_preauth_deinit(wpa_s->wpa);
TDLS: Add initial support for TDLS (IEEE Std 802.11z-2010)
2010-10-07 09:26:56 +02:00
#ifdef CONFIG_TDLS
wpa_tdls_deinit(wpa_s->wpa);
#endif /* CONFIG_TDLS */
WMM AC: Reconfigure tspecs on reassociation to the same BSS The specification requires the tspecs to be kept upon reassociation to the same BSS. Save the last tspecs before such reassociation, and reconfigure on the association notification. Note that the current flow is not transparent to the user (it is notified about deauth/reassoc and tspec removal/addition). Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
2014-12-29 03:15:01 +01:00
wmm_ac_clear_saved_tspecs(wpa_s);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
pmksa_candidate_free(wpa_s->wpa);
wpa_sm_deinit(wpa_s->wpa);
wpa_s->wpa = NULL;
wpa_blacklist_clear(wpa_s);
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
wpa_bss_deinit(wpa_s);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01: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(wpa_s);
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(wpa_s);
wpa_supplicant_cancel_auth_timeout(wpa_s);
Fix TKIP countermeasures stopping in deinit paths The eloop timeout to stop TKIP countermeasures has to be canceled on deinit path to avoid leaving bogus timeouts behind. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-10-30 11:43:30 +01:00
eloop_cancel_timeout(wpa_supplicant_stop_countermeasures, wpa_s, NULL);
#ifdef CONFIG_DELAYED_MIC_ERROR_REPORT
eloop_cancel_timeout(wpa_supplicant_delayed_mic_error_report,
wpa_s, NULL);
#endif /* CONFIG_DELAYED_MIC_ERROR_REPORT */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
Delay AP selection if all networks are temporarily disabled If all networks are temporarily disabled, delay AP selection until at least one network is enabled. Running AP selection when all networks are disabled is useless as wpa_supplicant will not try to connect. In addition, it will result in needless scan iterations that may delay the connection when it is needed. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2015-03-16 06:20:02 +01:00
eloop_cancel_timeout(wpas_network_reenabled, wpa_s, NULL);
WPS: Moved wps_context initialization into wps_supplicant.c The wps_context data is now managed at wpa_supplicant, not EAP-WSC. This makes wpa_supplicant design for WPS match with hostapd one and also makes it easier configure whatever parameters and callbacks are needed for WPS.
2008-11-28 19:32:13 +01:00
wpas_wps_deinit(wpa_s);
Added initial step for IBSS RSN support This commit adds a new build option, CONFIG_IBSS_RSN=y, that can be used to enable RSN support for IBSS. This links in RSN Authenticator code from hostapd and adds code for managing per-peer information for IBSS. A new wpa_cli command or driver event can be used to request RSN authentication with an IBSS peer. New RSN Authenticator and Supplicant will be allocated for each peer. The basic state machine setup code is included in this commit, but the state machines are not properly started yet. In addition, some of the callback functions are not yet complete.
2009-01-15 00:21:55 +01:00
Delay processing of EAPOL frames when not associated If an EAPOL frame is received while wpa_supplicant thinks the driver is not associated, queue the frame for processing at the moment when the association event is received. This is a workaround to a race condition in receiving data frames and management events from the kernel. The pending EAPOL frame will not be processed unless an association event is received within 100 msec for the same BSSID.
2009-09-04 17:04:41 +02:00
wpabuf_free(wpa_s->pending_eapol_rx);
wpa_s->pending_eapol_rx = NULL;
Added initial step for IBSS RSN support This commit adds a new build option, CONFIG_IBSS_RSN=y, that can be used to enable RSN support for IBSS. This links in RSN Authenticator code from hostapd and adds code for managing per-peer information for IBSS. A new wpa_cli command or driver event can be used to request RSN authentication with an IBSS peer. New RSN Authenticator and Supplicant will be allocated for each peer. The basic state machine setup code is included in this commit, but the state machines are not properly started yet. In addition, some of the callback functions are not yet complete.
2009-01-15 00:21:55 +01:00
#ifdef CONFIG_IBSS_RSN
ibss_rsn_deinit(wpa_s->ibss_rsn);
wpa_s->ibss_rsn = NULL;
#endif /* CONFIG_IBSS_RSN */
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
SME: Add timers for authentication and asscoiation mac80211 authentication or association operation may get stuck for some reasons, so wpa_supplicant better use an internal timer to recover from this. Signed-off-by: Ben Greear <greearb@candelatech.com>
2011-02-24 15:59:46 +01:00
sme_deinit(wpa_s);
Add preliminary hostapd data structure initialization for AP mode wpa_supplicant can now initialize hostapd data structures when mode=2 is used to set up an AP. The hostapd configuration is not yet set based on wpa_supplicant network configuration block. In addition, the glue code for hostapd driver_ops needs number of functions that will be needed for AP functionality.
2009-03-26 19:37:05 +01:00
#ifdef CONFIG_AP
wpa_supplicant_ap_deinit(wpa_s);
#endif /* CONFIG_AP */
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpas_p2p_deinit(wpa_s);
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
GAS: Use off-channel operations for requests This separates off-channel Action frame TX/RX from P2P into a generic implementation that can now be used both for P2P and GAS needs.
2011-09-29 18:22:08 +02:00
#ifdef CONFIG_OFFCHANNEL
offchannel_deinit(wpa_s);
#endif /* CONFIG_OFFCHANNEL */
Use sched_scan in driver init This patch uses sched_scan, if available, when the driver is initialized. It also adds a couple of cancel operations where appropriate. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:31 +02:00
wpa_supplicant_cancel_sched_scan(wpa_s);
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
os_free(wpa_s->next_scan_freqs);
wpa_s->next_scan_freqs = NULL;
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
os_free(wpa_s->manual_scan_freqs);
wpa_s->manual_scan_freqs = NULL;
GAS: Add a generic GAS query module This implements GAS request mechanism that is aimed at being used to replace use case specific GAS/ANQP implementations in the future. Compared to the earlier implementation in P2P SD, this implementation includes support for multiple concurrent requests and more thorough validation of frames against the pending query data. GAS header processing, including comeback and reassembly, are handled within gas_query.c and the users of this module will only need to provide the Query Request and process the (possibly reassembled) Query Response.
2011-09-28 18:44:25 +02:00
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
os_free(wpa_s->manual_sched_scan_freqs);
wpa_s->manual_sched_scan_freqs = NULL;
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, MAC_ADDR_RAND_ALL);
GAS: Remove all radio works before calling gas_query_deinit() Remove all gas-query radio works before calling gas_query_deinit() as gas_query_deinit() flow frees the query context, which might be later be accessed from the radio work callback (and result with unexpected behavior, e.g., segmentation fault). Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-06-01 12:38:10 +02:00
/*
* Need to remove any pending gas-query radio work before the
* gas_query_deinit() call because gas_query::work has not yet been set
* for works that have not been started. gas_query_free() will be unable
* to cancel such pending radio works and once the pending gas-query
* radio work eventually gets removed, the deinit notification call to
* gas_query_start_cb() would result in dereferencing freed memory.
*/
if (wpa_s->radio)
radio_remove_works(wpa_s, "gas-query", 0);
GAS: Add a generic GAS query module This implements GAS request mechanism that is aimed at being used to replace use case specific GAS/ANQP implementations in the future. Compared to the earlier implementation in P2P SD, this implementation includes support for multiple concurrent requests and more thorough validation of frames against the pending query data. GAS header processing, including comeback and reassembly, are handled within gas_query.c and the users of this module will only need to provide the Query Request and process the (possibly reassembled) Query Response.
2011-09-28 18:44:25 +02:00
gas_query_deinit(wpa_s->gas);
wpa_s->gas = NULL;
wpa_supplicant: Unify hardware feature data The hardware feature data is required in several different places throughout the code. Previously, the data was acquired and freed on demand, but with this patch wpa_supplicant will keep a single copy around at runtime for everyone to use. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
2011-10-23 10:58:54 +02:00
free_hw_features(wpa_s);
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
MACsec: wpa_supplicant integration Add MACsec to the wpa_supplicant build system and configuration file. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-25 20:39:02 +01:00
ieee802_1x_dealloc_kay_sm(wpa_s);
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
os_free(wpa_s->bssid_filter);
wpa_s->bssid_filter = NULL;
WNM: Add advertisement of BSS max idle period If WNM is enabled for the build (CONFIG_WNM=y), add BSS max idle period information to the (Re)Association Response frame from the AP and parse this information on the station. For SME-in-wpa_supplicant case, add a timer to handle periodic transmission of the keep-alive frame. The actual request for the driver to transmit a frame is not yet implemented. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-05-28 02:35:00 +02:00
Add disallow_aps parameter to disallow BSSIDs/SSIDs External programs can use this new parameter to prevent wpa_supplicant from connecting to a list of BSSIDs and/or SSIDs. The disallowed BSSes will still be visible in scan results and it is possible to run ANQP operations with them, but BSS selection for connection will skip any BSS that matches an entry in the disallowed list. The new parameter can be set with the control interface SET command using following syntax: SET disallow_aps <disallow_list> disallow_list ::= <ssid_spec> | <bssid_spec> | <disallow_list> | “” SSID_SPEC ::= ssid <SSID_HEX> BSSID_SPEC ::= bssid <BSSID_HEX> For example: wpa_cli set disallow_list "ssid 74657374 bssid 001122334455 ssid 68656c6c6f" wpa_cli set disallow_list (the empty value removes all entries) Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-27 16:36:59 +02:00
os_free(wpa_s->disallow_aps_bssid);
wpa_s->disallow_aps_bssid = NULL;
os_free(wpa_s->disallow_aps_ssid);
wpa_s->disallow_aps_ssid = NULL;
WNM: Add advertisement of BSS max idle period If WNM is enabled for the build (CONFIG_WNM=y), add BSS max idle period information to the (Re)Association Response frame from the AP and parse this information on the station. For SME-in-wpa_supplicant case, add a timer to handle periodic transmission of the keep-alive frame. The actual request for the driver to transmit a frame is not yet implemented. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-05-28 02:35:00 +02:00
wnm_bss_keep_alive_deinit(wpa_s);
WNM: Add neighbor report processing for BSS Transition Management Process the neighbor report received in BSS Management Request frames. Signed-hostap: Vinayak Kamath <vkamat@codeaurora.org>
2013-05-16 16:48:59 +02:00
#ifdef CONFIG_WNM
wnm_deallocate_memory(wpa_s);
#endif /* CONFIG_WNM */
EXT PW: Add framework for supporting external password storage This new mechanism can be used to make wpa_supplicant using external storage (e.g., key store in the operating system) for passwords, passphrases, and PSKs. This commit is only adding the framework part needed to support this, i.e., no actual configuration parameter can yet use this new mechanism. In addition, only a simple test backend is added to allow developer testing of the functionality. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-03 20:28:42 +02:00
ext_password_deinit(wpa_s->ext_pw);
wpa_s->ext_pw = NULL;
Add generic GAS request mechanism The new gas_request and gas_response_get commands can be used to request arbitary GAS queries to be performed. These can be used with ANQP or with other (including vendor specific) advertisement protocols. gas_request <BSSID> <AdvProtoID> [Query] gas_response_get <addr> <dialog token> [offset,length] For example, ANQP query for Capability list in interactive wpa_cli session: > gas_request 02:00:00:00:01:00 00 000102000101 <3>GAS-RESPONSE-INFO addr=02:00:00:00:01:00 dialog_token=0 status_code=0 resp_len=32 > gas_response_get 02:00:00:00:01:00 00 01011c00010102010501070108010c01dddd0c00506f9a110200020304050607 > gas_response_get 02:00:00:00:01:00 00 0,10 01011c00010102010501 > gas_response_get 02:00:00:00:01:00 00 10,10 070108010c01dddd0c00 > gas_response_get 02:00:00:00:01:00 00 20,10 506f9a11020002030405 > gas_response_get 02:00:00:00:01:00 00 30,2 0607 It should be noted that the maximum length of the response buffer is currently 4096 bytes which allows about 2000 bytes of the response data to be fetched with a single gas_response_get command. If the response is longer, it can be fetched in pieces as shown in the example above. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-27 17:13:10 +02:00
wpabuf_free(wpa_s->last_gas_resp);
Interworking: Keep up to two pending GAS_REQUEST responses Previously, only the last response data was kept in memory. This increases that to hold up to two last responses to allow some more parallel operations to be requested. In addition, the response data is now freed as soon as the external program has fetched it. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-06 06:53:37 +01:00
wpa_s->last_gas_resp = NULL;
wpabuf_free(wpa_s->prev_gas_resp);
wpa_s->prev_gas_resp = NULL;
Maintain list of BSS entries in last scan result order This allows last results to be used even after they have been freed since the information is copied to the BSS entries anyway and this new array provides the order in which scan results were processed. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 18:53:15 +02:00
os_free(wpa_s->last_scan_res);
wpa_s->last_scan_res = NULL;
HS 2.0R2: Add routine for fetching OSU provider information The new wpa_cli fetch_osu command can be used to fetch information about all OSU providers and write that to a text file with the icons in separate files. cancel_osu_fetch command can be used to stop ongoing OSU provider list fetch. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-25 23:10:41 +01:00
#ifdef CONFIG_HS20
Remove leftover timeouts on cleanup Signed-off-by: Alexandru Costache <alexandru.costache.100@gmail.com>
2014-05-12 18:14:55 +02:00
hs20_deinit(wpa_s);
HS 2.0R2: Add routine for fetching OSU provider information The new wpa_cli fetch_osu command can be used to fetch information about all OSU providers and write that to a text file with the icons in separate files. cancel_osu_fetch command can be used to stop ongoing OSU provider list fetch. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-25 23:10:41 +01:00
#endif /* CONFIG_HS20 */
Add generic mechanism for adding vendor elements into frames This adds following new control interface commands to allow arbitrary vendor elements to be added into number of frames: VENDOR_ELEM_ADD <frame id> <hexdump of elem(s)> VENDOR_ELEM_GET <frame id> VENDOR_ELEM_REMOVE <frame id> <hexdump of elem(s)> VENDOR_ELEM_REMOVE <frame id> * The following frames are supported in this commit (additional frames can be added in the future): 0 = Probe Request frame in P2P device discovery 1 = Probe Response frame from P2P Device role 2 = Probe Response frame from P2P GO 3 = Beacon frame from P2P GO 4 = PD Req 5 = PD Resp 6 = GO Neg Req 7 = GO Neg Resp 8 = GO Neg Conf 9 = Invitation Request 10 = Invitation Response 11 = P2P Association Request 12 = P2P Association Response One or more vendor element can be added/removed with the commands. The hexdump of the element(s) needs to contain the full element (id, len, payload) and the buffer needs to pass IE parsing requirements to be accepted. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-07-04 17:23:43 +02:00
for (i = 0; i < NUM_VENDOR_ELEM_FRAMES; i++) {
wpabuf_free(wpa_s->vendor_elem[i]);
wpa_s->vendor_elem[i] = NULL;
}
WMM AC: Fix memory leak on deinit without disassoc event It was possible for wmm_ac_deinit() not getting called when an interface was removed in a sequence where disassociation was not reported and wmm_ac_notify_disassoc() did not get called. This resulted in leaking whatever memory was allocated for WMM AC parameters. Fix that by calling wmm_ac_notify_disassoc() from wpa_supplicant_cleanup(). Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-11-27 18:00:02 +01:00
wmm_ac_notify_disassoc(wpa_s);
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_plans_num = 0;
os_free(wpa_s->sched_scan_plans);
wpa_s->sched_scan_plans = NULL;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
/**
* wpa_clear_keys - Clear keys configured for the driver
* @wpa_s: Pointer to wpa_supplicant data
* @addr: Previously used BSSID or %NULL if not available
*
* This function clears the encryption keys that has been previously configured
* for the driver.
*/
void wpa_clear_keys(struct wpa_supplicant *wpa_s, const u8 *addr)
{
Avoid unnecessary key clearing operations Track set_key operations per-key index and clear keys on disconnection only if the key was set (or may have been set which is the case for the first operation after wpa_supplicant start). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-02 22:46:21 +01:00
int i, max;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
MFP: Clear IGTK The fourth and fifth keys are used as IGTK for management frame protection. This patch clears these keys. I have tested with linux kernel 2.6.31.2.
2009-10-12 06:19:01 +02:00
#ifdef CONFIG_IEEE80211W
Avoid unnecessary key clearing operations Track set_key operations per-key index and clear keys on disconnection only if the key was set (or may have been set which is the case for the first operation after wpa_supplicant start). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-02 22:46:21 +01:00
max = 6;
#else /* CONFIG_IEEE80211W */
max = 4;
MFP: Clear IGTK The fourth and fifth keys are used as IGTK for management frame protection. This patch clears these keys. I have tested with linux kernel 2.6.31.2.
2009-10-12 06:19:01 +02:00
#endif /* CONFIG_IEEE80211W */
Avoid unnecessary key clearing operations Track set_key operations per-key index and clear keys on disconnection only if the key was set (or may have been set which is the case for the first operation after wpa_supplicant start). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-02 22:46:21 +01:00
/* MLME-DELETEKEYS.request */
for (i = 0; i < max; i++) {
if (wpa_s->keys_cleared & BIT(i))
continue;
wpa_drv_set_key(wpa_s, WPA_ALG_NONE, NULL, i, 0, NULL, 0,
NULL, 0);
}
if (!(wpa_s->keys_cleared & BIT(0)) && addr &&
!is_zero_ether_addr(addr)) {
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_drv_set_key(wpa_s, WPA_ALG_NONE, addr, 0, 0, NULL, 0, NULL,
0);
/* MLME-SETPROTECTION.request(None) */
wpa_drv_mlme_setprotection(
wpa_s, addr,
MLME_SETPROTECTION_PROTECT_TYPE_NONE,
MLME_SETPROTECTION_KEY_TYPE_PAIRWISE);
}
Avoid unnecessary key clearing operations Track set_key operations per-key index and clear keys on disconnection only if the key was set (or may have been set which is the case for the first operation after wpa_supplicant start). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-02 22:46:21 +01:00
wpa_s->keys_cleared = (u32) -1;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
/**
* wpa_supplicant_state_txt - Get the connection state name as a text string
* @state: State (wpa_state; WPA_*)
* Returns: The state name as a printable text string
*/
Get rid of unnecessary typedefs for enums.
2009-12-26 09:35:08 +01:00
const char * wpa_supplicant_state_txt(enum wpa_states state)
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
{
switch (state) {
case WPA_DISCONNECTED:
return "DISCONNECTED";
case WPA_INACTIVE:
return "INACTIVE";
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
case WPA_INTERFACE_DISABLED:
return "INTERFACE_DISABLED";
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
case WPA_SCANNING:
return "SCANNING";
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
case WPA_AUTHENTICATING:
return "AUTHENTICATING";
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
case WPA_ASSOCIATING:
return "ASSOCIATING";
case WPA_ASSOCIATED:
return "ASSOCIATED";
case WPA_4WAY_HANDSHAKE:
return "4WAY_HANDSHAKE";
case WPA_GROUP_HANDSHAKE:
return "GROUP_HANDSHAKE";
case WPA_COMPLETED:
return "COMPLETED";
default:
return "UNKNOWN";
}
}
wpa_supplicant: Start bgscan on COMPLETED, not ASSOCIATED Move the code snippet to switch on bgscan over to wpa_supplicant.c from event.c, so that it can be activated on wpa_supplicant_set_state(). Also create a centralized place to switch off bgscan. bgscan is now turned on in COMPLETED, not ASSOCIATED.
2011-03-20 11:27:03 +01:00
#ifdef CONFIG_BGSCAN
static void wpa_supplicant_start_bgscan(struct wpa_supplicant *wpa_s)
{
bgscan: Add global bgscan configuration This option can be used to globally configure bgscan parameters for all the network blocks. Note that this configuration will not override a network block specific bgscan settings, but will only be used in case that the network block does not have a valid bgscan configuration. Signed-hostap: Haim Dreyfuss <haim.dreyfuss@intel.com>
2013-11-03 14:19:59 +01:00
const char *name;
if (wpa_s->current_ssid && wpa_s->current_ssid->bgscan)
name = wpa_s->current_ssid->bgscan;
else
name = wpa_s->conf->bgscan;
bgscan: Do not initialize bgscan if disabled by user Do not initialize bgscan if the user explicitly set bgscan to an empty string. Without this patch wpa_supplicant tries to initialize bgscan to the first option if the string is empty. Signed-off-by: David Spinadel <david.spinadel@intel.com>
2014-03-03 13:53:17 +01:00
if (name == NULL || name[0] == '\0')
bgscan: Add global bgscan configuration This option can be used to globally configure bgscan parameters for all the network blocks. Note that this configuration will not override a network block specific bgscan settings, but will only be used in case that the network block does not have a valid bgscan configuration. Signed-hostap: Haim Dreyfuss <haim.dreyfuss@intel.com>
2013-11-03 14:19:59 +01:00
return;
Do not enable bgscan when driver takes care of BSS selection There is no need to request periodic bgscans when the driver claims to have capability for roaming within ESS. Ignoring the bgscan configuration allows the same configuration file to be used both with drivers the handle roaming and with drivers that don't.
2011-09-26 14:17:01 +02:00
if (wpas_driver_bss_selection(wpa_s))
return;
wpa_supplicant: Start bgscan on COMPLETED, not ASSOCIATED Move the code snippet to switch on bgscan over to wpa_supplicant.c from event.c, so that it can be activated on wpa_supplicant_set_state(). Also create a centralized place to switch off bgscan. bgscan is now turned on in COMPLETED, not ASSOCIATED.
2011-03-20 11:27:03 +01:00
if (wpa_s->current_ssid == wpa_s->bgscan_ssid)
return;
P2P: Do not initialize bgscan on P2P interfaces As a P2P group has a unique SSID and one security domain, it does not make sense to enable background scanning for roaming purposes. Signed-off-by: David Spinadel <david.spinadel@intel.com>
2014-03-03 13:53:20 +01:00
#ifdef CONFIG_P2P
if (wpa_s->p2p_group_interface != NOT_P2P_GROUP_INTERFACE)
return;
#endif /* CONFIG_P2P */
wpa_supplicant: Start bgscan on COMPLETED, not ASSOCIATED Move the code snippet to switch on bgscan over to wpa_supplicant.c from event.c, so that it can be activated on wpa_supplicant_set_state(). Also create a centralized place to switch off bgscan. bgscan is now turned on in COMPLETED, not ASSOCIATED.
2011-03-20 11:27:03 +01:00
bgscan_deinit(wpa_s);
bgscan: Add global bgscan configuration This option can be used to globally configure bgscan parameters for all the network blocks. Note that this configuration will not override a network block specific bgscan settings, but will only be used in case that the network block does not have a valid bgscan configuration. Signed-hostap: Haim Dreyfuss <haim.dreyfuss@intel.com>
2013-11-03 14:19:59 +01:00
if (wpa_s->current_ssid) {
if (bgscan_init(wpa_s, wpa_s->current_ssid, name)) {
wpa_supplicant: Start bgscan on COMPLETED, not ASSOCIATED Move the code snippet to switch on bgscan over to wpa_supplicant.c from event.c, so that it can be activated on wpa_supplicant_set_state(). Also create a centralized place to switch off bgscan. bgscan is now turned on in COMPLETED, not ASSOCIATED.
2011-03-20 11:27:03 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "Failed to initialize "
"bgscan");
/*
* Live without bgscan; it is only used as a roaming
* optimization, so the initial connection is not
* affected.
*/
Supply the connection scan results to bgscan after init If bgscan is enabled, then bgscan is initiated after the connection, with no bss scan result information. Since a scan was performed prior to the connection, the information exists and can be used to initialize the bgscan's cache. Signed-hostap: Yoni Divinsky <yoni.divinsky@ti.com>
2012-08-17 19:53:44 +02:00
} else {
struct wpa_scan_results *scan_res;
wpa_supplicant: Start bgscan on COMPLETED, not ASSOCIATED Move the code snippet to switch on bgscan over to wpa_supplicant.c from event.c, so that it can be activated on wpa_supplicant_set_state(). Also create a centralized place to switch off bgscan. bgscan is now turned on in COMPLETED, not ASSOCIATED.
2011-03-20 11:27:03 +01:00
wpa_s->bgscan_ssid = wpa_s->current_ssid;
Supply the connection scan results to bgscan after init If bgscan is enabled, then bgscan is initiated after the connection, with no bss scan result information. Since a scan was performed prior to the connection, the information exists and can be used to initialize the bgscan's cache. Signed-hostap: Yoni Divinsky <yoni.divinsky@ti.com>
2012-08-17 19:53:44 +02:00
scan_res = wpa_supplicant_get_scan_results(wpa_s, NULL,
0);
if (scan_res) {
bgscan_notify_scan(wpa_s, scan_res);
wpa_scan_results_free(scan_res);
}
}
wpa_supplicant: Start bgscan on COMPLETED, not ASSOCIATED Move the code snippet to switch on bgscan over to wpa_supplicant.c from event.c, so that it can be activated on wpa_supplicant_set_state(). Also create a centralized place to switch off bgscan. bgscan is now turned on in COMPLETED, not ASSOCIATED.
2011-03-20 11:27:03 +01:00
} else
wpa_s->bgscan_ssid = NULL;
}
static void wpa_supplicant_stop_bgscan(struct wpa_supplicant *wpa_s)
{
if (wpa_s->bgscan_ssid != NULL) {
bgscan_deinit(wpa_s);
wpa_s->bgscan_ssid = NULL;
}
}
#endif /* CONFIG_BGSCAN */
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
static void wpa_supplicant_start_autoscan(struct wpa_supplicant *wpa_s)
{
Start autoscan for first connection attempt Use wpa_supplicant_set_state() to initialize state to DISCONNECT so that autoscan gets initialized properly. This needs a change in autoscan_init() to avoid extra scan request that would postpone the first scan request when an interface is added. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-26 18:52:46 +02:00
if (autoscan_init(wpa_s, 0))
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
wpa_dbg(wpa_s, MSG_DEBUG, "Failed to initialize autoscan");
}
static void wpa_supplicant_stop_autoscan(struct wpa_supplicant *wpa_s)
{
autoscan_deinit(wpa_s);
}
Reinitialize autoscan on explicit reassocciate/reconnect command This clears the exponential scan interval back to the base value when a reconnection is requested explicitly. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-26 19:05:51 +02:00
void wpa_supplicant_reinit_autoscan(struct wpa_supplicant *wpa_s)
{
if (wpa_s->wpa_state == WPA_DISCONNECTED ||
wpa_s->wpa_state == WPA_SCANNING) {
autoscan_deinit(wpa_s);
wpa_supplicant_start_autoscan(wpa_s);
}
}
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 - Set current connection state
* @wpa_s: Pointer to wpa_supplicant data
* @state: The new connection state
*
* This function is called whenever the connection state changes, e.g.,
* association is completed for WPA/WPA2 4-Way Handshake is started.
*/
Get rid of unnecessary typedefs for enums.
2009-12-26 09:35:08 +01:00
void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s,
enum wpa_states state)
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
{
dbus: Replace StateChanged with PropertiesChanged signal The actual supplicant state is exposed via a property on the interface object. So having a separate signal StateChanged for notifying about changes is a bad idea. The standard PropertiesChanged signal should be used for this. The advantage of StateChanged signal was that it includes the previous state, but not even NetworkManager is making use of this. And tracking the old state via the property and this signal is easily possible anyway.
2010-01-04 15:33:44 +01:00
enum wpa_states old_state = wpa_s->wpa_state;
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, "State: %s -> %s",
wpa_supplicant_state_txt(wpa_s->wpa_state),
wpa_supplicant_state_txt(state));
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
Reset normal_scans counter upon entering INTERFACE_DISABLED state Depending on the implementation, the scheduled scan may not give results quickly when in DISCONNECTED state. This patch resets wpa_s::normal_scans upon entering to the INTERFACE_DISABLED state so a normal scan is assured upon going to DISCONNECTED state after the interface has been re-enabled. This mainly solves a long reconnect time observed upon repeated kernel driver reloads, i.e., third reload resulted in a scheduled scan. Reviewed-by: Hante Meuleman <meuleman@broadcom.com> Signed-hostap: Arend van Spriel <arend@broadcom.com>
2014-01-15 10:11:32 +01:00
if (state == WPA_INTERFACE_DISABLED) {
/* Assure normal scan when interface is restored */
wpa_s->normal_scans = 0;
}
scan: Reset normal scan counter when a connection succeeds The normal scan counter is used to trigger a few normal scans before a scheduled scan is issued. The reason for doing this is that we get results faster and some drivers support more SSIDs per normal scan than during sched scan. After 2 normal scans, we start using sched_scan. But the problem is that when a connection succeeds, we do not reset this counter, so we will keep using sched scans. To fix this, now we reset the counter when we switch to WPA_COMPLETED state. Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
2014-04-24 07:45:36 +02:00
if (state == WPA_COMPLETED) {
Use wpa_radio work for connection This protects against conflicting offchannel operations during connection (authentication, association, EAP exchanges, 4-way handshake). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 15:50:32 +01:00
wpas_connect_work_done(wpa_s);
scan: Reset normal scan counter when a connection succeeds The normal scan counter is used to trigger a few normal scans before a scheduled scan is issued. The reason for doing this is that we get results faster and some drivers support more SSIDs per normal scan than during sched scan. After 2 normal scans, we start using sched_scan. But the problem is that when a connection succeeds, we do not reset this counter, so we will keep using sched scans. To fix this, now we reset the counter when we switch to WPA_COMPLETED state. Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
2014-04-24 07:45:36 +02:00
/* Reinitialize normal_scan counter */
wpa_s->normal_scans = 0;
}
Use wpa_radio work for connection This protects against conflicting offchannel operations during connection (authentication, association, EAP exchanges, 4-way handshake). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 15:50:32 +01:00
P2PS: Enable Probe Request frame processing by P2P Client 1. Add global p2p_cli_probe property to enable/disable Probe Request frame RX reporting for connected P2P Clients. The property can be set to 0 - disable or 1 - enable. The default value is 0. 2. Enable Probe Request frame RX reporting for P2P Client on WPA_COMPLETED state if p2p_cli_probe property is set to 1. Disable it when an interface state is changing to any other state. 3. Don't cancel Probe Request frame RX reporting on wpa_stop_listen for a connected P2P Client handling Probe Request frames. Signed-off-by: Max Stepanov <Max.Stepanov@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-06-10 10:43:32 +02:00
#ifdef CONFIG_P2P
/*
* P2PS client has to reply to Probe Request frames received on the
* group operating channel. Enable Probe Request frame reporting for
* P2P connected client in case p2p_cli_probe configuration property is
* set to 1.
*/
if (wpa_s->conf->p2p_cli_probe && wpa_s->current_ssid &&
wpa_s->current_ssid->mode == WPAS_MODE_INFRA &&
wpa_s->current_ssid->p2p_group) {
if (state == WPA_COMPLETED && !wpa_s->p2p_cli_probe) {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: Enable CLI Probe Request RX reporting");
wpa_s->p2p_cli_probe =
wpa_drv_probe_req_report(wpa_s, 1) >= 0;
} else if (state != WPA_COMPLETED && wpa_s->p2p_cli_probe) {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: Disable CLI Probe Request RX reporting");
wpa_s->p2p_cli_probe = 0;
wpa_drv_probe_req_report(wpa_s, 0);
}
}
#endif /* CONFIG_P2P */
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
if (state != WPA_SCANNING)
wpa_supplicant_notify_scanning(wpa_s, 0);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (state == WPA_COMPLETED && wpa_s->new_connection) {
struct wpa_ssid *ssid = wpa_s->current_ssid;
Fix build without CONFIG_CTRL_IFACE or CONFIG_NO_STDOUT_DEBUG Signed-off-by: Solomon Peachy <pizza@shaftnet.org>
2013-03-16 11:07:18 +01:00
#if defined(CONFIG_CTRL_IFACE) || !defined(CONFIG_NO_STDOUT_DEBUG)
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_CONNECTED "- Connection to "
Remove reassociated_connection variable This was used to select between "(auth)" and "(reauth)" in CTRL-EVENT-CONNECTED events. However, the variable was not cleared anywhere else apart from the AP deinit case. As such, it did not really provide correct information and is not really of much use even with proper clearing added. As such, it is cleaner to just get rid of this altogether. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-25 18:51:04 +01:00
MACSTR " completed [id=%d id_str=%s]",
MAC2STR(wpa_s->bssid),
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
ssid ? ssid->id : -1,
ssid && ssid->id_str ? ssid->id_str : "");
#endif /* CONFIG_CTRL_IFACE || !CONFIG_NO_STDOUT_DEBUG */
Disable network block temporarily on authentication failures If 4-way handshake fails due to likely PSK failure or if EAP authentication fails, disable the network block temporarily. Use longer duration if multiple consecutive failures are seen. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-26 22:01:26 +02:00
wpas_clear_temp_disabled(wpa_s, ssid, 1);
wpa_supplicant: Clear blacklist on connect It has been noticed that the band steering/load balancing of some multi-AP networks will lead to an ever-growing list of blacklisted BSSIDs. This eventually leads to a connection drop when the connection is pushed to a distant AP. Fix this issue by clearing the blacklist upon successful connect. Signed-off-by: Jason Abele <jason@aether.com>
2015-04-03 02:30:48 +02:00
wpa_blacklist_clear(wpa_s);
Maintain maximum blacklist count over list clear operations wpas_connection_failed() uses the blacklist count to figure out a suitable time to wait for the next scan. This mechanism did not work properly in cases where the temporary blacklist gets cleared due to no other BSSes being available. Address this by maintaining an additional count of blacklisting values over wpa_blacklist_clear() calls. In addition, add one more step in the count to timeout mapping to go to 10 second interval if more than four failures are seen. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-25 15:20:44 +01:00
wpa_s->extra_blacklist_count = 0;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_s->new_connection = 0;
wpa_drv_set_operstate(wpa_s, 1);
wpa_supplicant: Fix port state management without IEEE8021X_EAPOL If IEE8021X_EAPOL is not enabled in the config, wpa_drv_set_supp_port must be called from the supplicant, otherwise port will not be activated after association.
2010-11-09 15:31:33 +01:00
#ifndef IEEE8021X_EAPOL
wpa_drv_set_supp_port(wpa_s, 1);
#endif /* IEEE8021X_EAPOL */
Optimize post-WPS scan based on channel used during provisioning Scan only the frequency that was used during provisioning during the first five scans for the connection. This speeds up connection in the most likely case where the AP remains on the same channel. If the AP is not found after these initial scans, all channels will be scanned.
2010-04-11 18:06:42 +02:00
wpa_s->after_wps = 0;
WPS: Clear known_wps_freq in addition to after_wps Both of these variables can result in optimized WPS scans, so better clear these more consistently to avoid unexpected single-channel scans. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-27 11:56:56 +01:00
wpa_s->known_wps_freq = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpas_p2p_completed(wpa_s);
Add handling of OBSS scan requests and 20/40 BSS coex reports Add support for HT STA to report 40 MHz intolerance to the associated AP. A HT station generates a report (20/40 BSS coexistence) of channel list if it finds a non-HT capable AP or a HT AP which prohibits 40 MHz transmission (i.e., 40 MHz intolerant bit is set in HT capabilities IE) from the scan results. Parse the OBSS scan parameter from Beacon or Probe Response frames and schedule periodic scan to generate 20/40 coexistence channel report if requested to do so. This patch decodes Scan Interval alone from the OBSS Scan Parameters element and triggers scan on timeout. Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-03 11:13:43 +02:00
sme_sched_obss_scan(wpa_s, 1);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
} else if (state == WPA_DISCONNECTED || state == WPA_ASSOCIATING ||
state == WPA_ASSOCIATED) {
wpa_s->new_connection = 1;
wpa_drv_set_operstate(wpa_s, 0);
wpa_supplicant: Fix port state management without IEEE8021X_EAPOL If IEE8021X_EAPOL is not enabled in the config, wpa_drv_set_supp_port must be called from the supplicant, otherwise port will not be activated after association.
2010-11-09 15:31:33 +01:00
#ifndef IEEE8021X_EAPOL
wpa_drv_set_supp_port(wpa_s, 0);
#endif /* IEEE8021X_EAPOL */
Add handling of OBSS scan requests and 20/40 BSS coex reports Add support for HT STA to report 40 MHz intolerance to the associated AP. A HT station generates a report (20/40 BSS coexistence) of channel list if it finds a non-HT capable AP or a HT AP which prohibits 40 MHz transmission (i.e., 40 MHz intolerant bit is set in HT capabilities IE) from the scan results. Parse the OBSS scan parameter from Beacon or Probe Response frames and schedule periodic scan to generate 20/40 coexistence channel report if requested to do so. This patch decodes Scan Interval alone from the OBSS Scan Parameters element and triggers scan on timeout. Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-03 11:13:43 +02:00
sme_sched_obss_scan(wpa_s, 0);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
wpa_s->wpa_state = state;
dbus: Replace StateChanged with PropertiesChanged signal The actual supplicant state is exposed via a property on the interface object. So having a separate signal StateChanged for notifying about changes is a bad idea. The standard PropertiesChanged signal should be used for this. The advantage of StateChanged signal was that it includes the previous state, but not even NetworkManager is making use of this. And tracking the old state via the property and this signal is easily possible anyway.
2010-01-04 15:33:44 +01:00
wpa_supplicant: Start bgscan on COMPLETED, not ASSOCIATED Move the code snippet to switch on bgscan over to wpa_supplicant.c from event.c, so that it can be activated on wpa_supplicant_set_state(). Also create a centralized place to switch off bgscan. bgscan is now turned on in COMPLETED, not ASSOCIATED.
2011-03-20 11:27:03 +01:00
#ifdef CONFIG_BGSCAN
if (state == WPA_COMPLETED)
wpa_supplicant_start_bgscan(wpa_s);
bgscan: Stop bgscan only on disassociation Stopping bgscan on any state other than COMPLETED results in bgscan reset (stop + start) on every rekeying operation. Signed-hostap: Eliad Peller <eliad@wizery.com>
2013-12-19 11:03:23 +01:00
else if (state < WPA_ASSOCIATED)
wpa_supplicant: Start bgscan on COMPLETED, not ASSOCIATED Move the code snippet to switch on bgscan over to wpa_supplicant.c from event.c, so that it can be activated on wpa_supplicant_set_state(). Also create a centralized place to switch off bgscan. bgscan is now turned on in COMPLETED, not ASSOCIATED.
2011-03-20 11:27:03 +01:00
wpa_supplicant_stop_bgscan(wpa_s);
#endif /* CONFIG_BGSCAN */
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 (state == WPA_AUTHENTICATING)
wpa_supplicant_stop_autoscan(wpa_s);
if (state == WPA_DISCONNECTED || state == WPA_INACTIVE)
wpa_supplicant_start_autoscan(wpa_s);
WMM AC: Delete tspecs on roaming In case of roaming, we don't get disassoc notification, but still want to remove the existing tspecs. Move the wmm_ac_notify_disassoc() call to the state change function, which get called also on roaming. Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
2014-12-29 03:14:59 +01:00
if (old_state >= WPA_ASSOCIATED && wpa_s->wpa_state < WPA_ASSOCIATED)
wmm_ac_notify_disassoc(wpa_s);
Add DBus state change notification for AuthMode property Signed-off-by: Paul Stewart <pstew@google.com>
2011-03-15 12:54:59 +01:00
if (wpa_s->wpa_state != old_state) {
dbus: Replace StateChanged with PropertiesChanged signal The actual supplicant state is exposed via a property on the interface object. So having a separate signal StateChanged for notifying about changes is a bad idea. The standard PropertiesChanged signal should be used for this. The advantage of StateChanged signal was that it includes the previous state, but not even NetworkManager is making use of this. And tracking the old state via the property and this signal is easily possible anyway.
2010-01-04 15:33:44 +01:00
wpas_notify_state_changed(wpa_s, wpa_s->wpa_state, old_state);
Add DBus state change notification for AuthMode property Signed-off-by: Paul Stewart <pstew@google.com>
2011-03-15 12:54:59 +01:00
P2P: Use another interface operating channel as listen channel Performing a P2P Device flow such as p2p_listen or p2p_find, can degrade the performance of an active interface connection, if the listen frequency is different than the frequency used by that interface. To reduce the effect of P2P Device flows on other interfaces, try changing the listen channel of the P2P Device to match the operating channel of one of the other active interfaces. This change will be possible only in case that the listen channel is not forced externally, and will be delayed to a point where the P2P Device state machine is idle. The optimization can be configured in the configuration file and is disabled by default. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:39 +02:00
/*
* Notify the P2P Device interface about a state change in one
* of the interfaces.
*/
wpas_p2p_indicate_state_change(wpa_s);
Add DBus state change notification for AuthMode property Signed-off-by: Paul Stewart <pstew@google.com>
2011-03-15 12:54:59 +01:00
if (wpa_s->wpa_state == WPA_COMPLETED ||
old_state == WPA_COMPLETED)
wpas_notify_auth_changed(wpa_s);
}
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
WPS ER: Delay wpa_supplicant termination to allow unsubscription Instead of forcefully deinitializing ER immediately, give it some time to complete unsubscription and call eloop_terminate() only once ER code has completed its work.
2009-12-19 22:47:54 +01:00
void wpa_supplicant_terminate_proc(struct wpa_global *global)
{
int pending = 0;
#ifdef CONFIG_WPS
struct wpa_supplicant *wpa_s = global->ifaces;
while (wpa_s) {
wpa_supplicant: Fix crash when terminating all interfaces In wpa_supplicant_terminate_proc(), while iterating and terminating interfaces, after an interface is terminated, we can no longer access its memory as it is no longer valid and causes a crash. Fix this by saving the pointer to the next interface before freeing the current one to avoid accessing an invalid memory location. Signed-hostap: Moshe Benji <moshe.benji@intel.com>
2013-12-15 09:50:07 +01:00
struct wpa_supplicant *next = wpa_s->next;
WPS: Deinit before wpas_p2p_disconnect() When there is a pending WPS negotiation for P2P and signal interrupt is triggered, invalid read occurs in wpas_wps_terminate_pending() if wpas_p2p_disconnect() removed the interface. Inverting deinit order solves the issue. Signed-off-by: Eduardo Abinader <eduardo.abinader@openbossa.org>
2014-05-14 15:08:47 +02:00
if (wpas_wps_terminate_pending(wpa_s) == 1)
pending = 1;
P2P: Remove P2P groups on process termination Killing the wpa_supplicant process or using TERMINATE ctrl_iface command resulted in the process existing without cleaning up possibly added dynamic P2P group interfaces. Clean this up by stopping each P2P group before stopping eloop. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-26 00:38:30 +02:00
#ifdef CONFIG_P2P
if (wpa_s->p2p_group_interface != NOT_P2P_GROUP_INTERFACE ||
(wpa_s->current_ssid && wpa_s->current_ssid->p2p_group))
wpas_p2p_disconnect(wpa_s);
#endif /* CONFIG_P2P */
wpa_supplicant: Fix crash when terminating all interfaces In wpa_supplicant_terminate_proc(), while iterating and terminating interfaces, after an interface is terminated, we can no longer access its memory as it is no longer valid and causes a crash. Fix this by saving the pointer to the next interface before freeing the current one to avoid accessing an invalid memory location. Signed-hostap: Moshe Benji <moshe.benji@intel.com>
2013-12-15 09:50:07 +01:00
wpa_s = next;
WPS ER: Delay wpa_supplicant termination to allow unsubscription Instead of forcefully deinitializing ER immediately, give it some time to complete unsubscription and call eloop_terminate() only once ER code has completed its work.
2009-12-19 22:47:54 +01:00
}
#endif /* CONFIG_WPS */
if (pending)
return;
eloop_terminate();
}
eloop: Remove global user data pointer This is not really needed since all signal handlers can use a context pointer provided during signal handler registration.
2009-12-19 18:22:16 +01:00
static void wpa_supplicant_terminate(int sig, void *signal_ctx)
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
{
eloop: Remove global user data pointer This is not really needed since all signal handlers can use a context pointer provided during signal handler registration.
2009-12-19 18:22:16 +01:00
struct wpa_global *global = signal_ctx;
WPS ER: Delay wpa_supplicant termination to allow unsubscription Instead of forcefully deinitializing ER immediately, give it some time to complete unsubscription and call eloop_terminate() only once ER code has completed its work.
2009-12-19 22:47:54 +01:00
wpa_supplicant_terminate_proc(global);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
void wpa_supplicant_clear_status(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
{
Get rid of unnecessary typedefs for enums.
2009-12-26 09:35:08 +01:00
enum wpa_states old_state = wpa_s->wpa_state;
dbus: Replace StateChanged with PropertiesChanged signal The actual supplicant state is exposed via a property on the interface object. So having a separate signal StateChanged for notifying about changes is a bad idea. The standard PropertiesChanged signal should be used for this. The advantage of StateChanged signal was that it includes the previous state, but not even NetworkManager is making use of this. And tracking the old state via the property and this signal is easily possible anyway.
2010-01-04 15:33:44 +01:00
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_s->pairwise_cipher = 0;
wpa_s->group_cipher = 0;
wpa_s->mgmt_group_cipher = 0;
wpa_s->key_mgmt = 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)
Start autoscan for first connection attempt Use wpa_supplicant_set_state() to initialize state to DISCONNECT so that autoscan gets initialized properly. This needs a change in autoscan_init() to avoid extra scan request that would postpone the first scan request when an interface is added. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-26 18:52:46 +02:00
wpa_supplicant_set_state(wpa_s, WPA_DISCONNECTED);
dbus: Replace StateChanged with PropertiesChanged signal The actual supplicant state is exposed via a property on the interface object. So having a separate signal StateChanged for notifying about changes is a bad idea. The standard PropertiesChanged signal should be used for this. The advantage of StateChanged signal was that it includes the previous state, but not even NetworkManager is making use of this. And tracking the old state via the property and this signal is easily possible anyway.
2010-01-04 15:33:44 +01:00
if (wpa_s->wpa_state != old_state)
wpas_notify_state_changed(wpa_s, wpa_s->wpa_state, old_state);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
/**
* wpa_supplicant_reload_configuration - Reload configuration data
* @wpa_s: Pointer to wpa_supplicant data
* Returns: 0 on success or -1 if configuration parsing failed
*
* This function can be used to request that the configuration data is reloaded
* (e.g., after configuration file change). This function is reloading
* configuration only for one interface, so this may need to be called multiple
* times if %wpa_supplicant is controlling multiple interfaces and all
* interfaces need reconfiguration.
*/
int wpa_supplicant_reload_configuration(struct wpa_supplicant *wpa_s)
{
struct wpa_config *conf;
int reconf_ctrl;
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
int old_ap_scan;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (wpa_s->confname == NULL)
return -1;
wpa_supplicant: Add option -I for additional config file This option can be used only for global parameters that are not going to be changed from settings. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
2013-04-23 16:38:57 +02:00
conf = wpa_config_read(wpa_s->confname, NULL);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (conf == NULL) {
wpa_msg(wpa_s, MSG_ERROR, "Failed to parse the configuration "
"file '%s' - exiting", wpa_s->confname);
return -1;
}
wpa_supplicant: Add option -I for additional config file This option can be used only for global parameters that are not going to be changed from settings. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
2013-04-23 16:38:57 +02:00
wpa_config_read(wpa_s->confanother, conf);
Allow ctrl_iface SET command to change global config parameters
2010-07-18 23:30:24 +02:00
conf->changed_parameters = (unsigned int) -1;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
reconf_ctrl = !!conf->ctrl_interface != !!wpa_s->conf->ctrl_interface
|| (conf->ctrl_interface && wpa_s->conf->ctrl_interface &&
os_strcmp(conf->ctrl_interface,
wpa_s->conf->ctrl_interface) != 0);
if (reconf_ctrl && wpa_s->ctrl_iface) {
wpa_supplicant_ctrl_iface_deinit(wpa_s->ctrl_iface);
wpa_s->ctrl_iface = NULL;
}
eapol_sm_invalidate_cached_session(wpa_s->eapol);
Deauthenticate on reconfiguration This makes sure that the old connection is not maintained if the new configuration does not allow it anymore. In addition, it is better to use wpa_supplicant_clear_connection() instead of just clearing wpa_s->current_ssid here to keep things in sync.
2011-07-16 15:57:11 +02:00
if (wpa_s->current_ssid) {
Do not set own_disconnect_req flag if not connected This fixes some issues where a disconnection event may get ignored if an earlier operation to remove or disable a network resulted in an attempt to disconnect event though no connection was in place. wpa_s->current_ssid != NULL alone is not sufficient to determine that there will be a driver event notifying completion of such disconnection request. Set own_disconnect_req to 1 only if wpa_s->wpa_state is also indicating that there is a connection or an attempt to complete one. This showed up in a failure, e.g., when running the hwsim test case scan_int followed by ap_vlan_wpa2_psk_radius_required where the latter ended up not processing a connection failure event and getting stuck not trying to run a new scan and connection attempt. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-06-10 14:40:35 +02:00
if (wpa_s->wpa_state >= WPA_AUTHENTICATING)
wpa_s->own_disconnect_req = 1;
Deauthenticate on reconfiguration This makes sure that the old connection is not maintained if the new configuration does not allow it anymore. In addition, it is better to use wpa_supplicant_clear_connection() instead of just clearing wpa_s->current_ssid here to keep things in sync.
2011-07-16 15:57:11 +02:00
wpa_supplicant_deauthenticate(wpa_s,
WLAN_REASON_DEAUTH_LEAVING);
}
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
/*
* TODO: should notify EAPOL SM about changes in opensc_engine_path,
wpa_supplicant: Allow OpenSSL cipherlist string to be configured The new openssl_cipher configuration parameter can be used to select which TLS cipher suites are enabled for TLS-based EAP methods when OpenSSL is used as the TLS library. This parameter can be used both as a global parameter to set the default for all network blocks and as a network block parameter to override the default for each network profile. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-12 10:53:51 +02:00
* pkcs11_engine_path, pkcs11_module_path, openssl_ciphers.
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
*/
Added support for using SHA256-based stronger key derivation for WPA2 IEEE 802.11w/D6.0 defines new AKMPs to indicate SHA256-based algorithms for key derivation (and AES-CMAC for EAPOL-Key MIC). Add support for using new AKMPs and clean up AKMP processing with helper functions in defs.h.
2008-08-31 21:57:28 +02:00
if (wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt)) {
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
/*
* Clear forced success to clear EAP state for next
* authentication.
*/
eapol_sm_notify_eap_success(wpa_s->eapol, FALSE);
}
eapol_sm_notify_config(wpa_s->eapol, NULL, NULL);
wpa_sm_set_config(wpa_s->wpa, NULL);
Flush PMKSA cache entries and invalidate EAP state on network changes If a network configuration block is removed or modified, flush all PMKSA cache entries that were created using that network configuration. Similarly, invalidate EAP state (fast re-auth). The special case for OKC on wpa_supplicant reconfiguration (network_ctx pointer change) is now addressed as part of the PMKSA cache flushing, so it does not need a separate mechanism for clearing the network_ctx values in the PMKSA cache.
2011-09-07 16:46:00 +02:00
wpa_sm_pmksa_cache_flush(wpa_s->wpa, NULL);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_sm_set_fast_reauth(wpa_s->wpa, wpa_s->conf->fast_reauth);
rsn_preauth_deinit(wpa_s->wpa);
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
old_ap_scan = wpa_s->conf->ap_scan;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_config_free(wpa_s->conf);
wpa_s->conf = conf;
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 (old_ap_scan != wpa_s->conf->ap_scan)
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 (reconf_ctrl)
wpa_s->ctrl_iface = wpa_supplicant_ctrl_iface_init(wpa_s);
Allow ctrl_iface SET command to change global config parameters
2010-07-18 23:30:24 +02:00
wpa_supplicant_update_config(wpa_s);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_supplicant_clear_status(wpa_s);
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)) {
Trigger scan on reload-config only if there are enabled networks
2010-07-07 05:37:52 +02:00
wpa_s->reassociate = 1;
wpa_supplicant_req_scan(wpa_s, 0, 0);
}
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, "Reconfiguration completed");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return 0;
}
eloop: Remove global user data pointer This is not really needed since all signal handlers can use a context pointer provided during signal handler registration.
2009-12-19 18:22:16 +01:00
static void wpa_supplicant_reconfig(int sig, void *signal_ctx)
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
{
eloop: Remove global user data pointer This is not really needed since all signal handlers can use a context pointer provided during signal handler registration.
2009-12-19 18:22:16 +01:00
struct wpa_global *global = signal_ctx;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
struct wpa_supplicant *wpa_s;
for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next) {
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, "Signal %d received - reconfiguring",
sig);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (wpa_supplicant_reload_configuration(wpa_s) < 0) {
WPS ER: Delay wpa_supplicant termination to allow unsubscription Instead of forcefully deinitializing ER immediately, give it some time to complete unsubscription and call eloop_terminate() only once ER code has completed its work.
2009-12-19 22:47:54 +01:00
wpa_supplicant_terminate_proc(global);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
}
wpa_supplicant: Reopen debug log file upon receipt of SIGHUP signal This is useful for logrotate to be able to rotate the file even if the control interface is not enabled (e.g., when using DBus). Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
2015-10-23 18:02:42 +02:00
if (wpa_debug_reopen_file() < 0) {
/* Ignore errors since we cannot really do much to fix this */
wpa_printf(MSG_DEBUG, "Could not reopen debug log file");
}
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
static int wpa_supplicant_suites_from_ai(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid,
struct wpa_ie_data *ie)
{
int ret = wpa_sm_parse_own_wpa_ie(wpa_s->wpa, ie);
if (ret) {
if (ret == -2) {
wpa_msg(wpa_s, MSG_INFO, "WPA: Failed to parse WPA IE "
"from association info");
}
return -1;
}
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: Using WPA IE from AssocReq to set "
"cipher suites");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (!(ie->group_cipher & ssid->group_cipher)) {
wpa_msg(wpa_s, MSG_INFO, "WPA: Driver used disabled group "
"cipher 0x%x (mask 0x%x) - reject",
ie->group_cipher, ssid->group_cipher);
return -1;
}
if (!(ie->pairwise_cipher & ssid->pairwise_cipher)) {
wpa_msg(wpa_s, MSG_INFO, "WPA: Driver used disabled pairwise "
"cipher 0x%x (mask 0x%x) - reject",
ie->pairwise_cipher, ssid->pairwise_cipher);
return -1;
}
if (!(ie->key_mgmt & ssid->key_mgmt)) {
wpa_msg(wpa_s, MSG_INFO, "WPA: Driver used disabled key "
"management 0x%x (mask 0x%x) - reject",
ie->key_mgmt, ssid->key_mgmt);
return -1;
}
#ifdef CONFIG_IEEE80211W
Updated MFP defines based on IEEE 802.11w/D6.0 and use new MFPC/MFPR This adds most of the new frame format and identifier definitions from IEEE 802.11w/D6.0. In addition, the RSN IE capability field values for MFP is replaced with the new two-bit version with MFPC (capable) and MFPR (required) processing.
2008-08-30 13:59:39 +02:00
if (!(ie->capabilities & WPA_CAPABILITY_MFPC) &&
Ignore pmf=1 default if driver does not support PMF Connection with a PMF enabled AP will fail if we try to negotiate PMF while the local driver does not support this. Since pmf=1 does not require PMF for a successful connection, it can be ignored in such a case to avoid connectivity issues with invalid configuration. This makes it somewhat easier to allow upper layer programs to use pmf=1 default regardless of driver capabilities. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-26 16:40:22 +01:00
wpas_get_ssid_pmf(wpa_s, ssid) == MGMT_FRAME_PROTECTION_REQUIRED) {
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_msg(wpa_s, MSG_INFO, "WPA: Driver associated with an AP "
"that does not support management frame protection - "
"reject");
return -1;
}
#endif /* CONFIG_IEEE80211W */
return 0;
}
/**
* wpa_supplicant_set_suites - Set authentication and encryption parameters
* @wpa_s: Pointer to wpa_supplicant data
* @bss: Scan results for the selected BSS, or %NULL if not available
* @ssid: Configuration data for the selected network
* @wpa_ie: Buffer for the WPA/RSN IE
* @wpa_ie_len: Maximum wpa_ie buffer size on input. This is changed to be the
* used buffer length in case the functions returns success.
* Returns: 0 on success or -1 on failure
*
* This function is used to configure authentication and encryption parameters
* based on the network configuration and scan result for the selected BSS (if
* available).
*/
int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s,
Use BSS table entry instead of raw scan result for connection
2010-01-02 15:16:02 +01:00
struct wpa_bss *bss, struct wpa_ssid *ssid,
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
u8 *wpa_ie, size_t *wpa_ie_len)
{
struct wpa_ie_data ie;
int sel, proto;
HS 2.0R2: Add OSEN client implementation Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-23 20:24:05 +02:00
const u8 *bss_wpa, *bss_rsn, *bss_osen;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (bss) {
Use BSS table entry instead of raw scan result for connection
2010-01-02 15:16:02 +01:00
bss_wpa = wpa_bss_get_vendor_ie(bss, WPA_IE_VENDOR_TYPE);
bss_rsn = wpa_bss_get_ie(bss, WLAN_EID_RSN);
HS 2.0R2: Add OSEN client implementation Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-23 20:24:05 +02:00
bss_osen = wpa_bss_get_vendor_ie(bss, OSEN_IE_VENDOR_TYPE);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
} else
HS 2.0R2: Add OSEN client implementation Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-23 20:24:05 +02:00
bss_wpa = bss_rsn = bss_osen = NULL;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (bss_rsn && (ssid->proto & WPA_PROTO_RSN) &&
wpa_parse_wpa_ie(bss_rsn, 2 + bss_rsn[1], &ie) == 0 &&
(ie.group_cipher & ssid->group_cipher) &&
(ie.pairwise_cipher & ssid->pairwise_cipher) &&
(ie.key_mgmt & ssid->key_mgmt)) {
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, "RSN: using IEEE 802.11i/D9.0");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
proto = WPA_PROTO_RSN;
} else if (bss_wpa && (ssid->proto & WPA_PROTO_WPA) &&
Add more debug prints for WPA/RSN selection issues for connection ap_ft_sae test case managed to hit a somewhat unclear error case which resulted in "WPA: Failed to select WPA/RSN" print and not enough information to figure out what exactly had went wrong. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-22 12:49:52 +01:00
wpa_parse_wpa_ie(bss_wpa, 2 + bss_wpa[1], &ie) == 0 &&
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
(ie.group_cipher & ssid->group_cipher) &&
(ie.pairwise_cipher & ssid->pairwise_cipher) &&
(ie.key_mgmt & ssid->key_mgmt)) {
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: using IEEE 802.11i/D3.0");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
proto = WPA_PROTO_WPA;
HS 2.0R2: Add OSEN client implementation Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-23 20:24:05 +02:00
#ifdef CONFIG_HS20
} else if (bss_osen && (ssid->proto & WPA_PROTO_OSEN)) {
wpa_dbg(wpa_s, MSG_DEBUG, "HS 2.0: using OSEN");
/* TODO: parse OSEN element */
HS 2.0R2: Fix OSEN IE parsing for in cipher setup (CID 68132) The OSEN code path hardcodes number of struct wpa_ie_data items. However, it did not clear the full structure and some uninitialized fields could have been used (e.g., ie.mgmt_group_cipher for a debug print and ie.capabilities for checking MFPC). Fix this by clearing the ie data before filling in the hardcoded OSEN values. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-12 23:36:42 +02:00
os_memset(&ie, 0, sizeof(ie));
HS 2.0R2: Add OSEN client implementation Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-23 20:24:05 +02:00
ie.group_cipher = WPA_CIPHER_CCMP;
ie.pairwise_cipher = WPA_CIPHER_CCMP;
ie.key_mgmt = WPA_KEY_MGMT_OSEN;
proto = WPA_PROTO_OSEN;
#endif /* CONFIG_HS20 */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
} else if (bss) {
wpa_msg(wpa_s, MSG_WARNING, "WPA: Failed to select WPA/RSN");
Add more debug prints for WPA/RSN selection issues for connection ap_ft_sae test case managed to hit a somewhat unclear error case which resulted in "WPA: Failed to select WPA/RSN" print and not enough information to figure out what exactly had went wrong. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-22 12:49:52 +01:00
wpa_dbg(wpa_s, MSG_DEBUG,
"WPA: ssid proto=0x%x pairwise_cipher=0x%x group_cipher=0x%x key_mgmt=0x%x",
ssid->proto, ssid->pairwise_cipher, ssid->group_cipher,
ssid->key_mgmt);
wpa_dbg(wpa_s, MSG_DEBUG, "WPA: BSS " MACSTR " ssid='%s'%s%s%s",
MAC2STR(bss->bssid),
wpa_ssid_txt(bss->ssid, bss->ssid_len),
bss_wpa ? " WPA" : "",
bss_rsn ? " RSN" : "",
bss_osen ? " OSEN" : "");
if (bss_rsn) {
wpa_hexdump(MSG_DEBUG, "RSN", bss_rsn, 2 + bss_rsn[1]);
if (wpa_parse_wpa_ie(bss_rsn, 2 + bss_rsn[1], &ie)) {
wpa_dbg(wpa_s, MSG_DEBUG,
"Could not parse RSN element");
} else {
wpa_dbg(wpa_s, MSG_DEBUG,
"RSN: pairwise_cipher=0x%x group_cipher=0x%x key_mgmt=0x%x",
ie.pairwise_cipher, ie.group_cipher,
ie.key_mgmt);
}
}
if (bss_wpa) {
wpa_hexdump(MSG_DEBUG, "WPA", bss_wpa, 2 + bss_wpa[1]);
if (wpa_parse_wpa_ie(bss_wpa, 2 + bss_wpa[1], &ie)) {
wpa_dbg(wpa_s, MSG_DEBUG,
"Could not parse WPA element");
} else {
wpa_dbg(wpa_s, MSG_DEBUG,
"WPA: pairwise_cipher=0x%x group_cipher=0x%x key_mgmt=0x%x",
ie.pairwise_cipher, ie.group_cipher,
ie.key_mgmt);
}
}
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return -1;
} else {
HS 2.0R2: Add OSEN client implementation Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-23 20:24:05 +02:00
if (ssid->proto & WPA_PROTO_OSEN)
proto = WPA_PROTO_OSEN;
else if (ssid->proto & WPA_PROTO_RSN)
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
proto = WPA_PROTO_RSN;
else
proto = WPA_PROTO_WPA;
if (wpa_supplicant_suites_from_ai(wpa_s, ssid, &ie) < 0) {
os_memset(&ie, 0, sizeof(ie));
ie.group_cipher = ssid->group_cipher;
ie.pairwise_cipher = ssid->pairwise_cipher;
ie.key_mgmt = ssid->key_mgmt;
#ifdef CONFIG_IEEE80211W
ie.mgmt_group_cipher =
Share the same enum for MFP configuration The three existing enums were already depending on using the same values in couple of places and it is just simpler to standardize on one of these to avoid need for mapping between different enums for the exact same thing.
2010-01-03 20:02:51 +01:00
ssid->ieee80211w != NO_MGMT_FRAME_PROTECTION ?
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
WPA_CIPHER_AES_128_CMAC : 0;
#endif /* CONFIG_IEEE80211W */
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: Set cipher suites "
"based on configuration");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
} else
proto = ie.proto;
}
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: Selected cipher suites: group %d "
"pairwise %d key_mgmt %d proto %d",
ie.group_cipher, ie.pairwise_cipher, ie.key_mgmt, proto);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
#ifdef CONFIG_IEEE80211W
if (ssid->ieee80211w) {
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: Selected mgmt group cipher %d",
ie.mgmt_group_cipher);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
#endif /* CONFIG_IEEE80211W */
nl80211: Fix WPA_VERSIONS attribute for Connect command The previous code was trying to figure out which WPA version is used based on the extra IEs requested for Association Request. That did not work properly in cases where non-WPA networks are used with some extra IEs. Fix this by using more robust mechanism for passing the WPA versions from core wpa_supplicant to the driver_ops associate().
2011-09-02 19:40:23 +02:00
wpa_s->wpa_proto = proto;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_sm_set_param(wpa_s->wpa, WPA_PARAM_PROTO, proto);
wpa_sm_set_param(wpa_s->wpa, WPA_PARAM_RSN_ENABLED,
HS 2.0R2: Add OSEN client implementation Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-23 20:24:05 +02:00
!!(ssid->proto & (WPA_PROTO_RSN | WPA_PROTO_OSEN)));
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (bss || !wpa_s->ap_ies_from_associnfo) {
if (wpa_sm_set_ap_wpa_ie(wpa_s->wpa, bss_wpa,
bss_wpa ? 2 + bss_wpa[1] : 0) ||
wpa_sm_set_ap_rsn_ie(wpa_s->wpa, bss_rsn,
bss_rsn ? 2 + bss_rsn[1] : 0))
return -1;
}
Fix CONFIG_NO_WPA=y build Number of places were calling functions that are not included in CONFIG_NO_WPA=y build anymore. Comment out such calls. In addition, pull in SHA1 and MD5 for config_internal.c, if needed. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-11-23 22:34:52 +01:00
#ifdef CONFIG_NO_WPA
wpa_s->group_cipher = WPA_CIPHER_NONE;
wpa_s->pairwise_cipher = WPA_CIPHER_NONE;
#else /* CONFIG_NO_WPA */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
sel = ie.group_cipher & ssid->group_cipher;
Move cipher suite selection into common helper functions Signed-hostap: Jouni Malinen <j@w1.fi>
2013-01-13 15:58:54 +01:00
wpa_s->group_cipher = wpa_pick_group_cipher(sel);
if (wpa_s->group_cipher < 0) {
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, "WPA: Failed to select group "
"cipher");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return -1;
}
Move cipher suite selection into common helper functions Signed-hostap: Jouni Malinen <j@w1.fi>
2013-01-13 15:58:54 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "WPA: using GTK %s",
wpa_cipher_txt(wpa_s->group_cipher));
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
sel = ie.pairwise_cipher & ssid->pairwise_cipher;
Move cipher suite selection into common helper functions Signed-hostap: Jouni Malinen <j@w1.fi>
2013-01-13 15:58:54 +01:00
wpa_s->pairwise_cipher = wpa_pick_pairwise_cipher(sel, 1);
if (wpa_s->pairwise_cipher < 0) {
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, "WPA: Failed to select pairwise "
"cipher");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return -1;
}
Move cipher suite selection into common helper functions Signed-hostap: Jouni Malinen <j@w1.fi>
2013-01-13 15:58:54 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "WPA: using PTK %s",
wpa_cipher_txt(wpa_s->pairwise_cipher));
Fix CONFIG_NO_WPA=y build Number of places were calling functions that are not included in CONFIG_NO_WPA=y build anymore. Comment out such calls. In addition, pull in SHA1 and MD5 for config_internal.c, if needed. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-11-23 22:34:52 +01:00
#endif /* CONFIG_NO_WPA */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
sel = ie.key_mgmt & ssid->key_mgmt;
Add initial parts for SAE This introduces new AKM for SAE and FT-SAE and adds the initial parts for going through the SAE Authentication frame exchange. The actual SAE algorithm and new fields in Authentication frames are not yet included in this commit and will be added separately. This version is able to complete a dummy authentication with the correct authentication algorithm and transaction values to allow cfg80211/mac80211 drivers to be tested (all the missing parts can be handled with hostapd/wpa_supplicant changes). Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-30 18:51:07 +02:00
#ifdef CONFIG_SAE
if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_SAE))
sel &= ~(WPA_KEY_MGMT_SAE | WPA_KEY_MGMT_FT_SAE);
#endif /* CONFIG_SAE */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (0) {
Add Suite B 192-bit AKM WPA-EAP-SUITE-B-192 can now be used to select 192-bit level Suite B into use as the key management method. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-25 22:32:01 +01:00
#ifdef CONFIG_SUITEB192
} else if (sel & WPA_KEY_MGMT_IEEE8021X_SUITE_B_192) {
wpa_s->key_mgmt = WPA_KEY_MGMT_IEEE8021X_SUITE_B_192;
wpa_dbg(wpa_s, MSG_DEBUG,
"WPA: using KEY_MGMT 802.1X with Suite B (192-bit)");
#endif /* CONFIG_SUITEB192 */
#ifdef CONFIG_SUITEB
Suite B: Add AKM 00-0F-AC:11 This adds definitions for the 128-bit level Suite B AKM 00-0F-AC:11. The functionality itself is not yet complete, i.e., this commit only includes parts to negotiate the new AKM. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-11-16 12:20:51 +01:00
} else if (sel & WPA_KEY_MGMT_IEEE8021X_SUITE_B) {
wpa_s->key_mgmt = WPA_KEY_MGMT_IEEE8021X_SUITE_B;
wpa_dbg(wpa_s, MSG_DEBUG,
"WPA: using KEY_MGMT 802.1X with Suite B");
Add Suite B 192-bit AKM WPA-EAP-SUITE-B-192 can now be used to select 192-bit level Suite B into use as the key management method. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-25 22:32:01 +01:00
#endif /* CONFIG_SUITEB */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
#ifdef CONFIG_IEEE80211R
} else if (sel & WPA_KEY_MGMT_FT_IEEE8021X) {
wpa_s->key_mgmt = WPA_KEY_MGMT_FT_IEEE8021X;
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: using KEY_MGMT FT/802.1X");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
} else if (sel & WPA_KEY_MGMT_FT_PSK) {
wpa_s->key_mgmt = WPA_KEY_MGMT_FT_PSK;
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: using KEY_MGMT FT/PSK");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
#endif /* CONFIG_IEEE80211R */
Add initial parts for SAE This introduces new AKM for SAE and FT-SAE and adds the initial parts for going through the SAE Authentication frame exchange. The actual SAE algorithm and new fields in Authentication frames are not yet included in this commit and will be added separately. This version is able to complete a dummy authentication with the correct authentication algorithm and transaction values to allow cfg80211/mac80211 drivers to be tested (all the missing parts can be handled with hostapd/wpa_supplicant changes). Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-30 18:51:07 +02:00
#ifdef CONFIG_SAE
} else if (sel & WPA_KEY_MGMT_SAE) {
wpa_s->key_mgmt = WPA_KEY_MGMT_SAE;
wpa_dbg(wpa_s, MSG_DEBUG, "RSN: using KEY_MGMT SAE");
} else if (sel & WPA_KEY_MGMT_FT_SAE) {
wpa_s->key_mgmt = WPA_KEY_MGMT_FT_SAE;
wpa_dbg(wpa_s, MSG_DEBUG, "RSN: using KEY_MGMT FT/SAE");
#endif /* CONFIG_SAE */
Added support for using SHA256-based stronger key derivation for WPA2 IEEE 802.11w/D6.0 defines new AKMPs to indicate SHA256-based algorithms for key derivation (and AES-CMAC for EAPOL-Key MIC). Add support for using new AKMPs and clean up AKMP processing with helper functions in defs.h.
2008-08-31 21:57:28 +02:00
#ifdef CONFIG_IEEE80211W
} else if (sel & WPA_KEY_MGMT_IEEE8021X_SHA256) {
wpa_s->key_mgmt = WPA_KEY_MGMT_IEEE8021X_SHA256;
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,
Added support for using SHA256-based stronger key derivation for WPA2 IEEE 802.11w/D6.0 defines new AKMPs to indicate SHA256-based algorithms for key derivation (and AES-CMAC for EAPOL-Key MIC). Add support for using new AKMPs and clean up AKMP processing with helper functions in defs.h.
2008-08-31 21:57:28 +02:00
"WPA: using KEY_MGMT 802.1X with SHA256");
} else if (sel & WPA_KEY_MGMT_PSK_SHA256) {
wpa_s->key_mgmt = WPA_KEY_MGMT_PSK_SHA256;
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,
Added support for using SHA256-based stronger key derivation for WPA2 IEEE 802.11w/D6.0 defines new AKMPs to indicate SHA256-based algorithms for key derivation (and AES-CMAC for EAPOL-Key MIC). Add support for using new AKMPs and clean up AKMP processing with helper functions in defs.h.
2008-08-31 21:57:28 +02:00
"WPA: using KEY_MGMT PSK with SHA256");
#endif /* CONFIG_IEEE80211W */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
} else if (sel & WPA_KEY_MGMT_IEEE8021X) {
wpa_s->key_mgmt = WPA_KEY_MGMT_IEEE8021X;
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: using KEY_MGMT 802.1X");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
} else if (sel & WPA_KEY_MGMT_PSK) {
wpa_s->key_mgmt = WPA_KEY_MGMT_PSK;
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: using KEY_MGMT WPA-PSK");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
} else if (sel & WPA_KEY_MGMT_WPA_NONE) {
wpa_s->key_mgmt = WPA_KEY_MGMT_WPA_NONE;
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: using KEY_MGMT WPA-NONE");
HS 2.0R2: Add OSEN client implementation Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-23 20:24:05 +02:00
#ifdef CONFIG_HS20
} else if (sel & WPA_KEY_MGMT_OSEN) {
wpa_s->key_mgmt = WPA_KEY_MGMT_OSEN;
wpa_dbg(wpa_s, MSG_DEBUG, "HS 2.0: using KEY_MGMT OSEN");
#endif /* CONFIG_HS20 */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
} else {
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, "WPA: Failed to select "
"authenticated key management type");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return -1;
}
wpa_sm_set_param(wpa_s->wpa, WPA_PARAM_KEY_MGMT, wpa_s->key_mgmt);
wpa_sm_set_param(wpa_s->wpa, WPA_PARAM_PAIRWISE,
wpa_s->pairwise_cipher);
wpa_sm_set_param(wpa_s->wpa, WPA_PARAM_GROUP, wpa_s->group_cipher);
#ifdef CONFIG_IEEE80211W
sel = ie.mgmt_group_cipher;
Ignore pmf=1 default if driver does not support PMF Connection with a PMF enabled AP will fail if we try to negotiate PMF while the local driver does not support this. Since pmf=1 does not require PMF for a successful connection, it can be ignored in such a case to avoid connectivity issues with invalid configuration. This makes it somewhat easier to allow upper layer programs to use pmf=1 default regardless of driver capabilities. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-26 16:40:22 +01:00
if (wpas_get_ssid_pmf(wpa_s, ssid) == NO_MGMT_FRAME_PROTECTION ||
Updated MFP defines based on IEEE 802.11w/D6.0 and use new MFPC/MFPR This adds most of the new frame format and identifier definitions from IEEE 802.11w/D6.0. In addition, the RSN IE capability field values for MFP is replaced with the new two-bit version with MFPC (capable) and MFPR (required) processing.
2008-08-30 13:59:39 +02:00
!(ie.capabilities & WPA_CAPABILITY_MFPC))
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
sel = 0;
if (sel & WPA_CIPHER_AES_128_CMAC) {
wpa_s->mgmt_group_cipher = WPA_CIPHER_AES_128_CMAC;
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: using MGMT group cipher "
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
"AES-128-CMAC");
Allow management group cipher to be configured This allows hostapd to set a different management group cipher than the previously hardcoded default BIP (AES-128-CMAC). The new configuration file parameter group_mgmt_cipher can be set to BIP-GMAC-128, BIP-GMAC-256, or BIP-CMAC-256 to select one of the ciphers defined in IEEE Std 802.11ac-2013. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-12 19:26:37 +01:00
} else if (sel & WPA_CIPHER_BIP_GMAC_128) {
wpa_s->mgmt_group_cipher = WPA_CIPHER_BIP_GMAC_128;
wpa_dbg(wpa_s, MSG_DEBUG, "WPA: using MGMT group cipher "
"BIP-GMAC-128");
} else if (sel & WPA_CIPHER_BIP_GMAC_256) {
wpa_s->mgmt_group_cipher = WPA_CIPHER_BIP_GMAC_256;
wpa_dbg(wpa_s, MSG_DEBUG, "WPA: using MGMT group cipher "
"BIP-GMAC-256");
} else if (sel & WPA_CIPHER_BIP_CMAC_256) {
wpa_s->mgmt_group_cipher = WPA_CIPHER_BIP_CMAC_256;
wpa_dbg(wpa_s, MSG_DEBUG, "WPA: using MGMT group cipher "
"BIP-CMAC-256");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
} else {
wpa_s->mgmt_group_cipher = 0;
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: not using MGMT group cipher");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
wpa_sm_set_param(wpa_s->wpa, WPA_PARAM_MGMT_GROUP,
wpa_s->mgmt_group_cipher);
Allow PMF to be enabled by default Previously, PMF (protected management frames, IEEE 802.11w) could be enabled only with a per-network parameter (ieee80211w). The new global parameter (pmf) can now be used to change the default behavior to be PMF enabled (pmf=1) or required (pmf=2) for network blocks that do not override this with the ieee80211w parameter. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-24 21:21:29 +01:00
wpa_sm_set_param(wpa_s->wpa, WPA_PARAM_MFP,
Ignore pmf=1 default if driver does not support PMF Connection with a PMF enabled AP will fail if we try to negotiate PMF while the local driver does not support this. Since pmf=1 does not require PMF for a successful connection, it can be ignored in such a case to avoid connectivity issues with invalid configuration. This makes it somewhat easier to allow upper layer programs to use pmf=1 default regardless of driver capabilities. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-26 16:40:22 +01:00
wpas_get_ssid_pmf(wpa_s, ssid));
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
#endif /* CONFIG_IEEE80211W */
if (wpa_sm_set_assoc_wpa_ie_default(wpa_s->wpa, wpa_ie, wpa_ie_len)) {
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, "WPA: Failed to generate WPA IE");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return -1;
}
Use wpa_key_mgmt_*() helpers This cleans up the source code and makes it less likely that new AKM addition misses some needed changes in the future. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-11-24 21:46:14 +01:00
if (wpa_key_mgmt_wpa_psk(ssid->key_mgmt)) {
Allow PSK/passphrase to be set only when needed The new network profile parameter mem_only_psk=1 can be used to specify that the PSK/passphrase for that network is requested over the control interface (ctrl_iface or D-Bus) similarly to the EAP network parameter requests. The PSK/passphrase can then be configured temporarily in a way that prevents it from getting stored to the configuration file. For example: Event: CTRL-REQ-PSK_PASSPHRASE-0:PSK or passphrase needed for SSID test-wpa2-psk Response: CTRL-RSP-PSK_PASSPHRASE-0:"qwertyuiop" Note: The response value uses the same encoding as the psk network profile parameter, i.e., passphrase is within double quotation marks. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-28 10:05:13 +01:00
int psk_set = 0;
if (ssid->psk_set) {
wpa_sm_set_pmk(wpa_s->wpa, ssid->psk, PMK_LEN, NULL);
psk_set = 1;
}
Allow wildcard SSID to be used with WPA-PSK if bssid is set This allows the AP to be selected based on the BSSID when WPA-PSK is used with a passphrase. The PSK will be derived from the passphrase after the SSID has been learned from scan results.
2011-09-30 21:01:42 +02:00
#ifndef CONFIG_NO_PBKDF2
if (bss && ssid->bssid_set && ssid->ssid_len == 0 &&
ssid->passphrase) {
u8 psk[PMK_LEN];
Convert remaining SSID routines from char* to u8* This makes it more explicit that the SSID is not a null terminated C string. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-07 15:07:25 +02:00
pbkdf2_sha1(ssid->passphrase, bss->ssid, bss->ssid_len,
4096, psk, PMK_LEN);
Allow wildcard SSID to be used with WPA-PSK if bssid is set This allows the AP to be selected based on the BSSID when WPA-PSK is used with a passphrase. The PSK will be derived from the passphrase after the SSID has been learned from scan results.
2011-09-30 21:01:42 +02:00
wpa_hexdump_key(MSG_MSGDUMP, "PSK (from passphrase)",
psk, PMK_LEN);
SAE: Add support for PMKSA caching on the station side This makes wpa_supplicant SME create PMKSA cache entries from SAE authentication and try to use PMKSA caching if an entry is found for the AP. If the AP rejects the attempt, fall back to SAE authentication is used. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-18 12:02:02 +02:00
wpa_sm_set_pmk(wpa_s->wpa, psk, PMK_LEN, NULL);
Allow PSK/passphrase to be set only when needed The new network profile parameter mem_only_psk=1 can be used to specify that the PSK/passphrase for that network is requested over the control interface (ctrl_iface or D-Bus) similarly to the EAP network parameter requests. The PSK/passphrase can then be configured temporarily in a way that prevents it from getting stored to the configuration file. For example: Event: CTRL-REQ-PSK_PASSPHRASE-0:PSK or passphrase needed for SSID test-wpa2-psk Response: CTRL-RSP-PSK_PASSPHRASE-0:"qwertyuiop" Note: The response value uses the same encoding as the psk network profile parameter, i.e., passphrase is within double quotation marks. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-28 10:05:13 +01:00
psk_set = 1;
Explicitly clear the temporary stack-based PSK buffer There is no need to leave this temporary key in stack memory after having been configured to the WPA state machine. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-29 12:10:30 +01:00
os_memset(psk, 0, sizeof(psk));
Allow wildcard SSID to be used with WPA-PSK if bssid is set This allows the AP to be selected based on the BSSID when WPA-PSK is used with a passphrase. The PSK will be derived from the passphrase after the SSID has been learned from scan results.
2011-09-30 21:01:42 +02:00
}
#endif /* CONFIG_NO_PBKDF2 */
EXT PW: Add support for psk parameter from external storage This allows wpa_supplicant configuration file to be created without the PSK/passphrase value included in the file when a backend for external password storage is available. Following example can be used for developer testing: ext_password_backend=test:psk1=12345678 network={ ssid="test-psk" key_mgmt=WPA-PSK psk=ext:psk1 } Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-03 20:36:38 +02:00
#ifdef CONFIG_EXT_PASSWORD
if (ssid->ext_psk) {
struct wpabuf *pw = ext_password_get(wpa_s->ext_pw,
ssid->ext_psk);
char pw_str[64 + 1];
u8 psk[PMK_LEN];
if (pw == NULL) {
wpa_msg(wpa_s, MSG_INFO, "EXT PW: No PSK "
"found from external storage");
return -1;
}
if (wpabuf_len(pw) < 8 || wpabuf_len(pw) > 64) {
wpa_msg(wpa_s, MSG_INFO, "EXT PW: Unexpected "
"PSK length %d in external storage",
(int) wpabuf_len(pw));
ext_password_free(pw);
return -1;
}
os_memcpy(pw_str, wpabuf_head(pw), wpabuf_len(pw));
pw_str[wpabuf_len(pw)] = '\0';
#ifndef CONFIG_NO_PBKDF2
if (wpabuf_len(pw) >= 8 && wpabuf_len(pw) < 64 && bss)
{
Convert remaining SSID routines from char* to u8* This makes it more explicit that the SSID is not a null terminated C string. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-07 15:07:25 +02:00
pbkdf2_sha1(pw_str, bss->ssid, bss->ssid_len,
4096, psk, PMK_LEN);
EXT PW: Add support for psk parameter from external storage This allows wpa_supplicant configuration file to be created without the PSK/passphrase value included in the file when a backend for external password storage is available. Following example can be used for developer testing: ext_password_backend=test:psk1=12345678 network={ ssid="test-psk" key_mgmt=WPA-PSK psk=ext:psk1 } Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-03 20:36:38 +02:00
os_memset(pw_str, 0, sizeof(pw_str));
wpa_hexdump_key(MSG_MSGDUMP, "PSK (from "
"external passphrase)",
psk, PMK_LEN);
SAE: Add support for PMKSA caching on the station side This makes wpa_supplicant SME create PMKSA cache entries from SAE authentication and try to use PMKSA caching if an entry is found for the AP. If the AP rejects the attempt, fall back to SAE authentication is used. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-18 12:02:02 +02:00
wpa_sm_set_pmk(wpa_s->wpa, psk, PMK_LEN, NULL);
Allow PSK/passphrase to be set only when needed The new network profile parameter mem_only_psk=1 can be used to specify that the PSK/passphrase for that network is requested over the control interface (ctrl_iface or D-Bus) similarly to the EAP network parameter requests. The PSK/passphrase can then be configured temporarily in a way that prevents it from getting stored to the configuration file. For example: Event: CTRL-REQ-PSK_PASSPHRASE-0:PSK or passphrase needed for SSID test-wpa2-psk Response: CTRL-RSP-PSK_PASSPHRASE-0:"qwertyuiop" Note: The response value uses the same encoding as the psk network profile parameter, i.e., passphrase is within double quotation marks. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-28 10:05:13 +01:00
psk_set = 1;
Explicitly clear the temporary stack-based PSK buffer There is no need to leave this temporary key in stack memory after having been configured to the WPA state machine. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-29 12:10:30 +01:00
os_memset(psk, 0, sizeof(psk));
EXT PW: Add support for psk parameter from external storage This allows wpa_supplicant configuration file to be created without the PSK/passphrase value included in the file when a backend for external password storage is available. Following example can be used for developer testing: ext_password_backend=test:psk1=12345678 network={ ssid="test-psk" key_mgmt=WPA-PSK psk=ext:psk1 } Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-03 20:36:38 +02:00
} else
#endif /* CONFIG_NO_PBKDF2 */
if (wpabuf_len(pw) == 2 * PMK_LEN) {
if (hexstr2bin(pw_str, psk, PMK_LEN) < 0) {
wpa_msg(wpa_s, MSG_INFO, "EXT PW: "
"Invalid PSK hex string");
os_memset(pw_str, 0, sizeof(pw_str));
ext_password_free(pw);
return -1;
}
SAE: Add support for PMKSA caching on the station side This makes wpa_supplicant SME create PMKSA cache entries from SAE authentication and try to use PMKSA caching if an entry is found for the AP. If the AP rejects the attempt, fall back to SAE authentication is used. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-18 12:02:02 +02:00
wpa_sm_set_pmk(wpa_s->wpa, psk, PMK_LEN, NULL);
Allow PSK/passphrase to be set only when needed The new network profile parameter mem_only_psk=1 can be used to specify that the PSK/passphrase for that network is requested over the control interface (ctrl_iface or D-Bus) similarly to the EAP network parameter requests. The PSK/passphrase can then be configured temporarily in a way that prevents it from getting stored to the configuration file. For example: Event: CTRL-REQ-PSK_PASSPHRASE-0:PSK or passphrase needed for SSID test-wpa2-psk Response: CTRL-RSP-PSK_PASSPHRASE-0:"qwertyuiop" Note: The response value uses the same encoding as the psk network profile parameter, i.e., passphrase is within double quotation marks. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-28 10:05:13 +01:00
psk_set = 1;
Explicitly clear the temporary stack-based PSK buffer There is no need to leave this temporary key in stack memory after having been configured to the WPA state machine. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-29 12:10:30 +01:00
os_memset(psk, 0, sizeof(psk));
EXT PW: Add support for psk parameter from external storage This allows wpa_supplicant configuration file to be created without the PSK/passphrase value included in the file when a backend for external password storage is available. Following example can be used for developer testing: ext_password_backend=test:psk1=12345678 network={ ssid="test-psk" key_mgmt=WPA-PSK psk=ext:psk1 } Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-03 20:36:38 +02:00
} else {
wpa_msg(wpa_s, MSG_INFO, "EXT PW: No suitable "
"PSK available");
os_memset(pw_str, 0, sizeof(pw_str));
ext_password_free(pw);
return -1;
}
os_memset(pw_str, 0, sizeof(pw_str));
ext_password_free(pw);
}
#endif /* CONFIG_EXT_PASSWORD */
Allow PSK/passphrase to be set only when needed The new network profile parameter mem_only_psk=1 can be used to specify that the PSK/passphrase for that network is requested over the control interface (ctrl_iface or D-Bus) similarly to the EAP network parameter requests. The PSK/passphrase can then be configured temporarily in a way that prevents it from getting stored to the configuration file. For example: Event: CTRL-REQ-PSK_PASSPHRASE-0:PSK or passphrase needed for SSID test-wpa2-psk Response: CTRL-RSP-PSK_PASSPHRASE-0:"qwertyuiop" Note: The response value uses the same encoding as the psk network profile parameter, i.e., passphrase is within double quotation marks. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-28 10:05:13 +01:00
if (!psk_set) {
wpa_msg(wpa_s, MSG_INFO,
"No PSK available for association");
return -1;
}
Allow wildcard SSID to be used with WPA-PSK if bssid is set This allows the AP to be selected based on the BSSID when WPA-PSK is used with a passphrase. The PSK will be derived from the passphrase after the SSID has been learned from scan results.
2011-09-30 21:01:42 +02:00
} else
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_sm_set_pmk_from_pmksa(wpa_s->wpa);
return 0;
}
hostapd/wpa_s: Use driver's extended capabilities Some extended capabilities (I'm currently interested in "Operating Mode Notification" for VHT) are implemented by the kernel driver and exported in nl80211. Use these in hostapd/wpa_supplicant. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-03-31 20:51:44 +02:00
static void wpas_ext_capab_byte(struct wpa_supplicant *wpa_s, u8 *pos, int idx)
Share a single function for building extended capabilities element This makes it easier to update extended capabilities for all uses within wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-22 18:17:15 +01:00
{
hostapd/wpa_s: Use driver's extended capabilities Some extended capabilities (I'm currently interested in "Operating Mode Notification" for VHT) are implemented by the kernel driver and exported in nl80211. Use these in hostapd/wpa_supplicant. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-03-31 20:51:44 +02:00
*pos = 0x00;
Share a single function for building extended capabilities element This makes it easier to update extended capabilities for all uses within wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-22 18:17:15 +01:00
hostapd/wpa_s: Use driver's extended capabilities Some extended capabilities (I'm currently interested in "Operating Mode Notification" for VHT) are implemented by the kernel driver and exported in nl80211. Use these in hostapd/wpa_supplicant. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-03-31 20:51:44 +02:00
switch (idx) {
case 0: /* Bits 0-7 */
break;
case 1: /* Bits 8-15 */
break;
case 2: /* Bits 16-23 */
#ifdef CONFIG_WNM
*pos |= 0x02; /* Bit 17 - WNM-Sleep Mode */
*pos |= 0x08; /* Bit 19 - BSS Transition */
#endif /* CONFIG_WNM */
break;
case 3: /* Bits 24-31 */
#ifdef CONFIG_WNM
*pos |= 0x02; /* Bit 25 - SSID List */
#endif /* CONFIG_WNM */
Share a single function for building extended capabilities element This makes it easier to update extended capabilities for all uses within wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-22 18:17:15 +01:00
#ifdef CONFIG_INTERWORKING
hostapd/wpa_s: Use driver's extended capabilities Some extended capabilities (I'm currently interested in "Operating Mode Notification" for VHT) are implemented by the kernel driver and exported in nl80211. Use these in hostapd/wpa_supplicant. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-03-31 20:51:44 +02:00
if (wpa_s->conf->interworking)
*pos |= 0x80; /* Bit 31 - Interworking */
Share a single function for building extended capabilities element This makes it easier to update extended capabilities for all uses within wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-22 18:17:15 +01:00
#endif /* CONFIG_INTERWORKING */
hostapd/wpa_s: Use driver's extended capabilities Some extended capabilities (I'm currently interested in "Operating Mode Notification" for VHT) are implemented by the kernel driver and exported in nl80211. Use these in hostapd/wpa_supplicant. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-03-31 20:51:44 +02:00
break;
case 4: /* Bits 32-39 */
Interworking: Add support for QoS Mapping functionality for the STA Indicate support for QoS Mapping and configure driver to update the QoS Map if QoS Map Set elements is received from the AP either in (Re)Association Response or QoS Map Configure frame. This commit adds support for receiving the frames with nl80211 drivers, but the actual QoS Map configuration command is still missing. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-24 12:17:56 +02:00
#ifdef CONFIG_INTERWORKING
Advertise QoS Map support based on driver capability Do not assume the driver supports QoS Mapping, but instead, advertise support for this only if CONFIG_INTERWORKING is defined and driver indicates support for configuring QoS Map. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-12-23 10:05:20 +01:00
if (wpa_s->drv_flags / WPA_DRIVER_FLAGS_QOS_MAPPING)
*pos |= 0x01; /* Bit 32 - QoS Map */
Interworking: Add support for QoS Mapping functionality for the STA Indicate support for QoS Mapping and configure driver to update the QoS Map if QoS Map Set elements is received from the AP either in (Re)Association Response or QoS Map Configure frame. This commit adds support for receiving the frames with nl80211 drivers, but the actual QoS Map configuration command is still missing. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-24 12:17:56 +02:00
#endif /* CONFIG_INTERWORKING */
hostapd/wpa_s: Use driver's extended capabilities Some extended capabilities (I'm currently interested in "Operating Mode Notification" for VHT) are implemented by the kernel driver and exported in nl80211. Use these in hostapd/wpa_supplicant. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-03-31 20:51:44 +02:00
break;
case 5: /* Bits 40-47 */
HS 2.0R2: Add WNM-Notification Request for Subscription Remediation Subscription remediation notification WNM-Notification Request is now shown in the following way in wpa_supplicant control interface: <3>HS20-SUBSCRIPTION-REMEDIATION http://example.com/foo/ Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-02 12:05:57 +01:00
#ifdef CONFIG_HS20
if (wpa_s->conf->hs20)
*pos |= 0x40; /* Bit 46 - WNM-Notification */
#endif /* CONFIG_HS20 */
hostapd/wpa_s: Use driver's extended capabilities Some extended capabilities (I'm currently interested in "Operating Mode Notification" for VHT) are implemented by the kernel driver and exported in nl80211. Use these in hostapd/wpa_supplicant. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-03-31 20:51:44 +02:00
break;
case 6: /* Bits 48-55 */
break;
}
}
Share a single function for building extended capabilities element This makes it easier to update extended capabilities for all uses within wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-22 18:17:15 +01:00
Validate driver extended capabilities length against buffer length Prepare for new extended capabilities bits by checking that the local buffer is large enough to contain all the bits the driver requests. The existing buffers are large enough to include anything defined until now, but it would be possible to add more definitions in the future, so increase them a bit as well to make this more future proof. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-07 15:33:28 +02:00
int wpas_build_ext_capab(struct wpa_supplicant *wpa_s, u8 *buf, size_t buflen)
hostapd/wpa_s: Use driver's extended capabilities Some extended capabilities (I'm currently interested in "Operating Mode Notification" for VHT) are implemented by the kernel driver and exported in nl80211. Use these in hostapd/wpa_supplicant. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-03-31 20:51:44 +02:00
{
u8 *pos = buf;
HS 2.0R2: Add WNM-Notification Request for Subscription Remediation Subscription remediation notification WNM-Notification Request is now shown in the following way in wpa_supplicant control interface: <3>HS20-SUBSCRIPTION-REMEDIATION http://example.com/foo/ Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-02 12:05:57 +01:00
u8 len = 6, i;
hostapd/wpa_s: Use driver's extended capabilities Some extended capabilities (I'm currently interested in "Operating Mode Notification" for VHT) are implemented by the kernel driver and exported in nl80211. Use these in hostapd/wpa_supplicant. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-03-31 20:51:44 +02:00
if (len < wpa_s->extended_capa_len)
len = wpa_s->extended_capa_len;
Validate driver extended capabilities length against buffer length Prepare for new extended capabilities bits by checking that the local buffer is large enough to contain all the bits the driver requests. The existing buffers are large enough to include anything defined until now, but it would be possible to add more definitions in the future, so increase them a bit as well to make this more future proof. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-07 15:33:28 +02:00
if (buflen < (size_t) len + 2) {
wpa_printf(MSG_INFO,
"Not enough room for building extended capabilities element");
return -1;
}
Share a single function for building extended capabilities element This makes it easier to update extended capabilities for all uses within wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-22 18:17:15 +01:00
*pos++ = WLAN_EID_EXT_CAPAB;
hostapd/wpa_s: Use driver's extended capabilities Some extended capabilities (I'm currently interested in "Operating Mode Notification" for VHT) are implemented by the kernel driver and exported in nl80211. Use these in hostapd/wpa_supplicant. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-03-31 20:51:44 +02:00
*pos++ = len;
for (i = 0; i < len; i++, pos++) {
wpas_ext_capab_byte(wpa_s, pos, i);
if (i < wpa_s->extended_capa_len) {
*pos &= ~wpa_s->extended_capa_mask[i];
*pos |= wpa_s->extended_capa[i];
}
}
Share a single function for building extended capabilities element This makes it easier to update extended capabilities for all uses within wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-22 18:17:15 +01:00
Optimize Extended Capabilities element to be of minimal length Leave out zero octets from the end of the element. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-03-31 20:58:17 +02:00
while (len > 0 && buf[1 + len] == 0) {
len--;
buf[1] = len;
}
if (len == 0)
return 0;
return 2 + len;
Share a single function for building extended capabilities element This makes it easier to update extended capabilities for all uses within wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-22 18:17:15 +01:00
}
Use wpa_radio work for connection This protects against conflicting offchannel operations during connection (authentication, association, EAP exchanges, 4-way handshake). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 15:50:32 +01:00
static int wpas_valid_bss(struct wpa_supplicant *wpa_s,
struct wpa_bss *test_bss)
{
struct wpa_bss *bss;
dl_list_for_each(bss, &wpa_s->bss, struct wpa_bss, list) {
if (bss == test_bss)
return 1;
}
return 0;
}
static int wpas_valid_ssid(struct wpa_supplicant *wpa_s,
struct wpa_ssid *test_ssid)
{
struct wpa_ssid *ssid;
for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next) {
if (ssid == test_ssid)
return 1;
}
return 0;
}
int wpas_valid_bss_ssid(struct wpa_supplicant *wpa_s, struct wpa_bss *test_bss,
struct wpa_ssid *test_ssid)
{
if (test_bss && !wpas_valid_bss(wpa_s, test_bss))
return 0;
return test_ssid == NULL || wpas_valid_ssid(wpa_s, test_ssid);
}
void wpas_connect_work_free(struct wpa_connect_work *cwork)
{
if (cwork == NULL)
return;
os_free(cwork);
}
void wpas_connect_work_done(struct wpa_supplicant *wpa_s)
{
struct wpa_connect_work *cwork;
struct wpa_radio_work *work = wpa_s->connect_work;
if (!work)
return;
wpa_s->connect_work = NULL;
cwork = work->ctx;
work->ctx = NULL;
wpas_connect_work_free(cwork);
radio_work_done(work);
}
Extend random MAC address support to allow OUI to be kept mac_addr=2 and preassoc_mac_addr=2 parameters can now be used to configure random MAC address to be generated by maintaining the OUI part of the permanent MAC address (but with locally administered bit set to 1). Other than that, these values result in similar behavior with mac_addr=1 and preassoc_mac_addr=1, respectively. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-09-29 22:24:19 +02:00
int wpas_update_random_addr(struct wpa_supplicant *wpa_s, int style)
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
{
struct os_reltime now;
u8 addr[ETH_ALEN];
os_get_reltime(&now);
Extend random MAC address support to allow OUI to be kept mac_addr=2 and preassoc_mac_addr=2 parameters can now be used to configure random MAC address to be generated by maintaining the OUI part of the permanent MAC address (but with locally administered bit set to 1). Other than that, these values result in similar behavior with mac_addr=1 and preassoc_mac_addr=1, respectively. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-09-29 22:24:19 +02:00
if (wpa_s->last_mac_addr_style == style &&
wpa_s->last_mac_addr_change.sec != 0 &&
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
!os_reltime_expired(&now, &wpa_s->last_mac_addr_change,
wpa_s->conf->rand_addr_lifetime)) {
wpa_msg(wpa_s, MSG_DEBUG,
"Previously selected random MAC address has not yet expired");
return 0;
}
Extend random MAC address support to allow OUI to be kept mac_addr=2 and preassoc_mac_addr=2 parameters can now be used to configure random MAC address to be generated by maintaining the OUI part of the permanent MAC address (but with locally administered bit set to 1). Other than that, these values result in similar behavior with mac_addr=1 and preassoc_mac_addr=1, respectively. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-09-29 22:24:19 +02:00
switch (style) {
case 1:
if (random_mac_addr(addr) < 0)
return -1;
break;
case 2:
os_memcpy(addr, wpa_s->perm_addr, ETH_ALEN);
if (random_mac_addr_keep_oui(addr) < 0)
return -1;
break;
default:
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
return -1;
Extend random MAC address support to allow OUI to be kept mac_addr=2 and preassoc_mac_addr=2 parameters can now be used to configure random MAC address to be generated by maintaining the OUI part of the permanent MAC address (but with locally administered bit set to 1). Other than that, these values result in similar behavior with mac_addr=1 and preassoc_mac_addr=1, respectively. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-09-29 22:24:19 +02:00
}
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 (wpa_drv_set_mac_addr(wpa_s, addr) < 0) {
wpa_msg(wpa_s, MSG_INFO,
"Failed to set random MAC address");
return -1;
}
os_get_reltime(&wpa_s->last_mac_addr_change);
wpa_s->mac_addr_changed = 1;
Extend random MAC address support to allow OUI to be kept mac_addr=2 and preassoc_mac_addr=2 parameters can now be used to configure random MAC address to be generated by maintaining the OUI part of the permanent MAC address (but with locally administered bit set to 1). Other than that, these values result in similar behavior with mac_addr=1 and preassoc_mac_addr=1, respectively. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-09-29 22:24:19 +02:00
wpa_s->last_mac_addr_style = style;
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 (wpa_supplicant_update_mac_addr(wpa_s) < 0) {
wpa_msg(wpa_s, MSG_INFO,
"Could not update MAC address information");
return -1;
}
wpa_msg(wpa_s, MSG_DEBUG, "Using random MAC address " MACSTR,
MAC2STR(addr));
return 0;
}
int wpas_update_random_addr_disassoc(struct wpa_supplicant *wpa_s)
{
if (wpa_s->wpa_state >= WPA_AUTHENTICATING ||
!wpa_s->conf->preassoc_mac_addr)
return 0;
Extend random MAC address support to allow OUI to be kept mac_addr=2 and preassoc_mac_addr=2 parameters can now be used to configure random MAC address to be generated by maintaining the OUI part of the permanent MAC address (but with locally administered bit set to 1). Other than that, these values result in similar behavior with mac_addr=1 and preassoc_mac_addr=1, respectively. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-09-29 22:24:19 +02:00
return wpas_update_random_addr(wpa_s, wpa_s->conf->preassoc_mac_addr);
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
}
Use wpa_radio work for connection This protects against conflicting offchannel operations during connection (authentication, association, EAP exchanges, 4-way handshake). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 15:50:32 +01:00
static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
/**
* wpa_supplicant_associate - Request association
* @wpa_s: Pointer to wpa_supplicant data
* @bss: Scan results for the selected BSS, or %NULL if not available
* @ssid: Configuration data for the selected network
*
* This function is used to request %wpa_supplicant to associate with a BSS.
*/
void wpa_supplicant_associate(struct wpa_supplicant *wpa_s,
Use BSS table entry instead of raw scan result for connection
2010-01-02 15:16:02 +01:00
struct wpa_bss *bss, struct wpa_ssid *ssid)
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
{
Use wpa_radio work for connection This protects against conflicting offchannel operations during connection (authentication, association, EAP exchanges, 4-way handshake). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 15:50:32 +01:00
struct wpa_connect_work *cwork;
Extend random MAC address support to allow OUI to be kept mac_addr=2 and preassoc_mac_addr=2 parameters can now be used to configure random MAC address to be generated by maintaining the OUI part of the permanent MAC address (but with locally administered bit set to 1). Other than that, these values result in similar behavior with mac_addr=1 and preassoc_mac_addr=1, respectively. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-09-29 22:24:19 +02:00
int rand_style;
Clear own_disconnect_req on new connection attempt It was possible for wpa_s->own_disconnect_req to be left set to 1 from a disconnection attempt from a prior connection. This could then prevent proper connection failure processing with the new connection in wpas_connection_failed(). This was triggered by the following hwsim test case sequence: wpas_mesh_secure sae_no_ffc_by_default. In this sequence, the SAE failure due to unsupported group did not result in proper wpas_connection_failed() processing and retry. Fix this by clearing wpa_s->own_disconnect_req in wpa_supplicant_associate() before starting a new connection. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-12 13:24:06 +02:00
wpa_s->own_disconnect_req = 0;
Drop any pending EAPOL RX frame when starting a new connection Such a pending frame cannot be valid anymore, so drop it instead of risking of using an unexpected EAPOL frame after association if a previous association received one at the end and the new association can happen within 100 ms. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-12-20 12:40:59 +01:00
/*
* If we are starting a new connection, any previously pending EAPOL
* RX cannot be valid anymore.
*/
wpabuf_free(wpa_s->pending_eapol_rx);
wpa_s->pending_eapol_rx = NULL;
Extend random MAC address support to allow OUI to be kept mac_addr=2 and preassoc_mac_addr=2 parameters can now be used to configure random MAC address to be generated by maintaining the OUI part of the permanent MAC address (but with locally administered bit set to 1). Other than that, these values result in similar behavior with mac_addr=1 and preassoc_mac_addr=1, respectively. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-09-29 22:24:19 +02:00
if (ssid->mac_addr == -1)
rand_style = wpa_s->conf->mac_addr;
else
rand_style = ssid->mac_addr;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
WMM AC: Reconfigure tspecs on reassociation to the same BSS The specification requires the tspecs to be kept upon reassociation to the same BSS. Save the last tspecs before such reassociation, and reconfigure on the association notification. Note that the current flow is not transparent to the user (it is notified about deauth/reassoc and tspec removal/addition). Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
2014-12-29 03:15:01 +01:00
wmm_ac_clear_saved_tspecs(wpa_s);
wpa_s->reassoc_same_bss = 0;
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 (wpa_s->last_ssid == ssid) {
wpa_dbg(wpa_s, MSG_DEBUG, "Re-association to the same ESS");
WMM AC: Reconfigure tspecs on reassociation to the same BSS The specification requires the tspecs to be kept upon reassociation to the same BSS. Save the last tspecs before such reassociation, and reconfigure on the association notification. Note that the current flow is not transparent to the user (it is notified about deauth/reassoc and tspec removal/addition). Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
2014-12-29 03:15:01 +01:00
if (wpa_s->current_bss && wpa_s->current_bss == bss) {
wmm_ac_save_tspecs(wpa_s);
wpa_s->reassoc_same_bss = 1;
}
Extend random MAC address support to allow OUI to be kept mac_addr=2 and preassoc_mac_addr=2 parameters can now be used to configure random MAC address to be generated by maintaining the OUI part of the permanent MAC address (but with locally administered bit set to 1). Other than that, these values result in similar behavior with mac_addr=1 and preassoc_mac_addr=1, respectively. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-09-29 22:24:19 +02:00
} else if (rand_style > 0) {
if (wpas_update_random_addr(wpa_s, rand_style) < 0)
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
return;
wpa_sm_pmksa_cache_flush(wpa_s->wpa, ssid);
} else if (wpa_s->mac_addr_changed) {
if (wpa_drv_set_mac_addr(wpa_s, NULL) < 0) {
wpa_msg(wpa_s, MSG_INFO,
"Could not restore permanent MAC address");
return;
}
wpa_s->mac_addr_changed = 0;
if (wpa_supplicant_update_mac_addr(wpa_s) < 0) {
wpa_msg(wpa_s, MSG_INFO,
"Could not update MAC address information");
return;
}
wpa_msg(wpa_s, MSG_DEBUG, "Using permanent MAC address");
}
wpa_s->last_ssid = ssid;
RSN IBSS: Restart IBSS state machines for each new IBSS Change the old design of running a single long living RSN IBSS instance to keep a separate instance for each IBSS connection. This fixes number of issues in getting keys set properly for new connections and is in general quite a bit more correct design.
2011-03-23 20:15:46 +01:00
#ifdef CONFIG_IBSS_RSN
ibss_rsn_deinit(wpa_s->ibss_rsn);
wpa_s->ibss_rsn = NULL;
#endif /* CONFIG_IBSS_RSN */
P2P: Add dynamic network config block parameters for P2P
2010-07-18 23:30:24 +02:00
if (ssid->mode == WPAS_MODE_AP || ssid->mode == WPAS_MODE_P2P_GO ||
ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION) {
Initial step in adding simple AP mode support into wpa_supplicant This version is adding the configuration option (mode=2) for this and driver capability reporting to figure out whether AP mode can be used. However, this does not actually implement any real functionality yet.
2009-03-25 10:38:47 +01:00
#ifdef CONFIG_AP
if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_AP)) {
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_INFO, "Driver does not support AP "
"mode");
Initial step in adding simple AP mode support into wpa_supplicant This version is adding the configuration option (mode=2) for this and driver capability reporting to figure out whether AP mode can be used. However, this does not actually implement any real functionality yet.
2009-03-25 10:38:47 +01:00
return;
}
wpa_supplicant: Set state to DISCONNECTED on AP creation errors If the AP creation failed (missing freq= or driver error) the supplicant would previously stay in SCANNING state forever. Instead, it should handle the error a bit better and drop back to DISCONNECTED so clients know something went wrong. Signed-hostap: Dan Williams <dcbw@redhat.com> intended-for: hostap-1
2012-09-23 12:55:58 +02:00
if (wpa_supplicant_create_ap(wpa_s, ssid) < 0) {
wpa_supplicant_set_state(wpa_s, WPA_DISCONNECTED);
P2P: Fix crash when failed to create GO interface wpa_supplicant crashes if driver configuration for AP mode interface configuration fails after group negotiation. This is because of a regression from commit 1075b2957169d8f9d6dddd7679339c751dc9515b that ends up freeing the wpa_s instance from within wpa_supplicant_create_ap() without the caller knowing. Fix this by using an eloop timeout to free remove the P2P group so that wpa_supplicant_create_ap() and especially wpa_supplicant_associate() callers do not need to know about interface getting possibly removed. In addition, move the P2P specific code into p2p_supplicant.c where it really belongs. This allows the already existing group formation timeout to be used by reducing the timeout to zero. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-03 10:17:21 +02:00
if (ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION)
wpas_p2p_ap_setup_failed(wpa_s);
wpa_supplicant: Set state to DISCONNECTED on AP creation errors If the AP creation failed (missing freq= or driver error) the supplicant would previously stay in SCANNING state forever. Instead, it should handle the error a bit better and drop back to DISCONNECTED so clients know something went wrong. Signed-hostap: Dan Williams <dcbw@redhat.com> intended-for: hostap-1
2012-09-23 12:55:58 +02:00
return;
}
Maintain a pointer to the current BSS table entry
2010-01-02 15:59:19 +01:00
wpa_s->current_bss = bss;
Initial step in adding simple AP mode support into wpa_supplicant This version is adding the configuration option (mode=2) for this and driver capability reporting to figure out whether AP mode can be used. However, this does not actually implement any real functionality yet.
2009-03-25 10:38:47 +01:00
#else /* CONFIG_AP */
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_ERROR, "AP mode support not included in "
"the build");
Initial step in adding simple AP mode support into wpa_supplicant This version is adding the configuration option (mode=2) for this and driver capability reporting to figure out whether AP mode can be used. However, this does not actually implement any real functionality yet.
2009-03-25 10:38:47 +01:00
#endif /* CONFIG_AP */
return;
}
Add mesh_group_{add,remove} control interface commands Parse MESH_GROUP_ADD/REMOVE commands on ctrl interface and call wpa_supplicant routines. These commands are used to start or join and leave a mesh network. The mesh id is given in the configuration file, therefore there is no need to scan before joining a mesh network. We reuse the connect_without_scan construct used by P2P for that same purpose. Signed-off-by: Javier Cardona <javier@cozybit.com> Signed-off-by: Javier Lopez <jlopex@gmail.com>
2014-09-01 06:23:33 +02:00
if (ssid->mode == WPAS_MODE_MESH) {
#ifdef CONFIG_MESH
if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_MESH)) {
wpa_msg(wpa_s, MSG_INFO,
"Driver does not support mesh mode");
return;
}
if (bss)
ssid->frequency = bss->freq;
if (wpa_supplicant_join_mesh(wpa_s, ssid) < 0) {
wpa_msg(wpa_s, MSG_ERROR, "Could not join mesh");
return;
}
wpa_s->current_bss = bss;
wpa_msg_ctrl(wpa_s, MSG_INFO, MESH_GROUP_STARTED
"ssid=\"%s\" id=%d",
wpa_ssid_txt(ssid->ssid, ssid->ssid_len),
ssid->id);
#else /* CONFIG_MESH */
wpa_msg(wpa_s, MSG_ERROR,
"mesh mode support not included in the build");
#endif /* CONFIG_MESH */
return;
}
TDLS: Do not allow setup to be started if AP prohibits TDLS
2011-01-28 18:27:28 +01:00
#ifdef CONFIG_TDLS
TDLS: Verify that scan results for BSS are available before using them
2011-04-14 18:50:26 +02:00
if (bss)
wpa_tdls_ap_ies(wpa_s->wpa, (const u8 *) (bss + 1),
bss->ie_len);
TDLS: Do not allow setup to be started if AP prohibits TDLS
2011-01-28 18:27:28 +01:00
#endif /* CONFIG_TDLS */
nl80211: Add support for IBSS networks
2009-12-03 23:15:32 +01:00
if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME) &&
ssid->mode == IEEE80211_MODE_INFRA) {
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
sme_authenticate(wpa_s, bss, ssid);
return;
}
Use wpa_radio work for connection This protects against conflicting offchannel operations during connection (authentication, association, EAP exchanges, 4-way handshake). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 15:50:32 +01:00
if (wpa_s->connect_work) {
wpa_dbg(wpa_s, MSG_DEBUG, "Reject wpa_supplicant_associate() call since connect_work exist");
return;
}
Do not start another connect work while one is pending It was possible for the connect or sme-connect radio work to get re-scheduled while an earlier request was still pending, e.g., select_network is issued at the moment a scan radio work is in progress and the old scan results are recent enough for starting the connection. This could result in unexpected attempt to re-associate immediately after completing the first connection. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-02-24 14:22:35 +01:00
if (radio_work_pending(wpa_s, "connect")) {
wpa_dbg(wpa_s, MSG_DEBUG, "Reject wpa_supplicant_associate() call since pending work exist");
return;
}
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
wpas_abort_ongoing_scan(wpa_s);
Use wpa_radio work for connection This protects against conflicting offchannel operations during connection (authentication, association, EAP exchanges, 4-way handshake). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 15:50:32 +01:00
cwork = os_zalloc(sizeof(*cwork));
if (cwork == NULL)
return;
cwork->bss = bss;
cwork->ssid = ssid;
if (radio_add_work(wpa_s, bss ? bss->freq : 0, "connect", 1,
wpas_start_assoc_cb, cwork) < 0) {
os_free(cwork);
}
}
IBSS: Update operating frequency if joining an existing IBSS If a matching IBSS is found in scan results, change requested frequency to match and disable OBSS scan. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-02-19 07:15:46 +01:00
static int bss_is_ibss(struct wpa_bss *bss)
{
return (bss->caps & (IEEE80211_CAP_ESS | IEEE80211_CAP_IBSS)) ==
IEEE80211_CAP_IBSS;
}
Add VHT support for Mesh Mesh Points themselves have capability to support VHT as long as hardware supports it. However, supporting VHT in mesh mode was disabled because no one had clearly tested and confirmed its functionality. Since VHT80 has now been verified to work with ath10k QCA988X driver and mac80211_hwsim, enable VHT support in mesh mode. Signed-off-by: Peter Oh <poh@qca.qualcomm.com>
2015-11-10 20:01:20 +01:00
static int drv_supports_vht(struct wpa_supplicant *wpa_s,
const struct wpa_ssid *ssid)
{
enum hostapd_hw_mode hw_mode;
struct hostapd_hw_modes *mode = NULL;
u8 channel;
int i;
#ifdef CONFIG_HT_OVERRIDES
if (ssid->disable_ht)
return 0;
#endif /* CONFIG_HT_OVERRIDES */
hw_mode = ieee80211_freq_to_chan(ssid->frequency, &channel);
if (hw_mode == NUM_HOSTAPD_MODES)
return 0;
for (i = 0; wpa_s->hw.modes && i < wpa_s->hw.num_modes; i++) {
if (wpa_s->hw.modes[i].mode == hw_mode) {
mode = &wpa_s->hw.modes[i];
break;
}
}
if (!mode)
return 0;
return mode->vht_capab != 0;
}
mesh: Use the shared function with IBSS to determine channel parameters Automatically enable HT20, HT40+, HT40-, or VHT, based on driver capabilities. This obsoletes the mesh_ht_mode network block parameter that was previously used to configure HT parameters. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-10 12:03:45 +01:00
void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
const struct wpa_ssid *ssid,
struct hostapd_freq_params *freq)
IBSS: Add WPA_DRIVER_FLAGS_HT_IBSS Add WPA_DRIVER_FLAGS_HT_IBSS driver feature flag. Some drivers could not set this feature and next could fail when we will enable HT support for IBSS with error message: nl80211: Join IBSS failed: ret=-22 (Invalid argument). Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-01-07 09:29:43 +01:00
{
enum hostapd_hw_mode hw_mode;
struct hostapd_hw_modes *mode = NULL;
ibss/mesh: Enable HT40 if supported Setup HT40+/HT40- if supported by driver. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-01-08 12:48:36 +01:00
int ht40plus[] = { 36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157,
184, 192 };
IBSS: Add support for VHT80 configuration Configure VHT80 based on driver capabilities. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-02-19 07:15:48 +01:00
int vht80[] = { 36, 52, 100, 116, 132, 149 };
ibss/mesh: Enable HT40 if supported Setup HT40+/HT40- if supported by driver. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-01-08 12:48:36 +01:00
struct hostapd_channel_data *pri_chan = NULL, *sec_chan = NULL;
IBSS: Add WPA_DRIVER_FLAGS_HT_IBSS Add WPA_DRIVER_FLAGS_HT_IBSS driver feature flag. Some drivers could not set this feature and next could fail when we will enable HT support for IBSS with error message: nl80211: Join IBSS failed: ret=-22 (Invalid argument). Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-01-07 09:29:43 +01:00
u8 channel;
IBSS: Update operating frequency if joining an existing IBSS If a matching IBSS is found in scan results, change requested frequency to match and disable OBSS scan. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-02-19 07:15:46 +01:00
int i, chan_idx, ht40 = -1, res, obss_scan = 1;
IBSS/mesh: Add support for VHT80P80 configuration A new network profile configuration parameter max_oper_chwidth=3 can be used to specify preference to enable 80+80 MHz VHT channel for IBSS. If that is set, the first 80 MHz segment is specified based on the frequency parameter in the network profile and the second segment is selected automatically (which will practically be limited to a single possibility due to DFS requirements in most countries). Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-11-25 04:51:43 +01:00
unsigned int j, k;
IBSS: Add support for VHT80 configuration Configure VHT80 based on driver capabilities. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-02-19 07:15:48 +01:00
struct hostapd_freq_params vht_freq;
IBSS/mesh: Add support for VHT80P80 configuration A new network profile configuration parameter max_oper_chwidth=3 can be used to specify preference to enable 80+80 MHz VHT channel for IBSS. If that is set, the first 80 MHz segment is specified based on the frequency parameter in the network profile and the second segment is selected automatically (which will practically be limited to a single possibility due to DFS requirements in most countries). Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-11-25 04:51:43 +01:00
int chwidth, seg0, seg1;
u32 vht_caps = 0;
IBSS: Add WPA_DRIVER_FLAGS_HT_IBSS Add WPA_DRIVER_FLAGS_HT_IBSS driver feature flag. Some drivers could not set this feature and next could fail when we will enable HT support for IBSS with error message: nl80211: Join IBSS failed: ret=-22 (Invalid argument). Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-01-07 09:29:43 +01:00
freq->freq = ssid->frequency;
IBSS: Update operating frequency if joining an existing IBSS If a matching IBSS is found in scan results, change requested frequency to match and disable OBSS scan. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-02-19 07:15:46 +01:00
for (j = 0; j < wpa_s->last_scan_res_used; j++) {
struct wpa_bss *bss = wpa_s->last_scan_res[j];
if (ssid->mode != WPAS_MODE_IBSS)
break;
/* Don't adjust control freq in case of fixed_freq */
if (ssid->fixed_freq)
break;
if (!bss_is_ibss(bss))
continue;
if (ssid->ssid_len == bss->ssid_len &&
os_memcmp(ssid->ssid, bss->ssid, bss->ssid_len) == 0) {
wpa_printf(MSG_DEBUG,
"IBSS already found in scan results, adjust control freq: %d",
bss->freq);
freq->freq = bss->freq;
obss_scan = 0;
break;
}
}
IBSS: Add WPA_DRIVER_FLAGS_HT_IBSS Add WPA_DRIVER_FLAGS_HT_IBSS driver feature flag. Some drivers could not set this feature and next could fail when we will enable HT support for IBSS with error message: nl80211: Join IBSS failed: ret=-22 (Invalid argument). Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-01-07 09:29:43 +01:00
/* For IBSS check HT_IBSS flag */
if (ssid->mode == WPAS_MODE_IBSS &&
!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_HT_IBSS))
return;
IBSS: Do not enable HT with WEP or TKIP We should not enable HT if WEP or TKIP is configured. Without the patch and WEP configuration we will get message: Association request to the driver failed Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-02-06 13:11:24 +01:00
if (wpa_s->group_cipher == WPA_CIPHER_WEP40 ||
wpa_s->group_cipher == WPA_CIPHER_WEP104 ||
wpa_s->pairwise_cipher == WPA_CIPHER_TKIP) {
wpa_printf(MSG_DEBUG,
"IBSS: WEP/TKIP detected, do not try to enable HT");
return;
}
IBSS: Update operating frequency if joining an existing IBSS If a matching IBSS is found in scan results, change requested frequency to match and disable OBSS scan. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-02-19 07:15:46 +01:00
hw_mode = ieee80211_freq_to_chan(freq->freq, &channel);
IBSS: Add WPA_DRIVER_FLAGS_HT_IBSS Add WPA_DRIVER_FLAGS_HT_IBSS driver feature flag. Some drivers could not set this feature and next could fail when we will enable HT support for IBSS with error message: nl80211: Join IBSS failed: ret=-22 (Invalid argument). Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-01-07 09:29:43 +01:00
for (i = 0; wpa_s->hw.modes && i < wpa_s->hw.num_modes; i++) {
if (wpa_s->hw.modes[i].mode == hw_mode) {
mode = &wpa_s->hw.modes[i];
break;
}
}
if (!mode)
return;
freq->ht_enabled = ht_supported(mode);
ibss/mesh: Enable HT40 if supported Setup HT40+/HT40- if supported by driver. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-01-08 12:48:36 +01:00
if (!freq->ht_enabled)
return;
/* Setup higher BW only for 5 GHz */
if (mode->mode != HOSTAPD_MODE_IEEE80211A)
return;
for (chan_idx = 0; chan_idx < mode->num_channels; chan_idx++) {
pri_chan = &mode->channels[chan_idx];
if (pri_chan->chan == channel)
break;
pri_chan = NULL;
}
if (!pri_chan)
return;
/* Check primary channel flags */
if (pri_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
return;
/* Check/setup HT40+/HT40- */
for (j = 0; j < ARRAY_SIZE(ht40plus); j++) {
if (ht40plus[j] == channel) {
ht40 = 1;
break;
}
}
/* Find secondary channel */
for (i = 0; i < mode->num_channels; i++) {
sec_chan = &mode->channels[i];
if (sec_chan->chan == channel + ht40 * 4)
break;
sec_chan = NULL;
}
if (!sec_chan)
return;
/* Check secondary channel flags */
if (sec_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
return;
freq->channel = pri_chan->chan;
switch (ht40) {
case -1:
if (!(pri_chan->flag & HOSTAPD_CHAN_HT40MINUS))
return;
freq->sec_channel_offset = -1;
break;
case 1:
if (!(pri_chan->flag & HOSTAPD_CHAN_HT40PLUS))
return;
freq->sec_channel_offset = 1;
break;
default:
break;
}
IBSS: Update operating frequency if joining an existing IBSS If a matching IBSS is found in scan results, change requested frequency to match and disable OBSS scan. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-02-19 07:15:46 +01:00
if (freq->sec_channel_offset && obss_scan) {
ibss/mesh: Enable HT40 if supported Setup HT40+/HT40- if supported by driver. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-01-08 12:48:36 +01:00
struct wpa_scan_results *scan_res;
scan_res = wpa_supplicant_get_scan_results(wpa_s, NULL, 0);
if (scan_res == NULL) {
/* Back to HT20 */
freq->sec_channel_offset = 0;
return;
}
res = check_40mhz_5g(mode, scan_res, pri_chan->chan,
sec_chan->chan);
switch (res) {
case 0:
/* Back to HT20 */
freq->sec_channel_offset = 0;
break;
case 1:
/* Configuration allowed */
break;
case 2:
/* Switch pri/sec channels */
freq->freq = hw_get_freq(mode, sec_chan->chan);
freq->sec_channel_offset = -freq->sec_channel_offset;
freq->channel = sec_chan->chan;
break;
default:
freq->sec_channel_offset = 0;
break;
}
wpa_scan_results_free(scan_res);
}
wpa_printf(MSG_DEBUG,
"IBSS/mesh: setup freq channel %d, sec_channel_offset %d",
freq->channel, freq->sec_channel_offset);
IBSS: Add support for VHT80 configuration Configure VHT80 based on driver capabilities. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-02-19 07:15:48 +01:00
Add VHT support for Mesh Mesh Points themselves have capability to support VHT as long as hardware supports it. However, supporting VHT in mesh mode was disabled because no one had clearly tested and confirmed its functionality. Since VHT80 has now been verified to work with ath10k QCA988X driver and mac80211_hwsim, enable VHT support in mesh mode. Signed-off-by: Peter Oh <poh@qca.qualcomm.com>
2015-11-10 20:01:20 +01:00
if (!drv_supports_vht(wpa_s, ssid))
IBSS: Add support for VHT80 configuration Configure VHT80 based on driver capabilities. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-02-19 07:15:48 +01:00
return;
/* For IBSS check VHT_IBSS flag */
Add VHT support for Mesh Mesh Points themselves have capability to support VHT as long as hardware supports it. However, supporting VHT in mesh mode was disabled because no one had clearly tested and confirmed its functionality. Since VHT80 has now been verified to work with ath10k QCA988X driver and mac80211_hwsim, enable VHT support in mesh mode. Signed-off-by: Peter Oh <poh@qca.qualcomm.com>
2015-11-10 20:01:20 +01:00
if (ssid->mode == WPAS_MODE_IBSS &&
!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_VHT_IBSS))
IBSS: Add support for VHT80 configuration Configure VHT80 based on driver capabilities. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-02-19 07:15:48 +01:00
return;
vht_freq = *freq;
vht_freq.vht_enabled = vht_supported(mode);
if (!vht_freq.vht_enabled)
return;
/* setup center_freq1, bandwidth */
for (j = 0; j < ARRAY_SIZE(vht80); j++) {
if (freq->channel >= vht80[j] &&
freq->channel < vht80[j] + 16)
break;
}
if (j == ARRAY_SIZE(vht80))
return;
for (i = vht80[j]; i < vht80[j] + 16; i += 4) {
struct hostapd_channel_data *chan;
chan = hw_get_channel_chan(mode, i, NULL);
if (!chan)
return;
/* Back to HT configuration if channel not usable */
if (chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
return;
}
IBSS/mesh: Add support for VHT80P80 configuration A new network profile configuration parameter max_oper_chwidth=3 can be used to specify preference to enable 80+80 MHz VHT channel for IBSS. If that is set, the first 80 MHz segment is specified based on the frequency parameter in the network profile and the second segment is selected automatically (which will practically be limited to a single possibility due to DFS requirements in most countries). Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-11-25 04:51:43 +01:00
chwidth = VHT_CHANWIDTH_80MHZ;
seg0 = vht80[j] + 6;
seg1 = 0;
if (ssid->max_oper_chwidth == VHT_CHANWIDTH_80P80MHZ) {
/* setup center_freq2, bandwidth */
for (k = 0; k < ARRAY_SIZE(vht80); k++) {
/* Only accept 80 MHz segments separated by a gap */
if (j == k || abs(vht80[j] - vht80[k]) == 16)
continue;
for (i = vht80[k]; i < vht80[k] + 16; i += 4) {
struct hostapd_channel_data *chan;
chan = hw_get_channel_chan(mode, i, NULL);
if (!chan)
continue;
if (chan->flag & (HOSTAPD_CHAN_DISABLED |
HOSTAPD_CHAN_NO_IR |
HOSTAPD_CHAN_RADAR))
continue;
/* Found a suitable second segment for 80+80 */
chwidth = VHT_CHANWIDTH_80P80MHZ;
vht_caps |=
VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ;
seg1 = vht80[k] + 6;
}
if (chwidth == VHT_CHANWIDTH_80P80MHZ)
break;
}
}
IBSS: Add support for VHT80 configuration Configure VHT80 based on driver capabilities. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-02-19 07:15:48 +01:00
if (hostapd_set_freq_params(&vht_freq, mode->mode, freq->freq,
freq->channel, freq->ht_enabled,
vht_freq.vht_enabled,
freq->sec_channel_offset,
IBSS/mesh: Add support for VHT80P80 configuration A new network profile configuration parameter max_oper_chwidth=3 can be used to specify preference to enable 80+80 MHz VHT channel for IBSS. If that is set, the first 80 MHz segment is specified based on the frequency parameter in the network profile and the second segment is selected automatically (which will practically be limited to a single possibility due to DFS requirements in most countries). Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-11-25 04:51:43 +01:00
chwidth, seg0, seg1, vht_caps) != 0)
IBSS: Add support for VHT80 configuration Configure VHT80 based on driver capabilities. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-02-19 07:15:48 +01:00
return;
*freq = vht_freq;
wpa_printf(MSG_DEBUG, "IBSS: VHT setup freq cf1 %d, cf2 %d, bw %d",
freq->center_freq1, freq->center_freq2, freq->bandwidth);
IBSS: Add WPA_DRIVER_FLAGS_HT_IBSS Add WPA_DRIVER_FLAGS_HT_IBSS driver feature flag. Some drivers could not set this feature and next could fail when we will enable HT support for IBSS with error message: nl80211: Join IBSS failed: ret=-22 (Invalid argument). Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-01-07 09:29:43 +01:00
}
Use wpa_radio work for connection This protects against conflicting offchannel operations during connection (authentication, association, EAP exchanges, 4-way handshake). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 15:50:32 +01:00
static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit)
{
struct wpa_connect_work *cwork = work->ctx;
struct wpa_bss *bss = cwork->bss;
struct wpa_ssid *ssid = cwork->ssid;
struct wpa_supplicant *wpa_s = work->wpa_s;
u8 wpa_ie[200];
size_t wpa_ie_len;
int use_crypt, ret, i, bssid_changed;
int algs = WPA_AUTH_ALG_OPEN;
unsigned int cipher_pairwise, cipher_group;
struct wpa_driver_associate_params params;
int wep_keys_set = 0;
int assoc_failed = 0;
struct wpa_ssid *old_ssid;
#ifdef CONFIG_HT_OVERRIDES
struct ieee80211_ht_capabilities htcaps;
struct ieee80211_ht_capabilities htcaps_mask;
#endif /* CONFIG_HT_OVERRIDES */
wpa_supplicant: Apply VHT_OVERRIDES to wpas_start_assoc_cb() A previous patch "Support VHT capability overrides" missed one place where HT overrides were being applied and where it would also be useful to apply VHT overrides. Signed-hostap: Paul Stewart <pstew@chromium.org>
2014-03-14 05:33:43 +01:00
#ifdef CONFIG_VHT_OVERRIDES
struct ieee80211_vht_capabilities vhtcaps;
struct ieee80211_vht_capabilities vhtcaps_mask;
#endif /* CONFIG_VHT_OVERRIDES */
Use wpa_radio work for connection This protects against conflicting offchannel operations during connection (authentication, association, EAP exchanges, 4-way handshake). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 15:50:32 +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_s->connect_work = NULL;
/* cancel possible auth. timeout */
eloop_cancel_timeout(wpa_supplicant_timeout, wpa_s,
NULL);
}
Use wpa_radio work for connection This protects against conflicting offchannel operations during connection (authentication, association, EAP exchanges, 4-way handshake). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 15:50:32 +01:00
wpas_connect_work_free(cwork);
return;
}
wpa_s->connect_work = work;
Drop connection attempt if network is disabled before radio work starts With the radio work design, it is possible for a network entry to get disabled (e.g., DISABLE_NETWORK <id>) during the time the connect or sme-connect radio work waits to start. Previously, only the validity of the BSS entry and BSSID/SSID was verified when starting the actual connection step. Add call to wpas_network_disabled() to those checks to catch the case where the network profile is disabled. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-08-10 21:12:59 +02:00
if (cwork->bss_removed || !wpas_valid_bss_ssid(wpa_s, bss, ssid) ||
wpas_network_disabled(wpa_s, ssid)) {
Use wpa_radio work for connection This protects against conflicting offchannel operations during connection (authentication, association, EAP exchanges, 4-way handshake). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 15:50:32 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "BSS/SSID entry for association not valid anymore - drop connection attempt");
wpas_connect_work_done(wpa_s);
return;
}
NDIS: Fix association for WPS provisioning with protected AP Some NDIS drivers require a workaround to allow them to associate with a WPS AP that is already using protection (Privacy field = 1). Let driver_ndis.c know if the AP is already using Privacy and if so, configure a dummy WEP key to force the driver to associate.
2010-09-04 12:56:12 +02:00
os_memset(&params, 0, sizeof(params));
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_s->reassociate = 0;
Skip network disabling on expected EAP failure Some EAP methods can go through a step that is expected to fail and as such, should not trigger temporary network disabling when processing EAP-Failure or deauthentication. EAP-WSC for WPS was already handled as a special case, but similar behavior is needed for EAP-FAST with unauthenticated provisioning. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-08 09:24:05 +01:00
wpa_s->eap_expected_failure = 0;
WPS: Fix ap_scan=2 special association case Commit 22628eca3440976bf51846da0554099f7429b206 ('Support driver-based BSS selection in ap_scan=1 mode') ended up disabling the special ap_scan=2 WPS case where ap_scan=1 like scan followed by association is used to find the WPS AP using wildcard SSID. Fix this by allowing association request even with wpas_driver_bss_selection() when searching for a WPS AP. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-27 19:13:39 +01:00
if (bss &&
(!wpas_driver_bss_selection(wpa_s) || wpas_wps_searching(wpa_s))) {
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
#ifdef CONFIG_IEEE80211R
Use BSS table entry instead of raw scan result for connection
2010-01-02 15:16:02 +01:00
const u8 *ie, *md = NULL;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
#endif /* CONFIG_IEEE80211R */
wpa_msg(wpa_s, MSG_INFO, "Trying to associate with " MACSTR
" (SSID='%s' freq=%d MHz)", MAC2STR(bss->bssid),
Use BSS table entry instead of raw scan result for connection
2010-01-02 15:16:02 +01:00
wpa_ssid_txt(bss->ssid, bss->ssid_len), bss->freq);
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
bssid_changed = !is_zero_ether_addr(wpa_s->bssid);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
os_memset(wpa_s->bssid, 0, ETH_ALEN);
os_memcpy(wpa_s->pending_bssid, bss->bssid, ETH_ALEN);
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 (bssid_changed)
wpas_notify_bssid_changed(wpa_s);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
#ifdef CONFIG_IEEE80211R
Use BSS table entry instead of raw scan result for connection
2010-01-02 15:16:02 +01:00
ie = wpa_bss_get_ie(bss, WLAN_EID_MOBILITY_DOMAIN);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (ie && ie[1] >= MOBILITY_DOMAIN_ID_LEN)
md = ie + 2;
FT: Clean up wpa_sm_set_ft_params() by using common parse Instead of parsing the IEs in the callers, use the already existing parser in wpa_ft.c to handle MDIE and FTIE from initial MD association response. In addition, this provides more complete access to association response IEs to FT code which will be needed to fix FT 4-way handshake message 2/4.
2010-04-10 10:36:35 +02:00
wpa_sm_set_ft_params(wpa_s->wpa, ie, ie ? 2 + ie[1] : 0);
FT: Do not call wpa_ft_prepare_auth_request() if FT is not used This saves some extra processing for the non-FT case if FT is built in, but not used for the association.
2008-09-29 16:28:10 +02:00
if (md) {
/* Prepare for the next transition */
FT: Copy FT Capability and Policy to MDIE from target AP This sets the FT Capability and Policy field in the MDIE to the values received from the target AP (if available). This fixes the MDIE contents during FT Protocol, but the correct value may not yet be used in initial mobility domain association.
2010-04-09 15:26:20 +02:00
wpa_ft_prepare_auth_request(wpa_s->wpa, ie);
FT: Do not call wpa_ft_prepare_auth_request() if FT is not used This saves some extra processing for the non-FT case if FT is built in, but not used for the association.
2008-09-29 16:28:10 +02:00
}
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
#endif /* CONFIG_IEEE80211R */
WPS: Added support for wildcard SSID matching in ap_scan=2 mode Change association behavior to match with ap_scan=1 when WPS is used in ap_scan=2 mode with wildcard SSID matching. In addition, allow hardcoded BSSID to be used to select AP even if selected registrar attribute is not present.
2008-12-20 21:55:02 +01:00
#ifdef CONFIG_WPS
} else if ((ssid->ssid == NULL || ssid->ssid_len == 0) &&
wpa_s->conf->ap_scan == 2 &&
(ssid->key_mgmt & WPA_KEY_MGMT_WPS)) {
/* Use ap_scan==1 style network selection to find the network
*/
Invoke connect work done for all the connection failure cases This commit fixes couple of connection failure paths where wpas_connect_work_done() was not called, thus enabling the radio work interface to proceed with the other queued actions. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-20 06:48:47 +02:00
wpas_connect_work_done(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 = MANUAL_SCAN_REQ;
WPS: Added support for wildcard SSID matching in ap_scan=2 mode Change association behavior to match with ap_scan=1 when WPS is used in ap_scan=2 mode with wildcard SSID matching. In addition, allow hardcoded BSSID to be used to select AP even if selected registrar attribute is not present.
2008-12-20 21:55:02 +01:00
wpa_s->reassociate = 1;
wpa_supplicant_req_scan(wpa_s, 0, 0);
return;
#endif /* CONFIG_WPS */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
} else {
wpa_msg(wpa_s, MSG_INFO, "Trying to associate with SSID '%s'",
wpa_ssid_txt(ssid->ssid, ssid->ssid_len));
os_memset(wpa_s->pending_bssid, 0, ETH_ALEN);
}
Do not stop ongoing PNO sched_scan on association/disconnection PNO was stopped by the wpa_supplicant during the connection attempts or while handling disassociation indication. External entities, mainly, the Android Wi-Fi framework, does not expects PNO to be stopped by other modules. Hence, do not stop the sched_scan in these scenarios if it is triggered externally for PNO. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-06-30 09:11:27 +02:00
if (!wpa_s->pno)
wpa_supplicant_cancel_sched_scan(wpa_s);
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(wpa_s);
/* Starting new association, so clear the possibly used WPA IE from the
* previous association. */
wpa_sm_set_assoc_wpa_ie(wpa_s->wpa, NULL, 0);
#ifdef IEEE8021X_EAPOL
if (ssid->key_mgmt & WPA_KEY_MGMT_IEEE8021X_NO_WPA) {
if (ssid->leap) {
if (ssid->non_leap == 0)
Standardize on a single definition of auth_alg bitfield values
2010-01-03 20:14:40 +01:00
algs = WPA_AUTH_ALG_LEAP;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
else
Standardize on a single definition of auth_alg bitfield values
2010-01-03 20:14:40 +01:00
algs |= WPA_AUTH_ALG_LEAP;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
}
#endif /* IEEE8021X_EAPOL */
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, "Automatic auth_alg selection: 0x%x", algs);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (ssid->auth_alg) {
Standardize on a single definition of auth_alg bitfield values
2010-01-03 20:14:40 +01:00
algs = ssid->auth_alg;
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, "Overriding auth_alg selection: "
"0x%x", algs);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
Use BSS table entry instead of raw scan result for connection
2010-01-02 15:16:02 +01:00
if (bss && (wpa_bss_get_vendor_ie(bss, WPA_IE_VENDOR_TYPE) ||
wpa_bss_get_ie(bss, WLAN_EID_RSN)) &&
Use wpa_key_mgmt_*() helpers This cleans up the source code and makes it less likely that new AKM addition misses some needed changes in the future. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-11-24 21:46:14 +01:00
wpa_key_mgmt_wpa(ssid->key_mgmt)) {
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
int try_opportunistic;
Allow OKC to be enabled by default Previously, OKC (opportunistic key caching, a.k.a. proactive key caching) could be enabled only with a per-network parameter (proactive_key_caching). The new global parameter (okc) can now be used to change the default behavior to be OKC enabled (okc=1) for network blocks that do not override this with the proactive_key_caching parameter. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-12 19:07:53 +01:00
try_opportunistic = (ssid->proactive_key_caching < 0 ?
wpa_s->conf->okc :
ssid->proactive_key_caching) &&
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
(ssid->proto & WPA_PROTO_RSN);
if (pmksa_cache_set_current(wpa_s->wpa, NULL, bss->bssid,
wpa_supplicant: Fix lookup of cached PMKSA This fixes the lookup of a usable PMKSA entry in the cache. Using wpa_s->current_ssid often returns nothing when a usable PMKSA exists in the cache since wpa_s->current_ssid does not necessarily point to the correct network entry at this point in time (prior to association). Signed-hostap: Partha Narasimhan <parthan@gmail.com>
2013-03-16 11:45:31 +01:00
ssid, try_opportunistic) == 0)
Simplify eapol_sm_notify_pmkid_attempt() Drop the unneeded 'attempt' argument. This was originally used for indicating an aborted PMKID caching attempt, but a fix in 2006 removed the only such user and since that time, only attempt == 1 has been used. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-28 00:26:14 +01:00
eapol_sm_notify_pmkid_attempt(wpa_s->eapol);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_ie_len = sizeof(wpa_ie);
if (wpa_supplicant_set_suites(wpa_s, bss, ssid,
wpa_ie, &wpa_ie_len)) {
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, "WPA: Failed to set WPA "
"key management and encryption suites");
Invoke connect work done for all the connection failure cases This commit fixes couple of connection failure paths where wpas_connect_work_done() was not called, thus enabling the radio work interface to proceed with the other queued actions. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-20 06:48:47 +02:00
wpas_connect_work_done(wpa_s);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return;
}
Allow non-WPA IEEE 802.1X to be select even if WPA is also enabled If key_mgmt was set to allow both WPA and non-WPA IEEE 802.1X (i.e., to IEEE8021X WPA-EAP), non-WPA IEEE 802.1X was rejected while preparing association parameters. Allow this special case to be handled by selecting non-WPA case if the scan results for the AP do not include either WPA or RSN elements. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-15 18:34:04 +02:00
} else if ((ssid->key_mgmt & WPA_KEY_MGMT_IEEE8021X_NO_WPA) && bss &&
wpa_key_mgmt_wpa_ieee8021x(ssid->key_mgmt)) {
/*
* Both WPA and non-WPA IEEE 802.1X enabled in configuration -
* use non-WPA since the scan results did not indicate that the
* AP is using WPA or WPA2.
*/
wpa_supplicant_set_non_wpa_policy(wpa_s, ssid);
wpa_ie_len = 0;
wpa_s->wpa_proto = 0;
Use wpa_key_mgmt_*() helpers This cleans up the source code and makes it less likely that new AKM addition misses some needed changes in the future. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-11-24 21:46:14 +01:00
} else if (wpa_key_mgmt_wpa_any(ssid->key_mgmt)) {
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_ie_len = sizeof(wpa_ie);
if (wpa_supplicant_set_suites(wpa_s, NULL, ssid,
wpa_ie, &wpa_ie_len)) {
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, "WPA: Failed to set WPA "
"key management and encryption suites (no "
"scan results)");
Invoke connect work done for all the connection failure cases This commit fixes couple of connection failure paths where wpas_connect_work_done() was not called, thus enabling the radio work interface to proceed with the other queued actions. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-20 06:48:47 +02:00
wpas_connect_work_done(wpa_s);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return;
}
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
} else if (ssid->key_mgmt & WPA_KEY_MGMT_WPS) {
WPS: Set Request Type properly into WPS IE in ProbeReq/AssocReq
2008-11-29 12:38:03 +01:00
struct wpabuf *wps_ie;
wps_ie = wps_build_assoc_req_ie(wpas_wps_get_req_type(ssid));
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 (wps_ie && wpabuf_len(wps_ie) <= sizeof(wpa_ie)) {
wpa_ie_len = wpabuf_len(wps_ie);
os_memcpy(wpa_ie, wpabuf_head(wps_ie), wpa_ie_len);
Initialize wpa_ie_len to 0 if WPA IE is not set on all paths The new WPS code was not setting this in error case.
2009-01-02 20:50:22 +01:00
} else
wpa_ie_len = 0;
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
wpabuf_free(wps_ie);
wpa_supplicant_set_non_wpa_policy(wpa_s, ssid);
NDIS: Fix association for WPS provisioning with protected AP Some NDIS drivers require a workaround to allow them to associate with a WPS AP that is already using protection (Privacy field = 1). Let driver_ndis.c know if the AP is already using Privacy and if so, configure a dummy WEP key to force the driver to associate.
2010-09-04 12:56:12 +02:00
if (!bss || (bss->caps & IEEE80211_CAP_PRIVACY))
params.wps = WPS_MODE_PRIVACY;
else
params.wps = WPS_MODE_OPEN;
Make sure wpa_proto gets cleared for WPS and non-WPA connections This is needed to fix the wpa_proto association parameter for drivers that select AP based on security parameters internally.
2011-09-08 16:51:08 +02:00
wpa_s->wpa_proto = 0;
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
#endif /* CONFIG_WPS */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
} else {
wpa_supplicant_set_non_wpa_policy(wpa_s, ssid);
wpa_ie_len = 0;
Make sure wpa_proto gets cleared for WPS and non-WPA connections This is needed to fix the wpa_proto association parameter for drivers that select AP based on security parameters internally.
2011-09-08 16:51:08 +02:00
wpa_s->wpa_proto = 0;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
P2P: Add P2P IE into (Re)Association Request frames
2010-07-18 23:30:25 +02:00
#ifdef CONFIG_P2P
if (wpa_s->global->p2p) {
u8 *pos;
size_t len;
int res;
pos = wpa_ie + wpa_ie_len;
len = sizeof(wpa_ie) - wpa_ie_len;
P2P: Do not include P2P IE in association request to non-P2P AP This was previously fixed for most cases in commit ffad8858370e297b22ff5d9e6e36372755364ec0, but the check here for drivers that implement SME/MLME was missed in that commit. This removes the P2P IE from (Re)Association Request frame with drivers that do not use wpa_supplicant SME implementation and are P2P cabable when associating with a non-P2P AP (i.e., not a GO or P2P WLAN manager AP). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-02-17 10:34:56 +01:00
res = wpas_p2p_assoc_req_ie(wpa_s, bss, pos, len,
ssid->p2p_group);
P2P: Add P2P IE into (Re)Association Request frames
2010-07-18 23:30:25 +02:00
if (res >= 0)
wpa_ie_len += res;
}
P2P: Add support for cross connection If enabled, cross connection allows GO to forward IPv4 packets using masquerading NAT from the P2P clients in the group to an uplink WLAN connection. This is disabled by default and can be enabled with "wpa_cli p2p_set cross_connect 1" on the P2P device interface.
2010-07-10 19:19:34 +02:00
wpa_s->cross_connect_disallowed = 0;
if (bss) {
struct wpabuf *p2p;
p2p = wpa_bss_get_vendor_ie_multi(bss, P2P_IE_VENDOR_TYPE);
if (p2p) {
wpa_s->cross_connect_disallowed =
p2p_get_cross_connect_disallowed(p2p);
wpabuf_free(p2p);
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, "P2P: WLAN AP %s cross "
"connection",
wpa_s->cross_connect_disallowed ?
"disallows" : "allows");
P2P: Add support for cross connection If enabled, cross connection allows GO to forward IPv4 packets using masquerading NAT from the P2P clients in the group to an uplink WLAN connection. This is disabled by default and can be enabled with "wpa_cli p2p_set cross_connect 1" on the P2P device interface.
2010-07-10 19:19:34 +02:00
}
}
P2P: Add support for IP address assignment in 4-way handshake This new mechanism allows P2P Client to request an IPv4 address from the GO as part of the 4-way handshake to avoid use of DHCP exchange after 4-way handshake. If the new mechanism is used, the assigned IP address is shown in the P2P-GROUP-STARTED event on the client side with following new parameters: ip_addr, ip_mask, go_ip_addr. The assigned IP address is included in the AP-STA-CONNECTED event on the GO side as a new ip_addr parameter. The IP address is valid for the duration of the association. The IP address pool for this new mechanism is configured as global wpa_supplicant configuration file parameters ip_addr_go, ip_addr_mask, ip_addr_star, ip_addr_end. For example: ip_addr_go=192.168.42.1 ip_addr_mask=255.255.255.0 ip_addr_start=192.168.42.2 ip_addr_end=192.168.42.100 DHCP mechanism is expected to be enabled at the same time to support P2P Devices that do not use the new mechanism. The easiest way of managing the IP addresses is by splitting the IP address range into two parts and assign a separate range for wpa_supplicant and DHCP server. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-16 18:13:31 +01:00
os_memset(wpa_s->p2p_ip_addr_info, 0, sizeof(wpa_s->p2p_ip_addr_info));
P2P: Add P2P IE into (Re)Association Request frames
2010-07-18 23:30:25 +02:00
#endif /* CONFIG_P2P */
HS 2.0: Add HS 2.0 Indication element into (Re)Association Request Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-10-03 17:10:23 +02:00
#ifdef CONFIG_HS20
HS 2.0: Include HS 2.0 Indication element only for HS 2.0 association The Hotspot 2.0 specification seems to mandate this element to be included in all (Re)Association Request frames if the station is Hotspot 2.0 capable. However, that results in conflicts with other requirements like no TKIP use when this element is present. The design is really supposed to include the indication element only for Hotspot 2.0 associations regardless of what the current specification implies. Remove the HS 2.0 Indication element from (Re)Association Request frame whenever the connection is not for Hotspot 2.0 purposes. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-05 15:29:21 +02:00
if (is_hs20_network(wpa_s, ssid, bss)) {
HS 2.0: Add HS 2.0 Indication element into (Re)Association Request Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-10-03 17:10:23 +02:00
struct wpabuf *hs20;
hs20 = wpabuf_alloc(20);
if (hs20) {
HS 2.0R2: Update Indication element to Release 2 The HS 2.0 Indication element from wpa_supplicant now includes the release number field and wpa_supplicant shows the release number of the AP in STATUS command (hs20=1 replaced with hs20=<release>). The new update_identifier field in the cred block can now be used to configure the PPS MO ID so that wpa_supplicant adds it to the Indication element in Association Request frames. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-02 11:08:11 +01:00
int pps_mo_id = hs20_get_pps_mo_id(wpa_s, ssid);
HS 2.0: Verify assoc_req_ie buffer size for indication elements While the buffer is expected to be large enough for all the IEs, it is better to check for this explicitly when adding the HS 2.0 Indication element. (CID 68601) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-29 23:32:12 +02:00
size_t len;
HS 2.0R2: Update Indication element to Release 2 The HS 2.0 Indication element from wpa_supplicant now includes the release number field and wpa_supplicant shows the release number of the AP in STATUS command (hs20=1 replaced with hs20=<release>). The new update_identifier field in the cred block can now be used to configure the PPS MO ID so that wpa_supplicant adds it to the Indication element in Association Request frames. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-02 11:08:11 +01:00
wpas_hs20_add_indication(hs20, pps_mo_id);
HS 2.0: Verify assoc_req_ie buffer size for indication elements While the buffer is expected to be large enough for all the IEs, it is better to check for this explicitly when adding the HS 2.0 Indication element. (CID 68601) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-29 23:32:12 +02:00
len = sizeof(wpa_ie) - wpa_ie_len;
if (wpabuf_len(hs20) <= len) {
os_memcpy(wpa_ie + wpa_ie_len,
wpabuf_head(hs20), wpabuf_len(hs20));
wpa_ie_len += wpabuf_len(hs20);
}
HS 2.0: Add HS 2.0 Indication element into (Re)Association Request Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-10-03 17:10:23 +02:00
wpabuf_free(hs20);
}
}
#endif /* CONFIG_HS20 */
Include Extended Capabilities element based on scan results Add Extended Capabilities element to association request only if the AP included this element in Beacon/Probe Response frames. This is a workaround to address interoperability issues with some older APs that do not seem to be able to handle Extended Capabilities element in (Re)Association Request frames. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-02 16:38:35 +02:00
/*
* Workaround: Add Extended Capabilities element only if the AP
* included this element in Beacon/Probe Response frames. Some older
* APs seem to have interoperability issues if this element is
* included, so while the standard may require us to include the
* element in all cases, it is justifiable to skip it to avoid
* interoperability issues.
*/
if (!bss || wpa_bss_get_ie(bss, WLAN_EID_EXT_CAPAB)) {
Validate driver extended capabilities length against buffer length Prepare for new extended capabilities bits by checking that the local buffer is large enough to contain all the bits the driver requests. The existing buffers are large enough to include anything defined until now, but it would be possible to add more definitions in the future, so increase them a bit as well to make this more future proof. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-07 15:33:28 +02:00
u8 ext_capab[18];
Include Extended Capabilities element based on scan results Add Extended Capabilities element to association request only if the AP included this element in Beacon/Probe Response frames. This is a workaround to address interoperability issues with some older APs that do not seem to be able to handle Extended Capabilities element in (Re)Association Request frames. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-02 16:38:35 +02:00
int ext_capab_len;
Validate driver extended capabilities length against buffer length Prepare for new extended capabilities bits by checking that the local buffer is large enough to contain all the bits the driver requests. The existing buffers are large enough to include anything defined until now, but it would be possible to add more definitions in the future, so increase them a bit as well to make this more future proof. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-07 15:33:28 +02:00
ext_capab_len = wpas_build_ext_capab(wpa_s, ext_capab,
sizeof(ext_capab));
Include Extended Capabilities element based on scan results Add Extended Capabilities element to association request only if the AP included this element in Beacon/Probe Response frames. This is a workaround to address interoperability issues with some older APs that do not seem to be able to handle Extended Capabilities element in (Re)Association Request frames. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-02 16:38:35 +02:00
if (ext_capab_len > 0) {
u8 *pos = wpa_ie;
if (wpa_ie_len > 0 && pos[0] == WLAN_EID_RSN)
pos += 2 + pos[1];
os_memmove(pos + ext_capab_len, pos,
wpa_ie_len - (pos - wpa_ie));
wpa_ie_len += ext_capab_len;
os_memcpy(pos, ext_capab, ext_capab_len);
}
Add Extended Capability element to AssocReq for Interworking If Interworking is enabled, add Extended Capability element to (Re)Association Request frames to indicate support for Interworking.
2011-10-16 18:04:46 +02:00
}
Extend VENDOR_ELEM parameters to cover non-P2P Association Request The new VENDOR_ELEM value 13 can now be used to add a vendor element into all (Re)Association Request frames, not just for P2P use cases like the previous item was for. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-01-13 23:50:58 +01:00
if (wpa_s->vendor_elem[VENDOR_ELEM_ASSOC_REQ]) {
struct wpabuf *buf = wpa_s->vendor_elem[VENDOR_ELEM_ASSOC_REQ];
size_t len;
len = sizeof(wpa_ie) - wpa_ie_len;
if (wpabuf_len(buf) <= len) {
os_memcpy(wpa_ie + wpa_ie_len,
wpabuf_head(buf), wpabuf_len(buf));
wpa_ie_len += wpabuf_len(buf);
}
}
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) {
int fst_ies_len = wpabuf_len(wpa_s->fst_ies);
if (wpa_ie_len + fst_ies_len <= sizeof(wpa_ie)) {
os_memcpy(wpa_ie + wpa_ie_len,
wpabuf_head(wpa_s->fst_ies), fst_ies_len);
wpa_ie_len += fst_ies_len;
}
}
#endif /* CONFIG_FST */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_clear_keys(wpa_s, bss ? bss->bssid : NULL);
use_crypt = 1;
Get rid of duplicated cipher suite and AKM definitions WPA_CIPHER_* and CIPHER_* are used for the exact same set of cipher suites with the main difference being that the WPA_CIPHER_* version is suitable to be used as a bitfield. Similarly, WPA_KEY_MGMT_* and KEY_MGMT_* have similar design for AKMs. There is no need to maintain two separate copies of the definitions since the bitfield compatible version can be used for both needs. Get rid of the CIPHER_* and KEY_MGMT_* versions to clean up the implementation by getting rid of unnecessary mapping functions. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-30 18:33:39 +01:00
cipher_pairwise = wpa_s->pairwise_cipher;
cipher_group = wpa_s->group_cipher;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (wpa_s->key_mgmt == WPA_KEY_MGMT_NONE ||
wpa_s->key_mgmt == WPA_KEY_MGMT_IEEE8021X_NO_WPA) {
if (wpa_s->key_mgmt == WPA_KEY_MGMT_NONE)
use_crypt = 0;
if (wpa_set_wep_keys(wpa_s, ssid)) {
use_crypt = 1;
wep_keys_set = 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
if (wpa_s->key_mgmt == WPA_KEY_MGMT_WPS)
use_crypt = 0;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
#ifdef IEEE8021X_EAPOL
if (wpa_s->key_mgmt == WPA_KEY_MGMT_IEEE8021X_NO_WPA) {
if ((ssid->eapol_flags &
(EAPOL_FLAG_REQUIRE_KEY_UNICAST |
EAPOL_FLAG_REQUIRE_KEY_BROADCAST)) == 0 &&
!wep_keys_set) {
use_crypt = 0;
} else {
/* Assume that dynamic WEP-104 keys will be used and
* set cipher suites in order for drivers to expect
* encryption. */
Get rid of duplicated cipher suite and AKM definitions WPA_CIPHER_* and CIPHER_* are used for the exact same set of cipher suites with the main difference being that the WPA_CIPHER_* version is suitable to be used as a bitfield. Similarly, WPA_KEY_MGMT_* and KEY_MGMT_* have similar design for AKMs. There is no need to maintain two separate copies of the definitions since the bitfield compatible version can be used for both needs. Get rid of the CIPHER_* and KEY_MGMT_* versions to clean up the implementation by getting rid of unnecessary mapping functions. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-30 18:33:39 +01:00
cipher_pairwise = cipher_group = WPA_CIPHER_WEP104;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
}
#endif /* IEEE8021X_EAPOL */
if (wpa_s->key_mgmt == WPA_KEY_MGMT_WPA_NONE) {
/* Set the key before (and later after) association */
wpa_supplicant_set_wpa_none_key(wpa_s, ssid);
}
wpa_supplicant_set_state(wpa_s, WPA_ASSOCIATING);
if (bss) {
Use BSS table entry instead of raw scan result for connection
2010-01-02 15:16:02 +01:00
params.ssid = bss->ssid;
params.ssid_len = bss->ssid_len;
Fix BSSID enforcement with driver-based BSS selection Previously, wpa_supplicant did not specify BSSID to any connection request if the driver indicated that it will take care of BSS selection. This is fine for most use cases, but can result to issues if the network block has an explicit bssid parameter to select which BSS is to be used. Fix this by setting BSSID and channel when the network block includes the bssid parameter even if the driver indicates support for BSS selection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-05-11 14:27:46 +02:00
if (!wpas_driver_bss_selection(wpa_s) || ssid->bssid_set) {
wpa_printf(MSG_DEBUG, "Limit connection to BSSID "
MACSTR " freq=%u MHz based on scan results "
"(bssid_set=%d)",
MAC2STR(bss->bssid), bss->freq,
ssid->bssid_set);
Support driver-based BSS selection in ap_scan=1 mode If the driver indicates that it supports BSS selection (including roaming within an ESS) with WPA_DRIVER_FLAGS_BSS_SELECTION, modify ap_scan=1 mode to behave like ap_scan=2 mode for BSS selection. The initial scan is still done to avoid the need for strict configuration of or security parameters (e.g., to figure out whether TKIP or CCMP is being used as the group cipher). However, when requesting the driver to connect, the bssid and freq parameters are not provided to leave the driver in control of selecting which BSS to use and to allow the driver to decide when to roam.
2011-09-26 13:57:23 +02:00
params.bssid = bss->bssid;
wpa_supplicant: Use hostapd_freq_params in assoc_params Use hostapd_freq_params instead of simple frequency parameter for driver commands. This is preparation for IBSS configuration to allow use of HT/VHT in IBSS. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2014-10-01 09:52:53 +02:00
params.freq.freq = bss->freq;
Support driver-based BSS selection in ap_scan=1 mode If the driver indicates that it supports BSS selection (including roaming within an ESS) with WPA_DRIVER_FLAGS_BSS_SELECTION, modify ap_scan=1 mode to behave like ap_scan=2 mode for BSS selection. The initial scan is still done to avoid the need for strict configuration of or security parameters (e.g., to figure out whether TKIP or CCMP is being used as the group cipher). However, when requesting the driver to connect, the bssid and freq parameters are not provided to leave the driver in control of selecting which BSS to use and to allow the driver to decide when to roam.
2011-09-26 13:57:23 +02:00
}
Add bssid/freq hint for driver-based BSS selection This uses the new nl80211 attributes to allow the connect command to provide bssid and freq hints to the driver without limiting roaming to the specific BSS/frequency. This can be used by drivers that perform internal BSS selection (WPA_DRIVER_FLAGS_BSS_SELECTION) as a candidate for initial association. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-02-13 14:14:18 +01:00
params.bssid_hint = bss->bssid;
params.freq_hint = bss->freq;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
} else {
params.ssid = ssid->ssid;
params.ssid_len = ssid->ssid_len;
}
Support fixing the BSSID in IBSS mode When the "bssid=" option is set for an IBSS network and ap_scan = 2, ask the driver to fix this BSSID, if possible. Previously, any "bssid=" option were ignored in IBSS mode when ap_scan=2. Signed-hostap: Nicolas Cavallari <cavallar@lri.fr>
2012-01-28 10:33:47 +01:00
if (ssid->mode == WPAS_MODE_IBSS && ssid->bssid_set &&
wpa_s->conf->ap_scan == 2) {
params.bssid = ssid->bssid;
params.fixed_bssid = 1;
}
Add mesh_group_{add,remove} control interface commands Parse MESH_GROUP_ADD/REMOVE commands on ctrl interface and call wpa_supplicant routines. These commands are used to start or join and leave a mesh network. The mesh id is given in the configuration file, therefore there is no need to scan before joining a mesh network. We reuse the connect_without_scan construct used by P2P for that same purpose. Signed-off-by: Javier Cardona <javier@cozybit.com> Signed-off-by: Javier Lopez <jlopex@gmail.com>
2014-09-01 06:23:33 +02:00
/* Initial frequency for IBSS/mesh */
if ((ssid->mode == WPAS_MODE_IBSS || ssid->mode == WPAS_MODE_MESH) &&
IBSS: Add WPA_DRIVER_FLAGS_HT_IBSS Add WPA_DRIVER_FLAGS_HT_IBSS driver feature flag. Some drivers could not set this feature and next could fail when we will enable HT support for IBSS with error message: nl80211: Join IBSS failed: ret=-22 (Invalid argument). Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-01-07 09:29:43 +01:00
ssid->frequency > 0 && params.freq.freq == 0)
ibss_mesh_setup_freq(wpa_s, ssid, &params.freq);
wpa_supplicant: Enable HT for IBSS Enable HT20 for IBSS when HT is supported by the driver. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2014-10-01 09:52:54 +02:00
Configure beacon interval for IBSS command wpa_supplicant already allowed beacon interval to be configured for AP mode operations, but this was not passed to the driver for IBSS even though the same parameter can used for that case. Add this for the nl80211 driver interface to allow beacon interval to be controlled for IBSS as well. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-06 22:09:20 +01:00
if (ssid->mode == WPAS_MODE_IBSS) {
IBSS: Add fixed_freq network parameter Add fixed_freq=<0/1> network block parameter and pass it to the driver when starting or joining an IBSS. If this flag is set, IBSS should not try to look for other IBSS networks to merge with on different channels. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-02-19 07:15:45 +01:00
params.fixed_freq = ssid->fixed_freq;
Configure beacon interval for IBSS command wpa_supplicant already allowed beacon interval to be configured for AP mode operations, but this was not passed to the driver for IBSS even though the same parameter can used for that case. Add this for the nl80211 driver interface to allow beacon interval to be controlled for IBSS as well. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-06 22:09:20 +01:00
if (ssid->beacon_int)
params.beacon_int = ssid->beacon_int;
else
params.beacon_int = wpa_s->conf->beacon_int;
}
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
params.wpa_ie = wpa_ie;
params.wpa_ie_len = wpa_ie_len;
params.pairwise_suite = cipher_pairwise;
params.group_suite = cipher_group;
Get rid of duplicated cipher suite and AKM definitions WPA_CIPHER_* and CIPHER_* are used for the exact same set of cipher suites with the main difference being that the WPA_CIPHER_* version is suitable to be used as a bitfield. Similarly, WPA_KEY_MGMT_* and KEY_MGMT_* have similar design for AKMs. There is no need to maintain two separate copies of the definitions since the bitfield compatible version can be used for both needs. Get rid of the CIPHER_* and KEY_MGMT_* versions to clean up the implementation by getting rid of unnecessary mapping functions. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-30 18:33:39 +01:00
params.key_mgmt_suite = wpa_s->key_mgmt;
nl80211: Fix WPA_VERSIONS attribute for Connect command The previous code was trying to figure out which WPA version is used based on the extra IEs requested for Association Request. That did not work properly in cases where non-WPA networks are used with some extra IEs. Fix this by using more robust mechanism for passing the WPA versions from core wpa_supplicant to the driver_ops associate().
2011-09-02 19:40:23 +02:00
params.wpa_proto = wpa_s->wpa_proto;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
params.auth_alg = algs;
params.mode = ssid->mode;
Allow background scan period to be configured A network block specific background scan period can now be configured for drivers that implement internal background scan mechanism for roaming and BSS selection. Signed-hostap: Bala Shanmugam <bkamatch@qca.qualcomm.com>
2012-03-30 14:20:35 +02:00
params.bg_scan_period = ssid->bg_scan_period;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
for (i = 0; i < NUM_WEP_KEYS; i++) {
if (ssid->wep_key_len[i])
params.wep_key[i] = ssid->wep_key[i];
params.wep_key_len[i] = ssid->wep_key_len[i];
}
params.wep_tx_keyidx = ssid->wep_tx_keyidx;
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->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE) &&
Get rid of duplicated cipher suite and AKM definitions WPA_CIPHER_* and CIPHER_* are used for the exact same set of cipher suites with the main difference being that the WPA_CIPHER_* version is suitable to be used as a bitfield. Similarly, WPA_KEY_MGMT_* and KEY_MGMT_* have similar design for AKMs. There is no need to maintain two separate copies of the definitions since the bitfield compatible version can be used for both needs. Get rid of the CIPHER_* and KEY_MGMT_* versions to clean up the implementation by getting rid of unnecessary mapping functions. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-30 18:33:39 +01:00
(params.key_mgmt_suite == WPA_KEY_MGMT_PSK ||
params.key_mgmt_suite == WPA_KEY_MGMT_FT_PSK)) {
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
params.passphrase = ssid->passphrase;
if (ssid->psk_set)
params.psk = ssid->psk;
Add support for offloading key management operations to the driver This commit introduces a QCA vendor command and event to provide an option to use extended versions of the nl80211 connect/roam operations in a way that allows drivers to offload key management operations to the driver/firmware. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-23 17:21:49 +02:00
}
if (wpa_s->conf->key_mgmt_offload) {
if (params.key_mgmt_suite == WPA_KEY_MGMT_IEEE8021X ||
Suite B: Add AKM 00-0F-AC:11 This adds definitions for the 128-bit level Suite B AKM 00-0F-AC:11. The functionality itself is not yet complete, i.e., this commit only includes parts to negotiate the new AKM. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-11-16 12:20:51 +01:00
params.key_mgmt_suite == WPA_KEY_MGMT_IEEE8021X_SHA256 ||
Add Suite B 192-bit AKM WPA-EAP-SUITE-B-192 can now be used to select 192-bit level Suite B into use as the key management method. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-25 22:32:01 +01:00
params.key_mgmt_suite == WPA_KEY_MGMT_IEEE8021X_SUITE_B ||
params.key_mgmt_suite == WPA_KEY_MGMT_IEEE8021X_SUITE_B_192)
Add support for offloading key management operations to the driver This commit introduces a QCA vendor command and event to provide an option to use extended versions of the nl80211 connect/roam operations in a way that allows drivers to offload key management operations to the driver/firmware. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-23 17:21:49 +02:00
params.req_key_mgmt_offload =
ssid->proactive_key_caching < 0 ?
wpa_s->conf->okc : ssid->proactive_key_caching;
else
params.req_key_mgmt_offload = 1;
if ((params.key_mgmt_suite == WPA_KEY_MGMT_PSK ||
params.key_mgmt_suite == WPA_KEY_MGMT_PSK_SHA256 ||
params.key_mgmt_suite == WPA_KEY_MGMT_FT_PSK) &&
ssid->psk_set)
params.psk = ssid->psk;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
Deprecate set_drop_unencrypted(), set_auth_alg(), and set_mode() All these driver handlers can be implemented in associate() handler which gets all the needed information in the parameters structure. The old functions that provided only a single parameter will be removed eventually to clean up the driver_ops structure, so driver wrappers should start using the newer mechanism.
2009-03-24 19:06:02 +01:00
params.drop_unencrypted = use_crypt;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
#ifdef CONFIG_IEEE80211W
Ignore pmf=1 default if driver does not support PMF Connection with a PMF enabled AP will fail if we try to negotiate PMF while the local driver does not support this. Since pmf=1 does not require PMF for a successful connection, it can be ignored in such a case to avoid connectivity issues with invalid configuration. This makes it somewhat easier to allow upper layer programs to use pmf=1 default regardless of driver capabilities. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-26 16:40:22 +01:00
params.mgmt_frame_protection = wpas_get_ssid_pmf(wpa_s, ssid);
Allow PMF to be enabled by default Previously, PMF (protected management frames, IEEE 802.11w) could be enabled only with a per-network parameter (ieee80211w). The new global parameter (pmf) can now be used to change the default behavior to be PMF enabled (pmf=1) or required (pmf=2) for network blocks that do not override this with the ieee80211w parameter. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-24 21:21:29 +01:00
if (params.mgmt_frame_protection != NO_MGMT_FRAME_PROTECTION && bss) {
Use BSS table entry instead of raw scan result for connection
2010-01-02 15:16:02 +01:00
const u8 *rsn = wpa_bss_get_ie(bss, WLAN_EID_RSN);
MFP: Require MFP is it is enabled and AP scan shows support for it When using ap_scan=1, we know before the association request that MFP will be supported, so we can as well require it. This helps mac80211 in configuring whether to enable MFP.
2008-12-31 16:53:31 +01:00
struct wpa_ie_data ie;
if (rsn && wpa_parse_wpa_ie(rsn, 2 + rsn[1], &ie) == 0 &&
ie.capabilities &
(WPA_CAPABILITY_MFPC | WPA_CAPABILITY_MFPR)) {
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: Selected AP supports "
"MFP: require MFP");
MFP: Require MFP is it is enabled and AP scan shows support for it When using ap_scan=1, we know before the association request that MFP will be supported, so we can as well require it. This helps mac80211 in configuring whether to enable MFP.
2008-12-31 16:53:31 +01:00
params.mgmt_frame_protection =
MGMT_FRAME_PROTECTION_REQUIRED;
}
}
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
#endif /* CONFIG_IEEE80211W */
P2P: Set p2p auth/assoc parameter based on connection type Fix the previous code that was hardcoding the p2p parameter based on the driver P2P capability regardless of whether the connection was really used for P2P or not.
2011-07-17 19:52:49 +02:00
params.p2p = ssid->p2p_group;
P2P: Let the driver wrapper know if association is for P2P group
2010-07-18 23:30:25 +02:00
P2P: Add mechanism for configuring UAPSD parameters for group This is needed to be able to change parameters for dynamically created interfaces between the creation of the interface and association/start AP commands. Following ctrl_interface commands can now be used: P2P_SET client_apsd disable - disable configuration (i.e., use driver default) in client mode P2P_SET client_apsd <BE>,<BK>,<VI>,<VO>;<max SP Length> - enable UASPD with specific trigger configuration (0/1) per AC (max SP Length is currently ignored) P2P_SET go_apsd disable - disable configuration (i.e., use driver default) in AP mode P2P_SET go_apsd <0/1> - disable/enable APSD in AP mode
2010-07-28 19:18:52 +02:00
if (wpa_s->parent->set_sta_uapsd)
params.uapsd = wpa_s->parent->sta_uapsd;
else
params.uapsd = -1;
Support HT capability overrides This allows HT capabilities overrides on kernels that support these features. MCS Rates can be disabled to force to slower speeds when using HT. Rates cannot be forced higher. HT can be disabled, forcing an 802.11a/b/g/n station to act like an 802.11a/b/g station. HT40 can be disabled. MAX A-MSDU can be disabled. A-MPDU Factor and A-MPDU Density can be modified. Please note that these are suggestions to the kernel. Only mac80211 drivers will work at all. The A-MPDU Factor can only be decreased and the A-MPDU Density can only be increased currently. Signed-hostap: Ben Greear <greearb@candelatech.com>
2012-01-29 20:01:31 +01:00
#ifdef CONFIG_HT_OVERRIDES
os_memset(&htcaps, 0, sizeof(htcaps));
os_memset(&htcaps_mask, 0, sizeof(htcaps_mask));
params.htcaps = (u8 *) &htcaps;
params.htcaps_mask = (u8 *) &htcaps_mask;
wpa_supplicant_apply_ht_overrides(wpa_s, ssid, &params);
#endif /* CONFIG_HT_OVERRIDES */
wpa_supplicant: Apply VHT_OVERRIDES to wpas_start_assoc_cb() A previous patch "Support VHT capability overrides" missed one place where HT overrides were being applied and where it would also be useful to apply VHT overrides. Signed-hostap: Paul Stewart <pstew@chromium.org>
2014-03-14 05:33:43 +01:00
#ifdef CONFIG_VHT_OVERRIDES
os_memset(&vhtcaps, 0, sizeof(vhtcaps));
os_memset(&vhtcaps_mask, 0, sizeof(vhtcaps_mask));
params.vhtcaps = &vhtcaps;
params.vhtcaps_mask = &vhtcaps_mask;
nl80211: Allow HT/VHT to be disabled for IBSS Allow HT/VHT overrides to be used for IBSS. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2015-01-13 09:55:52 +01:00
wpa_supplicant_apply_vht_overrides(wpa_s, ssid, &params);
wpa_supplicant: Apply VHT_OVERRIDES to wpas_start_assoc_cb() A previous patch "Support VHT capability overrides" missed one place where HT overrides were being applied and where it would also be useful to apply VHT overrides. Signed-hostap: Paul Stewart <pstew@chromium.org>
2014-03-14 05:33:43 +01:00
#endif /* CONFIG_VHT_OVERRIDES */
Support HT capability overrides This allows HT capabilities overrides on kernels that support these features. MCS Rates can be disabled to force to slower speeds when using HT. Rates cannot be forced higher. HT can be disabled, forcing an 802.11a/b/g/n station to act like an 802.11a/b/g station. HT40 can be disabled. MAX A-MSDU can be disabled. A-MPDU Factor and A-MPDU Density can be modified. Please note that these are suggestions to the kernel. Only mac80211 drivers will work at all. The A-MPDU Factor can only be decreased and the A-MPDU Density can only be increased currently. Signed-hostap: Ben Greear <greearb@candelatech.com>
2012-01-29 20:01:31 +01:00
P2P: Handle frequency conflict in single channel concurrency case Based on priority, remove the connection with least priority whenever a frequency conflict is detected. Signed-hostap: Jithu Jance <jithu@broadcom.com>
2013-11-26 14:10:16 +01:00
#ifdef CONFIG_P2P
/*
* If multi-channel concurrency is not supported, check for any
* frequency conflict. In case of any frequency conflict, remove the
* least prioritized connection.
*/
if (wpa_s->num_multichan_concurrent < 2) {
wpa_supplicant: Call frequency conflict handling during auth Previously, the frequency conflict was handled only during the association flow. However, some drivers, e.g., mac80211 based drivers, will fail an authentication request in case that there are no available channels for use (as they might be used by other interfaces), and thus the frequency conflict resolution is never called. Fix this by calling frequency conflict resolution during authentication (SME-in-wpa_supplicant) as well. In addition, get the shared radio frequency from the wpa_s context in both the SME-in-driver and SME-in-wpa_supplicant cases and not from the driver. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-04-24 07:45:40 +02:00
int freq, num;
num = get_shared_radio_freqs(wpa_s, &freq, 1);
wpa_supplicant: Use hostapd_freq_params in assoc_params Use hostapd_freq_params instead of simple frequency parameter for driver commands. This is preparation for IBSS configuration to allow use of HT/VHT in IBSS. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2014-10-01 09:52:53 +02:00
if (num > 0 && freq > 0 && freq != params.freq.freq) {
wpa_supplicant: Call frequency conflict handling during auth Previously, the frequency conflict was handled only during the association flow. However, some drivers, e.g., mac80211 based drivers, will fail an authentication request in case that there are no available channels for use (as they might be used by other interfaces), and thus the frequency conflict resolution is never called. Fix this by calling frequency conflict resolution during authentication (SME-in-wpa_supplicant) as well. In addition, get the shared radio frequency from the wpa_s context in both the SME-in-driver and SME-in-wpa_supplicant cases and not from the driver. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-04-24 07:45:40 +02:00
wpa_printf(MSG_DEBUG,
"Assoc conflicting freq found (%d != %d)",
wpa_supplicant: Use hostapd_freq_params in assoc_params Use hostapd_freq_params instead of simple frequency parameter for driver commands. This is preparation for IBSS configuration to allow use of HT/VHT in IBSS. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2014-10-01 09:52:53 +02:00
freq, params.freq.freq);
if (wpas_p2p_handle_frequency_conflicts(
Invoke connect work done for all the connection failure cases This commit fixes couple of connection failure paths where wpas_connect_work_done() was not called, thus enabling the radio work interface to proceed with the other queued actions. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-20 06:48:47 +02:00
wpa_s, params.freq.freq, ssid) < 0) {
wpas_connect_work_done(wpa_s);
P2P: Handle frequency conflict in single channel concurrency case Based on priority, remove the connection with least priority whenever a frequency conflict is detected. Signed-hostap: Jithu Jance <jithu@broadcom.com>
2013-11-26 14:10:16 +01:00
return;
Invoke connect work done for all the connection failure cases This commit fixes couple of connection failure paths where wpas_connect_work_done() was not called, thus enabling the radio work interface to proceed with the other queued actions. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-20 06:48:47 +02:00
}
P2P: Handle frequency conflict in single channel concurrency case Based on priority, remove the connection with least priority whenever a frequency conflict is detected. Signed-hostap: Jithu Jance <jithu@broadcom.com>
2013-11-26 14:10:16 +01:00
}
}
#endif /* CONFIG_P2P */
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_associate(wpa_s, &params);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (ret < 0) {
wpa_msg(wpa_s, MSG_INFO, "Association request to the driver "
"failed");
Allow driver wrappers to indicate whether result codes are sane Some drivers are not providing exactly reliable error codes (e.g., with WEXT), but others may actually indicate reliable information. Allow driver wrappers to indicate if that is the case and use optimizations if so. For now, this improves nl80211 with NL80211_CMD_CONNECT for a case where connection request fails.
2010-11-26 16:41:21 +01:00
if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SANE_ERROR_CODES) {
/*
* The driver is known to mean what is saying, so we
* can stop right here; the association will not
* succeed.
*/
wpas_connection_failed(wpa_s, wpa_s->pending_bssid);
Set state to DISCONNECTED on auth/assoc failures Some of the authentication/association failure paths left wpa_state to its previous value. This can result in unexpected behavior when wpa_supplicant tries to find an AP to connect to since the uncleared state can result the in the selected BSS being ignored if it is same as the previously used BSS. This could happen, e.g., when wpa_supplicant SME was used and the AP rejected authentication. Fix this by explicitly setting state to DISCONNECTED on auth/assoc failures that did not yet do this. Signed-hostap: Jouni Malinen <j@w1.fi> intended-for: hostap-1
2012-06-25 13:23:25 +02:00
wpa_supplicant_set_state(wpa_s, WPA_DISCONNECTED);
Allow driver wrappers to indicate whether result codes are sane Some drivers are not providing exactly reliable error codes (e.g., with WEXT), but others may actually indicate reliable information. Allow driver wrappers to indicate if that is the case and use optimizations if so. For now, this improves nl80211 with NL80211_CMD_CONNECT for a case where connection request fails.
2010-11-26 16:41:21 +01:00
os_memset(wpa_s->pending_bssid, 0, ETH_ALEN);
return;
}
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
/* try to continue anyway; new association will be tried again
* after timeout */
assoc_failed = 1;
}
if (wpa_s->key_mgmt == WPA_KEY_MGMT_WPA_NONE) {
/* Set the key after the association just in case association
* cleared the previously configured key. */
wpa_supplicant_set_wpa_none_key(wpa_s, ssid);
/* No need to timeout authentication since there is no key
* management. */
wpa_supplicant_cancel_auth_timeout(wpa_s);
wpa_supplicant_set_state(wpa_s, WPA_COMPLETED);
Disable per-BSSID authentication for RSN IBSS RSN IBSS uses authentication per-STA and that is initialized separately, so there is no need to enable the per-BSS like authentication that is used with APs.
2009-01-17 15:41:47 +01:00
#ifdef CONFIG_IBSS_RSN
Define struct wpa_ssid::mode as an enum with more readable values
2009-12-28 15:00:36 +01:00
} else if (ssid->mode == WPAS_MODE_IBSS &&
Disable per-BSSID authentication for RSN IBSS RSN IBSS uses authentication per-STA and that is initialized separately, so there is no need to enable the per-BSS like authentication that is used with APs.
2009-01-17 15:41:47 +01:00
wpa_s->key_mgmt != WPA_KEY_MGMT_NONE &&
wpa_s->key_mgmt != WPA_KEY_MGMT_WPA_NONE) {
/*
* RSN IBSS authentication is per-STA and we can disable the
* per-BSSID authentication.
*/
wpa_supplicant_cancel_auth_timeout(wpa_s);
#endif /* CONFIG_IBSS_RSN */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
} else {
/* Timeout for IEEE 802.11 authentication and association */
Give adhoc associations a bit more time Depending on how the driver implements IBSS searching and creation, it may need to perform one or more scans before successfully completing the association operation. Therefore, increase the timeout for IBSS association operations so that the supplicant doesn't interrupt the driver as much.
2008-06-04 20:00:09 +02:00
int timeout = 60;
if (assoc_failed) {
/* give IBSS a bit more time */
Define struct wpa_ssid::mode as an enum with more readable values
2009-12-28 15:00:36 +01:00
timeout = ssid->mode == WPAS_MODE_IBSS ? 10 : 5;
Give adhoc associations a bit more time Depending on how the driver implements IBSS searching and creation, it may need to perform one or more scans before successfully completing the association operation. Therefore, increase the timeout for IBSS association operations so that the supplicant doesn't interrupt the driver as much.
2008-06-04 20:00:09 +02:00
} else if (wpa_s->conf->ap_scan == 1) {
/* give IBSS a bit more time */
Define struct wpa_ssid::mode as an enum with more readable values
2009-12-28 15:00:36 +01:00
timeout = ssid->mode == WPAS_MODE_IBSS ? 20 : 10;
Give adhoc associations a bit more time Depending on how the driver implements IBSS searching and creation, it may need to perform one or more scans before successfully completing the association operation. Therefore, increase the timeout for IBSS association operations so that the supplicant doesn't interrupt the driver as much.
2008-06-04 20:00:09 +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_req_auth_timeout(wpa_s, timeout, 0);
}
Use cached driver capabilities instead of new fetch for each operation There is no need to repeat the driver capability fetch for each operation since we already cache driver flags in wpa_s->drv_flags. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-05-07 16:36:40 +02:00
if (wep_keys_set &&
(wpa_s->drv_flags & WPA_DRIVER_FLAGS_SET_KEYS_AFTER_ASSOC)) {
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
/* Set static WEP keys again */
wpa_set_wep_keys(wpa_s, ssid);
}
if (wpa_s->current_ssid && wpa_s->current_ssid != ssid) {
/*
* Do not allow EAP session resumption between different
* network configurations.
*/
eapol_sm_invalidate_cached_session(wpa_s->eapol);
}
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
old_ssid = wpa_s->current_ssid;
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;
Postpone updating of wpa_s->current_bss till association event In the case of driver-based BSS selection, a bssid_hint in the connect request might not result in to the selection of the same BSS. Thus, postpone the updation of the wpa_s->current_bss till the association event is received unless the BSSID is forced. This fixes issues where wpa_s->current_bss may end up being updated to point to the BSS that wpa_supplicant provided as a hint for a roaming case, but then not restored if the driver decides to "return" to the current BSS instead. This could result in some operations (e.g., WNM BSS TM response) not working properly due to incorrect BSS being identified in wpa_s->current_bss. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-05-28 17:11:12 +02:00
if (!wpas_driver_bss_selection(wpa_s) || ssid->bssid_set)
wpa_s->current_bss = bss;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_supplicant_rsn_supp_set_config(wpa_s, wpa_s->current_ssid);
wpa_supplicant_initiate_eapol(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
if (old_ssid != wpa_s->current_ssid)
wpas_notify_network_changed(wpa_s);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
Share common code in wpa_supplicant_{disassociate,deauthenticate}()
2010-08-26 12:43:38 +02:00
static void wpa_supplicant_clear_connection(struct wpa_supplicant *wpa_s,
const u8 *addr)
{
struct wpa_ssid *old_ssid;
Complete sme-connect radio work when clearing connection state It was possible for local deauthentication request to leave sme-connect radio work running even when there was no ongoing effort to complete the connection anymore. Clean this up by marking sme-connect radio work item, if any, done when clearing connection state after such disconnection during connection. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-10 00:33:58 +02:00
wpas_connect_work_done(wpa_s);
Share common code in wpa_supplicant_{disassociate,deauthenticate}()
2010-08-26 12:43:38 +02:00
wpa_clear_keys(wpa_s, addr);
old_ssid = wpa_s->current_ssid;
Clear current_ssid and key_mgmt when disconnected This makes wpa_supplicant state somewhat cleaner since the information from previously used connection is not maintained after getting disconnected. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-26 22:20:41 +02:00
wpa_supplicant_mark_disassoc(wpa_s);
Share common code in wpa_supplicant_{disassociate,deauthenticate}()
2010-08-26 12:43:38 +02:00
wpa_sm_set_config(wpa_s->wpa, NULL);
eapol_sm_notify_config(wpa_s->eapol, NULL, NULL);
if (old_ssid != wpa_s->current_ssid)
wpas_notify_network_changed(wpa_s);
eloop_cancel_timeout(wpa_supplicant_timeout, wpa_s, NULL);
}
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
/**
* wpa_supplicant_deauthenticate - Deauthenticate the current connection
* @wpa_s: Pointer to wpa_supplicant data
* @reason_code: IEEE 802.11 reason code for the deauthenticate frame
*
Fixed a copy-paste error in a function documentation
2009-02-10 10:45:17 +01:00
* This function is used to request %wpa_supplicant to deauthenticate from the
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
* current AP.
*/
void wpa_supplicant_deauthenticate(struct wpa_supplicant *wpa_s,
int reason_code)
{
u8 *addr = NULL;
Fix CTRL-EVENT-DISCONNECTED event for locally generated disconnection When wpa_supplicant disconnects, e.g., due to authentication timeout, we need to go through the EVENT_DISASSOC/DEAUTH processing similarly to the driver triggered cases to get correct events delivered to the ctrl_iface. Fix this by calling wpa_supplicant_event() in these cases and by filtering out the confusing CTRL-EVENT-DISCONNECTED event with all zeros BSSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-01 14:42:35 +01:00
union wpa_event_data event;
Use wpa_drv_{disassociate,deauthenticate} while waiting for connection wpa_supplicant_{disassociate,deauthenticate}() need to inform the driver about decision to disconnect even if this happens during the time when the driver is still trying to complete association. During that time, wpa_s->bssid is not set, so the code in these functions needs to figure out the correct BSSID based on that field or wpa_s->pending_bssid. In addition, it is possible that the BSSID is not even known at wpa_supplicant at this point in time when using drivers that perform BSS selection internally. In those cases, the disconnect command needs to be sent to the driver without the BSSID. This fixes issues where the driver (or cfg80211 in particular) may be left in mismatching state with wpa_supplicant when disconnection (e.g., due to a ctrl_iface command) happens between connection request and association event. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-05 15:42:28 +01:00
int zero_addr = 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
Use wpa_drv_{disassociate,deauthenticate} while waiting for connection wpa_supplicant_{disassociate,deauthenticate}() need to inform the driver about decision to disconnect even if this happens during the time when the driver is still trying to complete association. During that time, wpa_s->bssid is not set, so the code in these functions needs to figure out the correct BSSID based on that field or wpa_s->pending_bssid. In addition, it is possible that the BSSID is not even known at wpa_supplicant at this point in time when using drivers that perform BSS selection internally. In those cases, the disconnect command needs to be sent to the driver without the BSSID. This fixes issues where the driver (or cfg80211 in particular) may be left in mismatching state with wpa_supplicant when disconnection (e.g., due to a ctrl_iface command) happens between connection request and association event. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-05 15:42:28 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "Request to deauthenticate - bssid=" MACSTR
" pending_bssid=" MACSTR " reason=%d state=%s",
MAC2STR(wpa_s->bssid), MAC2STR(wpa_s->pending_bssid),
reason_code, wpa_supplicant_state_txt(wpa_s->wpa_state));
if (!is_zero_ether_addr(wpa_s->bssid))
addr = wpa_s->bssid;
else if (!is_zero_ether_addr(wpa_s->pending_bssid) &&
(wpa_s->wpa_state == WPA_AUTHENTICATING ||
wpa_s->wpa_state == WPA_ASSOCIATING))
addr = wpa_s->pending_bssid;
else if (wpa_s->wpa_state == WPA_ASSOCIATING) {
/*
* When using driver-based BSS selection, we may not know the
* BSSID with which we are currently trying to associate. We
* need to notify the driver of this disconnection even in such
* a case, so use the all zeros address here.
*/
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
addr = wpa_s->bssid;
Use wpa_drv_{disassociate,deauthenticate} while waiting for connection wpa_supplicant_{disassociate,deauthenticate}() need to inform the driver about decision to disconnect even if this happens during the time when the driver is still trying to complete association. During that time, wpa_s->bssid is not set, so the code in these functions needs to figure out the correct BSSID based on that field or wpa_s->pending_bssid. In addition, it is possible that the BSSID is not even known at wpa_supplicant at this point in time when using drivers that perform BSS selection internally. In those cases, the disconnect command needs to be sent to the driver without the BSSID. This fixes issues where the driver (or cfg80211 in particular) may be left in mismatching state with wpa_supplicant when disconnection (e.g., due to a ctrl_iface command) happens between connection request and association event. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-05 15:42:28 +01:00
zero_addr = 1;
}
TDLS: Tear down peers when disconnecting from the AP A TDLS Teardown frame with Reason Code 3 (Deauthenticated because sending STA is leaving (or has left) IBSS or ESS) shall be transmitted to all TDLS peer STAs (via the AP or via the direct path) prior to transmitting a Disassociation frame or a Deauthentication frame to the AP. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-12 22:25:21 +01:00
#ifdef CONFIG_TDLS
wpa_tdls_teardown_peers(wpa_s->wpa);
#endif /* CONFIG_TDLS */
Add mesh_group_{add,remove} control interface commands Parse MESH_GROUP_ADD/REMOVE commands on ctrl interface and call wpa_supplicant routines. These commands are used to start or join and leave a mesh network. The mesh id is given in the configuration file, therefore there is no need to scan before joining a mesh network. We reuse the connect_without_scan construct used by P2P for that same purpose. Signed-off-by: Javier Cardona <javier@cozybit.com> Signed-off-by: Javier Lopez <jlopex@gmail.com>
2014-09-01 06:23:33 +02:00
#ifdef CONFIG_MESH
if (wpa_s->ifmsh) {
wpa_msg_ctrl(wpa_s, MSG_INFO, MESH_GROUP_REMOVED "%s",
wpa_s->ifname);
wpa_supplicant_leave_mesh(wpa_s);
}
#endif /* CONFIG_MESH */
Use wpa_drv_{disassociate,deauthenticate} while waiting for connection wpa_supplicant_{disassociate,deauthenticate}() need to inform the driver about decision to disconnect even if this happens during the time when the driver is still trying to complete association. During that time, wpa_s->bssid is not set, so the code in these functions needs to figure out the correct BSSID based on that field or wpa_s->pending_bssid. In addition, it is possible that the BSSID is not even known at wpa_supplicant at this point in time when using drivers that perform BSS selection internally. In those cases, the disconnect command needs to be sent to the driver without the BSSID. This fixes issues where the driver (or cfg80211 in particular) may be left in mismatching state with wpa_supplicant when disconnection (e.g., due to a ctrl_iface command) happens between connection request and association event. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-05 15:42:28 +01:00
if (addr) {
wpa_drv_deauthenticate(wpa_s, addr, reason_code);
Fix CTRL-EVENT-DISCONNECTED event for locally generated disconnection When wpa_supplicant disconnects, e.g., due to authentication timeout, we need to go through the EVENT_DISASSOC/DEAUTH processing similarly to the driver triggered cases to get correct events delivered to the ctrl_iface. Fix this by calling wpa_supplicant_event() in these cases and by filtering out the confusing CTRL-EVENT-DISCONNECTED event with all zeros BSSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-01 14:42:35 +01:00
os_memset(&event, 0, sizeof(event));
event.deauth_info.reason_code = (u16) reason_code;
event.deauth_info.locally_generated = 1;
wpa_supplicant_event(wpa_s, EVENT_DEAUTH, &event);
Use wpa_drv_{disassociate,deauthenticate} while waiting for connection wpa_supplicant_{disassociate,deauthenticate}() need to inform the driver about decision to disconnect even if this happens during the time when the driver is still trying to complete association. During that time, wpa_s->bssid is not set, so the code in these functions needs to figure out the correct BSSID based on that field or wpa_s->pending_bssid. In addition, it is possible that the BSSID is not even known at wpa_supplicant at this point in time when using drivers that perform BSS selection internally. In those cases, the disconnect command needs to be sent to the driver without the BSSID. This fixes issues where the driver (or cfg80211 in particular) may be left in mismatching state with wpa_supplicant when disconnection (e.g., due to a ctrl_iface command) happens between connection request and association event. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-05 15:42:28 +01:00
if (zero_addr)
addr = NULL;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
Share common code in wpa_supplicant_{disassociate,deauthenticate}()
2010-08-26 12:43:38 +02:00
wpa_supplicant_clear_connection(wpa_s, addr);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
wpa_supplicant: Handle enabling of one or all networks equally Move enabling a network to a separate function. Try to reconnect if not associated to an AP. Abort scheduled scan in any case of a new scan. Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-03-10 16:43:00 +01:00
static void wpa_supplicant_enable_one_network(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid)
{
if (!ssid || !ssid->disabled || ssid->disabled == 2)
return;
ssid->disabled = 0;
wpas_clear_temp_disabled(wpa_s, ssid, 1);
wpas_notify_network_enabled_changed(wpa_s, ssid);
/*
* Try to reassociate since there is no current configuration and a new
* network was made available.
*/
Fix ENABLE_NETWORK not to reconnect in disconnected state DISCONNECT followed by ENABLE_NETWORK ended up starting a scan for a new connection due to wpa_supplicant_enable_one_network() setting wpa_s->reassociate = 1. This was done regardless of wpa_s->disconnected being 1 which should imply that wpa_supplicant should not try to connect before asked explicitly with REASSOCIATE or RECONNECT. Fix this by making ENABLE_NETWORK setting of reassociate = 1 and starting of scans for connection conditional on wpa_s->disconnected == 0. This will make ENABLE_NETWORK trigger a connection only if wpa_supplicant is already in a state where it would try to connect if there are any enabled networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-23 10:51:45 +02:00
if (!wpa_s->current_ssid && !wpa_s->disconnected)
wpa_supplicant: Handle enabling of one or all networks equally Move enabling a network to a separate function. Try to reconnect if not associated to an AP. Abort scheduled scan in any case of a new scan. Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-03-10 16:43:00 +01:00
wpa_s->reassociate = 1;
}
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
/**
* wpa_supplicant_enable_network - Mark a configured network as enabled
* @wpa_s: wpa_supplicant structure for a network interface
* @ssid: wpa_ssid structure for a configured network or %NULL
*
* Enables the specified network or all networks if no network specified.
*/
void wpa_supplicant_enable_network(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid)
{
if (ssid == NULL) {
Remove unnecessary local variable The ssid parameter (if NULL) can be used for the loop, too, to make the code look a bit prettier. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-03-10 16:45:15 +01:00
for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next)
wpa_supplicant_enable_one_network(wpa_s, ssid);
wpa_supplicant: Handle enabling of one or all networks equally Move enabling a network to a separate function. Try to reconnect if not associated to an AP. Abort scheduled scan in any case of a new scan. Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-03-10 16:43:00 +01:00
} else
wpa_supplicant_enable_one_network(wpa_s, ssid);
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
Avoid reconnection on ENABLE_NETWORK if already connected This was already the case for most command sequences, but it was possible for wpa_s->reassociate to be set to 1 when CTRL-RSP-* commands were used to set identity, password, or passphrase for EAP authentication. In such cases, ENABLE_NETWORK issued after the connection was completed could result in a new connection attempt (likely reconnection back to the same BSS). Fix this by checking whether an actual connection is already present even if wpa_s->reassociate is set when processing the ENABLE_NETWORK command. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-09-22 10:55:54 +02:00
if (wpa_s->reassociate && !wpa_s->disconnected &&
(!wpa_s->current_ssid ||
wpa_s->wpa_state == WPA_DISCONNECTED ||
wpa_s->wpa_state == WPA_SCANNING)) {
wpa_supplicant: Handle enabling of one or all networks equally Move enabling a network to a separate function. Try to reconnect if not associated to an AP. Abort scheduled scan in any case of a new scan. Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-03-10 16:43:00 +01:00
if (wpa_s->sched_scanning) {
wpa_printf(MSG_DEBUG, "Stop ongoing sched_scan to add "
"new network to scan filters");
wpa_supplicant_cancel_sched_scan(wpa_s);
}
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
Set NORMAL_SCAN_REQ on SELECT_NETWORK/ENABLE_NETWORK wpa_s->scan_req needs to be set in these cases to get correct scanning behavior. This is mainly needed for starting of AP mode operation immediately in ap_scan=2 case. This fixes an issue that was found with mac80211_hwsim test cases in the following sequence: dbus_autoscan dbus_ap_scan_2_ap_mode_scan Signed-off-by: Jouni Malinen <j@w1.fi>
2015-08-16 23:16:46 +02:00
if (wpa_supplicant_fast_associate(wpa_s) != 1) {
wpa_s->scan_req = NORMAL_SCAN_REQ;
Try to use fast-associate on ENABLE_NETWORK This makes ENABLE_NETWORK behave similarily to SELECT_NETWORK by allowing a scan to be skipped if recent scan results are available. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-05-21 18:37:55 +02:00
wpa_supplicant_req_scan(wpa_s, 0, 0);
Set NORMAL_SCAN_REQ on SELECT_NETWORK/ENABLE_NETWORK wpa_s->scan_req needs to be set in these cases to get correct scanning behavior. This is mainly needed for starting of AP mode operation immediately in ap_scan=2 case. This fixes an issue that was found with mac80211_hwsim test cases in the following sequence: dbus_autoscan dbus_ap_scan_2_ap_mode_scan Signed-off-by: Jouni Malinen <j@w1.fi>
2015-08-16 23:16:46 +02:00
}
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
}
}
/**
* wpa_supplicant_disable_network - Mark a configured network as disabled
* @wpa_s: wpa_supplicant structure for a network interface
* @ssid: wpa_ssid structure for a configured network or %NULL
*
* Disables the specified network or all networks if no network specified.
*/
void wpa_supplicant_disable_network(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid)
{
struct wpa_ssid *other_ssid;
int was_disabled;
if (ssid == NULL) {
wpa_supplicant: Reschedule sched scan after network change Stop sched scan, if running, after any disabling or removing of a network, and request a new scan if needed. Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-03-10 16:51:13 +01:00
if (wpa_s->sched_scanning)
wpa_supplicant_cancel_sched_scan(wpa_s);
P2P: Use config block with disabled==2 to store persistent groups
2010-07-18 23:30:25 +02:00
for (other_ssid = wpa_s->conf->ssid; other_ssid;
other_ssid = other_ssid->next) {
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
was_disabled = other_ssid->disabled;
P2P: Use config block with disabled==2 to store persistent groups
2010-07-18 23:30:25 +02:00
if (was_disabled == 2)
continue; /* do not change persistent P2P group
* data */
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
other_ssid->disabled = 1;
if (was_disabled != other_ssid->disabled)
wpas_notify_network_enabled_changed(
wpa_s, other_ssid);
}
if (wpa_s->current_ssid)
Use deauthentication instead of disassociation if not associated cfg80211/mac80211 may reject disassociation command if association has not yet been formed. Use deauthentication in cases where it is possible that we are associating at the moment the command is issued. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-05 15:55:30 +01:00
wpa_supplicant_deauthenticate(
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
wpa_s, WLAN_REASON_DEAUTH_LEAVING);
P2P: Use config block with disabled==2 to store persistent groups
2010-07-18 23:30:25 +02:00
} else if (ssid->disabled != 2) {
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
if (ssid == wpa_s->current_ssid)
Use deauthentication instead of disassociation if not associated cfg80211/mac80211 may reject disassociation command if association has not yet been formed. Use deauthentication in cases where it is possible that we are associating at the moment the command is issued. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-05 15:55:30 +01:00
wpa_supplicant_deauthenticate(
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
wpa_s, WLAN_REASON_DEAUTH_LEAVING);
was_disabled = ssid->disabled;
ssid->disabled = 1;
wpa_supplicant: Reschedule sched scan after network change Stop sched scan, if running, after any disabling or removing of a network, and request a new scan if needed. Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-03-10 16:51:13 +01:00
if (was_disabled != ssid->disabled) {
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
wpas_notify_network_enabled_changed(wpa_s, ssid);
wpa_supplicant: Reschedule sched scan after network change Stop sched scan, if running, after any disabling or removing of a network, and request a new scan if needed. Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-03-10 16:51:13 +01:00
if (wpa_s->sched_scanning) {
wpa_printf(MSG_DEBUG, "Stop ongoing sched_scan "
"to remove network from filters");
wpa_supplicant_cancel_sched_scan(wpa_s);
wpa_supplicant_req_scan(wpa_s, 0, 0);
}
}
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
}
}
/**
* wpa_supplicant_select_network - Attempt association with a network
* @wpa_s: wpa_supplicant structure for a network interface
* @ssid: wpa_ssid structure for a configured network or %NULL for any network
*/
void wpa_supplicant_select_network(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid)
{
struct wpa_ssid *other_ssid;
Delay scan request on select_network if disconnecting The disconnection command results in disassociation and deauthentication events which were previously processed during the scan in case of select_network command being used while associated with another network. While this works in most cases, it can result in confusing event messages in ctrl_iface and debug log. Avoid this by using a short delay between the disconnection and scan request to allow the disconnection events to be processed prior to starting the new scan. Signed-hostap: Jouni Malinen <j@w1.fi> intended-for: hostap-1
2012-02-04 11:28:16 +01:00
int disconnected = 0;
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
Delay scan request on select_network if disconnecting The disconnection command results in disassociation and deauthentication events which were previously processed during the scan in case of select_network command being used while associated with another network. While this works in most cases, it can result in confusing event messages in ctrl_iface and debug log. Avoid this by using a short delay between the disconnection and scan request to allow the disconnection events to be processed prior to starting the new scan. Signed-hostap: Jouni Malinen <j@w1.fi> intended-for: hostap-1
2012-02-04 11:28:16 +01:00
if (ssid && ssid != wpa_s->current_ssid && wpa_s->current_ssid) {
Do not set own_disconnect_req flag if not connected This fixes some issues where a disconnection event may get ignored if an earlier operation to remove or disable a network resulted in an attempt to disconnect event though no connection was in place. wpa_s->current_ssid != NULL alone is not sufficient to determine that there will be a driver event notifying completion of such disconnection request. Set own_disconnect_req to 1 only if wpa_s->wpa_state is also indicating that there is a connection or an attempt to complete one. This showed up in a failure, e.g., when running the hwsim test case scan_int followed by ap_vlan_wpa2_psk_radius_required where the latter ended up not processing a connection failure event and getting stuck not trying to run a new scan and connection attempt. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-06-10 14:40:35 +02:00
if (wpa_s->wpa_state >= WPA_AUTHENTICATING)
wpa_s->own_disconnect_req = 1;
Use deauthentication instead of disassociation if not associated cfg80211/mac80211 may reject disassociation command if association has not yet been formed. Use deauthentication in cases where it is possible that we are associating at the moment the command is issued. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-05 15:55:30 +01:00
wpa_supplicant_deauthenticate(
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
wpa_s, WLAN_REASON_DEAUTH_LEAVING);
Delay scan request on select_network if disconnecting The disconnection command results in disassociation and deauthentication events which were previously processed during the scan in case of select_network command being used while associated with another network. While this works in most cases, it can result in confusing event messages in ctrl_iface and debug log. Avoid this by using a short delay between the disconnection and scan request to allow the disconnection events to be processed prior to starting the new scan. Signed-hostap: Jouni Malinen <j@w1.fi> intended-for: hostap-1
2012-02-04 11:28:16 +01:00
disconnected = 1;
}
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
Disable network block temporarily on authentication failures If 4-way handshake fails due to likely PSK failure or if EAP authentication fails, disable the network block temporarily. Use longer duration if multiple consecutive failures are seen. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-26 22:01:26 +02:00
if (ssid)
wpas_clear_temp_disabled(wpa_s, ssid, 1);
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
/*
* Mark all other networks disabled or mark all networks enabled if no
* network specified.
*/
P2P: Use config block with disabled==2 to store persistent groups
2010-07-18 23:30:25 +02:00
for (other_ssid = wpa_s->conf->ssid; other_ssid;
other_ssid = other_ssid->next) {
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
int was_disabled = other_ssid->disabled;
P2P: Use config block with disabled==2 to store persistent groups
2010-07-18 23:30:25 +02:00
if (was_disabled == 2)
continue; /* do not change persistent P2P group data */
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
other_ssid->disabled = ssid ? (ssid->id != other_ssid->id) : 0;
Disable network block temporarily on authentication failures If 4-way handshake fails due to likely PSK failure or if EAP authentication fails, disable the network block temporarily. Use longer duration if multiple consecutive failures are seen. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-26 22:01:26 +02:00
if (was_disabled && !other_ssid->disabled)
wpas_clear_temp_disabled(wpa_s, other_ssid, 0);
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
if (was_disabled != other_ssid->disabled)
wpas_notify_network_enabled_changed(wpa_s, other_ssid);
}
Do not re-associate on SELECT_NETWORK to current network Signed-off-by: Jithu Jance <jithu@broadcom.com>
2011-10-02 12:12:43 +02:00
Skip SELECT_NETWORK steps only if already connected or connecting Commit 2a6f78fbbefc34fec6685d08f46797c4ef4b2a6e ('Do not re-associate on SELECT_NETWORK to current network') started skipping all SELECT_NETWORK connection steps if the selected network had already been selected previously. This happened regardless of whether the connection was already established. This is not necessarily desirable for all cases where there is no immediate action to even try to connect (e.g., long wait for the next scan). Speed this up by allowing the SELECT_NETWORK operation to get started if there is no connection or ongoing connection attempt with the selected network. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-11-19 23:45:40 +01:00
if (ssid && ssid == wpa_s->current_ssid && wpa_s->current_ssid &&
wpa_s->wpa_state >= WPA_AUTHENTICATING) {
Do not re-associate on SELECT_NETWORK to current network Signed-off-by: Jithu Jance <jithu@broadcom.com>
2011-10-02 12:12:43 +02:00
/* We are already associated with the selected network */
wpa_printf(MSG_DEBUG, "Already associated with the "
"selected network - do nothing");
return;
}
Clear EAPOL supplicant configuration info on current_ssid changes There were some code paths that allowed obsolete configuration data pointer to be maintained within EAPOL supplicant in case a network was removed while not connection to it (i.e., wpa_s->current_ssid not pointing to the network that was removed). This could result in use of freed memory, e.g., from eap_sm_notify_ctrl_attached() when a new control interface connected prior to the EAPOL supplicant configuration pointer got updated. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-08-25 18:46:57 +02:00
if (ssid) {
Use PMKSA cache entries with only a single network context When looking for PMKSA cache entries to use with a new association, only accept entries created with the same network block that was used to create the cache entry. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-04 11:32:35 +01:00
wpa_s->current_ssid = ssid;
Clear EAPOL supplicant configuration info on current_ssid changes There were some code paths that allowed obsolete configuration data pointer to be maintained within EAPOL supplicant in case a network was removed while not connection to it (i.e., wpa_s->current_ssid not pointing to the network that was removed). This could result in use of freed memory, e.g., from eap_sm_notify_ctrl_attached() when a new control interface connected prior to the EAPOL supplicant configuration pointer got updated. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-08-25 18:46:57 +02:00
eapol_sm_notify_config(wpa_s->eapol, NULL, NULL);
Add mesh_group_{add,remove} control interface commands Parse MESH_GROUP_ADD/REMOVE commands on ctrl interface and call wpa_supplicant routines. These commands are used to start or join and leave a mesh network. The mesh id is given in the configuration file, therefore there is no need to scan before joining a mesh network. We reuse the connect_without_scan construct used by P2P for that same purpose. Signed-off-by: Javier Cardona <javier@cozybit.com> Signed-off-by: Javier Lopez <jlopex@gmail.com>
2014-09-01 06:23:33 +02:00
wpa_s->connect_without_scan =
(ssid->mode == WPAS_MODE_MESH) ? ssid : NULL;
Don't optimize scan frequencies if selected network has changed When disconnecting from a BSS, the next scan is optimized to scan only the channels used by the connected ESS. But when disconnecting because a new network was selected, this optimization is wrong because wpa_supplicant is now trying to connect to another ESS. Fix this by not optimizing the scan frequencies in case the selected network has changed. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2015-03-16 06:20:01 +01:00
/*
* Don't optimize next scan freqs since a new ESS has been
* selected.
*/
os_free(wpa_s->next_scan_freqs);
wpa_s->next_scan_freqs = NULL;
Add mesh_group_{add,remove} control interface commands Parse MESH_GROUP_ADD/REMOVE commands on ctrl interface and call wpa_supplicant routines. These commands are used to start or join and leave a mesh network. The mesh id is given in the configuration file, therefore there is no need to scan before joining a mesh network. We reuse the connect_without_scan construct used by P2P for that same purpose. Signed-off-by: Javier Cardona <javier@cozybit.com> Signed-off-by: Javier Lopez <jlopex@gmail.com>
2014-09-01 06:23:33 +02:00
} else {
wpa_s->connect_without_scan = NULL;
Clear EAPOL supplicant configuration info on current_ssid changes There were some code paths that allowed obsolete configuration data pointer to be maintained within EAPOL supplicant in case a network was removed while not connection to it (i.e., wpa_s->current_ssid not pointing to the network that was removed). This could result in use of freed memory, e.g., from eap_sm_notify_ctrl_attached() when a new control interface connected prior to the EAPOL supplicant configuration pointer got updated. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-08-25 18:46:57 +02:00
}
Add mesh_group_{add,remove} control interface commands Parse MESH_GROUP_ADD/REMOVE commands on ctrl interface and call wpa_supplicant routines. These commands are used to start or join and leave a mesh network. The mesh id is given in the configuration file, therefore there is no need to scan before joining a mesh network. We reuse the connect_without_scan construct used by P2P for that same purpose. Signed-off-by: Javier Cardona <javier@cozybit.com> Signed-off-by: Javier Lopez <jlopex@gmail.com>
2014-09-01 06:23:33 +02:00
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
wpa_s->disconnected = 0;
wpa_s->reassociate = 1;
wpa_supplicant: Implement fast-associate on SelectNetwork If scan results are available when we perform a SelectNetwork, use them to make an associate decision. This can save an entire scan interval-worth of time in situations where something external to wpa_supplicant (like a connection manager) has just previously requested a scan before calling SelectNetwork. Signed-hostap: Paul Stewart <pstew@chromium.org>
2013-02-03 20:08:31 +01:00
mesh: Skip fast-association when using connect_without_scan The mesh group addition was designed to use wpa_s->connect_without_scan to skip a scan. That path was skipped if wpa_supplicant_fast_associate() allowed previous scan results to be used. This could result in undesired double-initialization attempt for the mesh interface. Avoid this by not using wpa_supplicant_fast_associate() when wpa_s->connect_without_scan is set. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-11-30 14:47:07 +01:00
if (wpa_s->connect_without_scan ||
Set NORMAL_SCAN_REQ on SELECT_NETWORK/ENABLE_NETWORK wpa_s->scan_req needs to be set in these cases to get correct scanning behavior. This is mainly needed for starting of AP mode operation immediately in ap_scan=2 case. This fixes an issue that was found with mac80211_hwsim test cases in the following sequence: dbus_autoscan dbus_ap_scan_2_ap_mode_scan Signed-off-by: Jouni Malinen <j@w1.fi>
2015-08-16 23:16:46 +02:00
wpa_supplicant_fast_associate(wpa_s) != 1) {
wpa_s->scan_req = NORMAL_SCAN_REQ;
wpa_supplicant: Implement fast-associate on SelectNetwork If scan results are available when we perform a SelectNetwork, use them to make an associate decision. This can save an entire scan interval-worth of time in situations where something external to wpa_supplicant (like a connection manager) has just previously requested a scan before calling SelectNetwork. Signed-hostap: Paul Stewart <pstew@chromium.org>
2013-02-03 20:08:31 +01:00
wpa_supplicant_req_scan(wpa_s, 0, disconnected ? 100000 : 0);
Set NORMAL_SCAN_REQ on SELECT_NETWORK/ENABLE_NETWORK wpa_s->scan_req needs to be set in these cases to get correct scanning behavior. This is mainly needed for starting of AP mode operation immediately in ap_scan=2 case. This fixes an issue that was found with mac80211_hwsim test cases in the following sequence: dbus_autoscan dbus_ap_scan_2_ap_mode_scan Signed-off-by: Jouni Malinen <j@w1.fi>
2015-08-16 23:16:46 +02:00
}
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
Call wpas_notify_network_selected only if a specific network was selected ssid could be NULL here at least based on the function documentation, so better check whether that is the case prior to calling the notification function.
2009-11-10 17:06:02 +01:00
if (ssid)
wpas_notify_network_selected(wpa_s, ssid);
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
}
D-Bus: Add support to set pkcs11_{engine,module}_path Add SetPKCS11EngineAndModulePath D-Bus method. Add PKCS11EnginePath and PKCS11ModulePath D-Bus property getters. Signed-hostap: Michael Schaller <misch@google.com>
2013-11-23 09:38:07 +01:00
/**
* wpas_set_pkcs11_engine_and_module_path - Set PKCS #11 engine and module path
* @wpa_s: wpa_supplicant structure for a network interface
* @pkcs11_engine_path: PKCS #11 engine path or NULL
* @pkcs11_module_path: PKCS #11 module path or NULL
* Returns: 0 on success; -1 on failure
*
* Sets the PKCS #11 engine and module path. Both have to be NULL or a valid
* path. If resetting the EAPOL state machine with the new PKCS #11 engine and
* module path fails the paths will be reset to the default value (NULL).
*/
int wpas_set_pkcs11_engine_and_module_path(struct wpa_supplicant *wpa_s,
const char *pkcs11_engine_path,
const char *pkcs11_module_path)
{
char *pkcs11_engine_path_copy = NULL;
char *pkcs11_module_path_copy = NULL;
if (pkcs11_engine_path != NULL) {
pkcs11_engine_path_copy = os_strdup(pkcs11_engine_path);
if (pkcs11_engine_path_copy == NULL)
return -1;
}
if (pkcs11_module_path != NULL) {
pkcs11_module_path_copy = os_strdup(pkcs11_module_path);
Fix memory leaks and wrong memory access 1. In wpa_config_process_bgscan() fix memory leak after calling wpa_config_parse_string() 2. In hostapd_config_defaults(), on failure to allocate bss->radius, conf->bss was not freed. 3. In p2p_deauth_nofif(), memory allocated in p2p_parse_ies() was not freed in case of NULL minor_reason_code. 4. In p2p_disassoc_nofif(), memory allocated in p2p_parse_ies() was not freed in case of NULL minor_reason_code. 5. In p2p_process_go_neg_conf(), memory allocated was not freed in case that the P2P Device interface was not waiting for a GO Negotiation Confirm. 6. In wpa_set_pkcs11_engine_and_module_path(), the wrong pointer was checked. Signed-hostap: Eytan Lifshitz <eytan.lifshitz@intel.com>
2014-01-28 08:32:35 +01:00
if (pkcs11_module_path_copy == NULL) {
D-Bus: Add support to set pkcs11_{engine,module}_path Add SetPKCS11EngineAndModulePath D-Bus method. Add PKCS11EnginePath and PKCS11ModulePath D-Bus property getters. Signed-hostap: Michael Schaller <misch@google.com>
2013-11-23 09:38:07 +01:00
os_free(pkcs11_engine_path_copy);
return -1;
}
}
os_free(wpa_s->conf->pkcs11_engine_path);
os_free(wpa_s->conf->pkcs11_module_path);
wpa_s->conf->pkcs11_engine_path = pkcs11_engine_path_copy;
wpa_s->conf->pkcs11_module_path = pkcs11_module_path_copy;
wpa_sm_set_eapol(wpa_s->wpa, NULL);
eapol_sm_deinit(wpa_s->eapol);
wpa_s->eapol = NULL;
if (wpa_supplicant_init_eapol(wpa_s)) {
/* Error -> Reset paths to the default value (NULL) once. */
if (pkcs11_engine_path != NULL && pkcs11_module_path != NULL)
wpas_set_pkcs11_engine_and_module_path(wpa_s, NULL,
NULL);
return -1;
}
wpa_sm_set_eapol(wpa_s->wpa, wpa_s->eapol);
return 0;
}
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
/**
* wpa_supplicant_set_ap_scan - Set AP scan mode for interface
* @wpa_s: wpa_supplicant structure for a network interface
* @ap_scan: AP scan mode
* Returns: 0 if succeed or -1 if ap_scan has an invalid value
*
*/
int wpa_supplicant_set_ap_scan(struct wpa_supplicant *wpa_s, int ap_scan)
{
int old_ap_scan;
if (ap_scan < 0 || ap_scan > 2)
return -1;
Make it clearer that ap_scan=2 mode should not be used with nl80211 Add more details into configuration comments and a runtime info message if ap_scan=2 is used with the nl80211 driver interface. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-09-05 00:04:29 +02:00
if (ap_scan == 2 && os_strcmp(wpa_s->driver->name, "nl80211") == 0) {
wpa_printf(MSG_INFO,
"Note: nl80211 driver interface is not designed to be used with ap_scan=2; this can result in connection failures");
}
Prevent ap_scan change during association Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-08-16 20:52:06 +02:00
#ifdef ANDROID
if (ap_scan == 2 && ap_scan != wpa_s->conf->ap_scan &&
wpa_s->wpa_state >= WPA_ASSOCIATING &&
wpa_s->wpa_state < WPA_COMPLETED) {
wpa_printf(MSG_ERROR, "ap_scan = %d (%d) rejected while "
"associating", wpa_s->conf->ap_scan, ap_scan);
return 0;
}
#endif /* ANDROID */
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
old_ap_scan = wpa_s->conf->ap_scan;
wpa_s->conf->ap_scan = ap_scan;
if (old_ap_scan != wpa_s->conf->ap_scan)
wpas_notify_ap_scan_changed(wpa_s);
return 0;
}
wpa_supplicant: Parameterize BSS table expiration age + count Replace compile-time BSS cache expiration age and scan count by config parameters that can be set via wpa_cli and the new D-Bus API. The latter is done with interface properties BSSExpireAge and BSSExpireCount.
2011-03-20 11:40:59 +01:00
/**
* wpa_supplicant_set_bss_expiration_age - Set BSS entry expiration age
* @wpa_s: wpa_supplicant structure for a network interface
* @expire_age: Expiration age in seconds
* Returns: 0 if succeed or -1 if expire_age has an invalid value
*
*/
int wpa_supplicant_set_bss_expiration_age(struct wpa_supplicant *wpa_s,
unsigned int bss_expire_age)
{
if (bss_expire_age < 10) {
wpa_msg(wpa_s, MSG_ERROR, "Invalid bss expiration age %u",
bss_expire_age);
return -1;
}
wpa_msg(wpa_s, MSG_DEBUG, "Setting bss expiration age: %d sec",
bss_expire_age);
wpa_s->conf->bss_expiration_age = bss_expire_age;
return 0;
}
/**
* wpa_supplicant_set_bss_expiration_count - Set BSS entry expiration scan count
* @wpa_s: wpa_supplicant structure for a network interface
* @expire_count: number of scans after which an unseen BSS is reclaimed
* Returns: 0 if succeed or -1 if expire_count has an invalid value
*
*/
int wpa_supplicant_set_bss_expiration_count(struct wpa_supplicant *wpa_s,
unsigned int bss_expire_count)
{
if (bss_expire_count < 1) {
wpa_msg(wpa_s, MSG_ERROR, "Invalid bss expiration count %u",
bss_expire_count);
return -1;
}
wpa_msg(wpa_s, MSG_DEBUG, "Setting bss expiration scan count: %u",
bss_expire_count);
wpa_s->conf->bss_expiration_scan_count = bss_expire_count;
return 0;
}
Create DBus getter/setter for ScanInterval Enable control of wpa_s->scan_interval via D-Bus. This parameter controls the delay between successive scans for a suitable AP. Also, update dbus.doxygen with ScanInterval, and some other parameters that were undocumented. Signed-hostap: Mukesh Agrawal <quiche@chromium.org>
2012-04-01 17:05:22 +02:00
/**
* wpa_supplicant_set_scan_interval - Set scan interval
* @wpa_s: wpa_supplicant structure for a network interface
* @scan_interval: scan interval in seconds
* Returns: 0 if succeed or -1 if scan_interval has an invalid value
*
*/
int wpa_supplicant_set_scan_interval(struct wpa_supplicant *wpa_s,
int scan_interval)
{
if (scan_interval < 0) {
wpa_msg(wpa_s, MSG_ERROR, "Invalid scan interval %d",
scan_interval);
return -1;
}
wpa_msg(wpa_s, MSG_DEBUG, "Setting scan interval: %d sec",
scan_interval);
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_supplicant_update_scan_int(wpa_s, scan_interval);
Create DBus getter/setter for ScanInterval Enable control of wpa_s->scan_interval via D-Bus. This parameter controls the delay between successive scans for a suitable AP. Also, update dbus.doxygen with ScanInterval, and some other parameters that were undocumented. Signed-hostap: Mukesh Agrawal <quiche@chromium.org>
2012-04-01 17:05:22 +02:00
return 0;
}
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
/**
* wpa_supplicant_set_debug_params - Set global debug params
* @global: wpa_global structure
* @debug_level: debug level
* @debug_timestamp: determines if show timestamp in debug data
* @debug_show_keys: determines if show keys in debug data
* Returns: 0 if succeed or -1 if debug_level has wrong value
*/
int wpa_supplicant_set_debug_params(struct wpa_global *global, int debug_level,
int debug_timestamp, int debug_show_keys)
{
int old_level, old_timestamp, old_show_keys;
/* check for allowed debuglevels */
dbus: Add "excessive" to debug_strings The "debug_strings" private array in dbus_new_handles.c has fallen out of sync with wpa_debug.h. Add the new "excessive" level to the head of the list, realigning everything. Signed-off-by: Paul Stewart <pstew@google.com>
2011-03-31 16:38:08 +02:00
if (debug_level != MSG_EXCESSIVE &&
debug_level != MSG_MSGDUMP &&
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +02:00
debug_level != MSG_DEBUG &&
debug_level != MSG_INFO &&
debug_level != MSG_WARNING &&
debug_level != MSG_ERROR)
return -1;
old_level = wpa_debug_level;
old_timestamp = wpa_debug_timestamp;
old_show_keys = wpa_debug_show_keys;
wpa_debug_level = debug_level;
wpa_debug_timestamp = debug_timestamp ? 1 : 0;
wpa_debug_show_keys = debug_show_keys ? 1 : 0;
dbus: Divide DebugParams property to three separate properties
2010-01-01 12:00:22 +01:00
if (wpa_debug_level != old_level)
wpas_notify_debug_level_changed(global);
if (wpa_debug_timestamp != old_timestamp)
wpas_notify_debug_timestamp_changed(global);
if (wpa_debug_show_keys != old_show_keys)
wpas_notify_debug_show_keys_changed(global);
Use shared functions for network operations and param changes Instead of implementing these separately in various control interface handlers, use shared functions. These add some of the previously missing notification calls, too, for the affected areas.
2009-09-13 20:16:43 +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_get_ssid - Get a pointer to the current network structure
* @wpa_s: Pointer to wpa_supplicant data
* Returns: A pointer to the current network structure or %NULL on failure
*/
struct wpa_ssid * wpa_supplicant_get_ssid(struct wpa_supplicant *wpa_s)
{
struct wpa_ssid *entry;
Replace MAX_SSID_LEN with SSID_MAX_LEN This makes source code more consistent. The use within Android driver interface is left as-is to avoid changes in the old PNO interface definition. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-04-07 11:44:39 +02:00
u8 ssid[SSID_MAX_LEN];
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
int res;
size_t ssid_len;
u8 bssid[ETH_ALEN];
int wired;
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
res = wpa_drv_get_ssid(wpa_s, ssid);
if (res < 0) {
wpa_msg(wpa_s, MSG_WARNING, "Could not read SSID from "
"driver");
return NULL;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +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
ssid_len = res;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +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
if (wpa_drv_get_bssid(wpa_s, bssid) < 0) {
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, "Could not read BSSID from "
"driver");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return NULL;
}
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
wired = wpa_s->conf->ap_scan == 0 &&
(wpa_s->drv_flags & WPA_DRIVER_FLAGS_WIRED);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
entry = wpa_s->conf->ssid;
while (entry) {
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, entry) &&
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
((ssid_len == entry->ssid_len &&
os_memcmp(ssid, entry->ssid, ssid_len) == 0) || wired) &&
(!entry->bssid_set ||
os_memcmp(bssid, entry->bssid, ETH_ALEN) == 0))
return entry;
WPS: Added support for wildcard SSID matching in ap_scan=2 mode Change association behavior to match with ap_scan=1 when WPS is used in ap_scan=2 mode with wildcard SSID matching. In addition, allow hardcoded BSSID to be used to select AP even if selected registrar attribute is not present.
2008-12-20 21:55:02 +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, entry) &&
WPS: Added support for wildcard SSID matching in ap_scan=2 mode Change association behavior to match with ap_scan=1 when WPS is used in ap_scan=2 mode with wildcard SSID matching. In addition, allow hardcoded BSSID to be used to select AP even if selected registrar attribute is not present.
2008-12-20 21:55:02 +01:00
(entry->key_mgmt & WPA_KEY_MGMT_WPS) &&
(entry->ssid == NULL || entry->ssid_len == 0) &&
(!entry->bssid_set ||
os_memcmp(bssid, entry->bssid, ETH_ALEN) == 0))
return entry;
#endif /* CONFIG_WPS */
Allow wildcard SSID to be used with WPA-PSK if bssid is set This allows the AP to be selected based on the BSSID when WPA-PSK is used with a passphrase. The PSK will be derived from the passphrase after the SSID has been learned from scan results.
2011-09-30 21:01:42 +02: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
if (!wpas_network_disabled(wpa_s, entry) && entry->bssid_set &&
Allow wildcard SSID to be used with WPA-PSK if bssid is set This allows the AP to be selected based on the BSSID when WPA-PSK is used with a passphrase. The PSK will be derived from the passphrase after the SSID has been learned from scan results.
2011-09-30 21:01:42 +02:00
entry->ssid_len == 0 &&
os_memcmp(bssid, entry->bssid, ETH_ALEN) == 0)
return entry;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
entry = entry->next;
}
return NULL;
}
Postpone global_init() call until first driver instance is initialized This avoids allocating global driver state for driver wrappers that are built in but not used. This can save some resources and avoids failures with driver_nl80211.c that is now initializing netlink connections for nl80211 in global_init().
2011-10-23 12:20:52 +02:00
static int select_driver(struct wpa_supplicant *wpa_s, int i)
{
struct wpa_global *global = wpa_s->global;
if (wpa_drivers[i]->global_init && global->drv_priv[i] == NULL) {
global->drv_priv[i] = wpa_drivers[i]->global_init();
if (global->drv_priv[i] == NULL) {
wpa_printf(MSG_ERROR, "Failed to initialize driver "
"'%s'", wpa_drivers[i]->name);
return -1;
}
}
wpa_s->driver = wpa_drivers[i];
wpa_s->global_drv_priv = global->drv_priv[i];
return 0;
}
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
static int wpa_supplicant_set_driver(struct wpa_supplicant *wpa_s,
const char *name)
{
int i;
Allow multiple driver wrappers to be specified on command line For example, -Dnl80211,wext could be used to automatically select between nl80211 and wext. The first driver wrapper that is able to initialize the interface will be used.
2009-02-14 15:43:43 +01:00
size_t len;
wpa_supplicant: Test all compiled drivers before failing wpa_supplicant_set_driver() is returning an error if the first driver in the driver list is not built in. It should continue through the driver list until it finds one that's built in.
2010-11-09 15:45:27 +01:00
const char *pos, *driver = name;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (wpa_s == NULL)
return -1;
Merge wpa_supplicant and hostapd driver wrapper implementations This commit merges the driver_ops structures and implementations from hostapd/driver*.[ch] into src/drivers. This is only an initial step and there is room for number of cleanups to share code between the hostapd and wpa_supplicant parts of the wrappers to avoid unnecessary source code duplication.
2009-04-09 12:40:12 +02:00
if (wpa_drivers[0] == 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_msg(wpa_s, MSG_ERROR, "No driver interfaces build into "
"wpa_supplicant");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return -1;
}
if (name == NULL) {
/* default to first driver in the list */
Postpone global_init() call until first driver instance is initialized This avoids allocating global driver state for driver wrappers that are built in but not used. This can save some resources and avoids failures with driver_nl80211.c that is now initializing netlink connections for nl80211 in global_init().
2011-10-23 12:20:52 +02:00
return select_driver(wpa_s, 0);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
wpa_supplicant: Test all compiled drivers before failing wpa_supplicant_set_driver() is returning an error if the first driver in the driver list is not built in. It should continue through the driver list until it finds one that's built in.
2010-11-09 15:45:27 +01:00
do {
pos = os_strchr(driver, ',');
if (pos)
len = pos - driver;
else
len = os_strlen(driver);
for (i = 0; wpa_drivers[i]; i++) {
if (os_strlen(wpa_drivers[i]->name) == len &&
os_strncmp(driver, wpa_drivers[i]->name, len) ==
Try fallback drivers if global init for preferred drivers fails Driver global init was considered a hard failure. Thus if, for example, you used the Broadcom STA driver and didn't have nl80211 or cfg80211 loaded into the kernel, and specified a driver value of "nl80211,wext", the nl80211 driver's global init would fail with the following message: nl80211: 'nl80211' generic netlink not found Failed to initialize driver 'nl80211' but since global init was a hard failure, creating the supplicant interface would fail and the WEXT driver would not be tried. Give other drivers a chance instead. Signed-hostap: Dan Williams <dcbw@redhat.com> intended-for: hostap-1
2012-02-04 19:09:00 +01:00
0) {
/* First driver that succeeds wins */
if (select_driver(wpa_s, i) == 0)
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: Test all compiled drivers before failing wpa_supplicant_set_driver() is returning an error if the first driver in the driver list is not built in. It should continue through the driver list until it finds one that's built in.
2010-11-09 15:45:27 +01:00
driver = pos + 1;
} while (pos);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
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_ERROR, "Unsupported driver '%s'", name);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return -1;
}
Use driver event, EVENT_EAPOL_RX, for EAPOL frame indication
2010-01-03 16:44:40 +01:00
/**
* wpa_supplicant_rx_eapol - Deliver a received EAPOL frame to wpa_supplicant
* @ctx: Context pointer (wpa_s); this is the ctx variable registered
* with struct wpa_driver_ops::init()
* @src_addr: Source address of the EAPOL frame
* @buf: EAPOL data starting from the EAPOL header (i.e., no Ethernet header)
* @len: Length of the EAPOL data
*
* This function is called for each received EAPOL frame. Most driver
* interfaces rely on more generic OS mechanism for receiving frames through
* l2_packet, but if such a mechanism is not available, the driver wrapper may
* take care of received EAPOL frames and deliver them to the core supplicant
* code by calling this function.
*/
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
void wpa_supplicant_rx_eapol(void *ctx, const u8 *src_addr,
const u8 *buf, size_t len)
{
struct wpa_supplicant *wpa_s = ctx;
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, "RX EAPOL from " MACSTR, MAC2STR(src_addr));
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_hexdump(MSG_MSGDUMP, "RX EAPOL", buf, len);
Fix PeerKey 4-way handshake The earlier changes to buffer EAPOL frames when not associated to avoid race conditions (especially commit 3ab35a660364dc68eaebfc0df6130071bbee6be5 but maybe something even before that) broke PeerKey 4-way handshake. Fix this by using a separate check before the race condition workaround to process PeerKey 4-way handshake EAPOL-Key messages differently. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-28 10:40:23 +01:00
#ifdef CONFIG_PEERKEY
if (wpa_s->wpa_state > WPA_ASSOCIATED && wpa_s->current_ssid &&
wpa_s->current_ssid->peerkey &&
!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE) &&
wpa_sm_rx_eapol_peerkey(wpa_s->wpa, src_addr, buf, len) == 1) {
wpa_dbg(wpa_s, MSG_DEBUG, "RSN: Processed PeerKey EAPOL-Key");
return;
}
#endif /* CONFIG_PEERKEY */
Extend EAPOL frames processing workaround for roaming cases Commit 1ff733383f3d5c73233ef452a738765667021609 added a mechanism to work around issues due to association events and EAPOL RX events being getting reordered. However, this applied only for the case where wpa_supplicant is not in associated state. The same issue can happen in roaming case with drivers that perform BSS selection internally (or in firmware). Handle that case similarly by delaying received EAPOL frame processing if the source address of the EAPOL frame does not match the current BSSID. Since wired IEEE 802.1X do not have BSSID, make this additional workaround conditional on BSSID match having been observed during the previous association. This fixes issues where the initial EAPOL frame after reassociation was either dropped (e.g., due to replay counter not increasing) or replied to with incorrect destination address (the BSSID of the old AP). This can result in significantly more robust roaming behavior with drivers that do not use wpa_supplicant for BSS selection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-21 20:35:35 +01:00
if (wpa_s->wpa_state < WPA_ASSOCIATED ||
(wpa_s->last_eapol_matches_bssid &&
#ifdef CONFIG_AP
!wpa_s->ap_iface &&
#endif /* CONFIG_AP */
os_memcmp(src_addr, wpa_s->bssid, ETH_ALEN) != 0)) {
Delay processing of EAPOL frames when not associated If an EAPOL frame is received while wpa_supplicant thinks the driver is not associated, queue the frame for processing at the moment when the association event is received. This is a workaround to a race condition in receiving data frames and management events from the kernel. The pending EAPOL frame will not be processed unless an association event is received within 100 msec for the same BSSID.
2009-09-04 17:04:41 +02:00
/*
* There is possible race condition between receiving the
* association event and the EAPOL frame since they are coming
* through different paths from the driver. In order to avoid
* issues in trying to process the EAPOL frame before receiving
* association information, lets queue it for processing until
Extend EAPOL frames processing workaround for roaming cases Commit 1ff733383f3d5c73233ef452a738765667021609 added a mechanism to work around issues due to association events and EAPOL RX events being getting reordered. However, this applied only for the case where wpa_supplicant is not in associated state. The same issue can happen in roaming case with drivers that perform BSS selection internally (or in firmware). Handle that case similarly by delaying received EAPOL frame processing if the source address of the EAPOL frame does not match the current BSSID. Since wired IEEE 802.1X do not have BSSID, make this additional workaround conditional on BSSID match having been observed during the previous association. This fixes issues where the initial EAPOL frame after reassociation was either dropped (e.g., due to replay counter not increasing) or replied to with incorrect destination address (the BSSID of the old AP). This can result in significantly more robust roaming behavior with drivers that do not use wpa_supplicant for BSS selection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-21 20:35:35 +01:00
* the association event is received. This may also be needed in
* driver-based roaming case, so also use src_addr != BSSID as a
* trigger if we have previously confirmed that the
* Authenticator uses BSSID as the src_addr (which is not the
* case with wired IEEE 802.1X).
Delay processing of EAPOL frames when not associated If an EAPOL frame is received while wpa_supplicant thinks the driver is not associated, queue the frame for processing at the moment when the association event is received. This is a workaround to a race condition in receiving data frames and management events from the kernel. The pending EAPOL frame will not be processed unless an association event is received within 100 msec for the same BSSID.
2009-09-04 17:04:41 +02:00
*/
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, "Not associated - Delay processing "
Extend EAPOL frames processing workaround for roaming cases Commit 1ff733383f3d5c73233ef452a738765667021609 added a mechanism to work around issues due to association events and EAPOL RX events being getting reordered. However, this applied only for the case where wpa_supplicant is not in associated state. The same issue can happen in roaming case with drivers that perform BSS selection internally (or in firmware). Handle that case similarly by delaying received EAPOL frame processing if the source address of the EAPOL frame does not match the current BSSID. Since wired IEEE 802.1X do not have BSSID, make this additional workaround conditional on BSSID match having been observed during the previous association. This fixes issues where the initial EAPOL frame after reassociation was either dropped (e.g., due to replay counter not increasing) or replied to with incorrect destination address (the BSSID of the old AP). This can result in significantly more robust roaming behavior with drivers that do not use wpa_supplicant for BSS selection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-21 20:35:35 +01:00
"of received EAPOL frame (state=%s bssid=" MACSTR ")",
wpa_supplicant_state_txt(wpa_s->wpa_state),
MAC2STR(wpa_s->bssid));
Delay processing of EAPOL frames when not associated If an EAPOL frame is received while wpa_supplicant thinks the driver is not associated, queue the frame for processing at the moment when the association event is received. This is a workaround to a race condition in receiving data frames and management events from the kernel. The pending EAPOL frame will not be processed unless an association event is received within 100 msec for the same BSSID.
2009-09-04 17:04:41 +02:00
wpabuf_free(wpa_s->pending_eapol_rx);
wpa_s->pending_eapol_rx = wpabuf_alloc_copy(buf, len);
if (wpa_s->pending_eapol_rx) {
wpa_supplicant: Use monotonic time for EAPOL RX workaround The EAPOL RX workaround checks that the events are less than 100 ms apart, so only uses relative times and should use monotonic time. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-12-16 21:08:33 +01:00
os_get_reltime(&wpa_s->pending_eapol_rx_time);
Delay processing of EAPOL frames when not associated If an EAPOL frame is received while wpa_supplicant thinks the driver is not associated, queue the frame for processing at the moment when the association event is received. This is a workaround to a race condition in receiving data frames and management events from the kernel. The pending EAPOL frame will not be processed unless an association event is received within 100 msec for the same BSSID.
2009-09-04 17:04:41 +02:00
os_memcpy(wpa_s->pending_eapol_rx_src, src_addr,
ETH_ALEN);
}
return;
}
Extend EAPOL frames processing workaround for roaming cases Commit 1ff733383f3d5c73233ef452a738765667021609 added a mechanism to work around issues due to association events and EAPOL RX events being getting reordered. However, this applied only for the case where wpa_supplicant is not in associated state. The same issue can happen in roaming case with drivers that perform BSS selection internally (or in firmware). Handle that case similarly by delaying received EAPOL frame processing if the source address of the EAPOL frame does not match the current BSSID. Since wired IEEE 802.1X do not have BSSID, make this additional workaround conditional on BSSID match having been observed during the previous association. This fixes issues where the initial EAPOL frame after reassociation was either dropped (e.g., due to replay counter not increasing) or replied to with incorrect destination address (the BSSID of the old AP). This can result in significantly more robust roaming behavior with drivers that do not use wpa_supplicant for BSS selection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-21 20:35:35 +01:00
wpa_s->last_eapol_matches_bssid =
os_memcmp(src_addr, wpa_s->bssid, ETH_ALEN) == 0;
wpa_supplicant AP: Add EAPOL frame TX and RX This allows WPA-Personal 4-way handshake to be completed successfully.
2009-04-20 15:27:45 +02:00
#ifdef CONFIG_AP
if (wpa_s->ap_iface) {
wpa_supplicant_ap_rx_eapol(wpa_s, src_addr, buf, len);
return;
}
#endif /* CONFIG_AP */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (wpa_s->key_mgmt == WPA_KEY_MGMT_NONE) {
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, "Ignored received EAPOL frame since "
"no key management is configured");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return;
}
if (wpa_s->eapol_received == 0 &&
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
(!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE) ||
Added support for using SHA256-based stronger key derivation for WPA2 IEEE 802.11w/D6.0 defines new AKMPs to indicate SHA256-based algorithms for key derivation (and AES-CMAC for EAPOL-Key MIC). Add support for using new AKMPs and clean up AKMP processing with helper functions in defs.h.
2008-08-31 21:57:28 +02:00
!wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt) ||
IBSS RSN: Wait for connection event and do not use auth timeout Wait for connection (IBSS join completed) event before marking state completed. In addition, do not use the station mode authentication timeout since that can trigger full disconnection from IBSS when there is a timeout with just one of the peers.
2009-12-04 21:09:06 +01:00
wpa_s->wpa_state != WPA_COMPLETED) &&
(wpa_s->current_ssid == NULL ||
wpa_s->current_ssid->mode != IEEE80211_MODE_IBSS)) {
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
/* Timeout for completing IEEE 802.1X and WPA authentication */
WPS: Use shorter authentication timeout during no-SelReg iteration When iterating through WPS APs that do not advertise Selected Registrar TRUE, limit the authentication timeout to 10 seconds instead of the full 70 second value used with IEEE 802.1X/EAP/WPS in general. This helps speed up AP iteration for cases where a selected AP misbehaves and does not reply to EAP exchanges. This should not really be needed, but there seems to be deployed APs that do not implement WPS correctly and with such APs in the radio range, this extra timeout can speed up the iteration to allow the correct AP to be found before the WPS operation times out. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-04-24 15:45:27 +02:00
int timeout = 10;
if (wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt) ||
wpa_s->key_mgmt == WPA_KEY_MGMT_IEEE8021X_NO_WPA ||
wpa_s->key_mgmt == WPA_KEY_MGMT_WPS) {
/* Use longer timeout for IEEE 802.1X/EAP */
timeout = 70;
}
WPS: Fix build without CONFIG_WPS=y Commit 5add4101626b23c11f073630770896465d9cc8f3 ('WPS: Use shorter authentication timeout during no-SelReg iteration') broke the build with WPS disabled. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-05-24 09:33:26 +02:00
#ifdef CONFIG_WPS
WPS: Use shorter authentication timeout during no-SelReg iteration When iterating through WPS APs that do not advertise Selected Registrar TRUE, limit the authentication timeout to 10 seconds instead of the full 70 second value used with IEEE 802.1X/EAP/WPS in general. This helps speed up AP iteration for cases where a selected AP misbehaves and does not reply to EAP exchanges. This should not really be needed, but there seems to be deployed APs that do not implement WPS correctly and with such APs in the radio range, this extra timeout can speed up the iteration to allow the correct AP to be found before the WPS operation times out. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-04-24 15:45:27 +02:00
if (wpa_s->current_ssid && wpa_s->current_bss &&
(wpa_s->current_ssid->key_mgmt & WPA_KEY_MGMT_WPS) &&
eap_is_wps_pin_enrollee(&wpa_s->current_ssid->eap)) {
/*
* Use shorter timeout if going through WPS AP iteration
* for PIN config method with an AP that does not
* advertise Selected Registrar.
*/
struct wpabuf *wps_ie;
wps_ie = wpa_bss_get_vendor_ie_multi(
wpa_s->current_bss, WPS_IE_VENDOR_TYPE);
WPS: Fix shorter authentication timeout during no-SelReg iteration Commit 5add4101626b23c11f073630770896465d9cc8f3 ('WPS: Use shorter authentication timeout during no-SelReg iteration') added a new condition on reducing the authentication timeout for the WPS AP iteration process. However, due it ended up copy-pasting an incorrect condition for this. This was supposed to apply for PIN-based config method advertisement, not PBC. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-04-27 23:12:36 +02:00
if (wps_ie &&
!wps_is_addr_authorized(wps_ie, wpa_s->own_addr, 1))
WPS: Use shorter authentication timeout during no-SelReg iteration When iterating through WPS APs that do not advertise Selected Registrar TRUE, limit the authentication timeout to 10 seconds instead of the full 70 second value used with IEEE 802.1X/EAP/WPS in general. This helps speed up AP iteration for cases where a selected AP misbehaves and does not reply to EAP exchanges. This should not really be needed, but there seems to be deployed APs that do not implement WPS correctly and with such APs in the radio range, this extra timeout can speed up the iteration to allow the correct AP to be found before the WPS operation times out. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-04-24 15:45:27 +02:00
timeout = 10;
wpabuf_free(wps_ie);
}
WPS: Fix build without CONFIG_WPS=y Commit 5add4101626b23c11f073630770896465d9cc8f3 ('WPS: Use shorter authentication timeout during no-SelReg iteration') broke the build with WPS disabled. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-05-24 09:33:26 +02:00
#endif /* CONFIG_WPS */
WPS: Use shorter authentication timeout during no-SelReg iteration When iterating through WPS APs that do not advertise Selected Registrar TRUE, limit the authentication timeout to 10 seconds instead of the full 70 second value used with IEEE 802.1X/EAP/WPS in general. This helps speed up AP iteration for cases where a selected AP misbehaves and does not reply to EAP exchanges. This should not really be needed, but there seems to be deployed APs that do not implement WPS correctly and with such APs in the radio range, this extra timeout can speed up the iteration to allow the correct AP to be found before the WPS operation times out. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-04-24 15:45:27 +02:00
wpa_supplicant_req_auth_timeout(wpa_s, timeout, 0);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
wpa_s->eapol_received++;
if (wpa_s->countermeasures) {
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_INFO, "WPA: Countermeasures - dropped "
"EAPOL packet");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return;
}
Process received EAPOL frames in IBSS RSN code if in IBSS mode
2009-01-17 16:25:11 +01:00
#ifdef CONFIG_IBSS_RSN
if (wpa_s->current_ssid &&
Define struct wpa_ssid::mode as an enum with more readable values
2009-12-28 15:00:36 +01:00
wpa_s->current_ssid->mode == WPAS_MODE_IBSS) {
Process received EAPOL frames in IBSS RSN code if in IBSS mode
2009-01-17 16:25:11 +01:00
ibss_rsn_rx_eapol(wpa_s->ibss_rsn, src_addr, buf, len);
return;
}
#endif /* CONFIG_IBSS_RSN */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
/* Source address of the incoming EAPOL frame could be compared to the
* current BSSID. However, it is possible that a centralized
* Authenticator could be using another MAC address than the BSSID of
* an AP, so just allow any address to be used for now. The replies are
* still sent to the current BSSID (if available), though. */
os_memcpy(wpa_s->last_eapol_src, src_addr, ETH_ALEN);
Added support for using SHA256-based stronger key derivation for WPA2 IEEE 802.11w/D6.0 defines new AKMPs to indicate SHA256-based algorithms for key derivation (and AES-CMAC for EAPOL-Key MIC). Add support for using new AKMPs and clean up AKMP processing with helper functions in defs.h.
2008-08-31 21:57:28 +02:00
if (!wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt) &&
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
eapol_sm_rx_eapol(wpa_s->eapol, src_addr, buf, len) > 0)
return;
wpa_drv_poll(wpa_s);
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->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE))
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_sm_rx_eapol(wpa_s->wpa, src_addr, buf, len);
Added support for using SHA256-based stronger key derivation for WPA2 IEEE 802.11w/D6.0 defines new AKMPs to indicate SHA256-based algorithms for key derivation (and AES-CMAC for EAPOL-Key MIC). Add support for using new AKMPs and clean up AKMP processing with helper functions in defs.h.
2008-08-31 21:57:28 +02:00
else if (wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt)) {
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
/*
* Set portValid = TRUE here since we are going to skip 4-way
* handshake processing which would normally set portValid. We
* need this to allow the EAPOL state machines to be completed
* without going through EAPOL-Key handshake.
*/
eapol_sm_notify_portValid(wpa_s->eapol, TRUE);
}
}
Update internal MAC address on EVENT_INTERFACE_ENABLED events This allows the MAC address of the interface to be changed when the interface is set down even if the interface does not get completed removed and re-added. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-03 12:20:40 +01:00
int wpa_supplicant_update_mac_addr(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
{
Remove unused send_eapol() driver op The send_eapol() callback was used by driver_test.c, but with that removed, there is no remaining users of the alternative EAPOL frame transmitting mechanism in wpa_supplicant, i.e., all remaining driver interfaces use l2_packet instead. Remove the send_eapol() to get rid of unused code. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-11 14:40:07 +01:00
if ((!wpa_s->p2p_mgmt ||
!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_DEDICATED_P2P_DEVICE)) &&
!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_P2P_DEDICATED_INTERFACE)) {
Update internal MAC address on EVENT_INTERFACE_ENABLED events This allows the MAC address of the interface to be changed when the interface is set down even if the interface does not get completed removed and re-added. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-03 12:20:40 +01:00
l2_packet_deinit(wpa_s->l2);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_s->l2 = l2_packet_init(wpa_s->ifname,
wpa_drv_get_mac_addr(wpa_s),
ETH_P_EAPOL,
wpa_supplicant_rx_eapol, wpa_s, 0);
if (wpa_s->l2 == NULL)
return -1;
P2P: Do not register l2_packet on dedicated P2P device interface
2010-07-18 23:30:25 +02:00
} else {
const u8 *addr = wpa_drv_get_mac_addr(wpa_s);
if (addr)
os_memcpy(wpa_s->own_addr, addr, ETH_ALEN);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
if (wpa_s->l2 && l2_packet_get_own_addr(wpa_s->l2, wpa_s->own_addr)) {
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_ERROR, "Failed to get own L2 address");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return -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
wpa_sm_set_own_addr(wpa_s->wpa, wpa_s->own_addr);
Update internal MAC address on EVENT_INTERFACE_ENABLED events This allows the MAC address of the interface to be changed when the interface is set down even if the interface does not get completed removed and re-added. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-03 12:20:40 +01:00
return 0;
}
Filter station mode EAPOL RX on bridge interface based on destination If multiple station mode radios are bridged together on the same device, it is possible for wpa_supplicant to receive EAPOL frames from the bridge interface and then process them separately for each interface. This can results in problems since multiple instances of supplicant side could end up trying to process a single 4-way handshake. Avoid this problem by filtering bridge interface EAPOL RX based on the desctination MAC address. It should be noted that this works only when unicast addresses are used (e.g., with WLAN) and not with the IEEE 802.1X EAPOL group address (e.g., most wired networks). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-05 14:22:42 +01:00
static void wpa_supplicant_rx_eapol_bridge(void *ctx, const u8 *src_addr,
const u8 *buf, size_t len)
{
struct wpa_supplicant *wpa_s = ctx;
const struct l2_ethhdr *eth;
if (len < sizeof(*eth))
return;
eth = (const struct l2_ethhdr *) buf;
if (os_memcmp(eth->h_dest, wpa_s->own_addr, ETH_ALEN) != 0 &&
!(eth->h_dest[0] & 0x01)) {
wpa_dbg(wpa_s, MSG_DEBUG, "RX EAPOL from " MACSTR " to " MACSTR
" (bridge - not for this interface - ignore)",
MAC2STR(src_addr), MAC2STR(eth->h_dest));
return;
}
wpa_dbg(wpa_s, MSG_DEBUG, "RX EAPOL from " MACSTR " to " MACSTR
" (bridge)", MAC2STR(src_addr), MAC2STR(eth->h_dest));
wpa_supplicant_rx_eapol(wpa_s, src_addr, buf + sizeof(*eth),
len - sizeof(*eth));
}
Update internal MAC address on EVENT_INTERFACE_ENABLED events This allows the MAC address of the interface to be changed when the interface is set down even if the interface does not get completed removed and re-added. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-03 12:20:40 +01:00
/**
* wpa_supplicant_driver_init - Initialize driver interface parameters
* @wpa_s: Pointer to wpa_supplicant data
* Returns: 0 on success, -1 on failure
*
* This function is called to initialize driver interface parameters.
* wpa_drv_init() must have been called before this function to initialize the
* driver interface.
*/
int wpa_supplicant_driver_init(struct wpa_supplicant *wpa_s)
{
static int interface_count = 0;
if (wpa_supplicant_update_mac_addr(wpa_s) < 0)
return -1;
P2P: Create P2P Device interface if supported If the capability flag of the driver indicates a dedicated P2P Device is supported, a P2P Device interface is created. Create the P2P Device in main interface creation loop when the added interface flags support and P2P supplicant is not yet initialized avoiding recursion of add_interface. Do not register l2_packet for P2P Device interface (both for EAPOL and for TDLS). Signed-hostap: Arend van Spriel <arend@broadcom.com>
2013-06-30 09:17:47 +02:00
wpa_dbg(wpa_s, MSG_DEBUG, "Own MAC address: " MACSTR,
MAC2STR(wpa_s->own_addr));
Extend random MAC address support to allow OUI to be kept mac_addr=2 and preassoc_mac_addr=2 parameters can now be used to configure random MAC address to be generated by maintaining the OUI part of the permanent MAC address (but with locally administered bit set to 1). Other than that, these values result in similar behavior with mac_addr=1 and preassoc_mac_addr=1, respectively. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-09-29 22:24:19 +02:00
os_memcpy(wpa_s->perm_addr, wpa_s->own_addr, ETH_ALEN);
P2P: Create P2P Device interface if supported If the capability flag of the driver indicates a dedicated P2P Device is supported, a P2P Device interface is created. Create the P2P Device in main interface creation loop when the added interface flags support and P2P supplicant is not yet initialized avoiding recursion of add_interface. Do not register l2_packet for P2P Device interface (both for EAPOL and for TDLS). Signed-hostap: Arend van Spriel <arend@broadcom.com>
2013-06-30 09:17:47 +02:00
wpa_sm_set_own_addr(wpa_s->wpa, wpa_s->own_addr);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (wpa_s->bridge_ifname[0]) {
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, "Receiving packets from bridge "
"interface '%s'", wpa_s->bridge_ifname);
Work around Linux packet socket regression Linux kernel commit 576eb62598f10c8c7fd75703fe89010cdcfff596 ('bridge: respect RFC2863 operational state') from 2012 introduced a regression for using wpa_supplicant with EAPOL frames and a station interface in a bridge. Since it does not look like this regression is going to get fixed any time soon (it is already two years from that commit and over 1.5 from a discussion pointing out the regression), add a workaround in wpa_supplicant to avoid this issue. The wpa_supplicant workaround uses a secondary packet socket to capture all frames (ETH_P_ALL) from the netdev that is in a bridge. This is needed to avoid the kernel regression. However, this comes at the price of more CPU load. Some of this is avoided with use of Linux socket filter, but still, this is less efficient than a packet socket bound to the specific EAPOL ethertype. The workaround gets disabled automatically, if the main packet socket interface on the bridge interface turns out to be working for RX (e.g., due to an old kernel version being used or a new kernel version having a fix for the regression). In addition, this workaround is only taken into use for the special case of running wpa_supplicant with an interface in a bridge. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-31 16:21:58 +01:00
wpa_s->l2_br = l2_packet_init_bridge(
wpa_s->bridge_ifname, wpa_s->ifname, wpa_s->own_addr,
ETH_P_EAPOL, wpa_supplicant_rx_eapol_bridge, wpa_s, 1);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (wpa_s->l2_br == 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_msg(wpa_s, MSG_ERROR, "Failed to open l2_packet "
"connection for the bridge interface '%s'",
wpa_s->bridge_ifname);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return -1;
}
}
Make it clearer that ap_scan=2 mode should not be used with nl80211 Add more details into configuration comments and a runtime info message if ap_scan=2 is used with the nl80211 driver interface. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-09-05 00:04:29 +02:00
if (wpa_s->conf->ap_scan == 2 &&
os_strcmp(wpa_s->driver->name, "nl80211") == 0) {
wpa_printf(MSG_INFO,
"Note: nl80211 driver interface is not designed to be used with ap_scan=2; this can result in connection failures");
}
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_clear_keys(wpa_s, NULL);
/* Make sure that TKIP countermeasures are not left enabled (could
* happen if wpa_supplicant is killed during countermeasures. */
wpa_drv_set_countermeasures(wpa_s, 0);
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, "RSN: flushing PMKID list in the driver");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_drv_flush_pmkid(wpa_s);
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;
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;
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)) {
Use minimal scan delay upon EVENT_INTERFACE_ADDED This patch resets the static interface_count to zero in case of wpa_supplicant_driver_init() call for wpa_s which is in INTERFACE_DISABLED state. This interface_count is used for the delay of the scan which is now minimal for dynamically added interfaces. This may collide with a scan for another interface, but the same is true for any chosen delay in this scenario. Also the state change to DISCONNECTED is moved to wpa_supplicant_driver_init() so it will move from INTERFACE_DISABLED to INACTIVE when there are no enabled networks. Tested-by: Hante Meuleman <meuleman@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com>
2014-01-15 10:11:33 +01:00
if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED) {
wpa_supplicant_set_state(wpa_s, WPA_DISCONNECTED);
interface_count = 0;
}
Do not trigger the scan during initialization on Android platforms Android framework maintains a state to process the scan results after the scan is issued. If wpa_supplicant issues the scan during the initialization, the one issued by the framework may fail (with EBUSY) if the host driver is already processing the scan. Thus, the scan results returned for the first scan triggered by wpa_supplicant are not processed for getting displayed resulting in delay for the display of the first scan results after the Wi-Fi subsystem initialization. Thus, trigger the scan only based on the framework request on Android. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-17 08:17:10 +01:00
#ifndef ANDROID
P2P: Do not start scan for P2P Device interfaces at driver init wpa_supplicant started delayed sched scan also on P2P Device interfaces, resulting in erroneous scans and connection attempts. Skip that on driver init when the interface is dedicated only for P2P management purposes. Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
2014-03-03 13:53:23 +01:00
if (!wpa_s->p2p_mgmt &&
wpa_supplicant: Put upper bound on initial scan time delay This makes stations associate much faster when using lots of stations. In addition, this avoids delaying the initial scan continuously for dynamic interface removal/addition cases. Signed-hostap: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:49 +01:00
wpa_supplicant_delayed_sched_scan(wpa_s,
interface_count % 3,
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
100000))
wpa_supplicant: Put upper bound on initial scan time delay This makes stations associate much faster when using lots of stations. In addition, this avoids delaying the initial scan continuously for dynamic interface removal/addition cases. Signed-hostap: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:49 +01:00
wpa_supplicant_req_scan(wpa_s, interface_count % 3,
Use sched_scan in driver init This patch uses sched_scan, if available, when the driver is initialized. It also adds a couple of cancel operations where appropriate. Signed-off-by: Luciano Coelho <coelho@ti.com>
2011-09-27 21:21:31 +02:00
100000);
Do not trigger the scan during initialization on Android platforms Android framework maintains a state to process the scan results after the scan is issued. If wpa_supplicant issues the scan during the initialization, the one issued by the framework may fail (with EBUSY) if the host driver is already processing the scan. Thus, the scan results returned for the first scan triggered by wpa_supplicant are not processed for getting displayed resulting in delay for the display of the first scan results after the Wi-Fi subsystem initialization. Thus, trigger the scan only based on the framework request on Android. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-17 08:17:10 +01:00
#endif /* ANDROID */
Do not trigger initial scan if there are no enabled networks This allows wpa_supplicant to be started quickly with an empty configuration. If an external program wants to fetch scan results from wpa_supplicant, it will need to request a scan explicitly in this type of case.
2010-04-16 17:56:23 +02:00
interface_count++;
} else
wpa_supplicant_set_state(wpa_s, WPA_INACTIVE);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return 0;
}
static int wpa_supplicant_daemon(const char *pid_file)
{
wpa_printf(MSG_DEBUG, "Daemonize..");
return os_daemonize(pid_file);
}
P2P: Fix interface deinit for failed group interface initialization wpa_supplicant_deinit_iface() ends up removing all P2P groups if the removed interface is the parent interface. This is correct behavior in general, but this resulted in issues in the new group interface initialization error path since wpa_s->parent was not assigned before hitting this check. Fix this by assigning wpa_s->parent as part of wpa_supplicant_add_iface(). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 20:50:34 +01:00
static struct wpa_supplicant *
wpa_supplicant_alloc(struct wpa_supplicant *parent)
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
{
struct wpa_supplicant *wpa_s;
wpa_s = os_zalloc(sizeof(*wpa_s));
if (wpa_s == NULL)
return NULL;
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 = INITIAL_SCAN_REQ;
Make scan interval configurable It is now possible to configure the the time in seconds that wpa_supplicant waits before requesting a new scan after failing to find a suitable network in scan results. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-04-11 22:14:38 +02:00
wpa_s->scan_interval = 5;
Initialize new_connection = 1 to fix wpa_supplicant AP mode operstate When setting up an AP with wpa_supplicant, the initial connection was not necessarily setting oper state from DORMANT to UP which would be blocking normal data frames. Fix this by initializing new_connection to 1 so that even the first change to COMPLETED state will end up setting oper state.
2009-12-15 12:17:56 +01:00
wpa_s->new_connection = 1;
P2P: Fix interface deinit for failed group interface initialization wpa_supplicant_deinit_iface() ends up removing all P2P groups if the removed interface is the parent interface. This is correct behavior in general, but this resulted in issues in the new group interface initialization error path since wpa_s->parent was not assigned before hitting this check. Fix this by assigning wpa_s->parent as part of wpa_supplicant_add_iface(). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 20:50:34 +01:00
wpa_s->parent = parent ? parent : 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
wpa_s->sched_scanning = 0;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return wpa_s;
}
Support HT capability overrides This allows HT capabilities overrides on kernels that support these features. MCS Rates can be disabled to force to slower speeds when using HT. Rates cannot be forced higher. HT can be disabled, forcing an 802.11a/b/g/n station to act like an 802.11a/b/g station. HT40 can be disabled. MAX A-MSDU can be disabled. A-MPDU Factor and A-MPDU Density can be modified. Please note that these are suggestions to the kernel. Only mac80211 drivers will work at all. The A-MPDU Factor can only be decreased and the A-MPDU Density can only be increased currently. Signed-hostap: Ben Greear <greearb@candelatech.com>
2012-01-29 20:01:31 +01:00
#ifdef CONFIG_HT_OVERRIDES
static int wpa_set_htcap_mcs(struct wpa_supplicant *wpa_s,
struct ieee80211_ht_capabilities *htcaps,
struct ieee80211_ht_capabilities *htcaps_mask,
const char *ht_mcs)
{
/* parse ht_mcs into hex array */
int i;
const char *tmp = ht_mcs;
char *end = NULL;
/* If ht_mcs is null, do not set anything */
if (!ht_mcs)
return 0;
/* This is what we are setting in the kernel */
os_memset(&htcaps->supported_mcs_set, 0, IEEE80211_HT_MCS_MASK_LEN);
wpa_msg(wpa_s, MSG_DEBUG, "set_htcap, ht_mcs -:%s:-", ht_mcs);
for (i = 0; i < IEEE80211_HT_MCS_MASK_LEN; i++) {
errno = 0;
long v = strtol(tmp, &end, 16);
if (errno == 0) {
wpa_msg(wpa_s, MSG_DEBUG,
"htcap value[%i]: %ld end: %p tmp: %p",
i, v, end, tmp);
if (end == tmp)
break;
htcaps->supported_mcs_set[i] = v;
tmp = end;
} else {
wpa_msg(wpa_s, MSG_ERROR,
"Failed to parse ht-mcs: %s, error: %s\n",
ht_mcs, strerror(errno));
return -1;
}
}
/*
* If we were able to parse any values, then set mask for the MCS set.
*/
if (i) {
os_memset(&htcaps_mask->supported_mcs_set, 0xff,
IEEE80211_HT_MCS_MASK_LEN - 1);
/* skip the 3 reserved bits */
htcaps_mask->supported_mcs_set[IEEE80211_HT_MCS_MASK_LEN - 1] =
0x1f;
}
return 0;
}
static int wpa_disable_max_amsdu(struct wpa_supplicant *wpa_s,
struct ieee80211_ht_capabilities *htcaps,
struct ieee80211_ht_capabilities *htcaps_mask,
int disabled)
{
Fix some sparse warnings about u16 vs. le16 Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-07-02 12:12:36 +02:00
le16 msk;
Support HT capability overrides This allows HT capabilities overrides on kernels that support these features. MCS Rates can be disabled to force to slower speeds when using HT. Rates cannot be forced higher. HT can be disabled, forcing an 802.11a/b/g/n station to act like an 802.11a/b/g station. HT40 can be disabled. MAX A-MSDU can be disabled. A-MPDU Factor and A-MPDU Density can be modified. Please note that these are suggestions to the kernel. Only mac80211 drivers will work at all. The A-MPDU Factor can only be decreased and the A-MPDU Density can only be increased currently. Signed-hostap: Ben Greear <greearb@candelatech.com>
2012-01-29 20:01:31 +01:00
wpa_msg(wpa_s, MSG_DEBUG, "set_disable_max_amsdu: %d", disabled);
if (disabled == -1)
return 0;
msk = host_to_le16(HT_CAP_INFO_MAX_AMSDU_SIZE);
htcaps_mask->ht_capabilities_info |= msk;
if (disabled)
htcaps->ht_capabilities_info &= msk;
else
htcaps->ht_capabilities_info |= msk;
return 0;
}
static int wpa_set_ampdu_factor(struct wpa_supplicant *wpa_s,
struct ieee80211_ht_capabilities *htcaps,
struct ieee80211_ht_capabilities *htcaps_mask,
int factor)
{
wpa_msg(wpa_s, MSG_DEBUG, "set_ampdu_factor: %d", factor);
if (factor == -1)
return 0;
if (factor < 0 || factor > 3) {
wpa_msg(wpa_s, MSG_ERROR, "ampdu_factor: %d out of range. "
"Must be 0-3 or -1", factor);
return -EINVAL;
}
htcaps_mask->a_mpdu_params |= 0x3; /* 2 bits for factor */
htcaps->a_mpdu_params &= ~0x3;
htcaps->a_mpdu_params |= factor & 0x3;
return 0;
}
static int wpa_set_ampdu_density(struct wpa_supplicant *wpa_s,
struct ieee80211_ht_capabilities *htcaps,
struct ieee80211_ht_capabilities *htcaps_mask,
int density)
{
wpa_msg(wpa_s, MSG_DEBUG, "set_ampdu_density: %d", density);
if (density == -1)
return 0;
if (density < 0 || density > 7) {
wpa_msg(wpa_s, MSG_ERROR,
"ampdu_density: %d out of range. Must be 0-7 or -1.",
density);
return -EINVAL;
}
htcaps_mask->a_mpdu_params |= 0x1C;
htcaps->a_mpdu_params &= ~(0x1C);
htcaps->a_mpdu_params |= (density << 2) & 0x1C;
return 0;
}
static int wpa_set_disable_ht40(struct wpa_supplicant *wpa_s,
struct ieee80211_ht_capabilities *htcaps,
struct ieee80211_ht_capabilities *htcaps_mask,
int disabled)
{
/* Masking these out disables HT40 */
Fix some sparse warnings about u16 vs. le16 Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-07-02 12:12:36 +02:00
le16 msk = host_to_le16(HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET |
HT_CAP_INFO_SHORT_GI40MHZ);
Support HT capability overrides This allows HT capabilities overrides on kernels that support these features. MCS Rates can be disabled to force to slower speeds when using HT. Rates cannot be forced higher. HT can be disabled, forcing an 802.11a/b/g/n station to act like an 802.11a/b/g station. HT40 can be disabled. MAX A-MSDU can be disabled. A-MPDU Factor and A-MPDU Density can be modified. Please note that these are suggestions to the kernel. Only mac80211 drivers will work at all. The A-MPDU Factor can only be decreased and the A-MPDU Density can only be increased currently. Signed-hostap: Ben Greear <greearb@candelatech.com>
2012-01-29 20:01:31 +01:00
wpa_msg(wpa_s, MSG_DEBUG, "set_disable_ht40: %d", disabled);
if (disabled)
htcaps->ht_capabilities_info &= ~msk;
else
htcaps->ht_capabilities_info |= msk;
htcaps_mask->ht_capabilities_info |= msk;
return 0;
}
wpa_supplicant: Allow user to disable short guard interval (SGI) Requires Linux kernel patch to make the SGI-20 properly disabled. SGI-40 will already work since Linux 3.4 or so. Signed-hostap: Ben Greear <greearb@candelatech.com> Signed-off-by: Ben Greear <greearb@candelatech.com>
2012-12-18 13:44:15 +01:00
static int wpa_set_disable_sgi(struct wpa_supplicant *wpa_s,
struct ieee80211_ht_capabilities *htcaps,
struct ieee80211_ht_capabilities *htcaps_mask,
int disabled)
{
/* Masking these out disables SGI */
Fix some sparse warnings about u16 vs. le16 Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-07-02 12:12:36 +02:00
le16 msk = host_to_le16(HT_CAP_INFO_SHORT_GI20MHZ |
HT_CAP_INFO_SHORT_GI40MHZ);
wpa_supplicant: Allow user to disable short guard interval (SGI) Requires Linux kernel patch to make the SGI-20 properly disabled. SGI-40 will already work since Linux 3.4 or so. Signed-hostap: Ben Greear <greearb@candelatech.com> Signed-off-by: Ben Greear <greearb@candelatech.com>
2012-12-18 13:44:15 +01:00
wpa_msg(wpa_s, MSG_DEBUG, "set_disable_sgi: %d", disabled);
if (disabled)
htcaps->ht_capabilities_info &= ~msk;
else
htcaps->ht_capabilities_info |= msk;
htcaps_mask->ht_capabilities_info |= msk;
return 0;
}
wpa_supplicant: Allow disabling LDPC Allows user to disable LDPC coding. This possibility is useful for testing purpose. Signed-off-by: Pawel Kulakowski <pawel.kulakowski@tieto.com>
2014-04-01 07:16:00 +02:00
static int wpa_set_disable_ldpc(struct wpa_supplicant *wpa_s,
struct ieee80211_ht_capabilities *htcaps,
struct ieee80211_ht_capabilities *htcaps_mask,
int disabled)
{
/* Masking these out disables LDPC */
Fix some sparse warnings about u16 vs. le16 Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-07-02 12:12:36 +02:00
le16 msk = host_to_le16(HT_CAP_INFO_LDPC_CODING_CAP);
wpa_supplicant: Allow disabling LDPC Allows user to disable LDPC coding. This possibility is useful for testing purpose. Signed-off-by: Pawel Kulakowski <pawel.kulakowski@tieto.com>
2014-04-01 07:16:00 +02:00
wpa_msg(wpa_s, MSG_DEBUG, "set_disable_ldpc: %d", disabled);
if (disabled)
htcaps->ht_capabilities_info &= ~msk;
else
htcaps->ht_capabilities_info |= msk;
htcaps_mask->ht_capabilities_info |= msk;
return 0;
}
Support HT capability overrides This allows HT capabilities overrides on kernels that support these features. MCS Rates can be disabled to force to slower speeds when using HT. Rates cannot be forced higher. HT can be disabled, forcing an 802.11a/b/g/n station to act like an 802.11a/b/g station. HT40 can be disabled. MAX A-MSDU can be disabled. A-MPDU Factor and A-MPDU Density can be modified. Please note that these are suggestions to the kernel. Only mac80211 drivers will work at all. The A-MPDU Factor can only be decreased and the A-MPDU Density can only be increased currently. Signed-hostap: Ben Greear <greearb@candelatech.com>
2012-01-29 20:01:31 +01:00
void wpa_supplicant_apply_ht_overrides(
struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid,
struct wpa_driver_associate_params *params)
{
struct ieee80211_ht_capabilities *htcaps;
struct ieee80211_ht_capabilities *htcaps_mask;
if (!ssid)
return;
params->disable_ht = ssid->disable_ht;
if (!params->htcaps || !params->htcaps_mask)
return;
htcaps = (struct ieee80211_ht_capabilities *) params->htcaps;
htcaps_mask = (struct ieee80211_ht_capabilities *) params->htcaps_mask;
wpa_set_htcap_mcs(wpa_s, htcaps, htcaps_mask, ssid->ht_mcs);
wpa_disable_max_amsdu(wpa_s, htcaps, htcaps_mask,
ssid->disable_max_amsdu);
wpa_set_ampdu_factor(wpa_s, htcaps, htcaps_mask, ssid->ampdu_factor);
wpa_set_ampdu_density(wpa_s, htcaps, htcaps_mask, ssid->ampdu_density);
wpa_set_disable_ht40(wpa_s, htcaps, htcaps_mask, ssid->disable_ht40);
wpa_supplicant: Allow user to disable short guard interval (SGI) Requires Linux kernel patch to make the SGI-20 properly disabled. SGI-40 will already work since Linux 3.4 or so. Signed-hostap: Ben Greear <greearb@candelatech.com> Signed-off-by: Ben Greear <greearb@candelatech.com>
2012-12-18 13:44:15 +01:00
wpa_set_disable_sgi(wpa_s, htcaps, htcaps_mask, ssid->disable_sgi);
wpa_supplicant: Allow disabling LDPC Allows user to disable LDPC coding. This possibility is useful for testing purpose. Signed-off-by: Pawel Kulakowski <pawel.kulakowski@tieto.com>
2014-04-01 07:16:00 +02:00
wpa_set_disable_ldpc(wpa_s, htcaps, htcaps_mask, ssid->disable_ldpc);
Allow HT 40 MHz intolerant flag to be set for association This extends HT overrides to allow HT 40 MHz intolerant flag to be set with ht40_intolerant=1. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-04-15 16:22:47 +02:00
if (ssid->ht40_intolerant) {
Fix some sparse warnings about u16 vs. le16 Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-07-02 12:12:36 +02:00
le16 bit = host_to_le16(HT_CAP_INFO_40MHZ_INTOLERANT);
Allow HT 40 MHz intolerant flag to be set for association This extends HT overrides to allow HT 40 MHz intolerant flag to be set with ht40_intolerant=1. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-04-15 16:22:47 +02:00
htcaps->ht_capabilities_info |= bit;
htcaps_mask->ht_capabilities_info |= bit;
}
Support HT capability overrides This allows HT capabilities overrides on kernels that support these features. MCS Rates can be disabled to force to slower speeds when using HT. Rates cannot be forced higher. HT can be disabled, forcing an 802.11a/b/g/n station to act like an 802.11a/b/g station. HT40 can be disabled. MAX A-MSDU can be disabled. A-MPDU Factor and A-MPDU Density can be modified. Please note that these are suggestions to the kernel. Only mac80211 drivers will work at all. The A-MPDU Factor can only be decreased and the A-MPDU Density can only be increased currently. Signed-hostap: Ben Greear <greearb@candelatech.com>
2012-01-29 20:01:31 +01:00
}
#endif /* CONFIG_HT_OVERRIDES */
wpa_supplicant: Support VHT capability overrides Add support for VHT capability overrides to allow testing connections with a subset of the VHT capabilities that are actually supported by the device. The only thing that isn't currently supported (by mac80211 and this code) is the RX/TX highest rate field. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-03-10 17:04:39 +01:00
#ifdef CONFIG_VHT_OVERRIDES
void wpa_supplicant_apply_vht_overrides(
struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid,
struct wpa_driver_associate_params *params)
{
struct ieee80211_vht_capabilities *vhtcaps;
struct ieee80211_vht_capabilities *vhtcaps_mask;
if (!ssid)
return;
params->disable_vht = ssid->disable_vht;
vhtcaps = (void *) params->vhtcaps;
vhtcaps_mask = (void *) params->vhtcaps_mask;
if (!vhtcaps || !vhtcaps_mask)
return;
vhtcaps->vht_capabilities_info = ssid->vht_capa;
vhtcaps_mask->vht_capabilities_info = ssid->vht_capa_mask;
wpa_supplicant: Override HT A-MPDU size if VHT A-MPDU was overridden According to the standard, if the max A-MPDU VHT cap is <= 3, we have to adjust the max A-MPDU HT cap to the same value. Otherwise it should be set to 3. Take care of it when the max VHT A-MPDU value is overridden. Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
2014-03-27 07:58:32 +01:00
#ifdef CONFIG_HT_OVERRIDES
/* if max ampdu is <= 3, we have to make the HT cap the same */
Clean up VHT override max A-MPDU override calculation There is no need to use runtime call to find_first_bit() to determine shift amount for a constant integer. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-14 17:44:10 +01:00
if (ssid->vht_capa_mask & VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MAX) {
int max_ampdu;
max_ampdu = (ssid->vht_capa &
VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MAX) >>
VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MAX_SHIFT;
wpa_supplicant: Override HT A-MPDU size if VHT A-MPDU was overridden According to the standard, if the max A-MPDU VHT cap is <= 3, we have to adjust the max A-MPDU HT cap to the same value. Otherwise it should be set to 3. Take care of it when the max VHT A-MPDU value is overridden. Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
2014-03-27 07:58:32 +01:00
max_ampdu = max_ampdu < 3 ? max_ampdu : 3;
wpa_set_ampdu_factor(wpa_s,
(void *) params->htcaps,
(void *) params->htcaps_mask,
max_ampdu);
}
#endif /* CONFIG_HT_OVERRIDES */
wpa_supplicant: Support VHT capability overrides Add support for VHT capability overrides to allow testing connections with a subset of the VHT capabilities that are actually supported by the device. The only thing that isn't currently supported (by mac80211 and this code) is the RX/TX highest rate field. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-03-10 17:04:39 +01:00
#define OVERRIDE_MCS(i) \
if (ssid->vht_tx_mcs_nss_ ##i >= 0) { \
vhtcaps_mask->vht_supported_mcs_set.tx_map |= \
3 << 2 * (i - 1); \
vhtcaps->vht_supported_mcs_set.tx_map |= \
ssid->vht_tx_mcs_nss_ ##i << 2 * (i - 1); \
} \
if (ssid->vht_rx_mcs_nss_ ##i >= 0) { \
vhtcaps_mask->vht_supported_mcs_set.rx_map |= \
3 << 2 * (i - 1); \
vhtcaps->vht_supported_mcs_set.rx_map |= \
ssid->vht_rx_mcs_nss_ ##i << 2 * (i - 1); \
}
OVERRIDE_MCS(1);
OVERRIDE_MCS(2);
OVERRIDE_MCS(3);
OVERRIDE_MCS(4);
OVERRIDE_MCS(5);
OVERRIDE_MCS(6);
OVERRIDE_MCS(7);
OVERRIDE_MCS(8);
}
#endif /* CONFIG_VHT_OVERRIDES */
Allow PC/SC reader to be selected and initialized at start New global configuration parameters pcsc_reader and pcsc_pin can now be used to initialize PC/SC reader context at start of wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-26 12:07:05 +01:00
static int pcsc_reader_init(struct wpa_supplicant *wpa_s)
{
#ifdef PCSC_FUNCS
size_t len;
if (!wpa_s->conf->pcsc_reader)
return 0;
SCARD: Clean up SIM/USIM selection Commit eb324600295a570199a5e25eb64e60781a04fb74 left an unneeded sim_type argument to scard_init(). Remove that unnecessary argument to clean up the implementation. Signed-hostap: Masashi Honma <masashi.honma@gmail.com>
2013-11-17 11:17:09 +01:00
wpa_s->scard = scard_init(wpa_s->conf->pcsc_reader);
Allow PC/SC reader to be selected and initialized at start New global configuration parameters pcsc_reader and pcsc_pin can now be used to initialize PC/SC reader context at start of wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-26 12:07:05 +01:00
if (!wpa_s->scard)
return 1;
if (wpa_s->conf->pcsc_pin &&
scard_set_pin(wpa_s->scard, wpa_s->conf->pcsc_pin) < 0) {
scard_deinit(wpa_s->scard);
wpa_s->scard = NULL;
wpa_msg(wpa_s, MSG_ERROR, "PC/SC PIN validation failed");
return -1;
}
len = sizeof(wpa_s->imsi) - 1;
if (scard_get_imsi(wpa_s->scard, wpa_s->imsi, &len)) {
scard_deinit(wpa_s->scard);
wpa_s->scard = NULL;
wpa_msg(wpa_s, MSG_ERROR, "Could not read IMSI");
return -1;
}
wpa_s->imsi[len] = '\0';
wpa_s->mnc_len = scard_get_mnc_len(wpa_s->scard);
wpa_printf(MSG_DEBUG, "SCARD: IMSI %s (MNC length %d)",
wpa_s->imsi, wpa_s->mnc_len);
wpa_sm_set_scard_ctx(wpa_s->wpa, wpa_s->scard);
eapol_sm_register_scard_ctx(wpa_s->eapol, wpa_s->scard);
#endif /* PCSC_FUNCS */
return 0;
}
EXT PW: Add framework for supporting external password storage This new mechanism can be used to make wpa_supplicant using external storage (e.g., key store in the operating system) for passwords, passphrases, and PSKs. This commit is only adding the framework part needed to support this, i.e., no actual configuration parameter can yet use this new mechanism. In addition, only a simple test backend is added to allow developer testing of the functionality. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-03 20:28:42 +02:00
int wpas_init_ext_pw(struct wpa_supplicant *wpa_s)
{
char *val, *pos;
ext_password_deinit(wpa_s->ext_pw);
wpa_s->ext_pw = NULL;
eapol_sm_set_ext_pw_ctx(wpa_s->eapol, NULL);
if (!wpa_s->conf->ext_password_backend)
return 0;
val = os_strdup(wpa_s->conf->ext_password_backend);
if (val == NULL)
return -1;
pos = os_strchr(val, ':');
if (pos)
*pos++ = '\0';
wpa_printf(MSG_DEBUG, "EXT PW: Initialize backend '%s'", val);
wpa_s->ext_pw = ext_password_init(val, pos);
os_free(val);
if (wpa_s->ext_pw == NULL) {
wpa_printf(MSG_DEBUG, "EXT PW: Failed to initialize backend");
return -1;
}
eapol_sm_set_ext_pw_ctx(wpa_s->eapol, wpa_s->ext_pw);
return 0;
}
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
static const u8 * wpas_fst_get_bssid_cb(void *ctx)
{
struct wpa_supplicant *wpa_s = ctx;
return (is_zero_ether_addr(wpa_s->bssid) ||
wpa_s->wpa_state != WPA_COMPLETED) ? NULL : wpa_s->bssid;
}
static void wpas_fst_get_channel_info_cb(void *ctx,
enum hostapd_hw_mode *hw_mode,
u8 *channel)
{
struct wpa_supplicant *wpa_s = ctx;
if (wpa_s->current_bss) {
*hw_mode = ieee80211_freq_to_chan(wpa_s->current_bss->freq,
channel);
} else if (wpa_s->hw.num_modes) {
*hw_mode = wpa_s->hw.modes[0].mode;
} else {
WPA_ASSERT(0);
*hw_mode = 0;
}
}
static int wpas_fst_get_hw_modes(void *ctx, struct hostapd_hw_modes **modes)
{
struct wpa_supplicant *wpa_s = ctx;
*modes = wpa_s->hw.modes;
return wpa_s->hw.num_modes;
}
FST: Mark fst_ies buffer const This buffer is owned by the FST module, so mark it const in the set_ies() callback to make it clearer which component is responsible for modifying and freeing this. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-08-03 16:37:05 +02:00
static void wpas_fst_set_ies_cb(void *ctx, const struct wpabuf *fst_ies)
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
{
struct wpa_supplicant *wpa_s = ctx;
FST: Show FST IE update details in debug log This makes it more convenient to debug FST IE updates. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-17 15:25:09 +02:00
wpa_hexdump_buf(MSG_DEBUG, "FST: Set IEs", fst_ies);
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
wpa_s->fst_ies = fst_ies;
}
static int wpas_fst_send_action_cb(void *ctx, const u8 *da, struct wpabuf *data)
{
struct wpa_supplicant *wpa_s = ctx;
WPA_ASSERT(os_memcmp(wpa_s->bssid, da, ETH_ALEN) == 0);
return wpa_drv_send_action(wpa_s, wpa_s->assoc_freq, 0, wpa_s->bssid,
wpa_s->own_addr, wpa_s->bssid,
wpabuf_head(data), wpabuf_len(data),
0);
}
FST: Mark get_mb_ie() return value const The caller is not expected to free or modify the value since this is returning a reference to a buffer maintained by the upper layer. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-07-18 15:16:26 +02:00
static const struct wpabuf * wpas_fst_get_mb_ie_cb(void *ctx, const u8 *addr)
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
{
struct wpa_supplicant *wpa_s = ctx;
WPA_ASSERT(os_memcmp(wpa_s->bssid, addr, ETH_ALEN) == 0);
return wpa_s->received_mb_ies;
}
static void wpas_fst_update_mb_ie_cb(void *ctx, const u8 *addr,
const u8 *buf, size_t size)
{
struct wpa_supplicant *wpa_s = ctx;
struct mb_ies_info info;
WPA_ASSERT(os_memcmp(wpa_s->bssid, addr, ETH_ALEN) == 0);
if (!mb_ies_info_by_ies(&info, buf, size)) {
wpabuf_free(wpa_s->received_mb_ies);
wpa_s->received_mb_ies = mb_ies_by_info(&info);
}
}
const u8 * wpas_fst_get_peer_first(void *ctx, struct fst_get_peer_ctx **get_ctx,
Boolean mb_only)
{
struct wpa_supplicant *wpa_s = ctx;
*get_ctx = NULL;
if (!is_zero_ether_addr(wpa_s->bssid))
return (wpa_s->received_mb_ies || !mb_only) ?
wpa_s->bssid : NULL;
return NULL;
}
const u8 * wpas_fst_get_peer_next(void *ctx, struct fst_get_peer_ctx **get_ctx,
Boolean mb_only)
{
return NULL;
}
void fst_wpa_supplicant_fill_iface_obj(struct wpa_supplicant *wpa_s,
struct fst_wpa_obj *iface_obj)
{
iface_obj->ctx = wpa_s;
iface_obj->get_bssid = wpas_fst_get_bssid_cb;
iface_obj->get_channel_info = wpas_fst_get_channel_info_cb;
iface_obj->get_hw_modes = wpas_fst_get_hw_modes;
iface_obj->set_ies = wpas_fst_set_ies_cb;
iface_obj->send_action = wpas_fst_send_action_cb;
iface_obj->get_mb_ie = wpas_fst_get_mb_ie_cb;
iface_obj->update_mb_ie = wpas_fst_update_mb_ie_cb;
iface_obj->get_peer_first = wpas_fst_get_peer_first;
iface_obj->get_peer_next = wpas_fst_get_peer_next;
}
#endif /* CONFIG_FST */
Mark function static This function is not used outside this file. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-07-02 12:07:44 +02:00
static int wpas_set_wowlan_triggers(struct wpa_supplicant *wpa_s,
Set WoWLAN triggers only if driver capabilities are known Previously, wpas_set_wowlan_triggers() could have been called in uninitialized wpa_driver_capa data if the driver interface did not support reporting of capabilities. While this would not really happen with a driver wrapper that implements set_wowlan() and as such, would not cause any difference in practice, it is better to clean this up to make the code path easier to understand for static analyzers. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-11 11:38:35 +02:00
const struct wpa_driver_capa *capa)
wpa_supplicant: Add Wake-on-WLAN configuration support Add a new wowlan_triggers option to wpa_supplicant.conf. The triggers in this key will be used to configure the kernel wowlan configuration. For now, support only simple flags. More complex triggers can be added later on. Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
2014-04-24 07:45:39 +02:00
{
hostapd: Add wowlan_triggers config param New kernels in wiphy_suspend() will call cfg80211_leave_all() that will eventually end up in cfg80211_stop_ap() unless wowlan_triggers were set. For now, use the parameters from the station mode as-is. It may be desirable to extend (or constraint) this in the future for specific AP mode needs. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-09-03 23:58:37 +02:00
struct wowlan_triggers *triggers;
int ret = 0;
wpa_supplicant: Add Wake-on-WLAN configuration support Add a new wowlan_triggers option to wpa_supplicant.conf. The triggers in this key will be used to configure the kernel wowlan configuration. For now, support only simple flags. More complex triggers can be added later on. Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
2014-04-24 07:45:39 +02:00
if (!wpa_s->conf->wowlan_triggers)
return 0;
hostapd: Add wowlan_triggers config param New kernels in wiphy_suspend() will call cfg80211_leave_all() that will eventually end up in cfg80211_stop_ap() unless wowlan_triggers were set. For now, use the parameters from the station mode as-is. It may be desirable to extend (or constraint) this in the future for specific AP mode needs. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-09-03 23:58:37 +02:00
triggers = wpa_get_wowlan_triggers(wpa_s->conf->wowlan_triggers, capa);
if (triggers) {
ret = wpa_drv_wowlan(wpa_s, triggers);
os_free(triggers);
wpa_supplicant: Add Wake-on-WLAN configuration support Add a new wowlan_triggers option to wpa_supplicant.conf. The triggers in this key will be used to configure the kernel wowlan configuration. For now, support only simple flags. More complex triggers can be added later on. Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
2014-04-24 07:45:39 +02:00
}
return ret;
}
Parallelize distinct radio work operations This commit contains the necessary changes to parallelize distinct radio work operations which are different in type and the band used, only when the underlying driver is capable of supporting such simultaneous offchannel operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-09-25 13:36:27 +02:00
static enum wpa_radio_work_band wpas_freq_to_band(int freq)
{
if (freq < 3000)
return BAND_2_4_GHZ;
if (freq > 50000)
return BAND_60_GHZ;
return BAND_5_GHZ;
}
static unsigned int wpas_get_bands(struct wpa_supplicant *wpa_s,
const int *freqs)
{
int i;
unsigned int band = 0;
if (freqs) {
/* freqs are specified for the radio work */
for (i = 0; freqs[i]; i++)
band |= wpas_freq_to_band(freqs[i]);
} else {
/*
* freqs are not specified, implies all
* the supported freqs by HW
*/
for (i = 0; i < wpa_s->hw.num_modes; i++) {
if (wpa_s->hw.modes[i].num_channels != 0) {
if (wpa_s->hw.modes[i].mode ==
HOSTAPD_MODE_IEEE80211B ||
wpa_s->hw.modes[i].mode ==
HOSTAPD_MODE_IEEE80211G)
band |= BAND_2_4_GHZ;
else if (wpa_s->hw.modes[i].mode ==
HOSTAPD_MODE_IEEE80211A)
band |= BAND_5_GHZ;
else if (wpa_s->hw.modes[i].mode ==
HOSTAPD_MODE_IEEE80211AD)
band |= BAND_60_GHZ;
else if (wpa_s->hw.modes[i].mode ==
HOSTAPD_MODE_IEEE80211ANY)
band = BAND_2_4_GHZ | BAND_5_GHZ |
BAND_60_GHZ;
}
}
}
return band;
}
Add shared per-radio structure for wpa_supplicant struct wpa_radio is used as a shared data structure between all struct wpa_supplicant instances that share the same physical radio. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 18:53:19 +01:00
static struct wpa_radio * radio_add_interface(struct wpa_supplicant *wpa_s,
const char *rn)
{
struct wpa_supplicant *iface = wpa_s->global->ifaces;
struct wpa_radio *radio;
while (rn && iface) {
radio = iface->radio;
if (radio && os_strcmp(rn, radio->name) == 0) {
wpa_printf(MSG_DEBUG, "Add interface %s to existing radio %s",
wpa_s->ifname, rn);
dl_list_add(&radio->ifaces, &wpa_s->radio_list);
return radio;
}
Fix a never-ending loop with multiple radios in wpa_supplicant Commit 202dec2a94695a696236ee5a2ad1be0905ccea14 introduced a never ending loop for a case where a single wpa_supplicant process is used with multiple radios. Fix this by advancing the iface pointer properly to the next interface in the loop until a NULL pointer is hit. Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2013-12-09 13:47:55 +01:00
iface = iface->next;
Add shared per-radio structure for wpa_supplicant struct wpa_radio is used as a shared data structure between all struct wpa_supplicant instances that share the same physical radio. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 18:53:19 +01:00
}
wpa_printf(MSG_DEBUG, "Add interface %s to a new radio %s",
wpa_s->ifname, rn ? rn : "N/A");
radio = os_zalloc(sizeof(*radio));
if (radio == NULL)
return NULL;
if (rn)
os_strlcpy(radio->name, rn, sizeof(radio->name));
dl_list_init(&radio->ifaces);
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
dl_list_init(&radio->work);
Add shared per-radio structure for wpa_supplicant struct wpa_radio is used as a shared data structure between all struct wpa_supplicant instances that share the same physical radio. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 18:53:19 +01:00
dl_list_add(&radio->ifaces, &wpa_s->radio_list);
return radio;
}
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
static void radio_work_free(struct wpa_radio_work *work)
{
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 (work->wpa_s->scan_work == work) {
/* This should not really happen. */
wpa_dbg(work->wpa_s, MSG_INFO, "Freeing radio work '%s'@%p (started=%d) that is marked as scan_work",
work->type, work, work->started);
work->wpa_s->scan_work = NULL;
}
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
#ifdef CONFIG_P2P
if (work->wpa_s->p2p_scan_work == work) {
/* This should not really happen. */
wpa_dbg(work->wpa_s, MSG_INFO, "Freeing radio work '%s'@%p (started=%d) that is marked as p2p_scan_work",
work->type, work, work->started);
work->wpa_s->p2p_scan_work = NULL;
}
#endif /* CONFIG_P2P */
Parallelize distinct radio work operations This commit contains the necessary changes to parallelize distinct radio work operations which are different in type and the band used, only when the underlying driver is capable of supporting such simultaneous offchannel operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-09-25 13:36:27 +02:00
if (work->started) {
work->wpa_s->radio->num_active_works--;
wpa_dbg(work->wpa_s, MSG_DEBUG,
"radio_work_free('%s'@%p: num_active_works --> %u",
work->type, work,
work->wpa_s->radio->num_active_works);
}
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
dl_list_del(&work->list);
os_free(work);
}
Parallelize distinct radio work operations This commit contains the necessary changes to parallelize distinct radio work operations which are different in type and the band used, only when the underlying driver is capable of supporting such simultaneous offchannel operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-09-25 13:36:27 +02:00
static struct wpa_radio_work * radio_work_get_next_work(struct wpa_radio *radio)
{
struct wpa_radio_work *active_work = NULL;
struct wpa_radio_work *tmp;
/* Get the active work to know the type and band. */
dl_list_for_each(tmp, &radio->work, struct wpa_radio_work, list) {
if (tmp->started) {
active_work = tmp;
break;
}
}
if (!active_work) {
/* No active work, start one */
radio->num_active_works = 0;
dl_list_for_each(tmp, &radio->work, struct wpa_radio_work,
list) {
if (os_strcmp(tmp->type, "scan") == 0 &&
radio->external_scan_running &&
(((struct wpa_driver_scan_params *)
tmp->ctx)->only_new_results ||
tmp->wpa_s->clear_driver_scan_cache))
continue;
return tmp;
}
return NULL;
}
if (os_strcmp(active_work->type, "sme-connect") == 0 ||
os_strcmp(active_work->type, "connect") == 0) {
/*
* If the active work is either connect or sme-connect,
* do not parallelize them with other radio works.
*/
wpa_dbg(active_work->wpa_s, MSG_DEBUG,
"Do not parallelize radio work with %s",
active_work->type);
return NULL;
}
dl_list_for_each(tmp, &radio->work, struct wpa_radio_work, list) {
if (tmp->started)
continue;
/*
* If connect or sme-connect are enqueued, parallelize only
* those operations ahead of them in the queue.
*/
if (os_strcmp(tmp->type, "connect") == 0 ||
os_strcmp(tmp->type, "sme-connect") == 0)
break;
/*
* Check that the radio works are distinct and
* on different bands.
*/
if (os_strcmp(active_work->type, tmp->type) != 0 &&
(active_work->bands != tmp->bands)) {
/*
* If a scan has to be scheduled through nl80211 scan
* interface and if an external scan is already running,
* do not schedule the scan since it is likely to get
* rejected by kernel.
*/
if (os_strcmp(tmp->type, "scan") == 0 &&
radio->external_scan_running &&
(((struct wpa_driver_scan_params *)
tmp->ctx)->only_new_results ||
tmp->wpa_s->clear_driver_scan_cache))
continue;
wpa_dbg(active_work->wpa_s, MSG_DEBUG,
"active_work:%s new_work:%s",
active_work->type, tmp->type);
return tmp;
}
}
/* Did not find a radio work to schedule in parallel. */
return NULL;
}
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
static void radio_start_next_work(void *eloop_ctx, void *timeout_ctx)
{
struct wpa_radio *radio = eloop_ctx;
struct wpa_radio_work *work;
struct os_reltime now, diff;
Do not start wpa_radio work during externally triggered scan If an external program triggers a scan, wpa_supplicant does not have a wpa_radio work item for this operation to protect against other offchannel operations. This can result in operations failing, so try to avoid damage by not starting any new wpa_radio work items during a scan that was started by another process. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-04 09:33:14 +01:00
struct wpa_supplicant *wpa_s;
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
work = dl_list_first(&radio->work, struct wpa_radio_work, list);
Parallelize distinct radio work operations This commit contains the necessary changes to parallelize distinct radio work operations which are different in type and the band used, only when the underlying driver is capable of supporting such simultaneous offchannel operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-09-25 13:36:27 +02:00
if (work == NULL) {
radio->num_active_works = 0;
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
return;
Parallelize distinct radio work operations This commit contains the necessary changes to parallelize distinct radio work operations which are different in type and the band used, only when the underlying driver is capable of supporting such simultaneous offchannel operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-09-25 13:36:27 +02:00
}
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
Do not start wpa_radio work during externally triggered scan If an external program triggers a scan, wpa_supplicant does not have a wpa_radio work item for this operation to protect against other offchannel operations. This can result in operations failing, so try to avoid damage by not starting any new wpa_radio work items during a scan that was started by another process. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-04 09:33:14 +01:00
wpa_s = dl_list_first(&radio->ifaces, struct wpa_supplicant,
radio_list);
Parallelize distinct radio work operations This commit contains the necessary changes to parallelize distinct radio work operations which are different in type and the band used, only when the underlying driver is capable of supporting such simultaneous offchannel operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-09-25 13:36:27 +02:00
if (!(wpa_s &&
wpa_s->drv_flags & WPA_DRIVER_FLAGS_OFFCHANNEL_SIMULTANEOUS)) {
if (work->started)
return; /* already started and still in progress */
if (wpa_s && wpa_s->radio->external_scan_running) {
wpa_printf(MSG_DEBUG, "Delay radio work start until externally triggered scan completes");
return;
}
} else {
work = NULL;
if (radio->num_active_works < MAX_ACTIVE_WORKS) {
/* get the work to schedule next */
work = radio_work_get_next_work(radio);
}
if (!work)
return;
Do not start wpa_radio work during externally triggered scan If an external program triggers a scan, wpa_supplicant does not have a wpa_radio work item for this operation to protect against other offchannel operations. This can result in operations failing, so try to avoid damage by not starting any new wpa_radio work items during a scan that was started by another process. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-04 09:33:14 +01:00
}
Parallelize distinct radio work operations This commit contains the necessary changes to parallelize distinct radio work operations which are different in type and the band used, only when the underlying driver is capable of supporting such simultaneous offchannel operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-09-25 13:36:27 +02:00
wpa_s = work->wpa_s;
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
os_get_reltime(&now);
os_reltime_sub(&now, &work->time, &diff);
Parallelize distinct radio work operations This commit contains the necessary changes to parallelize distinct radio work operations which are different in type and the band used, only when the underlying driver is capable of supporting such simultaneous offchannel operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-09-25 13:36:27 +02:00
wpa_dbg(wpa_s, MSG_DEBUG,
"Starting radio work '%s'@%p after %ld.%06ld second wait",
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
work->type, work, diff.sec, diff.usec);
work->started = 1;
work->time = now;
Parallelize distinct radio work operations This commit contains the necessary changes to parallelize distinct radio work operations which are different in type and the band used, only when the underlying driver is capable of supporting such simultaneous offchannel operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-09-25 13:36:27 +02:00
radio->num_active_works++;
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
work->cb(work, 0);
Parallelize distinct radio work operations This commit contains the necessary changes to parallelize distinct radio work operations which are different in type and the band used, only when the underlying driver is capable of supporting such simultaneous offchannel operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-09-25 13:36:27 +02:00
if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_OFFCHANNEL_SIMULTANEOUS) &&
radio->num_active_works < MAX_ACTIVE_WORKS)
radio_work_check_next(wpa_s);
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
}
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
/*
* This function removes both started and pending radio works running on
* the provided interface's radio.
* Prior to the removal of the radio work, its callback (cb) is called with
* deinit set to be 1. Each work's callback is responsible for clearing its
* internal data and restoring to a correct state.
* @wpa_s: wpa_supplicant data
* @type: type of works to be removed
* @remove_all: 1 to remove all the works on this radio, 0 to remove only
* this interface's works.
*/
void radio_remove_works(struct wpa_supplicant *wpa_s,
const char *type, int remove_all)
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
{
struct wpa_radio_work *work, *tmp;
struct wpa_radio *radio = wpa_s->radio;
dl_list_for_each_safe(work, tmp, &radio->work, struct wpa_radio_work,
list) {
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 (type && os_strcmp(type, work->type) != 0)
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
continue;
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
/* skip other ifaces' works */
if (!remove_all && work->wpa_s != wpa_s)
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
continue;
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
wpa_dbg(wpa_s, MSG_DEBUG, "Remove radio work '%s'@%p%s",
work->type, work, work->started ? " (started)" : "");
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
work->cb(work, 1);
radio_work_free(work);
}
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
/* in case we removed the started work */
radio_work_check_next(wpa_s);
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
}
Add shared per-radio structure for wpa_supplicant struct wpa_radio is used as a shared data structure between all struct wpa_supplicant instances that share the same physical radio. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 18:53:19 +01:00
static void radio_remove_interface(struct wpa_supplicant *wpa_s)
{
struct wpa_radio *radio = wpa_s->radio;
if (!radio)
return;
wpa_printf(MSG_DEBUG, "Remove interface %s from radio %s",
wpa_s->ifname, radio->name);
dl_list_del(&wpa_s->radio_list);
wpa_supplicant: Fix radio_remove_interface Remove pending radio works when an interface is removed from a radio. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2014-03-20 08:24:11 +01:00
radio_remove_works(wpa_s, NULL, 0);
wpa_s->radio = NULL;
if (!dl_list_empty(&radio->ifaces))
Add shared per-radio structure for wpa_supplicant struct wpa_radio is used as a shared data structure between all struct wpa_supplicant instances that share the same physical radio. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 18:53:19 +01:00
return; /* Interfaces remain for this radio */
wpa_printf(MSG_DEBUG, "Remove radio %s", radio->name);
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
eloop_cancel_timeout(radio_start_next_work, radio, NULL);
Add shared per-radio structure for wpa_supplicant struct wpa_radio is used as a shared data structure between all struct wpa_supplicant instances that share the same physical radio. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 18:53:19 +01:00
os_free(radio);
}
Do not start wpa_radio work during externally triggered scan If an external program triggers a scan, wpa_supplicant does not have a wpa_radio work item for this operation to protect against other offchannel operations. This can result in operations failing, so try to avoid damage by not starting any new wpa_radio work items during a scan that was started by another process. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-04 09:33:14 +01:00
void radio_work_check_next(struct wpa_supplicant *wpa_s)
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
{
struct wpa_radio *radio = wpa_s->radio;
if (dl_list_empty(&radio->work))
return;
Do not start new radio work on scan completion during ext work Externally triggered scan could result in a new radio work item getting started even when external radio work was in progress. Delay such start until the external work is completed. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-01 16:49:19 +01:00
if (wpa_s->ext_work_in_progress) {
wpa_printf(MSG_DEBUG,
"External radio work in progress - delay start of pending item");
return;
}
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
eloop_cancel_timeout(radio_start_next_work, radio, NULL);
eloop_register_timeout(0, 0, radio_start_next_work, radio, NULL);
}
/**
* radio_add_work - Add a radio work item
* @wpa_s: Pointer to wpa_supplicant data
* @freq: Frequency of the offchannel operation in MHz or 0
* @type: Unique identifier for each type of work
* @next: Force as the next work to be executed
* @cb: Callback function for indicating when radio is available
* @ctx: Context pointer for the work (work->ctx in cb())
* Returns: 0 on success, -1 on failure
*
* This function is used to request time for an operation that requires
* exclusive radio control. Once the radio is available, the registered callback
* function will be called. radio_work_done() must be called once the exclusive
* radio operation has been completed, so that the radio is freed for other
* operations. The special case of deinit=1 is used to free the context data
* during interface removal. That does not allow the callback function to start
* the radio operation, i.e., it must free any resources allocated for the radio
* work and return.
*
* The @freq parameter can be used to indicate a single channel on which the
* offchannel operation will occur. This may allow multiple radio work
* operations to be performed in parallel if they apply for the same channel.
* Setting this to 0 indicates that the work item may use multiple channels or
* requires exclusive control of the radio.
*/
int radio_add_work(struct wpa_supplicant *wpa_s, unsigned int freq,
const char *type, int next,
void (*cb)(struct wpa_radio_work *work, int deinit),
void *ctx)
{
Parallelize distinct radio work operations This commit contains the necessary changes to parallelize distinct radio work operations which are different in type and the band used, only when the underlying driver is capable of supporting such simultaneous offchannel operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-09-25 13:36:27 +02:00
struct wpa_radio *radio = wpa_s->radio;
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
struct wpa_radio_work *work;
int was_empty;
work = os_zalloc(sizeof(*work));
if (work == NULL)
return -1;
wpa_dbg(wpa_s, MSG_DEBUG, "Add radio work '%s'@%p", type, work);
os_get_reltime(&work->time);
work->freq = freq;
work->type = type;
work->wpa_s = wpa_s;
work->cb = cb;
work->ctx = ctx;
Parallelize distinct radio work operations This commit contains the necessary changes to parallelize distinct radio work operations which are different in type and the band used, only when the underlying driver is capable of supporting such simultaneous offchannel operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-09-25 13:36:27 +02:00
if (freq)
work->bands = wpas_freq_to_band(freq);
else if (os_strcmp(type, "scan") == 0 ||
os_strcmp(type, "p2p-scan") == 0)
work->bands = wpas_get_bands(wpa_s,
((struct wpa_driver_scan_params *)
ctx)->freqs);
else
work->bands = wpas_get_bands(wpa_s, NULL);
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
was_empty = dl_list_empty(&wpa_s->radio->work);
if (next)
dl_list_add(&wpa_s->radio->work, &work->list);
else
dl_list_add_tail(&wpa_s->radio->work, &work->list);
if (was_empty) {
wpa_dbg(wpa_s, MSG_DEBUG, "First radio work item in the queue - schedule start immediately");
radio_work_check_next(wpa_s);
Parallelize distinct radio work operations This commit contains the necessary changes to parallelize distinct radio work operations which are different in type and the band used, only when the underlying driver is capable of supporting such simultaneous offchannel operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-09-25 13:36:27 +02:00
} else if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_OFFCHANNEL_SIMULTANEOUS)
&& radio->num_active_works < MAX_ACTIVE_WORKS) {
wpa_dbg(wpa_s, MSG_DEBUG,
"Try to schedule a radio work (num_active_works=%u)",
radio->num_active_works);
radio_work_check_next(wpa_s);
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
}
return 0;
}
/**
* radio_work_done - Indicate that a radio work item has been completed
* @work: Completed work
*
* This function is called once the callback function registered with
* radio_add_work() has completed its work.
*/
void radio_work_done(struct wpa_radio_work *work)
{
struct wpa_supplicant *wpa_s = work->wpa_s;
struct os_reltime now, diff;
Allow external programs to request wpa_radio work items The new control interface command RADIO_WORK can be used by external programs to request radio allocation slots from wpa_supplicant if exclusive radio control is needed, e.g., for offchannel operations. If such operations are done directly to the driver, wpa_supplicant may not have enough information to avoid conflicting operations. This new command can be used to provide enough information and radio scheduling to avoid issues with such cases. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-04 12:10:41 +01:00
unsigned int started = work->started;
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
os_get_reltime(&now);
os_reltime_sub(&now, &work->time, &diff);
Allow external programs to request wpa_radio work items The new control interface command RADIO_WORK can be used by external programs to request radio allocation slots from wpa_supplicant if exclusive radio control is needed, e.g., for offchannel operations. If such operations are done directly to the driver, wpa_supplicant may not have enough information to avoid conflicting operations. This new command can be used to provide enough information and radio scheduling to avoid issues with such cases. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-04 12:10:41 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "Radio work '%s'@%p %s in %ld.%06ld seconds",
work->type, work, started ? "done" : "canceled",
diff.sec, diff.usec);
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
radio_work_free(work);
Allow external programs to request wpa_radio work items The new control interface command RADIO_WORK can be used by external programs to request radio allocation slots from wpa_supplicant if exclusive radio control is needed, e.g., for offchannel operations. If such operations are done directly to the driver, wpa_supplicant may not have enough information to avoid conflicting operations. This new command can be used to provide enough information and radio scheduling to avoid issues with such cases. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-04 12:10:41 +01:00
if (started)
radio_work_check_next(wpa_s);
Add framework for exclusive radio operations The new radio work item concept can be used to request time for an operation that requires exclusive radio control, e.g., a scan. Once the radio is available, the registered callback function will be called. radio_work_done() must be called once the exclusive radio operation has been completed, so that the radio is freed for other operations. The special case of deinit=1 is used to free the context data during interface removal. That does not allow the callback function to start the radio operation, i.e., it needs to free the allocated resources and return. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 20:42:17 +01:00
}
Update pending connect radio work BSS pointer on scan update It is possible for scan result processing or BSS entry removal to occur while there is a pending connect or sme-connect radio work with a previously selected BSS entry. The BSS pointer was previously verified to be valid, i.e., still point to a BSS entry, at the time the actual connection operation is started. However, that BSS entry could have changed to point to another BSS if the old BSS entry was either removed or reallocated and a new BSS entry was added at the same location in memory. This could result in the connection attempt failing to configure parameters properly due to different BSS information (e.g., different BSSID). Fix this by updated the pending connect radio work data on BSS entry updates similarly to how the last_scan_res array was updated. If the selected BSS entry is removed, this will still result in a failed connection, but reallocated BSS entry is now followed properly and used when the connection work starts. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-27 23:19:24 +01:00
struct wpa_radio_work *
radio_work_pending(struct wpa_supplicant *wpa_s, const char *type)
Do not start another connect work while one is pending It was possible for the connect or sme-connect radio work to get re-scheduled while an earlier request was still pending, e.g., select_network is issued at the moment a scan radio work is in progress and the old scan results are recent enough for starting the connection. This could result in unexpected attempt to re-associate immediately after completing the first connection. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-02-24 14:22:35 +01:00
{
struct wpa_radio_work *work;
struct wpa_radio *radio = wpa_s->radio;
dl_list_for_each(work, &radio->work, struct wpa_radio_work, list) {
if (work->wpa_s == wpa_s && os_strcmp(work->type, type) == 0)
Update pending connect radio work BSS pointer on scan update It is possible for scan result processing or BSS entry removal to occur while there is a pending connect or sme-connect radio work with a previously selected BSS entry. The BSS pointer was previously verified to be valid, i.e., still point to a BSS entry, at the time the actual connection operation is started. However, that BSS entry could have changed to point to another BSS if the old BSS entry was either removed or reallocated and a new BSS entry was added at the same location in memory. This could result in the connection attempt failing to configure parameters properly due to different BSS information (e.g., different BSSID). Fix this by updated the pending connect radio work data on BSS entry updates similarly to how the last_scan_res array was updated. If the selected BSS entry is removed, this will still result in a failed connection, but reallocated BSS entry is now followed properly and used when the connection work starts. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-27 23:19:24 +01:00
return work;
Do not start another connect work while one is pending It was possible for the connect or sme-connect radio work to get re-scheduled while an earlier request was still pending, e.g., select_network is issued at the moment a scan radio work is in progress and the old scan results are recent enough for starting the connection. This could result in unexpected attempt to re-associate immediately after completing the first connection. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-02-24 14:22:35 +01:00
}
Update pending connect radio work BSS pointer on scan update It is possible for scan result processing or BSS entry removal to occur while there is a pending connect or sme-connect radio work with a previously selected BSS entry. The BSS pointer was previously verified to be valid, i.e., still point to a BSS entry, at the time the actual connection operation is started. However, that BSS entry could have changed to point to another BSS if the old BSS entry was either removed or reallocated and a new BSS entry was added at the same location in memory. This could result in the connection attempt failing to configure parameters properly due to different BSS information (e.g., different BSSID). Fix this by updated the pending connect radio work data on BSS entry updates similarly to how the last_scan_res array was updated. If the selected BSS entry is removed, this will still result in a failed connection, but reallocated BSS entry is now followed properly and used when the connection work starts. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-27 23:19:24 +01:00
return NULL;
Do not start another connect work while one is pending It was possible for the connect or sme-connect radio work to get re-scheduled while an earlier request was still pending, e.g., select_network is issued at the moment a scan radio work is in progress and the old scan results are recent enough for starting the connection. This could result in unexpected attempt to re-associate immediately after completing the first connection. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-02-24 14:22:35 +01:00
}
Move wpa_supplicant driver initialization into a helper function Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 18:36:29 +01:00
static int wpas_init_driver(struct wpa_supplicant *wpa_s,
struct wpa_interface *iface)
{
Add shared per-radio structure for wpa_supplicant struct wpa_radio is used as a shared data structure between all struct wpa_supplicant instances that share the same physical radio. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 18:53:19 +01:00
const char *ifname, *driver, *rn;
Move wpa_supplicant driver initialization into a helper function Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 18:36:29 +01:00
driver = iface->driver;
next_driver:
if (wpa_supplicant_set_driver(wpa_s, driver) < 0)
return -1;
wpa_s->drv_priv = wpa_drv_init(wpa_s, wpa_s->ifname);
if (wpa_s->drv_priv == NULL) {
const char *pos;
pos = driver ? os_strchr(driver, ',') : NULL;
if (pos) {
wpa_dbg(wpa_s, MSG_DEBUG, "Failed to initialize "
"driver interface - try next driver wrapper");
driver = pos + 1;
goto next_driver;
}
wpa_msg(wpa_s, MSG_ERROR, "Failed to initialize driver "
"interface");
return -1;
}
if (wpa_drv_set_param(wpa_s, wpa_s->conf->driver_param) < 0) {
wpa_msg(wpa_s, MSG_ERROR, "Driver interface rejected "
"driver_param '%s'", wpa_s->conf->driver_param);
return -1;
}
ifname = wpa_drv_get_ifname(wpa_s);
if (ifname && os_strcmp(ifname, wpa_s->ifname) != 0) {
wpa_dbg(wpa_s, MSG_DEBUG, "Driver interface replaced "
"interface name with '%s'", ifname);
os_strlcpy(wpa_s->ifname, ifname, sizeof(wpa_s->ifname));
}
Add get_radio_name() driver wrapper for wpa_supplicant Signed-off-by: Prameela Rani Garnepudi <prameela.g@samsung.com>
2014-03-18 13:05:22 +01:00
rn = wpa_driver_get_radio_name(wpa_s);
Add shared per-radio structure for wpa_supplicant struct wpa_radio is used as a shared data structure between all struct wpa_supplicant instances that share the same physical radio. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 18:53:19 +01:00
if (rn && rn[0] == '\0')
rn = NULL;
wpa_s->radio = radio_add_interface(wpa_s, rn);
if (wpa_s->radio == NULL)
return -1;
Move wpa_supplicant driver initialization into a helper function Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 18:36:29 +01:00
return 0;
}
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s,
struct wpa_interface *iface)
{
Allow multiple driver wrappers to be specified on command line For example, -Dnl80211,wext could be used to automatically select between nl80211 and wext. The first driver wrapper that is able to initialize the interface will be used.
2009-02-14 15:43:43 +01:00
struct wpa_driver_capa capa;
Set WoWLAN triggers only if driver capabilities are known Previously, wpas_set_wowlan_triggers() could have been called in uninitialized wpa_driver_capa data if the driver interface did not support reporting of capabilities. While this would not really happen with a driver wrapper that implements set_wowlan() and as such, would not cause any difference in practice, it is better to clean this up to make the code path easier to understand for static analyzers. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-11 11:38:35 +02:00
int capa_res;
Allow multiple driver wrappers to be specified on command line For example, -Dnl80211,wext could be used to automatically select between nl80211 and wext. The first driver wrapper that is able to initialize the interface will be used.
2009-02-14 15:43:43 +01:00
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_printf(MSG_DEBUG, "Initializing interface '%s' conf '%s' driver "
"'%s' ctrl_interface '%s' bridge '%s'", iface->ifname,
iface->confname ? iface->confname : "N/A",
iface->driver ? iface->driver : "default",
iface->ctrl_interface ? iface->ctrl_interface : "N/A",
iface->bridge_ifname ? iface->bridge_ifname : "N/A");
if (iface->confname) {
#ifdef CONFIG_BACKEND_FILE
wpa_s->confname = os_rel2abs_path(iface->confname);
if (wpa_s->confname == NULL) {
wpa_printf(MSG_ERROR, "Failed to get absolute path "
"for configuration file '%s'.",
iface->confname);
return -1;
}
wpa_printf(MSG_DEBUG, "Configuration file '%s' -> '%s'",
iface->confname, wpa_s->confname);
#else /* CONFIG_BACKEND_FILE */
wpa_s->confname = os_strdup(iface->confname);
#endif /* CONFIG_BACKEND_FILE */
wpa_supplicant: Add option -I for additional config file This option can be used only for global parameters that are not going to be changed from settings. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
2013-04-23 16:38:57 +02:00
wpa_s->conf = wpa_config_read(wpa_s->confname, NULL);
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 == NULL) {
wpa_printf(MSG_ERROR, "Failed to read or parse "
"configuration '%s'.", wpa_s->confname);
return -1;
}
wpa_supplicant: Add option -I for additional config file This option can be used only for global parameters that are not going to be changed from settings. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
2013-04-23 16:38:57 +02:00
wpa_s->confanother = os_rel2abs_path(iface->confanother);
wpa_config_read(wpa_s->confanother, wpa_s->conf);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
/*
* Override ctrl_interface and driver_param if set on command
* line.
*/
if (iface->ctrl_interface) {
os_free(wpa_s->conf->ctrl_interface);
wpa_s->conf->ctrl_interface =
os_strdup(iface->ctrl_interface);
}
if (iface->driver_param) {
os_free(wpa_s->conf->driver_param);
wpa_s->conf->driver_param =
os_strdup(iface->driver_param);
}
P2P: Do not add ctrl interface for P2P_DEVICE (p2p-dev-*) Adding a new wpa_supplicant control interface for the dedicated P2P_DEVICE would be quite confusing for programs that manage P2P operations. Remove this control interface and require the global control interface to be used since it will provide consistent interface for both the new dedicated P2P_DEVICE (non-netdev) and old style P2P management through a netdev. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-06-30 22:32:13 +02:00
if (iface->p2p_mgmt && !iface->ctrl_interface) {
os_free(wpa_s->conf->ctrl_interface);
wpa_s->conf->ctrl_interface = NULL;
}
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
} else
wpa_s->conf = wpa_config_alloc_empty(iface->ctrl_interface,
iface->driver_param);
if (wpa_s->conf == NULL) {
wpa_printf(MSG_ERROR, "\nNo configuration found.");
return -1;
}
if (iface->ifname == NULL) {
wpa_printf(MSG_ERROR, "\nInterface name is required.");
return -1;
}
if (os_strlen(iface->ifname) >= sizeof(wpa_s->ifname)) {
wpa_printf(MSG_ERROR, "\nToo long interface name '%s'.",
iface->ifname);
return -1;
}
os_strlcpy(wpa_s->ifname, iface->ifname, sizeof(wpa_s->ifname));
if (iface->bridge_ifname) {
if (os_strlen(iface->bridge_ifname) >=
sizeof(wpa_s->bridge_ifname)) {
wpa_printf(MSG_ERROR, "\nToo long bridge interface "
"name '%s'.", iface->bridge_ifname);
return -1;
}
os_strlcpy(wpa_s->bridge_ifname, iface->bridge_ifname,
sizeof(wpa_s->bridge_ifname));
}
/* RSNA Supplicant Key Management - INITIALIZE */
eapol_sm_notify_portEnabled(wpa_s->eapol, FALSE);
eapol_sm_notify_portValid(wpa_s->eapol, FALSE);
/* Initialize driver interface and register driver event handler before
* L2 receive handler so that association events are processed before
* EAPOL-Key packets if both become available for the same select()
* call. */
Move wpa_supplicant driver initialization into a helper function Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 18:36:29 +01:00
if (wpas_init_driver(wpa_s, iface) < 0)
Allow multiple driver wrappers to be specified on command line For example, -Dnl80211,wext could be used to automatically select between nl80211 and wext. The first driver wrapper that is able to initialize the interface will be used.
2009-02-14 15:43:43 +01:00
return -1;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (wpa_supplicant_init_wpa(wpa_s) < 0)
return -1;
wpa_sm_set_ifname(wpa_s->wpa, wpa_s->ifname,
wpa_s->bridge_ifname[0] ? wpa_s->bridge_ifname :
NULL);
wpa_sm_set_fast_reauth(wpa_s->wpa, wpa_s->conf->fast_reauth);
if (wpa_s->conf->dot11RSNAConfigPMKLifetime &&
wpa_sm_set_param(wpa_s->wpa, RSNA_PMK_LIFETIME,
wpa_s->conf->dot11RSNAConfigPMKLifetime)) {
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_ERROR, "Invalid WPA parameter value for "
"dot11RSNAConfigPMKLifetime");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return -1;
}
if (wpa_s->conf->dot11RSNAConfigPMKReauthThreshold &&
wpa_sm_set_param(wpa_s->wpa, RSNA_PMK_REAUTH_THRESHOLD,
wpa_s->conf->dot11RSNAConfigPMKReauthThreshold)) {
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_ERROR, "Invalid WPA parameter value for "
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
"dot11RSNAConfigPMKReauthThreshold");
return -1;
}
if (wpa_s->conf->dot11RSNAConfigSATimeout &&
wpa_sm_set_param(wpa_s->wpa, RSNA_SA_TIMEOUT,
wpa_s->conf->dot11RSNAConfigSATimeout)) {
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_ERROR, "Invalid WPA parameter value for "
"dot11RSNAConfigSATimeout");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return -1;
}
wpa_supplicant: Unify hardware feature data The hardware feature data is required in several different places throughout the code. Previously, the data was acquired and freed on demand, but with this patch wpa_supplicant will keep a single copy around at runtime for everyone to use. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
2011-10-23 10:58:54 +02:00
wpa_s->hw.modes = wpa_drv_get_hw_feature_data(wpa_s,
&wpa_s->hw.num_modes,
&wpa_s->hw.flags);
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 (wpa_s->hw.modes) {
u16 i;
for (i = 0; i < wpa_s->hw.num_modes; i++) {
if (wpa_s->hw.modes[i].vht_capab) {
wpa_s->hw_capab = CAPAB_VHT;
break;
}
if (wpa_s->hw.modes[i].ht_capab &
HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET)
wpa_s->hw_capab = CAPAB_HT40;
else if (wpa_s->hw.modes[i].ht_capab &&
wpa_s->hw_capab == CAPAB_NO_HT_VHT)
wpa_s->hw_capab = CAPAB_HT;
}
}
wpa_supplicant: Unify hardware feature data The hardware feature data is required in several different places throughout the code. Previously, the data was acquired and freed on demand, but with this patch wpa_supplicant will keep a single copy around at runtime for everyone to use. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
2011-10-23 10:58:54 +02:00
Set WoWLAN triggers only if driver capabilities are known Previously, wpas_set_wowlan_triggers() could have been called in uninitialized wpa_driver_capa data if the driver interface did not support reporting of capabilities. While this would not really happen with a driver wrapper that implements set_wowlan() and as such, would not cause any difference in practice, it is better to clean this up to make the code path easier to understand for static analyzers. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-11 11:38:35 +02:00
capa_res = wpa_drv_get_capa(wpa_s, &capa);
if (capa_res == 0) {
TDLS: Get TDLS related capabilities from driver Put glue code in place to propagate TDLS related driver capabilities to the TDLS state machine. If the driver doesn't support capabilities, assume TDLS is supported internally. When TDLS is explicitly not supported, disable all user facing TDLS operations. Signed-off-by: Arik Nemtsov <arik@wizery.com> Cc: Kalyan C Gaddam <chakkal@iit.edu>
2011-09-26 12:55:25 +02:00
wpa_s->drv_capa_known = 1;
Allow driver wrappers to indicate maximum remain-on-channel duration
2010-04-11 18:42:37 +02:00
wpa_s->drv_flags = capa.flags;
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
wpa_s->drv_enc = capa.enc;
HT: Let the driver advertise its supported SMPS modes for AP mode Add smps_modes field, and let the driver fill it with its supported SMPS modes (static/dynamic). This will let us start an AP with specific SMPS mode (e.g., dynamic) that will allow it to reduce its power usage. Signed-off-by: Eliad Peller <eliad@wizery.com>
2014-10-20 05:21:39 +02:00
wpa_s->drv_smps_modes = capa.smps_modes;
wpa_supplicant: Store driver's RRM capabilities Store the RRM capability flags reported by the underlying driver. Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
2014-11-05 09:42:47 +01:00
wpa_s->drv_rrm_flags = capa.rrm_flags;
Maintain internal copy of Probe Response offload capabilities Signed-hostap: Arik Nemtsov <arik@wizery.com> Signed-off-by: Arik Nemtsov <arik@wizery.com>
2011-12-10 16:17:43 +01:00
wpa_s->probe_resp_offloads = capa.probe_resp_offloads;
Allow driver wrappers to indicate maximum remain-on-channel duration
2010-04-11 18:42:37 +02:00
wpa_s->max_scan_ssids = capa.max_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->max_sched_scan_ssids = capa.max_sched_scan_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
wpa_s->max_sched_scan_plans = capa.max_sched_scan_plans;
wpa_s->max_sched_scan_plan_interval =
capa.max_sched_scan_plan_interval;
wpa_s->max_sched_scan_plan_iterations =
capa.max_sched_scan_plan_iterations;
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->sched_scan_supported = capa.sched_scan_supported;
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
wpa_s->max_match_sets = capa.max_match_sets;
Allow driver wrappers to indicate maximum remain-on-channel duration
2010-04-11 18:42:37 +02:00
wpa_s->max_remain_on_chan = capa.max_remain_on_chan;
P2P: Allow driver wrapper to indicate how many stations are supported This can be used to limit the number of clients allowed to connect to the group on the GO.
2010-07-30 00:32:33 +02:00
wpa_s->max_stations = capa.max_stations;
hostapd/wpa_s: Use driver's extended capabilities Some extended capabilities (I'm currently interested in "Operating Mode Notification" for VHT) are implemented by the kernel driver and exported in nl80211. Use these in hostapd/wpa_supplicant. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-03-31 20:51:44 +02:00
wpa_s->extended_capa = capa.extended_capa;
wpa_s->extended_capa_mask = capa.extended_capa_mask;
wpa_s->extended_capa_len = capa.extended_capa_len;
nl80211: Report the number of concurrent support channels Previously, drivers only reported if they support multiple concurrent channels, but did not report the maximum number of supported channels. Add this reporting to the driver capabilities and add the implementation to driver_nl80211. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 18:49:47 +02:00
wpa_s->num_multichan_concurrent =
capa.num_multichan_concurrent;
WMM AC: Add add_tx_ts and del_tx_ts driver ops Add add_tx_ts() and del_tx_ts() ops to notify the driver about TSPEC add / delete. Additionally, add wmm_ac_supported flag to indicate whether the driver supports WMM AC. Signed-off-by: Moshe Benji <moshe.benji@intel.com> Signed-off-by: Eliad Peller <eliad@wizery.com>
2014-10-22 14:03:55 +02:00
wpa_s->wmm_ac_supported = capa.wmm_ac_supported;
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
if (capa.mac_addr_rand_scan_supported)
wpa_s->mac_addr_rand_supported |= MAC_ADDR_RAND_SCAN;
if (wpa_s->sched_scan_supported &&
capa.mac_addr_rand_sched_scan_supported)
wpa_s->mac_addr_rand_supported |=
(MAC_ADDR_RAND_SCHED_SCAN | MAC_ADDR_RAND_PNO);
Allow driver wrappers to indicate maximum remain-on-channel duration
2010-04-11 18:42:37 +02:00
}
if (wpa_s->max_remain_on_chan == 0)
wpa_s->max_remain_on_chan = 1000;
P2P: Create P2P Device interface if supported If the capability flag of the driver indicates a dedicated P2P Device is supported, a P2P Device interface is created. Create the P2P Device in main interface creation loop when the added interface flags support and P2P supplicant is not yet initialized avoiding recursion of add_interface. Do not register l2_packet for P2P Device interface (both for EAPOL and for TDLS). Signed-hostap: Arend van Spriel <arend@broadcom.com>
2013-06-30 09:17:47 +02:00
/*
* Only take p2p_mgmt parameters when P2P Device is supported.
* Doing it here as it determines whether l2_packet_init() will be done
* during wpa_supplicant_driver_init().
*/
if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_DEDICATED_P2P_DEVICE)
wpa_s->p2p_mgmt = iface->p2p_mgmt;
else
iface->p2p_mgmt = 1;
nl80211: Report the number of concurrent support channels Previously, drivers only reported if they support multiple concurrent channels, but did not report the maximum number of supported channels. Add this reporting to the driver capabilities and add the implementation to driver_nl80211. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 18:49:47 +02:00
if (wpa_s->num_multichan_concurrent == 0)
wpa_s->num_multichan_concurrent = 1;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (wpa_supplicant_driver_init(wpa_s) < 0)
return -1;
TDLS: Add initial support for TDLS (IEEE Std 802.11z-2010)
2010-10-07 09:26:56 +02:00
#ifdef CONFIG_TDLS
P2P: Fix TDLS and l2_packet init without P2P Device interface Commit c68f6200a72f2b33304f583859b09e57757b9d2a made these calls conditional on !p2p_mgmt, but forced p2p_mgmt=1 for cases where the driver does not use the dedicated P2P Device. Fix this by making the !p2p_mgmt condition apply only if the driver does indicate use of a dedicated P2P Device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-06-30 19:02:25 +02:00
if ((!iface->p2p_mgmt ||
!(wpa_s->drv_flags &
WPA_DRIVER_FLAGS_DEDICATED_P2P_DEVICE)) &&
wpa_tdls_init(wpa_s->wpa))
TDLS: Add initial support for TDLS (IEEE Std 802.11z-2010)
2010-10-07 09:26:56 +02:00
return -1;
#endif /* CONFIG_TDLS */
Renamed the 'alpha2' variable to 'country' to match with config string
2008-12-09 21:15:47 +01:00
if (wpa_s->conf->country[0] && wpa_s->conf->country[1] &&
wpa_drv_set_country(wpa_s, wpa_s->conf->country)) {
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 set country");
wpa_supplicant: Add support for setting of a regulatory domain This adds support for setting of a regulatory domain to wpa_supplicant drivers. It also adds regulatory domain setting for the nl80211 driver. We expect an ISO / IEC 3166 alpha2 in the wpa configuration file as a global.
2008-12-09 21:11:14 +01:00
return -1;
}
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->conf->fst_group_id) {
struct fst_iface_cfg cfg;
struct fst_wpa_obj iface_obj;
fst_wpa_supplicant_fill_iface_obj(wpa_s, &iface_obj);
os_strlcpy(cfg.group_id, wpa_s->conf->fst_group_id,
sizeof(cfg.group_id));
cfg.priority = wpa_s->conf->fst_priority;
cfg.llt = wpa_s->conf->fst_llt;
wpa_s->fst = fst_attach(wpa_s->ifname, wpa_s->own_addr,
&iface_obj, &cfg);
if (!wpa_s->fst) {
wpa_msg(wpa_s, MSG_ERROR,
"FST: Cannot attach iface %s to group %s",
wpa_s->ifname, cfg.group_id);
return -1;
}
}
#endif /* CONFIG_FST */
WPS: Moved wps_context initialization into wps_supplicant.c The wps_context data is now managed at wpa_supplicant, not EAP-WSC. This makes wpa_supplicant design for WPS match with hostapd one and also makes it easier configure whatever parameters and callbacks are needed for WPS.
2008-11-28 19:32:13 +01:00
if (wpas_wps_init(wpa_s))
return -1;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (wpa_supplicant_init_eapol(wpa_s) < 0)
return -1;
wpa_sm_set_eapol(wpa_s->wpa, wpa_s->eapol);
wpa_s->ctrl_iface = wpa_supplicant_ctrl_iface_init(wpa_s);
if (wpa_s->ctrl_iface == NULL) {
wpa_printf(MSG_ERROR,
"Failed to initialize control interface '%s'.\n"
"You may have another wpa_supplicant process "
"already running or the file was\n"
"left by an unclean termination of wpa_supplicant "
"in which case you will need\n"
"to manually remove this file before starting "
"wpa_supplicant again.\n",
wpa_s->conf->ctrl_interface);
return -1;
}
GAS: Add a generic GAS query module This implements GAS request mechanism that is aimed at being used to replace use case specific GAS/ANQP implementations in the future. Compared to the earlier implementation in P2P SD, this implementation includes support for multiple concurrent requests and more thorough validation of frames against the pending query data. GAS header processing, including comeback and reassembly, are handled within gas_query.c and the users of this module will only need to provide the Query Request and process the (possibly reassembled) Query Response.
2011-09-28 18:44:25 +02:00
wpa_s->gas = gas_query_init(wpa_s);
if (wpa_s->gas == NULL) {
wpa_printf(MSG_ERROR, "Failed to initialize GAS query");
return -1;
}
P2P: Create P2P Device interface if supported If the capability flag of the driver indicates a dedicated P2P Device is supported, a P2P Device interface is created. Create the P2P Device in main interface creation loop when the added interface flags support and P2P supplicant is not yet initialized avoiding recursion of add_interface. Do not register l2_packet for P2P Device interface (both for EAPOL and for TDLS). Signed-hostap: Arend van Spriel <arend@broadcom.com>
2013-06-30 09:17:47 +02:00
if (iface->p2p_mgmt && wpas_p2p_init(wpa_s->global, wpa_s) < 0) {
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_ERROR, "Failed to init P2P");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return -1;
}
Add BSS table to track scan results without dropping information Collect information from scan results into a BSS table that will not expire information as quickly as scan results where every new scan, no matter for how limited set of channels/SSIDs, clears all old information. For now, this is only used for D-Bus BSS added/removed notifications, but this will likely be extended to be used internally instead of the scan results to better support partial scans.
2009-12-27 20:07:47 +01:00
if (wpa_bss_init(wpa_s) < 0)
return -1;
wpa_supplicant: Add Wake-on-WLAN configuration support Add a new wowlan_triggers option to wpa_supplicant.conf. The triggers in this key will be used to configure the kernel wowlan configuration. For now, support only simple flags. More complex triggers can be added later on. Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
2014-04-24 07:45:39 +02:00
/*
* Set Wake-on-WLAN triggers, if configured.
* Note: We don't restore/remove the triggers on shutdown (it doesn't
* have effect anyway when the interface is down).
*/
Set WoWLAN triggers only if driver capabilities are known Previously, wpas_set_wowlan_triggers() could have been called in uninitialized wpa_driver_capa data if the driver interface did not support reporting of capabilities. While this would not really happen with a driver wrapper that implements set_wowlan() and as such, would not cause any difference in practice, it is better to clean this up to make the code path easier to understand for static analyzers. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-11 11:38:35 +02:00
if (capa_res == 0 && wpas_set_wowlan_triggers(wpa_s, &capa) < 0)
wpa_supplicant: Add Wake-on-WLAN configuration support Add a new wowlan_triggers option to wpa_supplicant.conf. The triggers in this key will be used to configure the kernel wowlan configuration. For now, support only simple flags. More complex triggers can be added later on. Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
2014-04-24 07:45:39 +02:00
return -1;
Interworking: Add support for using eap_proxy offload Fetch IMSI through eap_proxy for Interworking network selection if needed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-06-19 17:42:17 +02:00
#ifdef CONFIG_EAP_PROXY
{
size_t len;
eap_proxy: Confirm eap_proxy initialization before reading SIM info Trying to access the SIM card details without checking if the eap_proxy layer has been initialized can results in a crash. Address this by sending the request for the IMSI through eapol_supp_sm.c which can verify that eap_proxy has been initialized. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-23 18:17:14 +02:00
wpa_s->mnc_len = eapol_sm_get_eap_proxy_imsi(wpa_s->eapol, wpa_s->imsi,
&len);
Interworking: Add support for using eap_proxy offload Fetch IMSI through eap_proxy for Interworking network selection if needed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-06-19 17:42:17 +02:00
if (wpa_s->mnc_len > 0) {
wpa_s->imsi[len] = '\0';
wpa_printf(MSG_DEBUG, "eap_proxy: IMSI %s (MNC length %d)",
wpa_s->imsi, wpa_s->mnc_len);
} else {
wpa_printf(MSG_DEBUG, "eap_proxy: IMSI not available");
}
}
#endif /* CONFIG_EAP_PROXY */
Allow PC/SC reader to be selected and initialized at start New global configuration parameters pcsc_reader and pcsc_pin can now be used to initialize PC/SC reader context at start of wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-26 12:07:05 +01:00
if (pcsc_reader_init(wpa_s) < 0)
return -1;
EXT PW: Add framework for supporting external password storage This new mechanism can be used to make wpa_supplicant using external storage (e.g., key store in the operating system) for passwords, passphrases, and PSKs. This commit is only adding the framework part needed to support this, i.e., no actual configuration parameter can yet use this new mechanism. In addition, only a simple test backend is added to allow developer testing of the functionality. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-03 20:28:42 +02:00
if (wpas_init_ext_pw(wpa_s) < 0)
return -1;
SME: Add RRM support to association request In case the AP we are associating with advertises support for RRM, advertise our own RRM support in the (Re)Association Request frame. This is done by adding an RRM Capabilities IE. The underlying driver is expected to further add a Power Capabilities IE to the request, and set the Radio Measurement flag in the Capability Info field. At this point the RRM Capabilities IE advertises no measurement support. Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
2014-11-05 09:42:48 +01:00
wpas_rrm_reset(wpa_s);
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
wpas_sched_scan_plans_set(wpa_s, wpa_s->conf->sched_scan_plans);
HS 2.0: Convert icon storage to use dl_list This simplifies the list operations quite a bit. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-12-19 17:49:32 +01:00
#ifdef CONFIG_HS20
hs20_init(wpa_s);
#endif /* CONFIG_HS20 */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return 0;
}
Indicate interface removal only if the interface was added successfully
2009-12-26 12:45:07 +01:00
static void wpa_supplicant_deinit_iface(struct wpa_supplicant *wpa_s,
Let wpa_supplicant_deinit_iface() know that process is terminating This will be needed to be able to move ctrl_iface TERMINATING event to the end of interface removal. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-01-29 19:15:48 +01:00
int notify, int terminate)
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
{
P2P: Remove all child interfaces when removing the parent This is needed to allow dynamic removal of an interface that adds the P2P Device interface without leaving behind the management interface with invalid wpa_s->parent pointer. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-20 11:40:29 +02:00
struct wpa_global *global = wpa_s->global;
struct wpa_supplicant *iface, *prev;
if (wpa_s == wpa_s->parent)
wpas_p2p_group_remove(wpa_s, "*");
iface = global->ifaces;
while (iface) {
if (iface == wpa_s || iface->parent != wpa_s) {
iface = iface->next;
continue;
}
wpa_printf(MSG_DEBUG,
"Remove remaining child interface %s from parent %s",
iface->ifname, wpa_s->ifname);
prev = iface;
iface = iface->next;
wpa_supplicant_remove_iface(global, prev, terminate);
}
Mark interface disconnected on removal request This cleans up debug log by not trying to process the disconnection event as a failure that could result in blacklist addition and auto connect attempt. These are pointless operations since the interface is going to removed immediately after this. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-05-12 18:16:35 +02:00
wpa_s->disconnected = 1;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (wpa_s->drv_priv) {
wpa_supplicant_deauthenticate(wpa_s,
WLAN_REASON_DEAUTH_LEAVING);
wpa_drv_set_countermeasures(wpa_s, 0);
wpa_clear_keys(wpa_s, NULL);
}
dbus: Fix D-Bus network and BSS object registration/unregistration Do not try to unregister BSS objects twice (the latter one with invalid path) and make sure all network objects get added and removed properly (the ones read from configuration file were not being registered, but were tried to be unregistered).
2009-12-29 21:17:18 +01:00
wpa_supplicant_cleanup(wpa_s);
P2P: Clean up by moving ifdef CONFIG_P2P to p2p_suppplicant.h This removes number of unnecessary #ifdef CONFIG_P2P blocks from generic code by hiding the conditional build into p2p_supplicant.h with empty inline functions. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-15 18:31:53 +02:00
wpas_p2p_deinit_iface(wpa_s);
P2P: Deinitialize global P2P context on P2P mgmt interface removal The P2P implementation assumes that the first wpa_s interface instance is used to manage P2P operations and the P2P module maintains a pointer to this interface in msg_ctx. This can result in issues (e.g., use of freed memory) when the management interface is removed. Fix this by deinitializing global P2P data if the interface that created it is removed. This will disable P2P until the next interface is added. Signed-hostap: Jouni Malinen <j@w1.fi> intended-for: hostap-1
2012-05-10 09:49:22 +02:00
Allow external programs to request wpa_radio work items The new control interface command RADIO_WORK can be used by external programs to request radio allocation slots from wpa_supplicant if exclusive radio control is needed, e.g., for offchannel operations. If such operations are done directly to the driver, wpa_supplicant may not have enough information to avoid conflicting operations. This new command can be used to provide enough information and radio scheduling to avoid issues with such cases. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-04 12:10:41 +01:00
wpas_ctrl_radio_work_flush(wpa_s);
Add shared per-radio structure for wpa_supplicant struct wpa_radio is used as a shared data structure between all struct wpa_supplicant instances that share the same physical radio. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 18:53:19 +01:00
radio_remove_interface(wpa_s);
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) {
fst_detach(wpa_s->fst);
wpa_s->fst = NULL;
}
if (wpa_s->received_mb_ies) {
wpabuf_free(wpa_s->received_mb_ies);
wpa_s->received_mb_ies = NULL;
}
#endif /* CONFIG_FST */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (wpa_s->drv_priv)
wpa_drv_deinit(wpa_s);
Deinit driver before notifying interface has been removed This avoids issues with some external program starting to use the interface based on the interface removal event before wpa_supplicant has completed deinitialization of the driver interface. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-01-29 19:18:48 +01:00
if (notify)
wpas_notify_iface_removed(wpa_s);
Move ctrl_iface deinit into the end of interface deinit This allows TERMINATING ctrl_iface event to be sent at the end of the deinit sequence to avoid race conditions with new operations that this event may trigger while wpa_supplicant would still be running through the deinitialization path. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-01-29 19:21:07 +01:00
if (terminate)
wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_TERMINATING);
if (wpa_s->ctrl_iface) {
wpa_supplicant_ctrl_iface_deinit(wpa_s->ctrl_iface);
wpa_s->ctrl_iface = NULL;
}
Add mesh_group_{add,remove} control interface commands Parse MESH_GROUP_ADD/REMOVE commands on ctrl interface and call wpa_supplicant routines. These commands are used to start or join and leave a mesh network. The mesh id is given in the configuration file, therefore there is no need to scan before joining a mesh network. We reuse the connect_without_scan construct used by P2P for that same purpose. Signed-off-by: Javier Cardona <javier@cozybit.com> Signed-off-by: Javier Lopez <jlopex@gmail.com>
2014-09-01 06:23:33 +02:00
#ifdef CONFIG_MESH
if (wpa_s->ifmsh) {
wpa_supplicant_mesh_iface_deinit(wpa_s, wpa_s->ifmsh);
wpa_s->ifmsh = NULL;
}
#endif /* CONFIG_MESH */
Move ctrl_iface deinit into the end of interface deinit This allows TERMINATING ctrl_iface event to be sent at the end of the deinit sequence to avoid race conditions with new operations that this event may trigger while wpa_supplicant would still be running through the deinitialization path. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-01-29 19:21:07 +01:00
if (wpa_s->conf != NULL) {
wpa_config_free(wpa_s->conf);
wpa_s->conf = NULL;
}
Move wpa_s freeing into wpa_supplicant_deinit_iface() All wpa_supplicant_deinit_iface() callers ended up freeing wpa_s immediately after this call. Move os_free(wpa_s) into the deinit function to share the same call and make the deinit sequence clearer. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-23 17:07:41 +02: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
os_free(wpa_s->ssids_from_scan_req);
Move wpa_s freeing into wpa_supplicant_deinit_iface() All wpa_supplicant_deinit_iface() callers ended up freeing wpa_s immediately after this call. Move os_free(wpa_s) into the deinit function to share the same call and make the deinit sequence clearer. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-23 17:07:41 +02:00
os_free(wpa_s);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
/**
* wpa_supplicant_add_iface - Add a new network interface
* @global: Pointer to global data from wpa_supplicant_init()
* @iface: Interface configuration options
P2P: Fix interface deinit for failed group interface initialization wpa_supplicant_deinit_iface() ends up removing all P2P groups if the removed interface is the parent interface. This is correct behavior in general, but this resulted in issues in the new group interface initialization error path since wpa_s->parent was not assigned before hitting this check. Fix this by assigning wpa_s->parent as part of wpa_supplicant_add_iface(). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 20:50:34 +01:00
* @parent: Parent interface or %NULL to assign new interface as parent
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
* Returns: Pointer to the created interface or %NULL on failure
*
* This function is used to add new network interfaces for %wpa_supplicant.
* This can be called before wpa_supplicant_run() to add interfaces before the
* main event loop has been started. In addition, new interfaces can be added
* dynamically while %wpa_supplicant is already running. This could happen,
* e.g., when a hotplug network adapter is inserted.
*/
struct wpa_supplicant * wpa_supplicant_add_iface(struct wpa_global *global,
P2P: Fix interface deinit for failed group interface initialization wpa_supplicant_deinit_iface() ends up removing all P2P groups if the removed interface is the parent interface. This is correct behavior in general, but this resulted in issues in the new group interface initialization error path since wpa_s->parent was not assigned before hitting this check. Fix this by assigning wpa_s->parent as part of wpa_supplicant_add_iface(). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 20:50:34 +01:00
struct wpa_interface *iface,
struct wpa_supplicant *parent)
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
{
struct wpa_supplicant *wpa_s;
Allow driver and ctrl_interface parameters to be overridden New wpa_supplicant command line options -o<driver> and -O<ctrl> can now be used to override the parameters received in add interface command from dbus or global ctrl_interface. This can be used, e.g., to enable control interface when using NetworkManager (add -O/var/run/wpa_supplicant into the Exec parameter in /usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service). Similarly, this can be used to use another driver wrapper with NetworkManager (e.g., -onl80211 to replace WEXT with nl80211).
2009-11-04 19:16:15 +01:00
struct wpa_interface t_iface;
dbus: Fix D-Bus network and BSS object registration/unregistration Do not try to unregister BSS objects twice (the latter one with invalid path) and make sure all network objects get added and removed properly (the ones read from configuration file were not being registered, but were tried to be unregistered).
2009-12-29 21:17:18 +01:00
struct wpa_ssid *ssid;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (global == NULL || iface == NULL)
return NULL;
P2P: Fix interface deinit for failed group interface initialization wpa_supplicant_deinit_iface() ends up removing all P2P groups if the removed interface is the parent interface. This is correct behavior in general, but this resulted in issues in the new group interface initialization error path since wpa_s->parent was not assigned before hitting this check. Fix this by assigning wpa_s->parent as part of wpa_supplicant_add_iface(). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 20:50:34 +01:00
wpa_s = wpa_supplicant_alloc(parent);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (wpa_s == NULL)
return NULL;
Fix driver initialization not to crash if driver does not use init2() 8a5ab9f5e56cd2f5781c2d92f41495e60d544780 fixed global driver context for init2(), but it also broke driver initialization with driver wrappers that do not use init2().. Fix this by setting wpa_s->global before it gets dereferenced.
2009-12-02 15:43:09 +01:00
wpa_s->global = global;
Allow driver and ctrl_interface parameters to be overridden New wpa_supplicant command line options -o<driver> and -O<ctrl> can now be used to override the parameters received in add interface command from dbus or global ctrl_interface. This can be used, e.g., to enable control interface when using NetworkManager (add -O/var/run/wpa_supplicant into the Exec parameter in /usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service). Similarly, this can be used to use another driver wrapper with NetworkManager (e.g., -onl80211 to replace WEXT with nl80211).
2009-11-04 19:16:15 +01:00
t_iface = *iface;
if (global->params.override_driver) {
wpa_printf(MSG_DEBUG, "Override interface parameter: driver "
"('%s' -> '%s')",
iface->driver, global->params.override_driver);
t_iface.driver = global->params.override_driver;
}
if (global->params.override_ctrl_interface) {
wpa_printf(MSG_DEBUG, "Override interface parameter: "
"ctrl_interface ('%s' -> '%s')",
iface->ctrl_interface,
global->params.override_ctrl_interface);
t_iface.ctrl_interface =
global->params.override_ctrl_interface;
}
if (wpa_supplicant_init_iface(wpa_s, &t_iface)) {
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_printf(MSG_DEBUG, "Failed to add interface %s",
iface->ifname);
Let wpa_supplicant_deinit_iface() know that process is terminating This will be needed to be able to move ctrl_iface TERMINATING event to the end of interface removal. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-01-29 19:15:48 +01:00
wpa_supplicant_deinit_iface(wpa_s, 0, 0);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return NULL;
}
wpa_supplicant: Do not register a P2P management interface on DBus DBus client should always request the proper netdev interface. This will be necessary to get a consistent behavior whatever driver is in use: iwlwifi (which requires a P2P mgmt dev), ath9/10k (which does not), etc... Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2014-10-23 10:31:19 +02:00
if (iface->p2p_mgmt == 0) {
/* Notify the control interfaces about new iface */
if (wpas_notify_iface_added(wpa_s)) {
wpa_supplicant_deinit_iface(wpa_s, 1, 0);
return NULL;
}
Remove extra whitespace
2009-09-13 19:27:54 +02:00
wpa_supplicant: Do not register a P2P management interface on DBus DBus client should always request the proper netdev interface. This will be necessary to get a consistent behavior whatever driver is in use: iwlwifi (which requires a P2P mgmt dev), ath9/10k (which does not), etc... Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2014-10-23 10:31:19 +02:00
for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next)
wpas_notify_network_added(wpa_s, ssid);
}
dbus: Fix D-Bus network and BSS object registration/unregistration Do not try to unregister BSS objects twice (the latter one with invalid path) and make sure all network objects get added and removed properly (the ones read from configuration file were not being registered, but were tried to be unregistered).
2009-12-29 21:17:18 +01:00
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_s->next = global->ifaces;
global->ifaces = 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, "Added interface %s", wpa_s->ifname);
Start autoscan for first connection attempt Use wpa_supplicant_set_state() to initialize state to DISCONNECT so that autoscan gets initialized properly. This needs a change in autoscan_init() to avoid extra scan request that would postpone the first scan request when an interface is added. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-06-26 18:52:46 +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
P2P: Support dynamic addition of P2P Device triggering interface This moves the addition of P2P Device interface into wpa_supplicant_add_iface() so that this operation can be done dynamically when adding an interface to an already running wpa_supplicant process. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-20 11:42:27 +02:00
#ifdef CONFIG_P2P
if (wpa_s->global->p2p == NULL &&
P2P: Do not create a P2P Device interface if P2P is disabled Do not add the dedicated P2P Device interface in case P2P is disabled in the configuration file or globally. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-04-22 12:13:18 +02:00
!wpa_s->global->p2p_disabled && !wpa_s->conf->p2p_disabled &&
P2P: Support dynamic addition of P2P Device triggering interface This moves the addition of P2P Device interface into wpa_supplicant_add_iface() so that this operation can be done dynamically when adding an interface to an already running wpa_supplicant process. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-20 11:42:27 +02:00
(wpa_s->drv_flags & WPA_DRIVER_FLAGS_DEDICATED_P2P_DEVICE) &&
P2P: Handle P2P Device dedicated interface parent removal In case of a network interface removal, check if the interface was also the parent interface of the P2P Device dedicated interface. If this is the case, then stop the P2P Device functionality, and remove the P2P Device dedicated interface. In case that the interface is added again and P2P Device functionality can be enabled again, add a new P2P Device dedicated interface and allow further P2P Device functionality. In case that the P2P Device dedicated interface is re-created, the original P2P Device configuration file is needed, so store it in the global params (instead in the wpa_interface configuration). Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-06-17 15:18:20 +02:00
wpas_p2p_add_p2pdev_interface(
wpa_s, wpa_s->global->params.conf_p2p_dev) < 0) {
P2P: Support dynamic addition of P2P Device triggering interface This moves the addition of P2P Device interface into wpa_supplicant_add_iface() so that this operation can be done dynamically when adding an interface to an already running wpa_supplicant process. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-20 11:42:27 +02:00
wpa_printf(MSG_INFO,
"P2P: Failed to enable P2P Device interface");
/* Try to continue without. P2P will be disabled. */
}
#endif /* CONFIG_P2P */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return wpa_s;
}
/**
* wpa_supplicant_remove_iface - Remove a network interface
* @global: Pointer to global data from wpa_supplicant_init()
* @wpa_s: Pointer to the network interface to be removed
* Returns: 0 if interface was removed, -1 if interface was not found
*
* This function can be used to dynamically remove network interfaces from
* %wpa_supplicant, e.g., when a hotplug network adapter is ejected. In
* addition, this function is used to remove all remaining interfaces when
* %wpa_supplicant is terminated.
*/
int wpa_supplicant_remove_iface(struct wpa_global *global,
Let wpa_supplicant_deinit_iface() know that process is terminating This will be needed to be able to move ctrl_iface TERMINATING event to the end of interface removal. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-01-29 19:15:48 +01:00
struct wpa_supplicant *wpa_s,
int terminate)
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
{
struct wpa_supplicant *prev;
mesh: Add mesh interface creation command for mesh gate The mesh gate is used to bridge (or route) between mesh network and another network. For example, mesh gate acts as router between mesh network and IEEE 802.11 BSS network. This command makes a virtual mesh interface to be used for mesh gate. This command expects to be used like this. wpa_cli -i wlan0 MESH_INTERFACE_ADD ifname=mesh0 wpa_cli -i mesh0 add_network wpa_cli -i mesh0 set_network 0 ssid '"commell_2X_mmm"' wpa_cli -i mesh0 set_network 0 mode 5 wpa_cli -i mesh0 set_network 0 frequency 2412 wpa_cli -i mesh0 set_network 0 key_mgmt SAE wpa_cli -i mesh0 set_network 0 psk '"01234567"' wpa_cli -i mesh0 mesh_group_add 0 wpa_cli -i wlan0 mesh_group_remove mesh0 Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
2014-11-15 02:35:23 +01:00
#ifdef CONFIG_MESH
unsigned int mesh_if_created = wpa_s->mesh_if_created;
char *ifname = NULL;
#endif /* CONFIG_MESH */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
/* Remove interface from the global list of interfaces */
prev = global->ifaces;
if (prev == wpa_s) {
global->ifaces = wpa_s->next;
} else {
while (prev && prev->next != wpa_s)
prev = prev->next;
if (prev == NULL)
return -1;
prev->next = wpa_s->next;
}
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, "Removing interface %s", wpa_s->ifname);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
mesh: Add mesh interface creation command for mesh gate The mesh gate is used to bridge (or route) between mesh network and another network. For example, mesh gate acts as router between mesh network and IEEE 802.11 BSS network. This command makes a virtual mesh interface to be used for mesh gate. This command expects to be used like this. wpa_cli -i wlan0 MESH_INTERFACE_ADD ifname=mesh0 wpa_cli -i mesh0 add_network wpa_cli -i mesh0 set_network 0 ssid '"commell_2X_mmm"' wpa_cli -i mesh0 set_network 0 mode 5 wpa_cli -i mesh0 set_network 0 frequency 2412 wpa_cli -i mesh0 set_network 0 key_mgmt SAE wpa_cli -i mesh0 set_network 0 psk '"01234567"' wpa_cli -i mesh0 mesh_group_add 0 wpa_cli -i wlan0 mesh_group_remove mesh0 Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
2014-11-15 02:35:23 +01:00
#ifdef CONFIG_MESH
if (mesh_if_created) {
ifname = os_strdup(wpa_s->ifname);
if (ifname == NULL) {
wpa_dbg(wpa_s, MSG_ERROR,
"mesh: Failed to malloc ifname");
return -1;
}
}
#endif /* CONFIG_MESH */
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (global->p2p_group_formation == wpa_s)
global->p2p_group_formation = NULL;
P2P: Remove persistent group peer if it rejects invitation If a peer replies to persistent group invitation with status code 8 (unknown group), remove the peer from the p2p_client_list if we are the GO or remove the persistent group if we are the P2P client since it looks like that the peer has dropped persistent group credentials and the provisioning step needs to be executed again. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-15 15:31:31 +01:00
if (global->p2p_invite_group == wpa_s)
global->p2p_invite_group = NULL;
Let wpa_supplicant_deinit_iface() know that process is terminating This will be needed to be able to move ctrl_iface TERMINATING event to the end of interface removal. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-01-29 19:15:48 +01:00
wpa_supplicant_deinit_iface(wpa_s, 1, terminate);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
mesh: Add mesh interface creation command for mesh gate The mesh gate is used to bridge (or route) between mesh network and another network. For example, mesh gate acts as router between mesh network and IEEE 802.11 BSS network. This command makes a virtual mesh interface to be used for mesh gate. This command expects to be used like this. wpa_cli -i wlan0 MESH_INTERFACE_ADD ifname=mesh0 wpa_cli -i mesh0 add_network wpa_cli -i mesh0 set_network 0 ssid '"commell_2X_mmm"' wpa_cli -i mesh0 set_network 0 mode 5 wpa_cli -i mesh0 set_network 0 frequency 2412 wpa_cli -i mesh0 set_network 0 key_mgmt SAE wpa_cli -i mesh0 set_network 0 psk '"01234567"' wpa_cli -i mesh0 mesh_group_add 0 wpa_cli -i wlan0 mesh_group_remove mesh0 Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
2014-11-15 02:35:23 +01:00
#ifdef CONFIG_MESH
if (mesh_if_created) {
wpa_drv_if_remove(global->ifaces, WPA_IF_MESH, ifname);
os_free(ifname);
}
#endif /* CONFIG_MESH */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return 0;
}
wpa_supplicant: Add wpa_supplicant_get_eap_mode method Signed-off-by: Paul Stewart <pstew@google.com>
2011-03-15 12:53:08 +01:00
/**
* wpa_supplicant_get_eap_mode - Get the current EAP mode
* @wpa_s: Pointer to the network interface
* Returns: Pointer to the eap mode or the string "UNKNOWN" if not found
*/
const char * wpa_supplicant_get_eap_mode(struct wpa_supplicant *wpa_s)
{
const char *eapol_method;
if (wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt) == 0 &&
wpa_s->key_mgmt != WPA_KEY_MGMT_IEEE8021X_NO_WPA) {
return "NO-EAP";
}
eapol_method = eapol_sm_get_method_name(wpa_s->eapol);
if (eapol_method == NULL)
return "UNKNOWN-EAP";
return eapol_method;
}
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
/**
* wpa_supplicant_get_iface - Get a new network interface
* @global: Pointer to global data from wpa_supplicant_init()
* @ifname: Interface name
* Returns: Pointer to the interface or %NULL if not found
*/
struct wpa_supplicant * wpa_supplicant_get_iface(struct wpa_global *global,
const char *ifname)
{
struct wpa_supplicant *wpa_s;
for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next) {
if (os_strcmp(wpa_s->ifname, ifname) == 0)
return wpa_s;
}
return NULL;
}
Fix CONFIG_NO_STDOUT_DEBUG=y build
2011-02-10 19:24:06 +01:00
#ifndef CONFIG_NO_WPA_MSG
Add interface name to wpa_msg() output This makes log files much more readable if multiple interfaces are being controlled by the same process. The interface name is added to stdout/file/syslog entries, but not to the messages sent to control interface monitors to avoid issues with parsing in external programs. Signed-off-by: Ben Greear <greearb@candelatech.com>
2011-02-06 19:39:34 +01:00
static const char * wpa_supplicant_msg_ifname_cb(void *ctx)
{
struct wpa_supplicant *wpa_s = ctx;
if (wpa_s == NULL)
return NULL;
return wpa_s->ifname;
}
Fix CONFIG_NO_STDOUT_DEBUG=y build
2011-02-10 19:24:06 +01:00
#endif /* CONFIG_NO_WPA_MSG */
Add interface name to wpa_msg() output This makes log files much more readable if multiple interfaces are being controlled by the same process. The interface name is added to stdout/file/syslog entries, but not to the messages sent to control interface monitors to avoid issues with parsing in external programs. Signed-off-by: Ben Greear <greearb@candelatech.com>
2011-02-06 19:39:34 +01:00
Use a single cleanup timer per wpa_supplicant process Previously, one timeout per process (by default every 30 seconds) was used P2P peer expiration and another per-interface timeout (every 10 seconds) was used to expire BSS entries. Merge these to a single per-process timeout that triggers every 10 seconds to minimize number of process wakeups due to periodic operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-20 12:11:31 +02:00
#ifndef WPA_SUPPLICANT_CLEANUP_INTERVAL
#define WPA_SUPPLICANT_CLEANUP_INTERVAL 10
#endif /* WPA_SUPPLICANT_CLEANUP_INTERVAL */
/* Periodic cleanup tasks */
static void wpas_periodic(void *eloop_ctx, void *timeout_ctx)
{
struct wpa_global *global = eloop_ctx;
struct wpa_supplicant *wpa_s;
eloop_register_timeout(WPA_SUPPLICANT_CLEANUP_INTERVAL, 0,
wpas_periodic, global, NULL);
#ifdef CONFIG_P2P
if (global->p2p)
p2p_expire_peers(global->p2p);
#endif /* CONFIG_P2P */
Add shared periodic cleanup function for AP mode This new mechanism can be used to combine multiple periodic AP (including P2P GO) task into a single eloop timeout to minimize number of wakeups for the process. hostapd gets its own periodic caller and wpa_supplicant uses the previously added timer to trigger these calls. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-20 12:33:30 +02:00
for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next) {
Use a single cleanup timer per wpa_supplicant process Previously, one timeout per process (by default every 30 seconds) was used P2P peer expiration and another per-interface timeout (every 10 seconds) was used to expire BSS entries. Merge these to a single per-process timeout that triggers every 10 seconds to minimize number of process wakeups due to periodic operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-20 12:11:31 +02:00
wpa_bss_flush_by_age(wpa_s, wpa_s->conf->bss_expiration_age);
Add shared periodic cleanup function for AP mode This new mechanism can be used to combine multiple periodic AP (including P2P GO) task into a single eloop timeout to minimize number of wakeups for the process. hostapd gets its own periodic caller and wpa_supplicant uses the previously added timer to trigger these calls. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-20 12:33:30 +02:00
#ifdef CONFIG_AP
ap_periodic(wpa_s);
#endif /* CONFIG_AP */
}
Use a single cleanup timer per wpa_supplicant process Previously, one timeout per process (by default every 30 seconds) was used P2P peer expiration and another per-interface timeout (every 10 seconds) was used to expire BSS entries. Merge these to a single per-process timeout that triggers every 10 seconds to minimize number of process wakeups due to periodic operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-20 12:11:31 +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_init - Initialize %wpa_supplicant
* @params: Parameters for %wpa_supplicant
* Returns: Pointer to global %wpa_supplicant data, or %NULL on failure
*
* This function is used to initialize %wpa_supplicant. After successful
* initialization, the returned data pointer can be used to add and remove
* network interfaces, and eventually, to deinitialize %wpa_supplicant.
*/
struct wpa_global * wpa_supplicant_init(struct wpa_params *params)
{
struct wpa_global *global;
Added support for global driver data (shared by multiple interfaces) Driver wrappers can now register global_init() and global_deinit() driver_ops handlers to get a global data structure that can be shared for all interfaces. This allows driver wrappers to initialize some functionality (e.g., interface monitoring) before any interfaces have been initialized.
2008-12-22 21:24:31 +01:00
int ret, i;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (params == NULL)
return NULL;
ndis: Work around lack of C99 designated initializers in MSVC Use a driver_ndis.c specific initialization function to fill in the wpa_driver_ops information to make it easier to modify struct wpa_driver_ops in the future. Being able to build driver_ndis.c with MSVC was the only reason for having to maintain the same order of function pointers in struct wpa_driver_ops and for having to update driver_ndis.c for all changes in that structure. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-11-03 17:45:21 +01:00
#ifdef CONFIG_DRIVER_NDIS
{
void driver_ndis_init_ops(void);
driver_ndis_init_ops();
}
#endif /* CONFIG_DRIVER_NDIS */
Fix CONFIG_NO_STDOUT_DEBUG=y build
2011-02-10 19:24:06 +01:00
#ifndef CONFIG_NO_WPA_MSG
Add interface name to wpa_msg() output This makes log files much more readable if multiple interfaces are being controlled by the same process. The interface name is added to stdout/file/syslog entries, but not to the messages sent to control interface monitors to avoid issues with parsing in external programs. Signed-off-by: Ben Greear <greearb@candelatech.com>
2011-02-06 19:39:34 +01:00
wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb);
Fix CONFIG_NO_STDOUT_DEBUG=y build
2011-02-10 19:24:06 +01:00
#endif /* CONFIG_NO_WPA_MSG */
Add interface name to wpa_msg() output This makes log files much more readable if multiple interfaces are being controlled by the same process. The interface name is added to stdout/file/syslog entries, but not to the messages sent to control interface monitors to avoid issues with parsing in external programs. Signed-off-by: Ben Greear <greearb@candelatech.com>
2011-02-06 19:39:34 +01:00
wpa_supplicant: Set stdout line-buffered This makes wpa_supplicant debug output in stdout line-buffered to remain consistent with hostapd. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-26 16:09:00 +01:00
if (params->wpa_debug_file_path)
wpa_debug_open_file(params->wpa_debug_file_path);
else
wpa_debug_setup_stdout();
Add support for wpa_supplicant syslog output Enable for build: CFLAGS += -DCONFIG_DEBUG_SYSLOG in .config Enable at runtime: -s on command line
2009-03-02 20:40:44 +01:00
if (params->wpa_debug_syslog)
wpa_debug_open_syslog();
debug: Add option to log to Linux tracing Add the option (-T) to wpa_supplicant to log all debug messages into the kernel tracing, allowing to aggregate kernel debugging with wpa_supplicant debugging and recording all with trace-cmd. Since tracing has relatively low overhead and can be filtered afterwards, record all messages regardless of log level. However, it will honor the -K option and not record key material by default. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2012-03-31 12:55:33 +02:00
if (params->wpa_debug_tracing) {
ret = wpa_debug_open_linux_tracing();
if (ret) {
wpa_printf(MSG_ERROR,
"Failed to enable trace logging");
return NULL;
}
}
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
Move EAP method registration away from src/eap_{peer,server} This makes it easier to make a library out of EAP methods without losing possiblity of binary size optimization by linker dropping unreferenced code.
2009-12-06 10:28:41 +01:00
ret = eap_register_methods();
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (ret) {
wpa_printf(MSG_ERROR, "Failed to register EAP methods");
if (ret == -2)
wpa_printf(MSG_ERROR, "Two or more EAP methods used "
"the same EAP type.");
return NULL;
}
global = os_zalloc(sizeof(*global));
if (global == NULL)
return NULL;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
dl_list_init(&global->p2p_srv_bonjour);
dl_list_init(&global->p2p_srv_upnp);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
global->params.daemonize = params->daemonize;
global->params.wait_for_monitor = params->wait_for_monitor;
global->params.dbus_ctrl_interface = params->dbus_ctrl_interface;
if (params->pid_file)
global->params.pid_file = os_strdup(params->pid_file);
if (params->ctrl_interface)
global->params.ctrl_interface =
os_strdup(params->ctrl_interface);
wpa_supplicant: Add -G argument to specify global ctrl group The optional -G<group> command line argument can be used to specify the group that can access the global control interface. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 10:00:05 +02:00
if (params->ctrl_interface_group)
global->params.ctrl_interface_group =
os_strdup(params->ctrl_interface_group);
Allow driver and ctrl_interface parameters to be overridden New wpa_supplicant command line options -o<driver> and -O<ctrl> can now be used to override the parameters received in add interface command from dbus or global ctrl_interface. This can be used, e.g., to enable control interface when using NetworkManager (add -O/var/run/wpa_supplicant into the Exec parameter in /usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service). Similarly, this can be used to use another driver wrapper with NetworkManager (e.g., -onl80211 to replace WEXT with nl80211).
2009-11-04 19:16:15 +01:00
if (params->override_driver)
global->params.override_driver =
os_strdup(params->override_driver);
if (params->override_ctrl_interface)
global->params.override_ctrl_interface =
os_strdup(params->override_ctrl_interface);
P2P: Fix P2P configuration file name The P2P configuration file is wrongly set as STA configuration file, even though a separate configuration file is mentioned with '-m' option. Add initialization and deallocation of global.params->conf_p2p_dev to fix this. Signed-off-by: Gautam <gautams@broadcom.com>
2015-07-31 11:04:30 +02:00
#ifdef CONFIG_P2P
if (params->conf_p2p_dev)
global->params.conf_p2p_dev =
os_strdup(params->conf_p2p_dev);
#endif /* CONFIG_P2P */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_debug_level = global->params.wpa_debug_level =
params->wpa_debug_level;
wpa_debug_show_keys = global->params.wpa_debug_show_keys =
params->wpa_debug_show_keys;
wpa_debug_timestamp = global->params.wpa_debug_timestamp =
params->wpa_debug_timestamp;
Show wpa_supplicant version number in the debug log
2010-10-22 10:50:34 +02:00
wpa_printf(MSG_DEBUG, "wpa_supplicant v" VERSION_STR);
eloop: Remove global user data pointer This is not really needed since all signal handlers can use a context pointer provided during signal handler registration.
2009-12-19 18:22:16 +01:00
if (eloop_init()) {
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_printf(MSG_ERROR, "Failed to initialize event loop");
wpa_supplicant_deinit(global);
return NULL;
}
random: Add support for maintaining internal entropy store over restarts This can be used to avoid rejection of first two 4-way handshakes every time hostapd (or wpa_supplicant in AP/IBSS mode) is restarted. A new command line parameter, -e, can now be used to specify an entropy file that will be used to maintain the needed state.
2011-05-31 19:07:11 +02:00
random_init(params->entropy_file);
random: Read /dev/random in the background with eloop read socket This makes it more likely to be able to fetch the 20 octet seed from /dev/random in cases where other programs may also be competing for this.
2011-03-22 22:15:00 +01:00
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
global->ctrl_iface = wpa_supplicant_global_ctrl_iface_init(global);
if (global->ctrl_iface == NULL) {
wpa_supplicant_deinit(global);
return NULL;
}
wpa_supplicant and dbus code separation This patch completely separates supplicant's code from dbus. It introduces three new notifications which copes with all remaining dbus stuff. wpas_notify_unregister_interface() was renamed to wpas_notify_iface_removed().
2009-10-15 20:15:10 +02:00
if (wpas_notify_supplicant_initialized(global)) {
wpa_supplicant_deinit(global);
return NULL;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
Merge wpa_supplicant and hostapd driver wrapper implementations This commit merges the driver_ops structures and implementations from hostapd/driver*.[ch] into src/drivers. This is only an initial step and there is room for number of cleanups to share code between the hostapd and wpa_supplicant parts of the wrappers to avoid unnecessary source code duplication.
2009-04-09 12:40:12 +02:00
for (i = 0; wpa_drivers[i]; i++)
Added support for global driver data (shared by multiple interfaces) Driver wrappers can now register global_init() and global_deinit() driver_ops handlers to get a global data structure that can be shared for all interfaces. This allows driver wrappers to initialize some functionality (e.g., interface monitoring) before any interfaces have been initialized.
2008-12-22 21:24:31 +01:00
global->drv_count++;
if (global->drv_count == 0) {
wpa_printf(MSG_ERROR, "No drivers enabled");
wpa_supplicant_deinit(global);
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
global->drv_priv = os_calloc(global->drv_count, sizeof(void *));
Added support for global driver data (shared by multiple interfaces) Driver wrappers can now register global_init() and global_deinit() driver_ops handlers to get a global data structure that can be shared for all interfaces. This allows driver wrappers to initialize some functionality (e.g., interface monitoring) before any interfaces have been initialized.
2008-12-22 21:24:31 +01:00
if (global->drv_priv == NULL) {
wpa_supplicant_deinit(global);
return NULL;
}
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
#ifdef CONFIG_WIFI_DISPLAY
if (wifi_display_init(global) < 0) {
wpa_printf(MSG_ERROR, "Failed to initialize Wi-Fi Display");
wpa_supplicant_deinit(global);
return NULL;
}
#endif /* CONFIG_WIFI_DISPLAY */
Use a single cleanup timer per wpa_supplicant process Previously, one timeout per process (by default every 30 seconds) was used P2P peer expiration and another per-interface timeout (every 10 seconds) was used to expire BSS entries. Merge these to a single per-process timeout that triggers every 10 seconds to minimize number of process wakeups due to periodic operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-20 12:11:31 +02:00
eloop_register_timeout(WPA_SUPPLICANT_CLEANUP_INTERVAL, 0,
wpas_periodic, global, NULL);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return global;
}
/**
* wpa_supplicant_run - Run the %wpa_supplicant main event loop
* @global: Pointer to global data from wpa_supplicant_init()
* Returns: 0 after successful event loop run, -1 on failure
*
* This function starts the main event loop and continues running as long as
* there are any remaining events. In most cases, this function is running as
* long as the %wpa_supplicant process in still in use.
*/
int wpa_supplicant_run(struct wpa_global *global)
{
struct wpa_supplicant *wpa_s;
if (global->params.daemonize &&
wpa_supplicant_daemon(global->params.pid_file))
return -1;
if (global->params.wait_for_monitor) {
for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next)
if (wpa_s->ctrl_iface)
wpa_supplicant_ctrl_iface_wait(
wpa_s->ctrl_iface);
}
eloop: Remove global user data pointer This is not really needed since all signal handlers can use a context pointer provided during signal handler registration.
2009-12-19 18:22:16 +01:00
eloop_register_signal_terminate(wpa_supplicant_terminate, global);
eloop_register_signal_reconfig(wpa_supplicant_reconfig, global);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
eloop_run();
return 0;
}
/**
* wpa_supplicant_deinit - Deinitialize %wpa_supplicant
* @global: Pointer to global data from wpa_supplicant_init()
*
* This function is called to deinitialize %wpa_supplicant and to free all
* allocated resources. Remaining network interfaces will also be removed.
*/
void wpa_supplicant_deinit(struct wpa_global *global)
{
Added support for global driver data (shared by multiple interfaces) Driver wrappers can now register global_init() and global_deinit() driver_ops handlers to get a global data structure that can be shared for all interfaces. This allows driver wrappers to initialize some functionality (e.g., interface monitoring) before any interfaces have been initialized.
2008-12-22 21:24:31 +01:00
int i;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (global == NULL)
return;
Use a single cleanup timer per wpa_supplicant process Previously, one timeout per process (by default every 30 seconds) was used P2P peer expiration and another per-interface timeout (every 10 seconds) was used to expire BSS entries. Merge these to a single per-process timeout that triggers every 10 seconds to minimize number of process wakeups due to periodic operations. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-20 12:11:31 +02:00
eloop_cancel_timeout(wpas_periodic, global, NULL);
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
#ifdef CONFIG_WIFI_DISPLAY
wifi_display_deinit(global);
#endif /* CONFIG_WIFI_DISPLAY */
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
while (global->ifaces)
Let wpa_supplicant_deinit_iface() know that process is terminating This will be needed to be able to move ctrl_iface TERMINATING event to the end of interface removal. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-01-29 19:15:48 +01:00
wpa_supplicant_remove_iface(global, global->ifaces, 1);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (global->ctrl_iface)
wpa_supplicant_global_ctrl_iface_deinit(global->ctrl_iface);
wpa_supplicant and dbus code separation This patch completely separates supplicant's code from dbus. It introduces three new notifications which copes with all remaining dbus stuff. wpas_notify_unregister_interface() was renamed to wpas_notify_iface_removed().
2009-10-15 20:15:10 +02:00
wpas_notify_supplicant_deinitialized(global);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
eap_peer_unregister_methods();
wpa_supplicant AP: Add preliminary support for WPS Internal Registrar When in AP mode, wpa_supplicant is now enabling WPS (only Internal Registrar). wpa_cli wps_pbc and wps_pin commands can be used to initiate WPS negotiation similarly to how this is done in station mode (though, the BSSID parameter is ignored).
2009-04-21 15:45:16 +02:00
#ifdef CONFIG_AP
eap_server_unregister_methods();
#endif /* CONFIG_AP */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
Merge wpa_supplicant and hostapd driver wrapper implementations This commit merges the driver_ops structures and implementations from hostapd/driver*.[ch] into src/drivers. This is only an initial step and there is room for number of cleanups to share code between the hostapd and wpa_supplicant parts of the wrappers to avoid unnecessary source code duplication.
2009-04-09 12:40:12 +02:00
for (i = 0; wpa_drivers[i] && global->drv_priv; i++) {
Added support for global driver data (shared by multiple interfaces) Driver wrappers can now register global_init() and global_deinit() driver_ops handlers to get a global data structure that can be shared for all interfaces. This allows driver wrappers to initialize some functionality (e.g., interface monitoring) before any interfaces have been initialized.
2008-12-22 21:24:31 +01:00
if (!global->drv_priv[i])
continue;
Merge wpa_supplicant and hostapd driver wrapper implementations This commit merges the driver_ops structures and implementations from hostapd/driver*.[ch] into src/drivers. This is only an initial step and there is room for number of cleanups to share code between the hostapd and wpa_supplicant parts of the wrappers to avoid unnecessary source code duplication.
2009-04-09 12:40:12 +02:00
wpa_drivers[i]->global_deinit(global->drv_priv[i]);
Added support for global driver data (shared by multiple interfaces) Driver wrappers can now register global_init() and global_deinit() driver_ops handlers to get a global data structure that can be shared for all interfaces. This allows driver wrappers to initialize some functionality (e.g., interface monitoring) before any interfaces have been initialized.
2008-12-22 21:24:31 +01:00
}
os_free(global->drv_priv);
random: Read /dev/random in the background with eloop read socket This makes it more likely to be able to fetch the 20 octet seed from /dev/random in cases where other programs may also be competing for this.
2011-03-22 22:15:00 +01:00
random_deinit();
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
eloop_destroy();
if (global->params.pid_file) {
os_daemonize_terminate(global->params.pid_file);
os_free(global->params.pid_file);
}
os_free(global->params.ctrl_interface);
wpa_supplicant: Add -G argument to specify global ctrl group The optional -G<group> command line argument can be used to specify the group that can access the global control interface. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 10:00:05 +02:00
os_free(global->params.ctrl_interface_group);
Allow driver and ctrl_interface parameters to be overridden New wpa_supplicant command line options -o<driver> and -O<ctrl> can now be used to override the parameters received in add interface command from dbus or global ctrl_interface. This can be used, e.g., to enable control interface when using NetworkManager (add -O/var/run/wpa_supplicant into the Exec parameter in /usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service). Similarly, this can be used to use another driver wrapper with NetworkManager (e.g., -onl80211 to replace WEXT with nl80211).
2009-11-04 19:16:15 +01:00
os_free(global->params.override_driver);
os_free(global->params.override_ctrl_interface);
P2P: Fix P2P configuration file name The P2P configuration file is wrongly set as STA configuration file, even though a separate configuration file is mentioned with '-m' option. Add initialization and deallocation of global.params->conf_p2p_dev to fix this. Signed-off-by: Gautam <gautams@broadcom.com>
2015-07-31 11:04:30 +02:00
#ifdef CONFIG_P2P
os_free(global->params.conf_p2p_dev);
#endif /* CONFIG_P2P */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
Make frequency range list routines more general This allows the frequency range list implementation to be shared for other purposes. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-22 18:10:56 +02:00
os_free(global->p2p_disallow_freq.range);
P2P: Apply unsafe frequency rules to available channels This adds a QCA vendor specific nl80211 event to allow the driver to indicate a list of frequency ranges that should be avoided due to interference or possible known co-existance constraints. Such frequencies are marked as not allowed for P2P use to force groups to be formed on different channels. If a P2P GO is operating on a channel that the driver recommended not to use, a notification about this is sent on the control interface and upper layer code may decide to tear down the group and optionally restart it on another channel. As a TODO item, this could also be changed to use CSA to avoid removing the group. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-01-24 15:14:29 +01:00
os_free(global->p2p_go_avoid_freq.range);
P2P: Maintain list of per-client PSKs for persistent groups Record all generated per-client PSKs in the persistent group network block and configure these for the GO Authenticator whenever re-starting the persistent group. This completes per-client PSK support for persistent groups. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-09-01 12:40:33 +02:00
os_free(global->add_psk);
P2P: Allow channels to be removed from P2P use A list of disallowed frequencies for P2P channel list can now be configured with P2P_SET disallow_freq. The frequencies (or frequency pairs) are comma separated. For example: wpa_cli p2p_set disallow_freq 2462,5000-6000 The allowed P2P channel list is constructed by removing explicitly disallowed channels from the channel list received from the driver. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-17 21:57:13 +01:00
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
os_free(global);
Add support for wpa_supplicant syslog output Enable for build: CFLAGS += -DCONFIG_DEBUG_SYSLOG in .config Enable at runtime: -s on command line
2009-03-02 20:40:44 +01:00
wpa_debug_close_syslog();
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_debug_close_file();
debug: Add option to log to Linux tracing Add the option (-T) to wpa_supplicant to log all debug messages into the kernel tracing, allowing to aggregate kernel debugging with wpa_supplicant debugging and recording all with trace-cmd. Since tracing has relatively low overhead and can be filtered afterwards, record all messages regardless of log level. However, it will honor the -K option and not record key material by default. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2012-03-31 12:55:33 +02:00
wpa_debug_close_linux_tracing();
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
}
Allow ctrl_iface SET command to change global config parameters
2010-07-18 23:30:24 +02:00
void wpa_supplicant_update_config(struct wpa_supplicant *wpa_s)
{
Update driver country info on 'SET country <value>'
2011-04-15 16:00:01 +02:00
if ((wpa_s->conf->changed_parameters & CFG_CHANGED_COUNTRY) &&
wpa_s->conf->country[0] && wpa_s->conf->country[1]) {
char country[3];
country[0] = wpa_s->conf->country[0];
country[1] = wpa_s->conf->country[1];
country[2] = '\0';
if (wpa_drv_set_country(wpa_s, country) < 0) {
wpa_printf(MSG_ERROR, "Failed to set country code "
"'%s'", country);
}
}
EXT PW: Add framework for supporting external password storage This new mechanism can be used to make wpa_supplicant using external storage (e.g., key store in the operating system) for passwords, passphrases, and PSKs. This commit is only adding the framework part needed to support this, i.e., no actual configuration parameter can yet use this new mechanism. In addition, only a simple test backend is added to allow developer testing of the functionality. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-03 20:28:42 +02:00
if (wpa_s->conf->changed_parameters & CFG_CHANGED_EXT_PW_BACKEND)
wpas_init_ext_pw(wpa_s);
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 (wpa_s->conf->changed_parameters & CFG_CHANGED_SCHED_SCAN_PLANS)
wpas_sched_scan_plans_set(wpa_s, wpa_s->conf->sched_scan_plans);
Allow ctrl_iface SET command to change global config parameters
2010-07-18 23:30:24 +02:00
#ifdef CONFIG_WPS
wpas_wps_update_config(wpa_s);
#endif /* CONFIG_WPS */
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpas_p2p_update_config(wpa_s);
Allow ctrl_iface SET command to change global config parameters
2010-07-18 23:30:24 +02:00
wpa_s->conf->changed_parameters = 0;
}
Fix memory leak in P2P build without MLME The ieee80211_sta_free_hw_features() function is now used outside the MLME code, so better make sure it gets included in the build to avoid leaking memory.
2010-10-27 10:26:46 +02:00
WNM: Optimize BSS transition management scans When the list of preferred transition candidates is received, use the identified channels to optimize the following scan so that no time is wasted on other channels. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-11-22 18:50:16 +01:00
void add_freq(int *freqs, int *num_freqs, int freq)
Extend load balancing optimization in BSS blacklisting Move the previously SME specific optimization code into generic function that can be used from non-SME code, too, and use it to handle disconnection events. In other words, allow disconnection event to trigger similar optimized scanning case to handle a common load balancing mechanism. If there is another BSS in the same ESS when we receive a disconnection event, scan only the known frequencies of such other BSSes on the next attempt to speed up recovery.
2010-11-26 10:36:03 +01:00
{
int i;
for (i = 0; i < *num_freqs; i++) {
if (freqs[i] == freq)
return;
}
freqs[*num_freqs] = freq;
(*num_freqs)++;
}
static int * get_bss_freqs_in_ess(struct wpa_supplicant *wpa_s)
{
struct wpa_bss *bss, *cbss;
const int max_freqs = 10;
int *freqs;
int num_freqs = 0;
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
freqs = os_calloc(max_freqs + 1, sizeof(int));
Extend load balancing optimization in BSS blacklisting Move the previously SME specific optimization code into generic function that can be used from non-SME code, too, and use it to handle disconnection events. In other words, allow disconnection event to trigger similar optimized scanning case to handle a common load balancing mechanism. If there is another BSS in the same ESS when we receive a disconnection event, scan only the known frequencies of such other BSSes on the next attempt to speed up recovery.
2010-11-26 10:36:03 +01:00
if (freqs == NULL)
return NULL;
cbss = wpa_s->current_bss;
dl_list_for_each(bss, &wpa_s->bss, struct wpa_bss, list) {
if (bss == cbss)
continue;
if (bss->ssid_len == cbss->ssid_len &&
os_memcmp(bss->ssid, cbss->ssid, bss->ssid_len) == 0 &&
wpa_blacklist_get(wpa_s, bss->bssid) == NULL) {
add_freq(freqs, &num_freqs, bss->freq);
if (num_freqs == max_freqs)
break;
}
}
if (num_freqs == 0) {
os_free(freqs);
freqs = NULL;
}
return freqs;
}
void wpas_connection_failed(struct wpa_supplicant *wpa_s, const u8 *bssid)
{
int timeout;
int count;
int *freqs = NULL;
Use wpa_radio work for connection This protects against conflicting offchannel operations during connection (authentication, association, EAP exchanges, 4-way handshake). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 15:50:32 +01:00
wpas_connect_work_done(wpa_s);
Remove possible authentication timeout on connection failure The authentication timeout could be triggered after the connection has already been known to have failed. The event at that point can be confusing, so better cancel the timeout when processing connection failure. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-31 12:25:37 +01:00
/*
* Remove possible authentication timeout since the connection failed.
*/
eloop_cancel_timeout(wpa_supplicant_timeout, wpa_s, NULL);
Do not add blacklist entries based on normal disconnect request cases There are number of cases where wpa_supplicant requests the current connection to be disconnected before starting a new operation. Such cases do not really indicate that there was an error in connecting or a disconnection initiated by the AP, so do not add a temporary blacklist entry in such sequences. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 14:54:24 +01:00
/*
* There is no point in blacklisting the AP if this event is
* generated based on local request to disconnect.
*/
if (wpa_s->own_disconnect_req) {
wpa_s->own_disconnect_req = 0;
wpa_dbg(wpa_s, MSG_DEBUG,
"Ignore connection failure due to local request to disconnect");
return;
}
Do not add BSS to blacklist on local disconnection request There is no point in marking a BSS temporarily blacklisted based on a connection failure or disconnection case if that happens as a result of a local request to disconnect. The blacklist entry could result on unexpected BSS getting selected on the next connection attempt. In addition, the code to try to find another BSS within the ESS could result in scanning a single channel on the next attempt. Fix these issues by handling the connection failure events only if we are not in disconnected state (i.e., would try to reconnect after this automatically). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-05-12 18:12:29 +02:00
if (wpa_s->disconnected) {
wpa_dbg(wpa_s, MSG_DEBUG, "Ignore connection failure "
"indication since interface has been put into "
"disconnected state");
return;
}
Extend load balancing optimization in BSS blacklisting Move the previously SME specific optimization code into generic function that can be used from non-SME code, too, and use it to handle disconnection events. In other words, allow disconnection event to trigger similar optimized scanning case to handle a common load balancing mechanism. If there is another BSS in the same ESS when we receive a disconnection event, scan only the known frequencies of such other BSSes on the next attempt to speed up recovery.
2010-11-26 10:36:03 +01:00
/*
* Add the failed BSSID into the blacklist and speed up next scan
* attempt if there could be other APs that could accept association.
* The current blacklist count indicates how many times we have tried
* connecting to this AP and multiple attempts mean that other APs are
* either not available or has already been tried, so that we can start
* increasing the delay here to avoid constant scanning.
*/
count = wpa_blacklist_add(wpa_s, bssid);
if (count == 1 && wpa_s->current_bss) {
/*
* This BSS was not in the blacklist before. If there is
* another BSS available for the same ESS, we should try that
* next. Otherwise, we may as well try this one once more
* before allowing other, likely worse, ESSes to be considered.
*/
freqs = get_bss_freqs_in_ess(wpa_s);
if (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, "Another BSS in this ESS "
"has been seen; try it next");
Extend load balancing optimization in BSS blacklisting Move the previously SME specific optimization code into generic function that can be used from non-SME code, too, and use it to handle disconnection events. In other words, allow disconnection event to trigger similar optimized scanning case to handle a common load balancing mechanism. If there is another BSS in the same ESS when we receive a disconnection event, scan only the known frequencies of such other BSSes on the next attempt to speed up recovery.
2010-11-26 10:36:03 +01:00
wpa_blacklist_add(wpa_s, bssid);
/*
* On the next scan, go through only the known channels
* used in this ESS based on previous scans to speed up
* common load balancing use case.
*/
os_free(wpa_s->next_scan_freqs);
wpa_s->next_scan_freqs = freqs;
}
}
Maintain maximum blacklist count over list clear operations wpas_connection_failed() uses the blacklist count to figure out a suitable time to wait for the next scan. This mechanism did not work properly in cases where the temporary blacklist gets cleared due to no other BSSes being available. Address this by maintaining an additional count of blacklisting values over wpa_blacklist_clear() calls. In addition, add one more step in the count to timeout mapping to go to 10 second interval if more than four failures are seen. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-25 15:20:44 +01:00
/*
* Add previous failure count in case the temporary blacklist was
* cleared due to no other BSSes being available.
*/
count += wpa_s->extra_blacklist_count;
Disable network temporarily on repeated connection failures Previously, only explicit indications of authentication failures were used to disable a network block temporarily. Extend this to use multiple failed connection attempts as a sign of a possible authentication or authorization failure to reduce the frequency of connection attempts with a network that does not seem to allow connection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-25 16:28:50 +02:00
if (count > 3 && wpa_s->current_ssid) {
wpa_printf(MSG_DEBUG, "Continuous association failures - "
"consider temporary network disabling");
Send authentication failure reason in wpas_auth_failed() "WRONG_KEY" - possibly wrong psk "AUTH_FAILED" - authentication failure "CONN_FAILED" - continiuos connection failure Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-05-16 00:55:21 +02:00
wpas_auth_failed(wpa_s, "CONN_FAILED");
Disable network temporarily on repeated connection failures Previously, only explicit indications of authentication failures were used to disable a network block temporarily. Extend this to use multiple failed connection attempts as a sign of a possible authentication or authorization failure to reduce the frequency of connection attempts with a network that does not seem to allow connection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-25 16:28:50 +02:00
}
Extend load balancing optimization in BSS blacklisting Move the previously SME specific optimization code into generic function that can be used from non-SME code, too, and use it to handle disconnection events. In other words, allow disconnection event to trigger similar optimized scanning case to handle a common load balancing mechanism. If there is another BSS in the same ESS when we receive a disconnection event, scan only the known frequencies of such other BSSes on the next attempt to speed up recovery.
2010-11-26 10:36:03 +01:00
switch (count) {
case 1:
timeout = 100;
break;
case 2:
timeout = 500;
break;
case 3:
timeout = 1000;
break;
Maintain maximum blacklist count over list clear operations wpas_connection_failed() uses the blacklist count to figure out a suitable time to wait for the next scan. This mechanism did not work properly in cases where the temporary blacklist gets cleared due to no other BSSes being available. Address this by maintaining an additional count of blacklisting values over wpa_blacklist_clear() calls. In addition, add one more step in the count to timeout mapping to go to 10 second interval if more than four failures are seen. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-25 15:20:44 +01:00
case 4:
Extend load balancing optimization in BSS blacklisting Move the previously SME specific optimization code into generic function that can be used from non-SME code, too, and use it to handle disconnection events. In other words, allow disconnection event to trigger similar optimized scanning case to handle a common load balancing mechanism. If there is another BSS in the same ESS when we receive a disconnection event, scan only the known frequencies of such other BSSes on the next attempt to speed up recovery.
2010-11-26 10:36:03 +01:00
timeout = 5000;
Maintain maximum blacklist count over list clear operations wpas_connection_failed() uses the blacklist count to figure out a suitable time to wait for the next scan. This mechanism did not work properly in cases where the temporary blacklist gets cleared due to no other BSSes being available. Address this by maintaining an additional count of blacklisting values over wpa_blacklist_clear() calls. In addition, add one more step in the count to timeout mapping to go to 10 second interval if more than four failures are seen. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-25 15:20:44 +01:00
break;
default:
timeout = 10000;
break;
Extend load balancing optimization in BSS blacklisting Move the previously SME specific optimization code into generic function that can be used from non-SME code, too, and use it to handle disconnection events. In other words, allow disconnection event to trigger similar optimized scanning case to handle a common load balancing mechanism. If there is another BSS in the same ESS when we receive a disconnection event, scan only the known frequencies of such other BSSes on the next attempt to speed up recovery.
2010-11-26 10:36:03 +01:00
}
Maintain maximum blacklist count over list clear operations wpas_connection_failed() uses the blacklist count to figure out a suitable time to wait for the next scan. This mechanism did not work properly in cases where the temporary blacklist gets cleared due to no other BSSes being available. Address this by maintaining an additional count of blacklisting values over wpa_blacklist_clear() calls. In addition, add one more step in the count to timeout mapping to go to 10 second interval if more than four failures are seen. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-25 15:20:44 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "Blacklist count %d --> request scan in %d "
"ms", count, timeout);
Extend load balancing optimization in BSS blacklisting Move the previously SME specific optimization code into generic function that can be used from non-SME code, too, and use it to handle disconnection events. In other words, allow disconnection event to trigger similar optimized scanning case to handle a common load balancing mechanism. If there is another BSS in the same ESS when we receive a disconnection event, scan only the known frequencies of such other BSSes on the next attempt to speed up recovery.
2010-11-26 10:36:03 +01:00
/*
* TODO: if more than one possible AP is available in scan results,
* could try the other ones before requesting a new scan.
*/
wpa_supplicant_req_scan(wpa_s, timeout / 1000,
1000 * (timeout % 1000));
}
Support driver-based BSS selection in ap_scan=1 mode If the driver indicates that it supports BSS selection (including roaming within an ESS) with WPA_DRIVER_FLAGS_BSS_SELECTION, modify ap_scan=1 mode to behave like ap_scan=2 mode for BSS selection. The initial scan is still done to avoid the need for strict configuration of or security parameters (e.g., to figure out whether TKIP or CCMP is being used as the group cipher). However, when requesting the driver to connect, the bssid and freq parameters are not provided to leave the driver in control of selecting which BSS to use and to allow the driver to decide when to roam.
2011-09-26 13:57:23 +02:00
int wpas_driver_bss_selection(struct wpa_supplicant *wpa_s)
{
return wpa_s->conf->ap_scan == 2 ||
(wpa_s->drv_flags & WPA_DRIVER_FLAGS_BSS_SELECTION);
}
Fix D-Bus build without ctrl_iface Commit 7de5688d682d4a96a4ce1f7959428a0112d4b75f started using wpa_supplicant_ctrl_iface_ctrl_rsp_handle() from the D-Bus code, but left this function in ctrl_iface.c that is included conditionally. Fix this by moving the common function into wpa_supplicant.c so that it can be included for builds that include only either ctrl_iface or D-Bus. Signed-hostap: Jouni Malinen <j@w1.fi> intended-for: hostap-1
2012-04-27 20:21:31 +02:00
#if defined(CONFIG_CTRL_IFACE) || defined(CONFIG_CTRL_IFACE_DBUS_NEW)
int wpa_supplicant_ctrl_iface_ctrl_rsp_handle(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid,
const char *field,
const char *value)
{
#ifdef IEEE8021X_EAPOL
struct eap_peer_config *eap = &ssid->eap;
wpa_printf(MSG_DEBUG, "CTRL_IFACE: response handle field=%s", field);
wpa_hexdump_ascii_key(MSG_DEBUG, "CTRL_IFACE: response value",
(const u8 *) value, os_strlen(value));
switch (wpa_supplicant_ctrl_req_from_string(field)) {
case WPA_CTRL_REQ_EAP_IDENTITY:
os_free(eap->identity);
eap->identity = (u8 *) os_strdup(value);
eap->identity_len = os_strlen(value);
eap->pending_req_identity = 0;
if (ssid == wpa_s->current_ssid)
wpa_s->reassociate = 1;
break;
case WPA_CTRL_REQ_EAP_PASSWORD:
Clear wpa_supplicant configuration keys explicitly Use an explicit memset call to clear any wpa_supplicant configuration parameter that contains private information like keys or identity. This brings in an additional layer of protection by reducing the length of time this type of private data is kept in memory. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-30 00:32:07 +02:00
bin_clear_free(eap->password, eap->password_len);
Fix D-Bus build without ctrl_iface Commit 7de5688d682d4a96a4ce1f7959428a0112d4b75f started using wpa_supplicant_ctrl_iface_ctrl_rsp_handle() from the D-Bus code, but left this function in ctrl_iface.c that is included conditionally. Fix this by moving the common function into wpa_supplicant.c so that it can be included for builds that include only either ctrl_iface or D-Bus. Signed-hostap: Jouni Malinen <j@w1.fi> intended-for: hostap-1
2012-04-27 20:21:31 +02:00
eap->password = (u8 *) os_strdup(value);
eap->password_len = os_strlen(value);
eap->pending_req_password = 0;
if (ssid == wpa_s->current_ssid)
wpa_s->reassociate = 1;
break;
case WPA_CTRL_REQ_EAP_NEW_PASSWORD:
Clear wpa_supplicant configuration keys explicitly Use an explicit memset call to clear any wpa_supplicant configuration parameter that contains private information like keys or identity. This brings in an additional layer of protection by reducing the length of time this type of private data is kept in memory. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-30 00:32:07 +02:00
bin_clear_free(eap->new_password, eap->new_password_len);
Fix D-Bus build without ctrl_iface Commit 7de5688d682d4a96a4ce1f7959428a0112d4b75f started using wpa_supplicant_ctrl_iface_ctrl_rsp_handle() from the D-Bus code, but left this function in ctrl_iface.c that is included conditionally. Fix this by moving the common function into wpa_supplicant.c so that it can be included for builds that include only either ctrl_iface or D-Bus. Signed-hostap: Jouni Malinen <j@w1.fi> intended-for: hostap-1
2012-04-27 20:21:31 +02:00
eap->new_password = (u8 *) os_strdup(value);
eap->new_password_len = os_strlen(value);
eap->pending_req_new_password = 0;
if (ssid == wpa_s->current_ssid)
wpa_s->reassociate = 1;
break;
case WPA_CTRL_REQ_EAP_PIN:
Clear wpa_supplicant configuration keys explicitly Use an explicit memset call to clear any wpa_supplicant configuration parameter that contains private information like keys or identity. This brings in an additional layer of protection by reducing the length of time this type of private data is kept in memory. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-30 00:32:07 +02:00
str_clear_free(eap->pin);
Fix D-Bus build without ctrl_iface Commit 7de5688d682d4a96a4ce1f7959428a0112d4b75f started using wpa_supplicant_ctrl_iface_ctrl_rsp_handle() from the D-Bus code, but left this function in ctrl_iface.c that is included conditionally. Fix this by moving the common function into wpa_supplicant.c so that it can be included for builds that include only either ctrl_iface or D-Bus. Signed-hostap: Jouni Malinen <j@w1.fi> intended-for: hostap-1
2012-04-27 20:21:31 +02:00
eap->pin = os_strdup(value);
eap->pending_req_pin = 0;
if (ssid == wpa_s->current_ssid)
wpa_s->reassociate = 1;
break;
case WPA_CTRL_REQ_EAP_OTP:
Clear wpa_supplicant configuration keys explicitly Use an explicit memset call to clear any wpa_supplicant configuration parameter that contains private information like keys or identity. This brings in an additional layer of protection by reducing the length of time this type of private data is kept in memory. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-30 00:32:07 +02:00
bin_clear_free(eap->otp, eap->otp_len);
Fix D-Bus build without ctrl_iface Commit 7de5688d682d4a96a4ce1f7959428a0112d4b75f started using wpa_supplicant_ctrl_iface_ctrl_rsp_handle() from the D-Bus code, but left this function in ctrl_iface.c that is included conditionally. Fix this by moving the common function into wpa_supplicant.c so that it can be included for builds that include only either ctrl_iface or D-Bus. Signed-hostap: Jouni Malinen <j@w1.fi> intended-for: hostap-1
2012-04-27 20:21:31 +02:00
eap->otp = (u8 *) os_strdup(value);
eap->otp_len = os_strlen(value);
os_free(eap->pending_req_otp);
eap->pending_req_otp = NULL;
eap->pending_req_otp_len = 0;
break;
case WPA_CTRL_REQ_EAP_PASSPHRASE:
Clear wpa_supplicant configuration keys explicitly Use an explicit memset call to clear any wpa_supplicant configuration parameter that contains private information like keys or identity. This brings in an additional layer of protection by reducing the length of time this type of private data is kept in memory. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-30 00:32:07 +02:00
str_clear_free(eap->private_key_passwd);
eap->private_key_passwd = os_strdup(value);
Fix D-Bus build without ctrl_iface Commit 7de5688d682d4a96a4ce1f7959428a0112d4b75f started using wpa_supplicant_ctrl_iface_ctrl_rsp_handle() from the D-Bus code, but left this function in ctrl_iface.c that is included conditionally. Fix this by moving the common function into wpa_supplicant.c so that it can be included for builds that include only either ctrl_iface or D-Bus. Signed-hostap: Jouni Malinen <j@w1.fi> intended-for: hostap-1
2012-04-27 20:21:31 +02:00
eap->pending_req_passphrase = 0;
if (ssid == wpa_s->current_ssid)
wpa_s->reassociate = 1;
break;
EAP peer: Add framework for external SIM/USIM processing The new configuration parameter external_sim=<0/1> can now be used to configure wpa_supplicant to use external SIM/USIM processing (e.g., GSM authentication for EAP-SIM or UMTS authentication for EAP-AKA). The requests and responses for such operations are sent over the ctrl_iface CTRL-REQ-SIM and CTRL-RSP-SIM commands similarly to the existing password query mechanism. Changes to the EAP methods to use this new mechanism will be added in separate commits. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-19 16:32:05 +02:00
case WPA_CTRL_REQ_SIM:
Clear wpa_supplicant configuration keys explicitly Use an explicit memset call to clear any wpa_supplicant configuration parameter that contains private information like keys or identity. This brings in an additional layer of protection by reducing the length of time this type of private data is kept in memory. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-30 00:32:07 +02:00
str_clear_free(eap->external_sim_resp);
EAP peer: Add framework for external SIM/USIM processing The new configuration parameter external_sim=<0/1> can now be used to configure wpa_supplicant to use external SIM/USIM processing (e.g., GSM authentication for EAP-SIM or UMTS authentication for EAP-AKA). The requests and responses for such operations are sent over the ctrl_iface CTRL-REQ-SIM and CTRL-RSP-SIM commands similarly to the existing password query mechanism. Changes to the EAP methods to use this new mechanism will be added in separate commits. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-19 16:32:05 +02:00
eap->external_sim_resp = os_strdup(value);
break;
Allow PSK/passphrase to be set only when needed The new network profile parameter mem_only_psk=1 can be used to specify that the PSK/passphrase for that network is requested over the control interface (ctrl_iface or D-Bus) similarly to the EAP network parameter requests. The PSK/passphrase can then be configured temporarily in a way that prevents it from getting stored to the configuration file. For example: Event: CTRL-REQ-PSK_PASSPHRASE-0:PSK or passphrase needed for SSID test-wpa2-psk Response: CTRL-RSP-PSK_PASSPHRASE-0:"qwertyuiop" Note: The response value uses the same encoding as the psk network profile parameter, i.e., passphrase is within double quotation marks. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-28 10:05:13 +01:00
case WPA_CTRL_REQ_PSK_PASSPHRASE:
if (wpa_config_set(ssid, "psk", value, 0) < 0)
return -1;
ssid->mem_only_psk = 1;
if (ssid->passphrase)
wpa_config_update_psk(ssid);
if (wpa_s->wpa_state == WPA_SCANNING && !wpa_s->scanning)
wpa_supplicant_req_scan(wpa_s, 0, 0);
break;
EAP peer: External server certificate chain validation This adds support for optional functionality to validate server certificate chain in TLS-based EAP methods in an external program. wpa_supplicant control interface is used to indicate when such validation is needed and what the result of the external validation is. This external validation can extend or replace the internal validation. When ca_cert or ca_path parameter is set, the internal validation is used. If these parameters are omitted, only the external validation is used. It needs to be understood that leaving those parameters out will disable most of the validation steps done with the TLS library and that configuration is not really recommend. By default, the external validation is not used. It can be enabled by addingtls_ext_cert_check=1 into the network profile phase1 parameter. When enabled, external validation is required through the CTRL-REQ/RSP mechanism similarly to other EAP authentication parameters through the control interface. The request to perform external validation is indicated by the following event: CTRL-REQ-EXT_CERT_CHECK-<id>:External server certificate validation needed for SSID <ssid> Before that event, the server certificate chain is provided with the CTRL-EVENT-EAP-PEER-CERT events that include the cert=<hexdump> parameter. depth=# indicates which certificate is in question (0 for the server certificate, 1 for its issues, and so on). The result of the external validation is provided with the following command: CTRL-RSP-EXT_CERT_CHECK-<id>:<good|bad> It should be noted that this is currently enabled only for OpenSSL (and BoringSSL/LibreSSL). Due to the constraints in the library API, the validation result from external processing cannot be reported cleanly with TLS alert. In other words, if the external validation reject the server certificate chain, the pending TLS handshake is terminated without sending more messages to the server. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-12-12 17:16:54 +01:00
case WPA_CTRL_REQ_EXT_CERT_CHECK:
if (eap->pending_ext_cert_check != PENDING_CHECK)
return -1;
if (os_strcmp(value, "good") == 0)
eap->pending_ext_cert_check = EXT_CERT_CHECK_GOOD;
else if (os_strcmp(value, "bad") == 0)
eap->pending_ext_cert_check = EXT_CERT_CHECK_BAD;
else
return -1;
break;
Fix D-Bus build without ctrl_iface Commit 7de5688d682d4a96a4ce1f7959428a0112d4b75f started using wpa_supplicant_ctrl_iface_ctrl_rsp_handle() from the D-Bus code, but left this function in ctrl_iface.c that is included conditionally. Fix this by moving the common function into wpa_supplicant.c so that it can be included for builds that include only either ctrl_iface or D-Bus. Signed-hostap: Jouni Malinen <j@w1.fi> intended-for: hostap-1
2012-04-27 20:21:31 +02:00
default:
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Unknown field '%s'", field);
return -1;
}
return 0;
#else /* IEEE8021X_EAPOL */
wpa_printf(MSG_DEBUG, "CTRL_IFACE: IEEE 802.1X not included");
return -1;
#endif /* IEEE8021X_EAPOL */
}
#endif /* CONFIG_CTRL_IFACE || CONFIG_CTRL_IFACE_DBUS_NEW */
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 wpas_network_disabled(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
{
int i;
unsigned int drv_enc;
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 1; /* no normal network profiles on p2p_mgmt interface */
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 (ssid == NULL)
return 1;
if (ssid->disabled)
return 1;
Remove unnecessary NULL check to make function more consistent Static analyzers may warn about dereference before NULL check in wpas_network_disabled() due to the new code added to check wpa_s->p2p_mgmt. wpa_s cannot be NULL here, so remove the unneeded check for it later in the function. (CID 106124) Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 21:15:44 +01:00
if (wpa_s->drv_capa_known)
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
drv_enc = wpa_s->drv_enc;
else
drv_enc = (unsigned int) -1;
for (i = 0; i < NUM_WEP_KEYS; i++) {
size_t len = ssid->wep_key_len[i];
if (len == 0)
continue;
if (len == 5 && (drv_enc & WPA_DRIVER_CAPA_ENC_WEP40))
continue;
if (len == 13 && (drv_enc & WPA_DRIVER_CAPA_ENC_WEP104))
continue;
if (len == 16 && (drv_enc & WPA_DRIVER_CAPA_ENC_WEP128))
continue;
return 1; /* invalid WEP key */
}
EXT PW: Add support for psk parameter from external storage This allows wpa_supplicant configuration file to be created without the PSK/passphrase value included in the file when a backend for external password storage is available. Following example can be used for developer testing: ext_password_backend=test:psk1=12345678 network={ ssid="test-psk" key_mgmt=WPA-PSK psk=ext:psk1 } Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-03 20:36:38 +02:00
if (wpa_key_mgmt_wpa_psk(ssid->key_mgmt) && !ssid->psk_set &&
Allow PSK/passphrase to be set only when needed The new network profile parameter mem_only_psk=1 can be used to specify that the PSK/passphrase for that network is requested over the control interface (ctrl_iface or D-Bus) similarly to the EAP network parameter requests. The PSK/passphrase can then be configured temporarily in a way that prevents it from getting stored to the configuration file. For example: Event: CTRL-REQ-PSK_PASSPHRASE-0:PSK or passphrase needed for SSID test-wpa2-psk Response: CTRL-RSP-PSK_PASSPHRASE-0:"qwertyuiop" Note: The response value uses the same encoding as the psk network profile parameter, i.e., passphrase is within double quotation marks. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-28 10:05:13 +01:00
(!ssid->passphrase || ssid->ssid_len != 0) && !ssid->ext_psk &&
!ssid->mem_only_psk)
Move PSK/passphrase configuration check into use time from parsing Instead of rejecting network blocks without PSK/passphrase at the time the configuration file is read, allow such configuration to be loaded and only behave as if the network block with missing PSK/passphrase is disabled. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-03 19:56:18 +02:00
return 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
return 0;
}
P2P: Add preference setting for concurrent use cases Add an additional parameter to prioritize either sta or p2p connection to resolve conflicts arising during single channel concurrency. Signed-hostap: Jithu Jance <jithu@broadcom.com>
2012-06-10 19:53:09 +02:00
Ignore pmf=1 default if driver does not support PMF Connection with a PMF enabled AP will fail if we try to negotiate PMF while the local driver does not support this. Since pmf=1 does not require PMF for a successful connection, it can be ignored in such a case to avoid connectivity issues with invalid configuration. This makes it somewhat easier to allow upper layer programs to use pmf=1 default regardless of driver capabilities. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-26 16:40:22 +01:00
int wpas_get_ssid_pmf(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
{
#ifdef CONFIG_IEEE80211W
if (ssid == NULL || ssid->ieee80211w == MGMT_FRAME_PROTECTION_DEFAULT) {
if (wpa_s->conf->pmf == MGMT_FRAME_PROTECTION_OPTIONAL &&
!(wpa_s->drv_enc & WPA_DRIVER_CAPA_ENC_BIP)) {
/*
* Driver does not support BIP -- ignore pmf=1 default
* since the connection with PMF would fail and the
* configuration does not require PMF to be enabled.
*/
return NO_MGMT_FRAME_PROTECTION;
}
return wpa_s->conf->pmf;
}
return ssid->ieee80211w;
#else /* CONFIG_IEEE80211W */
return NO_MGMT_FRAME_PROTECTION;
#endif /* CONFIG_IEEE80211W */
}
P2P: Add preference setting for concurrent use cases Add an additional parameter to prioritize either sta or p2p connection to resolve conflicts arising during single channel concurrency. Signed-hostap: Jithu Jance <jithu@broadcom.com>
2012-06-10 19:53:09 +02:00
int wpas_is_p2p_prioritized(struct wpa_supplicant *wpa_s)
{
if (wpa_s->global->conc_pref == WPA_CONC_PREF_P2P)
return 1;
if (wpa_s->global->conc_pref == WPA_CONC_PREF_STA)
return 0;
return -1;
}
Disable network block temporarily on authentication failures If 4-way handshake fails due to likely PSK failure or if EAP authentication fails, disable the network block temporarily. Use longer duration if multiple consecutive failures are seen. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-26 22:01:26 +02:00
Send authentication failure reason in wpas_auth_failed() "WRONG_KEY" - possibly wrong psk "AUTH_FAILED" - authentication failure "CONN_FAILED" - continiuos connection failure Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-05-16 00:55:21 +02:00
void wpas_auth_failed(struct wpa_supplicant *wpa_s, char *reason)
Disable network block temporarily on authentication failures If 4-way handshake fails due to likely PSK failure or if EAP authentication fails, disable the network block temporarily. Use longer duration if multiple consecutive failures are seen. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-26 22:01:26 +02:00
{
struct wpa_ssid *ssid = wpa_s->current_ssid;
int dur;
wpa_supplicant: Use monotonic time for temp-disabled networks Temporarily disabled networks are disabled for a certain duration, so the code should use monotonic time. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-12-16 21:08:41 +01:00
struct os_reltime now;
Disable network block temporarily on authentication failures If 4-way handshake fails due to likely PSK failure or if EAP authentication fails, disable the network block temporarily. Use longer duration if multiple consecutive failures are seen. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-26 22:01:26 +02:00
if (ssid == NULL) {
wpa_printf(MSG_DEBUG, "Authentication failure but no known "
"SSID block");
return;
}
if (ssid->key_mgmt == WPA_KEY_MGMT_WPS)
return;
ssid->auth_failures++;
P2P: Do not delay retries on failure during group formation 4-way handshake may fail under extremely noisy environment and if this happens during P2P group formation, the 10 second extra delay added in wpas_auth_failed() can result in running over the 15 second timeout. Avoid this by skipping the delay mechanism in wpas_auth_failed() for the P2P group formation case. The P2P formation timeout will take care of stopping the attempts if the failure condition does not get resolved. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-31 22:09:34 +02:00
#ifdef CONFIG_P2P
if (ssid->p2p_group &&
(wpa_s->p2p_in_provisioning || wpa_s->show_group_started)) {
/*
* Skip the wait time since there is a short timeout on the
* connection to a P2P group.
*/
return;
}
#endif /* CONFIG_P2P */
Disable network block temporarily on authentication failures If 4-way handshake fails due to likely PSK failure or if EAP authentication fails, disable the network block temporarily. Use longer duration if multiple consecutive failures are seen. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-26 22:01:26 +02:00
if (ssid->auth_failures > 50)
dur = 300;
else if (ssid->auth_failures > 10)
HS 2.0R2: Slow down connection attempts on EAP failures This is needed to limit the number of consecutive authentication attempts to no more than 10 within a 10-minute interval to avoid unnecessary load on the authentication server. In addition, use a random component in the delay to avoid multiple stations hitting the same timing in case of simultaneous disconnection from the network. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 22:41:29 +02:00
dur = 120;
Disable network block temporarily on authentication failures If 4-way handshake fails due to likely PSK failure or if EAP authentication fails, disable the network block temporarily. Use longer duration if multiple consecutive failures are seen. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-26 22:01:26 +02:00
else if (ssid->auth_failures > 5)
HS 2.0R2: Slow down connection attempts on EAP failures This is needed to limit the number of consecutive authentication attempts to no more than 10 within a 10-minute interval to avoid unnecessary load on the authentication server. In addition, use a random component in the delay to avoid multiple stations hitting the same timing in case of simultaneous disconnection from the network. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 22:41:29 +02:00
dur = 90;
else if (ssid->auth_failures > 3)
dur = 60;
else if (ssid->auth_failures > 2)
Disable network block temporarily on authentication failures If 4-way handshake fails due to likely PSK failure or if EAP authentication fails, disable the network block temporarily. Use longer duration if multiple consecutive failures are seen. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-26 22:01:26 +02:00
dur = 30;
else if (ssid->auth_failures > 1)
dur = 20;
else
dur = 10;
HS 2.0R2: Slow down connection attempts on EAP failures This is needed to limit the number of consecutive authentication attempts to no more than 10 within a 10-minute interval to avoid unnecessary load on the authentication server. In addition, use a random component in the delay to avoid multiple stations hitting the same timing in case of simultaneous disconnection from the network. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 22:41:29 +02:00
if (ssid->auth_failures > 1 &&
wpa_key_mgmt_wpa_ieee8021x(ssid->key_mgmt))
dur += os_random() % (ssid->auth_failures * 10);
wpa_supplicant: Use monotonic time for temp-disabled networks Temporarily disabled networks are disabled for a certain duration, so the code should use monotonic time. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-12-16 21:08:41 +01:00
os_get_reltime(&now);
Disable network block temporarily on authentication failures If 4-way handshake fails due to likely PSK failure or if EAP authentication fails, disable the network block temporarily. Use longer duration if multiple consecutive failures are seen. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-26 22:01:26 +02:00
if (now.sec + dur <= ssid->disabled_until.sec)
return;
ssid->disabled_until.sec = now.sec + dur;
wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_TEMP_DISABLED
Send authentication failure reason in wpas_auth_failed() "WRONG_KEY" - possibly wrong psk "AUTH_FAILED" - authentication failure "CONN_FAILED" - continiuos connection failure Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-05-16 00:55:21 +02:00
"id=%d ssid=\"%s\" auth_failures=%u duration=%d reason=%s",
Disable network block temporarily on authentication failures If 4-way handshake fails due to likely PSK failure or if EAP authentication fails, disable the network block temporarily. Use longer duration if multiple consecutive failures are seen. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-26 22:01:26 +02:00
ssid->id, wpa_ssid_txt(ssid->ssid, ssid->ssid_len),
Send authentication failure reason in wpas_auth_failed() "WRONG_KEY" - possibly wrong psk "AUTH_FAILED" - authentication failure "CONN_FAILED" - continiuos connection failure Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-05-16 00:55:21 +02:00
ssid->auth_failures, dur, reason);
Disable network block temporarily on authentication failures If 4-way handshake fails due to likely PSK failure or if EAP authentication fails, disable the network block temporarily. Use longer duration if multiple consecutive failures are seen. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-26 22:01:26 +02:00
}
void wpas_clear_temp_disabled(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid, int clear_failures)
{
if (ssid == NULL)
return;
if (ssid->disabled_until.sec) {
wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_REENABLED
"id=%d ssid=\"%s\"",
ssid->id, wpa_ssid_txt(ssid->ssid, ssid->ssid_len));
}
ssid->disabled_until.sec = 0;
ssid->disabled_until.usec = 0;
if (clear_failures)
ssid->auth_failures = 0;
}
Add disallow_aps parameter to disallow BSSIDs/SSIDs External programs can use this new parameter to prevent wpa_supplicant from connecting to a list of BSSIDs and/or SSIDs. The disallowed BSSes will still be visible in scan results and it is possible to run ANQP operations with them, but BSS selection for connection will skip any BSS that matches an entry in the disallowed list. The new parameter can be set with the control interface SET command using following syntax: SET disallow_aps <disallow_list> disallow_list ::= <ssid_spec> | <bssid_spec> | <disallow_list> | “” SSID_SPEC ::= ssid <SSID_HEX> BSSID_SPEC ::= bssid <BSSID_HEX> For example: wpa_cli set disallow_list "ssid 74657374 bssid 001122334455 ssid 68656c6c6f" wpa_cli set disallow_list (the empty value removes all entries) Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-27 16:36:59 +02:00
int disallowed_bssid(struct wpa_supplicant *wpa_s, const u8 *bssid)
{
size_t i;
if (wpa_s->disallow_aps_bssid == NULL)
return 0;
for (i = 0; i < wpa_s->disallow_aps_bssid_count; i++) {
if (os_memcmp(wpa_s->disallow_aps_bssid + i * ETH_ALEN,
bssid, ETH_ALEN) == 0)
return 1;
}
return 0;
}
int disallowed_ssid(struct wpa_supplicant *wpa_s, const u8 *ssid,
size_t ssid_len)
{
size_t i;
if (wpa_s->disallow_aps_ssid == NULL || ssid == NULL)
return 0;
for (i = 0; i < wpa_s->disallow_aps_ssid_count; i++) {
struct wpa_ssid_value *s = &wpa_s->disallow_aps_ssid[i];
if (ssid_len == s->ssid_len &&
os_memcmp(ssid, s->ssid, ssid_len) == 0)
return 1;
}
return 0;
}
Use a shared function for requesting a new connection Both the ctrl_iface and D-Bus interface use similar functionality to request a new connection. Combine these to a single function to avoid need to maintain duplicated implementation. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-25 15:30:30 +01:00
/**
* wpas_request_connection - Request a new connection
* @wpa_s: Pointer to the network interface
*
* This function is used to request a new connection to be found. It will mark
* the interface to allow reassociation and request a new scan to find a
* suitable network to connect to.
*/
void wpas_request_connection(struct wpa_supplicant *wpa_s)
{
wpa_s->normal_scans = 0;
Clear scan_req to NORMAL_SCAN_REQ for connection attempt This is needed to fix some sequencies where a real scan in ap_scan=2 case would be issued even when the connection case would expect direct connection without a scan. This fixed an issue shown in hwsim test case autoscan_exponential followed by ibss_open_fixed_bssid. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-11-27 16:41:02 +01:00
wpa_s->scan_req = NORMAL_SCAN_REQ;
Use a shared function for requesting a new connection Both the ctrl_iface and D-Bus interface use similar functionality to request a new connection. Combine these to a single function to avoid need to maintain duplicated implementation. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-25 15:30:30 +01:00
wpa_supplicant_reinit_autoscan(wpa_s);
wpa_s->extra_blacklist_count = 0;
wpa_s->disconnected = 0;
wpa_s->reassociate = 1;
Use scan results for reconnection This patch uses existing scan results for fast connection on REASSOCIATE and RECONNECT commands. Signed-hostap: Masashi Honma <masashi.honma@gmail.com>
2013-02-28 15:33:28 +01:00
if (wpa_supplicant_fast_associate(wpa_s) != 1)
wpa_supplicant_req_scan(wpa_s, 0, 0);
Clear reattach flag in fast associate flow Clear the reattach flags, in case a connection request did not trigger a scan. This needs to be done to avoid leaving the reattach flag set for the next scan operation which may not have anything to do with the specific request that could have been optimized using the single-channel single-SSID scan. Signed-off-by: Ben <ben.rosenfeld@intel.com>
2015-01-19 02:44:07 +01:00
else
wpa_s->reattach = 0;
Use a shared function for requesting a new connection Both the ctrl_iface and D-Bus interface use similar functionality to request a new connection. Combine these to a single function to avoid need to maintain duplicated implementation. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-25 15:30:30 +01:00
}
Defer scan if connection is in progress on any of the shared interfaces Scanning can delay concurrent operations considerably, so it is better to avoid that while trying to connect on any of the virtual interfaces that share the same radio. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-05-10 15:10:50 +02:00
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
void dump_freq_data(struct wpa_supplicant *wpa_s, const char *title,
struct wpa_used_freq_data *freqs_data,
unsigned int len)
{
unsigned int i;
wpa_dbg(wpa_s, MSG_DEBUG, "Shared frequencies (len=%u): %s",
len, title);
for (i = 0; i < len; i++) {
struct wpa_used_freq_data *cur = &freqs_data[i];
wpa_dbg(wpa_s, MSG_DEBUG, "freq[%u]: %d, flags=0x%X",
i, cur->freq, cur->flags);
}
}
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
/*
* Find the operating frequencies of any of the virtual interfaces that
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
* are using the same radio as the current interface, and in addition, get
* information about the interface types that are using the frequency.
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
*/
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
int get_shared_radio_freqs_data(struct wpa_supplicant *wpa_s,
struct wpa_used_freq_data *freqs_data,
unsigned int len)
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
{
struct wpa_supplicant *ifs;
u8 bssid[ETH_ALEN];
int freq;
unsigned int idx = 0, i;
P2P: Add more debug prints for frequency selection This prints out get_shared_radio_freqs() results and related information from P2P operations to make debug logs more helpful for figuring out issues related to multi-channel concurrency. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-05 10:07:51 +01:00
wpa_dbg(wpa_s, MSG_DEBUG,
"Determining shared radio frequencies (max len %u)", len);
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
os_memset(freqs_data, 0, sizeof(struct wpa_used_freq_data) * len);
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
Use wpa_radio data for get_shared_radio_freqs() This replaces the now unnecessary iteration of get_radio_name() calls. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 19:06:00 +01:00
dl_list_for_each(ifs, &wpa_s->radio->ifaces, struct wpa_supplicant,
radio_list) {
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
if (idx == len)
break;
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
if (ifs->current_ssid == NULL || ifs->assoc_freq == 0)
continue;
if (ifs->current_ssid->mode == WPAS_MODE_AP ||
mesh: Add support for scanning only the current frequency This patch enables scan_cur_freq=1 on VIF based mesh network. Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
2015-09-08 08:10:13 +02:00
ifs->current_ssid->mode == WPAS_MODE_P2P_GO ||
ifs->current_ssid->mode == WPAS_MODE_MESH)
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
freq = ifs->current_ssid->frequency;
else if (wpa_drv_get_bssid(ifs, bssid) == 0)
freq = ifs->assoc_freq;
else
continue;
/* Hold only distinct freqs */
for (i = 0; i < idx; i++)
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
if (freqs_data[i].freq == freq)
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
break;
if (i == idx)
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
freqs_data[idx++].freq = freq;
if (ifs->current_ssid->mode == WPAS_MODE_INFRA) {
Fix get_shared_radio_freqs_data() used-by flags setting Fix an iteration bug in get_shared_radio_freqs_data when building freqs_data array. Only the last used-by flag was maintained instead of making this a bitfield of all found uses. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-09-08 11:46:08 +02:00
freqs_data[i].flags |= ifs->current_ssid->p2p_group ?
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
WPA_FREQ_USED_BY_P2P_CLIENT :
WPA_FREQ_USED_BY_INFRA_STATION;
}
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
}
P2P: Add more debug prints for frequency selection This prints out get_shared_radio_freqs() results and related information from P2P operations to make debug logs more helpful for figuring out issues related to multi-channel concurrency. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-05 10:07:51 +01:00
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
dump_freq_data(wpa_s, "completed iteration", freqs_data, idx);
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
return idx;
}
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
/*
* Find the operating frequencies of any of the virtual interfaces that
* are using the same radio as the current interface.
*/
int get_shared_radio_freqs(struct wpa_supplicant *wpa_s,
int *freq_array, unsigned int len)
{
struct wpa_used_freq_data *freqs_data;
int num, i;
os_memset(freq_array, 0, sizeof(int) * len);
freqs_data = os_calloc(len, sizeof(struct wpa_used_freq_data));
if (!freqs_data)
return -1;
num = get_shared_radio_freqs_data(wpa_s, freqs_data, len);
for (i = 0; i < num; i++)
freq_array[i] = freqs_data[i].freq;
os_free(freqs_data);
return num;
}
SME: Add RRM support to association request In case the AP we are associating with advertises support for RRM, advertise our own RRM support in the (Re)Association Request frame. This is done by adding an RRM Capabilities IE. The underlying driver is expected to further add a Power Capabilities IE to the request, and set the Radio Measurement flag in the Capability Info field. At this point the RRM Capabilities IE advertises no measurement support. Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
2014-11-05 09:42:48 +01:00
wpa_supplicant: Add support for Neighbor Report Add the ability to send a Neighbor Report Request (part of RRM). Requester is then notified once the report arrives. Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
2014-11-05 09:42:50 +01:00
static void wpas_rrm_neighbor_rep_timeout_handler(void *data, void *user_ctx)
{
struct rrm_data *rrm = data;
if (!rrm->notify_neighbor_rep) {
wpa_printf(MSG_ERROR,
"RRM: Unexpected neighbor report timeout");
return;
}
wpa_printf(MSG_DEBUG, "RRM: Notifying neighbor report - NONE");
rrm->notify_neighbor_rep(rrm->neighbor_rep_cb_ctx, NULL);
rrm->notify_neighbor_rep = NULL;
rrm->neighbor_rep_cb_ctx = NULL;
}
SME: Add RRM support to association request In case the AP we are associating with advertises support for RRM, advertise our own RRM support in the (Re)Association Request frame. This is done by adding an RRM Capabilities IE. The underlying driver is expected to further add a Power Capabilities IE to the request, and set the Radio Measurement flag in the Capability Info field. At this point the RRM Capabilities IE advertises no measurement support. Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
2014-11-05 09:42:48 +01:00
/*
* wpas_rrm_reset - Clear and reset all RRM data in wpa_supplicant
* @wpa_s: Pointer to wpa_supplicant
*/
void wpas_rrm_reset(struct wpa_supplicant *wpa_s)
{
wpa_s->rrm.rrm_used = 0;
wpa_supplicant: Add support for Neighbor Report Add the ability to send a Neighbor Report Request (part of RRM). Requester is then notified once the report arrives. Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
2014-11-05 09:42:50 +01:00
eloop_cancel_timeout(wpas_rrm_neighbor_rep_timeout_handler, &wpa_s->rrm,
NULL);
if (wpa_s->rrm.notify_neighbor_rep)
wpas_rrm_neighbor_rep_timeout_handler(&wpa_s->rrm, NULL);
wpa_s->rrm.next_neighbor_rep_token = 1;
}
/*
* wpas_rrm_process_neighbor_rep - Handle incoming neighbor report
* @wpa_s: Pointer to wpa_supplicant
* @report: Neighbor report buffer, prefixed by a 1-byte dialog token
* @report_len: Length of neighbor report buffer
*/
void wpas_rrm_process_neighbor_rep(struct wpa_supplicant *wpa_s,
const u8 *report, size_t report_len)
{
struct wpabuf *neighbor_rep;
wpa_hexdump(MSG_DEBUG, "RRM: New Neighbor Report", report, report_len);
if (report_len < 1)
return;
if (report[0] != wpa_s->rrm.next_neighbor_rep_token - 1) {
wpa_printf(MSG_DEBUG,
"RRM: Discarding neighbor report with token %d (expected %d)",
report[0], wpa_s->rrm.next_neighbor_rep_token - 1);
return;
}
eloop_cancel_timeout(wpas_rrm_neighbor_rep_timeout_handler, &wpa_s->rrm,
NULL);
if (!wpa_s->rrm.notify_neighbor_rep) {
wpa_printf(MSG_ERROR, "RRM: Unexpected neighbor report");
return;
}
/* skipping the first byte, which is only an id (dialog token) */
neighbor_rep = wpabuf_alloc(report_len - 1);
if (neighbor_rep == NULL)
return;
wpabuf_put_data(neighbor_rep, report + 1, report_len - 1);
wpa_printf(MSG_DEBUG, "RRM: Notifying neighbor report (token = %d)",
report[0]);
wpa_s->rrm.notify_neighbor_rep(wpa_s->rrm.neighbor_rep_cb_ctx,
neighbor_rep);
wpa_s->rrm.notify_neighbor_rep = NULL;
wpa_s->rrm.neighbor_rep_cb_ctx = NULL;
}
Work around Windows build issues At least MinGW did not have ENOTCONN, EOPNOTSUPP, ECANCELED, so define these to allow the build to go through. wpas_rrm_send_neighbor_rep_request() is not really used on Windows, so the exact error code values do not make any difference here. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-10 23:56:17 +01:00
#if defined(__CYGWIN__) || defined(CONFIG_NATIVE_WINDOWS)
/* Workaround different, undefined for Windows, error codes used here */
#define ENOTCONN -1
#define EOPNOTSUPP -1
#define ECANCELED -1
#endif
wpa_supplicant: Add support for Neighbor Report Add the ability to send a Neighbor Report Request (part of RRM). Requester is then notified once the report arrives. Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
2014-11-05 09:42:50 +01:00
/**
* wpas_rrm_send_neighbor_rep_request - Request a neighbor report from our AP
* @wpa_s: Pointer to wpa_supplicant
wpa_supplicant: Add an option to specify SSID in neighbor report requests Allow supplying an SSID for the SSID IE. If not supplied, no SSID IE is sent, and the request implies the current SSID. Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
2014-11-05 09:42:53 +01:00
* @ssid: if not null, this is sent in the request. Otherwise, no SSID IE
* is sent in the request.
wpa_supplicant: Add support for Neighbor Report Add the ability to send a Neighbor Report Request (part of RRM). Requester is then notified once the report arrives. Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
2014-11-05 09:42:50 +01:00
* @cb: Callback function to be called once the requested report arrives, or
* timed out after RRM_NEIGHBOR_REPORT_TIMEOUT seconds.
* In the former case, 'neighbor_rep' is a newly allocated wpabuf, and it's
* the requester's responsibility to free it.
* In the latter case NULL will be sent in 'neighbor_rep'.
* @cb_ctx: Context value to send the callback function
* Returns: 0 in case of success, negative error code otherwise
*
* In case there is a previous request which has not been answered yet, the
* new request fails. The caller may retry after RRM_NEIGHBOR_REPORT_TIMEOUT.
* Request must contain a callback function.
*/
int wpas_rrm_send_neighbor_rep_request(struct wpa_supplicant *wpa_s,
wpa_supplicant: Add an option to specify SSID in neighbor report requests Allow supplying an SSID for the SSID IE. If not supplied, no SSID IE is sent, and the request implies the current SSID. Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
2014-11-05 09:42:53 +01:00
const struct wpa_ssid *ssid,
wpa_supplicant: Add support for Neighbor Report Add the ability to send a Neighbor Report Request (part of RRM). Requester is then notified once the report arrives. Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
2014-11-05 09:42:50 +01:00
void (*cb)(void *ctx,
struct wpabuf *neighbor_rep),
void *cb_ctx)
{
struct wpabuf *buf;
const u8 *rrm_ie;
if (wpa_s->wpa_state != WPA_COMPLETED || wpa_s->current_ssid == NULL) {
wpa_printf(MSG_DEBUG, "RRM: No connection, no RRM.");
return -ENOTCONN;
}
if (!wpa_s->rrm.rrm_used) {
wpa_printf(MSG_DEBUG, "RRM: No RRM in current connection.");
return -EOPNOTSUPP;
}
rrm_ie = wpa_bss_get_ie(wpa_s->current_bss,
WLAN_EID_RRM_ENABLED_CAPABILITIES);
if (!rrm_ie || !(wpa_s->current_bss->caps & IEEE80211_CAP_RRM) ||
!(rrm_ie[2] & WLAN_RRM_CAPS_NEIGHBOR_REPORT)) {
wpa_printf(MSG_DEBUG,
"RRM: No network support for Neighbor Report.");
return -EOPNOTSUPP;
}
if (!cb) {
wpa_printf(MSG_DEBUG,
"RRM: Neighbor Report request must provide a callback.");
return -EINVAL;
}
/* Refuse if there's a live request */
if (wpa_s->rrm.notify_neighbor_rep) {
wpa_printf(MSG_DEBUG,
"RRM: Currently handling previous Neighbor Report.");
return -EBUSY;
}
wpa_supplicant: Add an option to specify SSID in neighbor report requests Allow supplying an SSID for the SSID IE. If not supplied, no SSID IE is sent, and the request implies the current SSID. Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
2014-11-05 09:42:53 +01:00
/* 3 = action category + action code + dialog token */
buf = wpabuf_alloc(3 + (ssid ? 2 + ssid->ssid_len : 0));
wpa_supplicant: Add support for Neighbor Report Add the ability to send a Neighbor Report Request (part of RRM). Requester is then notified once the report arrives. Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
2014-11-05 09:42:50 +01:00
if (buf == NULL) {
wpa_printf(MSG_DEBUG,
"RRM: Failed to allocate Neighbor Report Request");
return -ENOMEM;
}
wpa_printf(MSG_DEBUG, "RRM: Neighbor report request (for %s), token=%d",
wpa_supplicant: Add an option to specify SSID in neighbor report requests Allow supplying an SSID for the SSID IE. If not supplied, no SSID IE is sent, and the request implies the current SSID. Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
2014-11-05 09:42:53 +01:00
(ssid ? wpa_ssid_txt(ssid->ssid, ssid->ssid_len) : ""),
wpa_supplicant: Add support for Neighbor Report Add the ability to send a Neighbor Report Request (part of RRM). Requester is then notified once the report arrives. Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
2014-11-05 09:42:50 +01:00
wpa_s->rrm.next_neighbor_rep_token);
wpabuf_put_u8(buf, WLAN_ACTION_RADIO_MEASUREMENT);
wpabuf_put_u8(buf, WLAN_RRM_NEIGHBOR_REPORT_REQUEST);
wpabuf_put_u8(buf, wpa_s->rrm.next_neighbor_rep_token);
wpa_supplicant: Add an option to specify SSID in neighbor report requests Allow supplying an SSID for the SSID IE. If not supplied, no SSID IE is sent, and the request implies the current SSID. Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
2014-11-05 09:42:53 +01:00
if (ssid) {
wpabuf_put_u8(buf, WLAN_EID_SSID);
wpabuf_put_u8(buf, ssid->ssid_len);
wpabuf_put_data(buf, ssid->ssid, ssid->ssid_len);
}
wpa_supplicant: Add support for Neighbor Report Add the ability to send a Neighbor Report Request (part of RRM). Requester is then notified once the report arrives. Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
2014-11-05 09:42:50 +01:00
wpa_s->rrm.next_neighbor_rep_token++;
if (wpa_drv_send_action(wpa_s, wpa_s->assoc_freq, 0, wpa_s->bssid,
wpa_s->own_addr, wpa_s->bssid,
wpabuf_head(buf), wpabuf_len(buf), 0) < 0) {
wpa_printf(MSG_DEBUG,
"RRM: Failed to send Neighbor Report Request");
wpabuf_free(buf);
return -ECANCELED;
}
wpa_s->rrm.neighbor_rep_cb_ctx = cb_ctx;
wpa_s->rrm.notify_neighbor_rep = cb;
eloop_register_timeout(RRM_NEIGHBOR_REPORT_TIMEOUT, 0,
wpas_rrm_neighbor_rep_timeout_handler,
&wpa_s->rrm, NULL);
wpabuf_free(buf);
return 0;
SME: Add RRM support to association request In case the AP we are associating with advertises support for RRM, advertise our own RRM support in the (Re)Association Request frame. This is done by adding an RRM Capabilities IE. The underlying driver is expected to further add a Power Capabilities IE to the request, and set the Radio Measurement flag in the Capability Info field. At this point the RRM Capabilities IE advertises no measurement support. Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
2014-11-05 09:42:48 +01:00
}
wpa_supplicant: Handle link measurement requests Send link measurement response when a request is received. Advertise only RCPI, computing it from the RSSI of the request. The TX power field is left to be filled by the driver. All other fields are not published. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2014-11-05 09:42:56 +01:00
void wpas_rrm_handle_link_measurement_request(struct wpa_supplicant *wpa_s,
const u8 *src,
const u8 *frame, size_t len,
int rssi)
{
struct wpabuf *buf;
const struct rrm_link_measurement_request *req;
struct rrm_link_measurement_report report;
if (wpa_s->wpa_state != WPA_COMPLETED) {
wpa_printf(MSG_INFO,
"RRM: Ignoring link measurement request. Not associated");
return;
}
if (!wpa_s->rrm.rrm_used) {
wpa_printf(MSG_INFO,
"RRM: Ignoring link measurement request. Not RRM network");
return;
}
if (!(wpa_s->drv_rrm_flags & WPA_DRIVER_FLAGS_TX_POWER_INSERTION)) {
wpa_printf(MSG_INFO,
"RRM: Measurement report failed. TX power insertion not supported");
return;
}
req = (const struct rrm_link_measurement_request *) frame;
if (len < sizeof(*req)) {
wpa_printf(MSG_INFO,
"RRM: Link measurement report failed. Request too short");
return;
}
os_memset(&report, 0, sizeof(report));
report.tpc.eid = WLAN_EID_TPC_REPORT;
report.tpc.len = 2;
report.rsni = 255; /* 255 indicates that RSNI is not available */
report.dialog_token = req->dialog_token;
/*
* It's possible to estimate RCPI based on RSSI in dBm. This
* calculation will not reflect the correct value for high rates,
* but it's good enough for Action frames which are transmitted
* with up to 24 Mbps rates.
*/
if (!rssi)
report.rcpi = 255; /* not available */
else if (rssi < -110)
report.rcpi = 0;
else if (rssi > 0)
report.rcpi = 220;
else
report.rcpi = (rssi + 110) * 2;
/* action_category + action_code */
buf = wpabuf_alloc(2 + sizeof(report));
if (buf == NULL) {
wpa_printf(MSG_ERROR,
"RRM: Link measurement report failed. Buffer allocation failed");
return;
}
wpabuf_put_u8(buf, WLAN_ACTION_RADIO_MEASUREMENT);
wpabuf_put_u8(buf, WLAN_RRM_LINK_MEASUREMENT_REPORT);
wpabuf_put_data(buf, &report, sizeof(report));
wpa_hexdump(MSG_DEBUG, "RRM: Link measurement report:",
wpabuf_head(buf), wpabuf_len(buf));
if (wpa_drv_send_action(wpa_s, wpa_s->assoc_freq, 0, src,
wpa_s->own_addr, wpa_s->bssid,
wpabuf_head(buf), wpabuf_len(buf), 0)) {
wpa_printf(MSG_ERROR,
"RRM: Link measurement report failed. Send action failed");
}
wpabuf_free(buf);
}
dbus: Add support for vendor specific elements The new methods are 1. VendorElemAdd "i" "ay" i=integer ay=array of bytes 2. VendorElemGet "i" i=integer (output array of bytes) 3. VendorElemRem "i" "ay" i=integer ay=array of bytes These provide functionality similar to the control interface commands VENDOR_ELEM_ADD, VENDOR_ELEM_GET, and VENDOR_ELEM_REMOVE. Signed-off-by: Avichal Agarwal <avichal.a@samsung.com> Signed-off-by: Purushottam Kushwaha <p.kushwaha@samsung.com> Signed-off-by: Kyeong-Chae Lim <kcya.lim@samsung.com> Signed-off-by: Mayank Haarit <mayank.h@samsung.com> Signed-off-by: Dilshad Ahmad <dilshad.a@samsung.com> [VendorElemGet to return array of bytes instead of string; cleanup] Signed-off-by: Jouni Malinen <j@w1.fi>
2015-12-04 06:27:27 +01:00
struct wpa_supplicant *
wpas_vendor_elem(struct wpa_supplicant *wpa_s, enum wpa_vendor_elem_frame frame)
{
switch (frame) {
#ifdef CONFIG_P2P
case VENDOR_ELEM_PROBE_REQ_P2P:
case VENDOR_ELEM_PROBE_RESP_P2P:
case VENDOR_ELEM_PROBE_RESP_P2P_GO:
case VENDOR_ELEM_BEACON_P2P_GO:
case VENDOR_ELEM_P2P_PD_REQ:
case VENDOR_ELEM_P2P_PD_RESP:
case VENDOR_ELEM_P2P_GO_NEG_REQ:
case VENDOR_ELEM_P2P_GO_NEG_RESP:
case VENDOR_ELEM_P2P_GO_NEG_CONF:
case VENDOR_ELEM_P2P_INV_REQ:
case VENDOR_ELEM_P2P_INV_RESP:
case VENDOR_ELEM_P2P_ASSOC_REQ:
case VENDOR_ELEM_P2P_ASSOC_RESP:
return wpa_s->parent;
#endif /* CONFIG_P2P */
default:
return wpa_s;
}
}
void wpas_vendor_elem_update(struct wpa_supplicant *wpa_s)
{
unsigned int i;
char buf[30];
wpa_printf(MSG_DEBUG, "Update vendor elements");
for (i = 0; i < NUM_VENDOR_ELEM_FRAMES; i++) {
if (wpa_s->vendor_elem[i]) {
int res;
res = os_snprintf(buf, sizeof(buf), "frame[%u]", i);
if (!os_snprintf_error(sizeof(buf), res)) {
wpa_hexdump_buf(MSG_DEBUG, buf,
wpa_s->vendor_elem[i]);
}
}
}
#ifdef CONFIG_P2P
if (wpa_s->parent == wpa_s &&
wpa_s->global->p2p &&
!wpa_s->global->p2p_disabled)
p2p_set_vendor_elems(wpa_s->global->p2p, wpa_s->vendor_elem);
#endif /* CONFIG_P2P */
}
int wpas_vendor_elem_remove(struct wpa_supplicant *wpa_s, int frame,
const u8 *elem, size_t len)
{
u8 *ie, *end;
ie = wpabuf_mhead_u8(wpa_s->vendor_elem[frame]);
end = ie + wpabuf_len(wpa_s->vendor_elem[frame]);
for (; ie + 1 < end; ie += 2 + ie[1]) {
if (ie + len > end)
break;
if (os_memcmp(ie, elem, len) != 0)
continue;
if (wpabuf_len(wpa_s->vendor_elem[frame]) == len) {
wpabuf_free(wpa_s->vendor_elem[frame]);
wpa_s->vendor_elem[frame] = NULL;
} else {
os_memmove(ie, ie + len, end - (ie + len));
wpa_s->vendor_elem[frame]->used -= len;
}
wpas_vendor_elem_update(wpa_s);
return 0;
}
return -1;
}
Reference in a new issue Copy permalink