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

4217 lines
116 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
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
* Copyright (c) 2003-2012, 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"
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"
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"
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
const char *wpa_supplicant_version =
"wpa_supplicant v" VERSION_STR "\n"
Update copyright notices to include year 2013 Signed-hostap: Jouni Malinen <j@w1.fi>
2013-01-01 13:05:25 +01:00
"Copyright (c) 2003-2013, 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
const char *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. */
const char *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
"";
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
const char *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";
const char *wpa_supplicant_full_license3 =
"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";
const char *wpa_supplicant_full_license4 =
"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";
const char *wpa_supplicant_full_license5 =
"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 */
extern int wpa_debug_level;
extern int wpa_debug_show_keys;
extern int wpa_debug_timestamp;
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
extern struct wpa_driver_ops *wpa_drivers[];
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
/* 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 };
/* 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.. */
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
return wpa_drv_set_key(wpa_s, alg, NULL, 0, 1, seq, 6, key, keylen);
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);
P2P: Allow scan operations during p2p_find Previously, all station mode scan operations were either skipped or delayed while any P2P operation was in progress. To make concurrent operations easier to use, reduce this limitation by allowing a scan operation to be completed in the middle of a p2p_find. In addition, allow station mode association to be completed. When the station mode operation is run to its completion (scan results not acted on, connection to an AP completed, connection failed), resume the p2p_find operation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-23 18:42:53 +02:00
P2P: Use common function for re-starting P2P scan after station scan Make the implementation more consistent and cleaner by using a single function for addressing all the cases where completion of a station mode scan operation allows a P2P operation (search) to be re-started. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-18 15:31:09 +01:00
wpas_p2p_continue_after_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_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;
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);
#endif /* IEEE8021X_EAPOL */
}
/**
* 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 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;
}
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 */
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
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
#ifdef CONFIG_P2P
wpas_p2p_deinit(wpa_s);
#endif /* CONFIG_P2P */
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;
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
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);
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;
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)
{
if (wpa_s->keys_cleared) {
/* Some drivers (e.g., ndiswrapper & NDIS drivers) seem to have
* timing issues with keys being cleared just before new keys
* are set or just after association or something similar. This
* shows up in group key handshake failing often because of the
* client not receiving the first encrypted packets correctly.
* Skipping some of the extra key clearing steps seems to help
* in completing group key handshake more reliably. */
Use wpa_msg() instead of wpa_printf() This converts number of debugging messages to use wpa_msg() in order to allow the interface name to be shown with the messages. A new function, wpa_dbg(), is introduced to allow CONFIG_NO_STDOUT_DEBUG=y builds to remove the debug strings. This is otherwise identical with wpa_msg(), but it gets compiled out if stdout debugging is disabled.
2011-02-10 19:14:46 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "No keys have been configured - "
"skip key clearing");
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
return;
}
/* MLME-DELETEKEYS.request */
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_NONE, NULL, 0, 0, NULL, 0, NULL, 0);
wpa_drv_set_key(wpa_s, WPA_ALG_NONE, NULL, 1, 0, NULL, 0, NULL, 0);
wpa_drv_set_key(wpa_s, WPA_ALG_NONE, NULL, 2, 0, NULL, 0, NULL, 0);
wpa_drv_set_key(wpa_s, WPA_ALG_NONE, NULL, 3, 0, NULL, 0, NULL, 0);
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
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_NONE, NULL, 4, 0, NULL, 0, NULL, 0);
wpa_drv_set_key(wpa_s, WPA_ALG_NONE, NULL, 5, 0, NULL, 0, NULL, 0);
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 */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
if (addr) {
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);
}
wpa_s->keys_cleared = 1;
}
/**
* 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;
if (name == NULL)
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;
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
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);
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
#ifdef CONFIG_P2P
wpas_p2p_completed(wpa_s);
#endif /* CONFIG_P2P */
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);
else
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);
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
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) {
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 */
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
if (wpas_wps_terminate_pending(wpa_s) == 1)
pending = 1;
wpa_s = wpa_s->next;
}
#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) {
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,
* pkcs11_engine_path, pkcs11_module_path.
*/
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
}
}
}
Add more wpa_supplicant AP mode parameters for the driver wrapper This makes it easier to configure AP mode for drivers that take care of WPA/RSN IE generation.
2010-04-11 19:02:01 +02:00
enum wpa_key_mgmt key_mgmt2driver(int key_mgmt)
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
{
switch (key_mgmt) {
case WPA_KEY_MGMT_NONE:
return KEY_MGMT_NONE;
case WPA_KEY_MGMT_IEEE8021X_NO_WPA:
return KEY_MGMT_802_1X_NO_WPA;
case WPA_KEY_MGMT_IEEE8021X:
return KEY_MGMT_802_1X;
case WPA_KEY_MGMT_WPA_NONE:
return KEY_MGMT_WPA_NONE;
case WPA_KEY_MGMT_FT_IEEE8021X:
return KEY_MGMT_FT_802_1X;
case WPA_KEY_MGMT_FT_PSK:
return KEY_MGMT_FT_PSK;
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
case WPA_KEY_MGMT_IEEE8021X_SHA256:
return KEY_MGMT_802_1X_SHA256;
case WPA_KEY_MGMT_PSK_SHA256:
return KEY_MGMT_PSK_SHA256;
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
case WPA_KEY_MGMT_WPS:
return KEY_MGMT_WPS;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
case WPA_KEY_MGMT_PSK:
default:
return KEY_MGMT_PSK;
}
}
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) &&
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
(ssid->ieee80211w == MGMT_FRAME_PROTECTION_DEFAULT ?
wpa_s->conf->pmf : ssid->ieee80211w) ==
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;
const u8 *bss_wpa, *bss_rsn;
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);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
} else
bss_wpa = bss_rsn = NULL;
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) &&
wpa_parse_wpa_ie(bss_wpa, 2 +bss_wpa[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, "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;
} else if (bss) {
wpa_msg(wpa_s, MSG_WARNING, "WPA: Failed to select WPA/RSN");
return -1;
} else {
if (ssid->proto & WPA_PROTO_RSN)
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,
!!(ssid->proto & WPA_PROTO_RSN));
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;
}
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));
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) {
#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");
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;
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 ((ssid->ieee80211w == MGMT_FRAME_PROTECTION_DEFAULT ?
wpa_s->conf->pmf : ssid->ieee80211w) == 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");
} 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,
(ssid->ieee80211w == MGMT_FRAME_PROTECTION_DEFAULT ?
wpa_s->conf->pmf : ssid->ieee80211w));
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)) {
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(wpa_s->wpa, ssid->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
#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);
wpa_sm_set_pmk(wpa_s->wpa, psk, PMK_LEN);
}
#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);
wpa_sm_set_pmk(wpa_s->wpa, psk, PMK_LEN);
} 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;
}
wpa_sm_set_pmk(wpa_s->wpa, psk, PMK_LEN);
} 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 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
*pos |= 0x01; /* Bit 32 - QoS Map */
#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 */
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
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
int wpas_build_ext_capab(struct wpa_supplicant *wpa_s, u8 *buf)
{
u8 *pos = buf;
u8 len = 4, i;
if (len < wpa_s->extended_capa_len)
len = wpa_s->extended_capa_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
*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
}
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
{
P2P: Add P2P IE into (Re)Association Request frames
2010-07-18 23:30:25 +02:00
u8 wpa_ie[200];
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
size_t wpa_ie_len;
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 use_crypt, ret, i, bssid_changed;
Standardize on a single definition of auth_alg bitfield values
2010-01-03 20:14:40 +01:00
int algs = WPA_AUTH_ALG_OPEN;
Get rid of unnecessary typedefs for enums.
2009-12-26 09:35:08 +01:00
enum wpa_cipher cipher_pairwise, cipher_group;
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
struct wpa_driver_associate_params params;
int wep_keys_set = 0;
int assoc_failed = 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
struct wpa_ssid *old_ssid;
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
struct ieee80211_ht_capabilities htcaps;
struct ieee80211_ht_capabilities htcaps_mask;
#endif /* CONFIG_HT_OVERRIDES */
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
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;
}
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;
}
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;
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
if (bss && !wpas_driver_bss_selection(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
*/
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);
}
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);
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)
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
eapol_sm_notify_pmkid_attempt(wpa_s->eapol, 1);
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");
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)");
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 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) {
wpas_hs20_add_indication(hs20);
os_memcpy(wpa_ie + wpa_ie_len, wpabuf_head(hs20),
wpabuf_len(hs20));
wpa_ie_len += wpabuf_len(hs20);
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)) {
u8 ext_capab[10];
int ext_capab_len;
ext_capab_len = wpas_build_ext_capab(wpa_s, ext_capab);
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
}
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;
Move cipher to enum wpa_cipher conversion into wpa_common.c Signed-hostap: Jouni Malinen <j@w1.fi>
2013-01-13 17:02:20 +01:00
cipher_pairwise = wpa_cipher_to_suite_driver(wpa_s->pairwise_cipher);
cipher_group = wpa_cipher_to_suite_driver(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. */
cipher_pairwise = cipher_group = CIPHER_WEP104;
}
}
#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;
params.freq = 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;
}
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 && ssid->frequency > 0 &&
params.freq == 0)
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
params.freq = ssid->frequency; /* Initial channel for IBSS */
params.wpa_ie = wpa_ie;
params.wpa_ie_len = wpa_ie_len;
params.pairwise_suite = cipher_pairwise;
params.group_suite = cipher_group;
params.key_mgmt_suite = key_mgmt2driver(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) &&
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
(params.key_mgmt_suite == KEY_MGMT_PSK ||
params.key_mgmt_suite == KEY_MGMT_FT_PSK)) {
params.passphrase = ssid->passphrase;
if (ssid->psk_set)
params.psk = ssid->psk;
}
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
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
params.mgmt_frame_protection =
ssid->ieee80211w == MGMT_FRAME_PROTECTION_DEFAULT ?
wpa_s->conf->pmf : ssid->ieee80211w;
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 */
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) {
int freq = wpa_drv_shared_freq(wpa_s);
if (freq > 0 && freq != params.freq) {
wpa_printf(MSG_DEBUG, "Shared interface with conflicting frequency found (%d != %d)",
freq, params.freq);
if (wpas_p2p_handle_frequency_conflicts(wpa_s,
params.freq,
ssid) < 0)
return;
}
}
#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;
Maintain a pointer to the current BSS table entry
2010-01-02 15:59:19 +01:00
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;
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 */
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
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->reassociate && !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
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
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
if (wpa_supplicant_fast_associate(wpa_s) != 1)
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_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) {
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
if (ssid && ssid == wpa_s->current_ssid && wpa_s->current_ssid) {
/* 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);
}
P2P: Start GO without extra scan step There are some corner cases, where the wpa_supplicant_req_scan() call may end up scheduling a scan even if we are about to start a GO. Avoid this by explicitly marking the GO network to be selected for the next connection.
2011-06-21 10:47:03 +02:00
wpa_s->connect_without_scan = NULL;
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
if (wpa_supplicant_fast_associate(wpa_s) != 1)
wpa_supplicant_req_scan(wpa_s, 0, disconnected ? 100000 : 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
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);
if (pkcs11_engine_path_copy == NULL) {
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;
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;
u8 ssid[MAX_SSID_LEN];
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);
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) {
os_get_time(&wpa_s->pending_eapol_rx_time);
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 */
wpa_supplicant_req_auth_timeout(
wpa_s,
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_ieee8021x(wpa_s->key_mgmt) ||
Longer auth_timeout for WPS key_mgmt It seems that for WPS registration we should use the same authentication timeout as for ieee8021x, no? (See patch attached.) On slow platforms public keys computation may take around 4-5 seconds (we actually stuck on this issue).
2008-12-25 19:26:07 +01:00
wpa_s->key_mgmt == WPA_KEY_MGMT_IEEE8021X_NO_WPA ||
wpa_s->key_mgmt == WPA_KEY_MGMT_WPS) ?
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
70 : 10, 0);
}
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
{
if (wpa_s->driver->send_eapol) {
const u8 *addr = wpa_drv_get_mac_addr(wpa_s);
if (addr)
os_memcpy(wpa_s->own_addr, addr, ETH_ALEN);
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
} else if ((!wpa_s->p2p_mgmt ||
!(wpa_s->drv_flags &
WPA_DRIVER_FLAGS_DEDICATED_P2P_DEVICE)) &&
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_s->drv_flags &
P2P: Do not register l2_packet on dedicated P2P device interface
2010-07-18 23:30:25 +02:00
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;
}
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));
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);
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_s->l2_br = l2_packet_init(wpa_s->bridge_ifname,
wpa_s->own_addr,
ETH_P_EAPOL,
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
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;
}
}
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)) {
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
if (wpa_supplicant_delayed_sched_scan(wpa_s, interface_count,
100000))
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_req_scan(wpa_s, interface_count,
100000);
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);
}
static struct wpa_supplicant * wpa_supplicant_alloc(void)
{
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: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_s->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)
{
u16 msk;
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 */
u16 msk = host_to_le16(HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET |
HT_CAP_INFO_SHORT_GI40MHZ);
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 */
u16 msk = host_to_le16(HT_CAP_INFO_SHORT_GI20MHZ |
HT_CAP_INFO_SHORT_GI40MHZ);
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;
}
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);
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;
#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;
}
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);
dl_list_add(&radio->ifaces, &wpa_s->radio_list);
return radio;
}
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_s->radio = NULL;
if (!dl_list_empty(&radio->ifaces))
return; /* Interfaces remain for this radio */
wpa_printf(MSG_DEBUG, "Remove radio %s", radio->name);
os_free(radio);
}
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 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 (wpa_s->driver->get_radio_name)
rn = wpa_s->driver->get_radio_name(wpa_s->drv_priv);
else
rn = NULL;
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;
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);
Allow driver wrappers to indicate maximum remain-on-channel duration
2010-04-11 18:42:37 +02:00
if (wpa_drv_get_capa(wpa_s, &capa) == 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;
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;
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;
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;
}
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: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
#ifdef CONFIG_P2P
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;
}
#endif /* CONFIG_P2P */
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;
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;
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
{
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: 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
#ifdef CONFIG_P2P
if (wpa_s == wpa_s->global->p2p_init_wpa_s && wpa_s->global->p2p) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Disable P2P since removing "
"the management interface is being removed");
wpas_p2p_deinit_global(wpa_s->global);
}
#endif /* CONFIG_P2P */
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);
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;
}
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
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
* 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,
struct wpa_interface *iface)
{
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;
wpa_s = wpa_supplicant_alloc();
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 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
/* Notify the control interfaces about new iface */
if (wpas_notify_iface_added(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
wpa_supplicant_deinit_iface(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
return NULL;
}
Remove extra whitespace
2009-09-13 19:27:54 +02:00
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
for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next)
wpas_notify_network_added(wpa_s, ssid);
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
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;
/* 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
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
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
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
Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 release
2008-02-28 02:34:43 +01:00
wpa_debug_open_file(params->wpa_debug_file_path);
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);
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;
}
global->drv_priv = os_zalloc(global->drv_count * sizeof(void *));
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 */
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;
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);
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: 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 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
#ifdef CONFIG_P2P
wpas_p2p_update_config(wpa_s);
#endif /* CONFIG_P2P */
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
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
static void add_freq(int *freqs, int *num_freqs, int freq)
{
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;
freqs = os_zalloc(sizeof(int) * (max_freqs + 1));
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;
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 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) {
/*
* There is no point in blacklisting the AP if this event is
* generated based on local request to disconnect.
*/
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");
wpas_auth_failed(wpa_s);
}
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));
P2P: Allow scan operations during p2p_find Previously, all station mode scan operations were either skipped or delayed while any P2P operation was in progress. To make concurrent operations easier to use, reduce this limitation by allowing a scan operation to be completed in the middle of a p2p_find. In addition, allow station mode association to be completed. When the station mode operation is run to its completion (scan results not acted on, connection to an AP completed, connection failed), resume the p2p_find operation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-23 18:42:53 +02:00
P2P: Use common function for re-starting P2P scan after station scan Make the implementation more consistent and cleaner by using a single function for addressing all the cases where completion of a station mode scan operation allows a P2P operation (search) to be re-started. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-18 15:31:09 +01:00
wpas_p2p_continue_after_scan(wpa_s);
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
}
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:
os_free(eap->password);
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:
os_free(eap->new_password);
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:
os_free(eap->pin);
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:
os_free(eap->otp);
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:
os_free(eap->private_key_passwd);
eap->private_key_passwd = (u8 *) os_strdup(value);
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:
os_free(eap->external_sim_resp);
eap->external_sim_resp = os_strdup(value);
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;
if (ssid == NULL)
return 1;
if (ssid->disabled)
return 1;
if (wpa_s && wpa_s->drv_capa_known)
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 &&
!ssid->ext_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
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
void wpas_auth_failed(struct wpa_supplicant *wpa_s)
{
struct wpa_ssid *ssid = wpa_s->current_ssid;
int dur;
struct os_time now;
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 > 20)
dur = 120;
else if (ssid->auth_failures > 10)
dur = 60;
else if (ssid->auth_failures > 5)
dur = 30;
else if (ssid->auth_failures > 1)
dur = 20;
else
dur = 10;
os_get_time(&now);
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
"id=%d ssid=\"%s\" auth_failures=%u duration=%d",
ssid->id, wpa_ssid_txt(ssid->ssid, ssid->ssid_len),
ssid->auth_failures, dur);
}
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;
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);
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
GAS: Delay GAS query Tx while scanning/connecting Offchannel operations needed for a GAS query can conflict with ongoing scan/connection progress, so delay GAS queries if such an operation is in progress on the current interface or any virtual interface sharing the same radio. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-21 12:15:45 +02:00
static int wpas_conn_in_progress(struct wpa_supplicant *wpa_s)
{
return wpa_s->wpa_state >= WPA_AUTHENTICATING &&
wpa_s->wpa_state != WPA_COMPLETED;
}
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
/**
* wpas_wpa_is_in_progress - Check whether a connection is in progress
* @wpa_s: Pointer to wpa_supplicant data
GAS: Delay GAS query Tx while scanning/connecting Offchannel operations needed for a GAS query can conflict with ongoing scan/connection progress, so delay GAS queries if such an operation is in progress on the current interface or any virtual interface sharing the same radio. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-21 12:15:45 +02:00
* @include_current: Whether to consider specified interface
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
*
* This function is to check if the wpa state is in beginning of the connection
* during 4-way handshake or group key handshake with WPA on any shared
* interface.
*/
GAS: Delay GAS query Tx while scanning/connecting Offchannel operations needed for a GAS query can conflict with ongoing scan/connection progress, so delay GAS queries if such an operation is in progress on the current interface or any virtual interface sharing the same radio. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-21 12:15:45 +02:00
int wpas_wpa_is_in_progress(struct wpa_supplicant *wpa_s, int include_current)
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
{
struct wpa_supplicant *ifs;
Use wpa_radio data for wpas_wpa_is_in_progress() This replaces the now unnecessary iteration of get_radio_name() calls. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 19:03:40 +01:00
dl_list_for_each(ifs, &wpa_s->radio->ifaces, struct wpa_supplicant,
radio_list) {
GAS: Delay GAS query Tx while scanning/connecting Offchannel operations needed for a GAS query can conflict with ongoing scan/connection progress, so delay GAS queries if such an operation is in progress on the current interface or any virtual interface sharing the same radio. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-21 12:15:45 +02:00
if (!include_current && ifs == wpa_s)
continue;
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
GAS: Delay GAS query Tx while scanning/connecting Offchannel operations needed for a GAS query can conflict with ongoing scan/connection progress, so delay GAS queries if such an operation is in progress on the current interface or any virtual interface sharing the same radio. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-21 12:15:45 +02:00
if (wpas_conn_in_progress(ifs)) {
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
wpa_dbg(wpa_s, MSG_DEBUG, "Connection is in progress "
GAS: Delay GAS query Tx while scanning/connecting Offchannel operations needed for a GAS query can conflict with ongoing scan/connection progress, so delay GAS queries if such an operation is in progress on the current interface or any virtual interface sharing the same radio. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-21 12:15:45 +02:00
"on interface %s - defer", ifs->ifname);
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
return 1;
}
}
return 0;
}
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
void dump_freq_array(struct wpa_supplicant *wpa_s, const char *title,
int *freq_array, 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++)
wpa_dbg(wpa_s, MSG_DEBUG, "freq[%u]: %d", i, freq_array[i]);
}
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
* 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_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);
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
os_memset(freq_array, 0, sizeof(int) * len);
/* First add the frequency of the local interface */
if (wpa_s->current_ssid != NULL && wpa_s->assoc_freq != 0) {
if (wpa_s->current_ssid->mode == WPAS_MODE_AP ||
wpa_s->current_ssid->mode == WPAS_MODE_P2P_GO)
freq_array[idx++] = wpa_s->current_ssid->frequency;
else if (wpa_drv_get_bssid(wpa_s, bssid) == 0)
freq_array[idx++] = wpa_s->assoc_freq;
}
/* If get_radio_name is not supported, use only the local freq */
Use wpa_drv_shared_freq() if get_radio_name() is not supported Some driver interfaces may not support the get_radio_name() design and get_shared_radio_freqs() needs to be aware of such possibility when determining shared radio frequencies. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-07-21 19:46:54 +02:00
if (!wpa_s->driver->get_radio_name) {
freq = wpa_drv_shared_freq(wpa_s);
if (freq > 0 && idx < len &&
(idx == 0 || freq_array[0] != freq))
freq_array[idx++] = freq;
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
dump_freq_array(wpa_s, "No get_radio_name", freq_array, 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;
Use wpa_drv_shared_freq() if get_radio_name() is not supported Some driver interfaces may not support the get_radio_name() design and get_shared_radio_freqs() needs to be aware of such possibility when determining shared radio frequencies. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-07-21 19:46:54 +02:00
}
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) {
if (wpa_s == ifs)
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
continue;
if (ifs->current_ssid == NULL || ifs->assoc_freq == 0)
continue;
if (ifs->current_ssid->mode == WPAS_MODE_AP ||
ifs->current_ssid->mode == WPAS_MODE_P2P_GO)
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++)
if (freq_array[i] == freq)
break;
if (i == idx)
freq_array[idx++] = freq;
}
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
dump_freq_array(wpa_s, "completed iteration", freq_array, 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;
}
Reference in a new issue Copy permalink