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

3140 lines
79 KiB
C
Raw Normal View History

Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
/*
* Interworking (IEEE 802.11u)
Interworking: Avoid duplicated network blocks Do not add multiple network blocks for the same network from a single credential. INTERWORKING_CONNECT used to generate a new network block for each instance regardless of what network blocks have already been configured. While this allows the connection to go through, it is not efficient to leave behind potentially large number of network blocks with the same contents (or worse, changed contents). Address this by removing an older network block for the same credential before adding a new one. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 22:32:43 +01:00
* Copyright (c) 2011-2013, Qualcomm Atheros, Inc.
Interworking: Keep up to two pending GAS_REQUEST responses Previously, only the last response data was kept in memory. This increases that to hold up to two last responses to allow some more parallel operations to be requested. In addition, the response data is now freed as soon as the external program has fetched it. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-06 06:53:37 +01:00
* Copyright (c) 2011-2014, Jouni Malinen <j@w1.fi>
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
*
Remove the GPL notification from files contributed by Atheros Remove the GPL notification text from files that were initially contributed by Atheros Communications or Qualcomm Atheros. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-11 15:31:36 +01:00
* This software may be distributed under the terms of the BSD license.
* See README for more details.
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
*/
#include "includes.h"
#include "common.h"
#include "common/ieee802_11_defs.h"
#include "common/gas.h"
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
#include "common/wpa_ctrl.h"
Interworking: Use EAP-AKA if USIM is used Signed-hostap: Jouni Malinen <j@w1.fi>
2012-03-04 15:11:02 +01:00
#include "utils/pcsc_funcs.h"
Interworking: Continue ANQP fetch after TX failure If the driver rejected any of the offchannel Action frame TX requests, the previous implementation terminated ANQP fetch process. While the driver should not really reject the request normally, it is possible that a request gets rejected for some reason. Allow the fetch process to continue with the next AP in such case to avoid breaking networking selection. This could result, e.g., in auto_interworking=1 process failing to connect if any the driver rejects requests to any of the APs in the scan result even if some other APs provided suitable information. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-07 17:38:09 +01:00
#include "utils/eloop.h"
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
#include "drivers/driver.h"
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
#include "eap_common/eap_defs.h"
Interworking: Allow pre-configuration of EAP parameters The new cred block parameters eap, phase1, and phase2 can be used to select which EAP method is used with network selection instead of using the value specified in ANQP information (e.g., NAI Realm). Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:40:45 +02:00
#include "eap_peer/eap.h"
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
#include "eap_peer/eap_methods.h"
eap_proxy: Re-read IMSI from proxy in Interworking functionality Try to read the IMSI values through the eap_proxy layer for Interworking functionality again if the value was not available at startup. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-01 19:48:03 +01:00
#include "eapol_supp/eapol_supp_sm.h"
Interworking: Avoid duplicated network blocks Do not add multiple network blocks for the same network from a single credential. INTERWORKING_CONNECT used to generate a new network block for each instance regardless of what network blocks have already been configured. While this allows the connection to go through, it is not efficient to leave behind potentially large number of network blocks with the same contents (or worse, changed contents). Address this by removing an older network block for the same credential before adding a new one. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 22:32:43 +01:00
#include "rsn_supp/wpa.h"
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
#include "wpa_supplicant_i.h"
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
#include "config.h"
Interworking: Allow network block -based connection without ANQP matches Previously, network block -based connection could have been used to override ANQP-based selection. However, if no ANQP-based matches were present, no connection was started. Fix this by trying to connect if any enabled network block has a match in the BSS table. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:38:50 +01:00
#include "config_ssid.h"
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
#include "bss.h"
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
#include "scan.h"
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
#include "notify.h"
Interworking: Allow FT to be used for connection This extends Interworking network selection to enable FT-EAP as an optional key_mgmt value to allow FT to be used instead of hardcoding WPA2-Enterprise without FT. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-05-10 15:15:20 +02:00
#include "driver_i.h"
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
#include "gas_query.h"
HS 2.0: Add Hotspot 2.0 ANQP elements to Interworking queries Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-10-16 21:25:42 +02:00
#include "hs20_supplicant.h"
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
#include "interworking.h"
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
#if defined(EAP_SIM) | defined(EAP_SIM_DYNAMIC)
#define INTERWORKING_3GPP
#else
#if defined(EAP_AKA) | defined(EAP_AKA_DYNAMIC)
#define INTERWORKING_3GPP
#else
#if defined(EAP_AKA_PRIME) | defined(EAP_AKA_PRIME_DYNAMIC)
#define INTERWORKING_3GPP
#endif
#endif
#endif
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
static void interworking_next_anqp_fetch(struct wpa_supplicant *wpa_s);
Interworking: Select highest priority cred if multiple matches Previously, the credential to use for a connection with a specific BSS was picked arbitrary based on first found match of each matching mechanism. While the credential priorities were used elsewhere, this did not take into account that different mechanisms could find multiple matching credentials. As such, the highest priority credential was not always used in case more than one credential matched with the selected BSS. Fix this by checking credential priorities again during connection request. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-16 18:54:09 +01:00
static struct wpa_cred * interworking_credentials_available_realm(
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
struct wpa_supplicant *wpa_s, struct wpa_bss *bss, int ignore_bw,
int *excluded);
Interworking: Select highest priority cred if multiple matches Previously, the credential to use for a connection with a specific BSS was picked arbitrary based on first found match of each matching mechanism. While the credential priorities were used elsewhere, this did not take into account that different mechanisms could find multiple matching credentials. As such, the highest priority credential was not always used in case more than one credential matched with the selected BSS. Fix this by checking credential priorities again during connection request. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-16 18:54:09 +01:00
static struct wpa_cred * interworking_credentials_available_3gpp(
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
struct wpa_supplicant *wpa_s, struct wpa_bss *bss, int ignore_bw,
int *excluded);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
Interworking: Use a helper function to compare cred priority This makes it easier to extend credential priority comparison beyond a single priority variable. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 18:06:49 +01:00
static int cred_prio_cmp(const struct wpa_cred *a, const struct wpa_cred *b)
{
if (a->priority > b->priority)
return 1;
if (a->priority < b->priority)
return -1;
Interworking: Add sp_priority cred parameter This new priority parameter can be used to specify priorities between credentials provisioned by the same SP. cred->priority is checked first and if it is same and the provisioning_sp parameter matches, the new sp_priority is used to order the credentials. It should be noted that the order of priorities is different (higher 'priority' value indicates higher priority of the credential, while higher 'sp_priority' indicates lower priority of the credential). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 18:14:40 +01:00
if (a->provisioning_sp == NULL || b->provisioning_sp == NULL ||
os_strcmp(a->provisioning_sp, b->provisioning_sp) != 0)
return 0;
if (a->sp_priority < b->sp_priority)
return 1;
if (a->sp_priority > b->sp_priority)
return -1;
Interworking: Use a helper function to compare cred priority This makes it easier to extend credential priority comparison beyond a single priority variable. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 18:06:49 +01:00
return 0;
}
Interworking: Disconnect before trying interworking reconnection Make the connection change on Interworking network selection cases clearer by forcing the previous association to be dropped before trying to start a new one. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-24 00:15:18 +01:00
static void interworking_reconnect(struct wpa_supplicant *wpa_s)
{
Interworking: Avoid busy loop in scan result mismatch corner cases It was possible for interworking_find_network_match() to find a possible BSS match in a case where more thorough checks in wpa_supplicant_select_bss() reject network. This itself is fine, in general, but when combined with wpa_supplicant_fast_associate() optimization and auto_interworking=1, this resulted in a busy loop of up to five seconds and a possible stack overflow due to recursion in that loop. Fix this by limiting the Interworking wpa_supplicant_fast_associate() call to be used only once per scan iteration, so that new scan operations can be completed before going through the scan results again. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-17 00:43:00 +01:00
unsigned int tried;
Interworking: Disconnect before trying interworking reconnection Make the connection change on Interworking network selection cases clearer by forcing the previous association to be dropped before trying to start a new one. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-24 00:15:18 +01:00
if (wpa_s->wpa_state >= WPA_AUTHENTICATING) {
wpa_supplicant_cancel_sched_scan(wpa_s);
Do not add blacklist entries based on normal disconnect request cases There are number of cases where wpa_supplicant requests the current connection to be disconnected before starting a new operation. Such cases do not really indicate that there was an error in connecting or a disconnection initiated by the AP, so do not add a temporary blacklist entry in such sequences. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 14:54:24 +01:00
wpa_s->own_disconnect_req = 1;
Interworking: Disconnect before trying interworking reconnection Make the connection change on Interworking network selection cases clearer by forcing the previous association to be dropped before trying to start a new one. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-24 00:15:18 +01:00
wpa_supplicant_deauthenticate(wpa_s,
WLAN_REASON_DEAUTH_LEAVING);
}
wpa_s->disconnected = 0;
wpa_s->reassociate = 1;
Interworking: Avoid busy loop in scan result mismatch corner cases It was possible for interworking_find_network_match() to find a possible BSS match in a case where more thorough checks in wpa_supplicant_select_bss() reject network. This itself is fine, in general, but when combined with wpa_supplicant_fast_associate() optimization and auto_interworking=1, this resulted in a busy loop of up to five seconds and a possible stack overflow due to recursion in that loop. Fix this by limiting the Interworking wpa_supplicant_fast_associate() call to be used only once per scan iteration, so that new scan operations can be completed before going through the scan results again. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-17 00:43:00 +01:00
tried = wpa_s->interworking_fast_assoc_tried;
wpa_s->interworking_fast_assoc_tried = 1;
Interworking: Skip extra scan after network auto-select If the scan results from before ANQP fetch are fresh (less than five seconds old), do not run a new scan when selecting the BSS after having used Interworking network selection. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 19:18:48 +02:00
Interworking: Avoid busy loop in scan result mismatch corner cases It was possible for interworking_find_network_match() to find a possible BSS match in a case where more thorough checks in wpa_supplicant_select_bss() reject network. This itself is fine, in general, but when combined with wpa_supplicant_fast_associate() optimization and auto_interworking=1, this resulted in a busy loop of up to five seconds and a possible stack overflow due to recursion in that loop. Fix this by limiting the Interworking wpa_supplicant_fast_associate() call to be used only once per scan iteration, so that new scan operations can be completed before going through the scan results again. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-17 00:43:00 +01:00
if (!tried && wpa_supplicant_fast_associate(wpa_s) >= 0)
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
return;
Interworking: Skip extra scan after network auto-select If the scan results from before ANQP fetch are fresh (less than five seconds old), do not run a new scan when selecting the BSS after having used Interworking network selection. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 19:18:48 +02:00
Interworking: Avoid busy loop in scan result mismatch corner cases It was possible for interworking_find_network_match() to find a possible BSS match in a case where more thorough checks in wpa_supplicant_select_bss() reject network. This itself is fine, in general, but when combined with wpa_supplicant_fast_associate() optimization and auto_interworking=1, this resulted in a busy loop of up to five seconds and a possible stack overflow due to recursion in that loop. Fix this by limiting the Interworking wpa_supplicant_fast_associate() call to be used only once per scan iteration, so that new scan operations can be completed before going through the scan results again. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-17 00:43:00 +01:00
wpa_s->interworking_fast_assoc_tried = 0;
Interworking: Disconnect before trying interworking reconnection Make the connection change on Interworking network selection cases clearer by forcing the previous association to be dropped before trying to start a new one. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-24 00:15:18 +01:00
wpa_supplicant_req_scan(wpa_s, 0, 0);
}
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
static struct wpabuf * anqp_build_req(u16 info_ids[], size_t num_ids,
struct wpabuf *extra)
{
struct wpabuf *buf;
size_t i;
u8 *len_pos;
buf = gas_anqp_build_initial_req(0, 4 + num_ids * 2 +
(extra ? wpabuf_len(extra) : 0));
if (buf == NULL)
return NULL;
len_pos = gas_anqp_add_element(buf, ANQP_QUERY_LIST);
for (i = 0; i < num_ids; i++)
wpabuf_put_le16(buf, info_ids[i]);
gas_anqp_set_element_len(buf, len_pos);
if (extra)
wpabuf_put_buf(buf, extra);
gas_anqp_set_len(buf);
return buf;
}
static void interworking_anqp_resp_cb(void *ctx, const u8 *dst,
u8 dialog_token,
enum gas_query_result result,
const struct wpabuf *adv_proto,
const struct wpabuf *resp,
u16 status_code)
{
struct wpa_supplicant *wpa_s = ctx;
HS 2.0R2: Add routine for fetching OSU provider information The new wpa_cli fetch_osu command can be used to fetch information about all OSU providers and write that to a text file with the icons in separate files. cancel_osu_fetch command can be used to stop ongoing OSU provider list fetch. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-25 23:10:41 +01:00
wpa_printf(MSG_DEBUG, "ANQP: Response callback dst=" MACSTR
" dialog_token=%u result=%d status_code=%u",
MAC2STR(dst), dialog_token, result, status_code);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
anqp_resp_cb(wpa_s, dst, dialog_token, result, adv_proto, resp,
status_code);
interworking_next_anqp_fetch(wpa_s);
}
Interworking: Fetch only the needed ANQP information Use configured credentials to figure out which ANQP information needs to be fetched and only fetch those when using Interworking network selection. The fetch_anqp command is still fetching all ANQP information. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 20:05:54 +02:00
static int cred_with_roaming_consortium(struct wpa_supplicant *wpa_s)
{
struct wpa_cred *cred;
for (cred = wpa_s->conf->cred; cred; cred = cred->next) {
if (cred->roaming_consortium_len)
return 1;
Interworking: Add required_roaming_consortium parameter for credentials This allows credentials to be limited from being used to connect to a network unless the AP advertises a matching roaming consortium OI. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-30 06:34:47 +01:00
if (cred->required_roaming_consortium_len)
return 1;
Interworking: Fetch only the needed ANQP information Use configured credentials to figure out which ANQP information needs to be fetched and only fetch those when using Interworking network selection. The fetch_anqp command is still fetching all ANQP information. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 20:05:54 +02:00
}
return 0;
}
static int cred_with_3gpp(struct wpa_supplicant *wpa_s)
{
struct wpa_cred *cred;
for (cred = wpa_s->conf->cred; cred; cred = cred->next) {
if (cred->pcsc || cred->imsi)
return 1;
}
return 0;
}
static int cred_with_nai_realm(struct wpa_supplicant *wpa_s)
{
struct wpa_cred *cred;
for (cred = wpa_s->conf->cred; cred; cred = cred->next) {
if (cred->pcsc || cred->imsi)
continue;
if (!cred->eap_method)
return 1;
if (cred->realm && cred->roaming_consortium_len == 0)
return 1;
}
return 0;
}
static int cred_with_domain(struct wpa_supplicant *wpa_s)
{
struct wpa_cred *cred;
for (cred = wpa_s->conf->cred; cred; cred = cred->next) {
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
if (cred->domain || cred->pcsc || cred->imsi ||
cred->roaming_partner)
Interworking: Fetch only the needed ANQP information Use configured credentials to figure out which ANQP information needs to be fetched and only fetch those when using Interworking network selection. The fetch_anqp command is still fetching all ANQP information. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 20:05:54 +02:00
return 1;
}
return 0;
}
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
#ifdef CONFIG_HS20
HS 2.0R2: Add support for Policy/RequiredProtoPortTuple The new credential parameter req_conn_capab can be used to specify restrictions on roaming networks providing connectivity for a set of protocols/ports. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-08 19:31:41 +02:00
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
static int cred_with_min_backhaul(struct wpa_supplicant *wpa_s)
{
struct wpa_cred *cred;
for (cred = wpa_s->conf->cred; cred; cred = cred->next) {
if (cred->min_dl_bandwidth_home ||
cred->min_ul_bandwidth_home ||
cred->min_dl_bandwidth_roaming ||
cred->min_ul_bandwidth_roaming)
return 1;
}
return 0;
}
HS 2.0R2: Add support for Policy/RequiredProtoPortTuple The new credential parameter req_conn_capab can be used to specify restrictions on roaming networks providing connectivity for a set of protocols/ports. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-08 19:31:41 +02:00
static int cred_with_conn_capab(struct wpa_supplicant *wpa_s)
{
struct wpa_cred *cred;
for (cred = wpa_s->conf->cred; cred; cred = cred->next) {
if (cred->num_req_conn_capab)
return 1;
}
return 0;
}
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
#endif /* CONFIG_HS20 */
Interworking: Fetch only the needed ANQP information Use configured credentials to figure out which ANQP information needs to be fetched and only fetch those when using Interworking network selection. The fetch_anqp command is still fetching all ANQP information. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 20:05:54 +02:00
static int additional_roaming_consortiums(struct wpa_bss *bss)
{
const u8 *ie;
ie = wpa_bss_get_ie(bss, WLAN_EID_ROAMING_CONSORTIUM);
if (ie == NULL || ie[1] == 0)
return 0;
return ie[2]; /* Number of ANQP OIs */
}
Interworking: Continue ANQP fetch after TX failure If the driver rejected any of the offchannel Action frame TX requests, the previous implementation terminated ANQP fetch process. While the driver should not really reject the request normally, it is possible that a request gets rejected for some reason. Allow the fetch process to continue with the next AP in such case to avoid breaking networking selection. This could result, e.g., in auto_interworking=1 process failing to connect if any the driver rejects requests to any of the APs in the scan result even if some other APs provided suitable information. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-07 17:38:09 +01:00
static void interworking_continue_anqp(void *eloop_ctx, void *sock_ctx)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
interworking_next_anqp_fetch(wpa_s);
}
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
static int interworking_anqp_send_req(struct wpa_supplicant *wpa_s,
struct wpa_bss *bss)
{
struct wpabuf *buf;
int ret = 0;
int res;
Interworking: Fetch only the needed ANQP information Use configured credentials to figure out which ANQP information needs to be fetched and only fetch those when using Interworking network selection. The fetch_anqp command is still fetching all ANQP information. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 20:05:54 +02:00
u16 info_ids[8];
size_t num_info_ids = 0;
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
struct wpabuf *extra = NULL;
Interworking: Fetch only the needed ANQP information Use configured credentials to figure out which ANQP information needs to be fetched and only fetch those when using Interworking network selection. The fetch_anqp command is still fetching all ANQP information. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 20:05:54 +02:00
int all = wpa_s->fetch_all_anqp;
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG, "Interworking: ANQP Query Request to " MACSTR,
MAC2STR(bss->bssid));
Interworking: Try to use same BSS entry for storing GAS results There may be cases where multiple BSS entries for a single BSSID are in the table. This is mostly in automated test cases due to the AP configuration changes, but something similar could potentially happen as a corner case in more realistic networks, too, e.g., when an AP changes its operating channel. Make network selection more robust by trying to find the exact BSS entry instead of any BSS entry with a matching BSSID when storing GAS/ANQP response. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 10:44:04 +02:00
wpa_s->interworking_gas_bss = bss;
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
Interworking: Fetch only the needed ANQP information Use configured credentials to figure out which ANQP information needs to be fetched and only fetch those when using Interworking network selection. The fetch_anqp command is still fetching all ANQP information. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 20:05:54 +02:00
info_ids[num_info_ids++] = ANQP_CAPABILITY_LIST;
if (all) {
info_ids[num_info_ids++] = ANQP_VENUE_NAME;
info_ids[num_info_ids++] = ANQP_NETWORK_AUTH_TYPE;
}
if (all || (cred_with_roaming_consortium(wpa_s) &&
additional_roaming_consortiums(bss)))
info_ids[num_info_ids++] = ANQP_ROAMING_CONSORTIUM;
if (all)
info_ids[num_info_ids++] = ANQP_IP_ADDR_TYPE_AVAILABILITY;
if (all || cred_with_nai_realm(wpa_s))
info_ids[num_info_ids++] = ANQP_NAI_REALM;
Interworking: Init scard when a credential requires SIM access When an ANQP fetch is triggered and ANQP_3GPP_CELLULAR_NETWORK info is required, initialize scard to be ready when comparing ANQP and credentials. Signed-off-by: Jean Trivelly <jean.trivelly@intel.com>
2014-03-28 14:41:36 +01:00
if (all || cred_with_3gpp(wpa_s)) {
Interworking: Fetch only the needed ANQP information Use configured credentials to figure out which ANQP information needs to be fetched and only fetch those when using Interworking network selection. The fetch_anqp command is still fetching all ANQP information. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 20:05:54 +02:00
info_ids[num_info_ids++] = ANQP_3GPP_CELLULAR_NETWORK;
Interworking: Init scard when a credential requires SIM access When an ANQP fetch is triggered and ANQP_3GPP_CELLULAR_NETWORK info is required, initialize scard to be ready when comparing ANQP and credentials. Signed-off-by: Jean Trivelly <jean.trivelly@intel.com>
2014-03-28 14:41:36 +01:00
wpa_supplicant_scard_init(wpa_s, NULL);
}
Interworking: Fetch only the needed ANQP information Use configured credentials to figure out which ANQP information needs to be fetched and only fetch those when using Interworking network selection. The fetch_anqp command is still fetching all ANQP information. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 20:05:54 +02:00
if (all || cred_with_domain(wpa_s))
info_ids[num_info_ids++] = ANQP_DOMAIN_NAME;
wpa_hexdump(MSG_DEBUG, "Interworking: ANQP Query info",
(u8 *) info_ids, num_info_ids * 2);
HS 2.0: Add Hotspot 2.0 ANQP elements to Interworking queries Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-10-16 21:25:42 +02:00
#ifdef CONFIG_HS20
if (wpa_bss_get_vendor_ie(bss, HS20_IE_VENDOR_TYPE)) {
u8 *len_pos;
extra = wpabuf_alloc(100);
if (!extra)
return -1;
len_pos = gas_anqp_add_element(extra, ANQP_VENDOR_SPECIFIC);
wpabuf_put_be24(extra, OUI_WFA);
wpabuf_put_u8(extra, HS20_ANQP_OUI_TYPE);
wpabuf_put_u8(extra, HS20_STYPE_QUERY_LIST);
wpabuf_put_u8(extra, 0); /* Reserved */
wpabuf_put_u8(extra, HS20_STYPE_CAPABILITY_LIST);
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
if (all)
Interworking: Fetch only the needed ANQP information Use configured credentials to figure out which ANQP information needs to be fetched and only fetch those when using Interworking network selection. The fetch_anqp command is still fetching all ANQP information. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 20:05:54 +02:00
wpabuf_put_u8(extra,
HS20_STYPE_OPERATOR_FRIENDLY_NAME);
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
if (all || cred_with_min_backhaul(wpa_s))
Interworking: Fetch only the needed ANQP information Use configured credentials to figure out which ANQP information needs to be fetched and only fetch those when using Interworking network selection. The fetch_anqp command is still fetching all ANQP information. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 20:05:54 +02:00
wpabuf_put_u8(extra, HS20_STYPE_WAN_METRICS);
HS 2.0R2: Add support for Policy/RequiredProtoPortTuple The new credential parameter req_conn_capab can be used to specify restrictions on roaming networks providing connectivity for a set of protocols/ports. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-08 19:31:41 +02:00
if (all || cred_with_conn_capab(wpa_s))
Interworking: Fetch only the needed ANQP information Use configured credentials to figure out which ANQP information needs to be fetched and only fetch those when using Interworking network selection. The fetch_anqp command is still fetching all ANQP information. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 20:05:54 +02:00
wpabuf_put_u8(extra, HS20_STYPE_CONNECTION_CAPABILITY);
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
if (all)
Interworking: Fetch only the needed ANQP information Use configured credentials to figure out which ANQP information needs to be fetched and only fetch those when using Interworking network selection. The fetch_anqp command is still fetching all ANQP information. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 20:05:54 +02:00
wpabuf_put_u8(extra, HS20_STYPE_OPERATING_CLASS);
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
if (all)
HS 2.0R2: Add OSU Providers list ANQP element wpa_supplicant can now request OSU Providers list with "hs20_anqp_get <BSSID> 8". Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-08 22:51:16 +01:00
wpabuf_put_u8(extra, HS20_STYPE_OSU_PROVIDERS_LIST);
HS 2.0: Add Hotspot 2.0 ANQP elements to Interworking queries Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-10-16 21:25:42 +02:00
gas_anqp_set_element_len(extra, len_pos);
}
#endif /* CONFIG_HS20 */
Interworking: Fetch only the needed ANQP information Use configured credentials to figure out which ANQP information needs to be fetched and only fetch those when using Interworking network selection. The fetch_anqp command is still fetching all ANQP information. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 20:05:54 +02:00
buf = anqp_build_req(info_ids, num_info_ids, extra);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
wpabuf_free(extra);
if (buf == NULL)
return -1;
res = gas_query_req(wpa_s->gas, bss->bssid, bss->freq, buf,
interworking_anqp_resp_cb, wpa_s);
if (res < 0) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG, "ANQP: Failed to send Query Request");
GAS: Delay GAS query Tx while another query is in progress It would be possible to issue another GAS query when a previous one is still in progress and this could result in conflicting offchannel operations. Prevent that by delaying GAS query initiation until the previous operation has been completed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-21 12:13:42 +02:00
wpabuf_free(buf);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
ret = -1;
Interworking: Continue ANQP fetch after TX failure If the driver rejected any of the offchannel Action frame TX requests, the previous implementation terminated ANQP fetch process. While the driver should not really reject the request normally, it is possible that a request gets rejected for some reason. Allow the fetch process to continue with the next AP in such case to avoid breaking networking selection. This could result, e.g., in auto_interworking=1 process failing to connect if any the driver rejects requests to any of the APs in the scan result even if some other APs provided suitable information. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-07 17:38:09 +01:00
eloop_register_timeout(0, 0, interworking_continue_anqp, wpa_s,
NULL);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
} else
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"ANQP: Query started with dialog token %u", res);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
return ret;
}
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
struct nai_realm_eap {
u8 method;
u8 inner_method;
enum nai_realm_eap_auth_inner_non_eap inner_non_eap;
u8 cred_type;
u8 tunneled_cred_type;
};
struct nai_realm {
u8 encoding;
char *realm;
u8 eap_count;
struct nai_realm_eap *eap;
};
static void nai_realm_free(struct nai_realm *realms, u16 count)
{
u16 i;
if (realms == NULL)
return;
for (i = 0; i < count; i++) {
os_free(realms[i].eap);
os_free(realms[i].realm);
}
os_free(realms);
}
static const u8 * nai_realm_parse_eap(struct nai_realm_eap *e, const u8 *pos,
const u8 *end)
{
u8 elen, auth_count, a;
const u8 *e_end;
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
if (end - pos < 3) {
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
wpa_printf(MSG_DEBUG, "No room for EAP Method fixed fields");
return NULL;
}
elen = *pos++;
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
if (elen > end - pos || elen < 2) {
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
wpa_printf(MSG_DEBUG, "No room for EAP Method subfield");
return NULL;
}
e_end = pos + elen;
e->method = *pos++;
auth_count = *pos++;
wpa_printf(MSG_DEBUG, "EAP Method: len=%u method=%u auth_count=%u",
elen, e->method, auth_count);
for (a = 0; a < auth_count; a++) {
u8 id, len;
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
if (end - pos < 2) {
wpa_printf(MSG_DEBUG,
"No room for Authentication Parameter subfield header");
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
return NULL;
}
id = *pos++;
len = *pos++;
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
if (len > end - pos) {
wpa_printf(MSG_DEBUG,
"No room for Authentication Parameter subfield");
return NULL;
}
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
switch (id) {
case NAI_REALM_EAP_AUTH_NON_EAP_INNER_AUTH:
if (len < 1)
break;
e->inner_non_eap = *pos;
if (e->method != EAP_TYPE_TTLS)
break;
switch (*pos) {
case NAI_REALM_INNER_NON_EAP_PAP:
wpa_printf(MSG_DEBUG, "EAP-TTLS/PAP");
break;
case NAI_REALM_INNER_NON_EAP_CHAP:
wpa_printf(MSG_DEBUG, "EAP-TTLS/CHAP");
break;
case NAI_REALM_INNER_NON_EAP_MSCHAP:
wpa_printf(MSG_DEBUG, "EAP-TTLS/MSCHAP");
break;
case NAI_REALM_INNER_NON_EAP_MSCHAPV2:
wpa_printf(MSG_DEBUG, "EAP-TTLS/MSCHAPV2");
break;
}
break;
case NAI_REALM_EAP_AUTH_INNER_AUTH_EAP_METHOD:
if (len < 1)
break;
e->inner_method = *pos;
wpa_printf(MSG_DEBUG, "Inner EAP method: %u",
e->inner_method);
break;
case NAI_REALM_EAP_AUTH_CRED_TYPE:
if (len < 1)
break;
e->cred_type = *pos;
wpa_printf(MSG_DEBUG, "Credential Type: %u",
e->cred_type);
break;
case NAI_REALM_EAP_AUTH_TUNNELED_CRED_TYPE:
if (len < 1)
break;
e->tunneled_cred_type = *pos;
wpa_printf(MSG_DEBUG, "Tunneled EAP Method Credential "
"Type: %u", e->tunneled_cred_type);
break;
default:
wpa_printf(MSG_DEBUG, "Unsupported Authentication "
"Parameter: id=%u len=%u", id, len);
wpa_hexdump(MSG_DEBUG, "Authentication Parameter "
"Value", pos, len);
break;
}
pos += len;
}
return e_end;
}
static const u8 * nai_realm_parse_realm(struct nai_realm *r, const u8 *pos,
const u8 *end)
{
u16 len;
const u8 *f_end;
u8 realm_len, e;
if (end - pos < 4) {
wpa_printf(MSG_DEBUG, "No room for NAI Realm Data "
"fixed fields");
return NULL;
}
len = WPA_GET_LE16(pos); /* NAI Realm Data field Length */
pos += 2;
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
if (len > end - pos || len < 3) {
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
wpa_printf(MSG_DEBUG, "No room for NAI Realm Data "
"(len=%u; left=%u)",
len, (unsigned int) (end - pos));
return NULL;
}
f_end = pos + len;
r->encoding = *pos++;
realm_len = *pos++;
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
if (realm_len > f_end - pos) {
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
wpa_printf(MSG_DEBUG, "No room for NAI Realm "
"(len=%u; left=%u)",
realm_len, (unsigned int) (f_end - pos));
return NULL;
}
wpa_hexdump_ascii(MSG_DEBUG, "NAI Realm", pos, realm_len);
Add dup_binstr() to help common binary string tasks There are quite a few places in the current implementation where a nul terminated string is generated from binary data. Add a helper function to simplify the code a bit. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-27 22:44:59 +02:00
r->realm = dup_binstr(pos, realm_len);
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
if (r->realm == NULL)
return NULL;
pos += realm_len;
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
if (f_end - pos < 1) {
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
wpa_printf(MSG_DEBUG, "No room for EAP Method Count");
return NULL;
}
r->eap_count = *pos++;
wpa_printf(MSG_DEBUG, "EAP Count: %u", r->eap_count);
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
if (r->eap_count * 3 > f_end - pos) {
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
wpa_printf(MSG_DEBUG, "No room for EAP Methods");
return NULL;
}
Convert os_zalloc() for an array to use os_calloc() Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-13 19:44:21 +02:00
r->eap = os_calloc(r->eap_count, sizeof(struct nai_realm_eap));
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
if (r->eap == NULL)
return NULL;
for (e = 0; e < r->eap_count; e++) {
pos = nai_realm_parse_eap(&r->eap[e], pos, f_end);
if (pos == NULL)
return NULL;
}
return f_end;
}
static struct nai_realm * nai_realm_parse(struct wpabuf *anqp, u16 *count)
{
struct nai_realm *realm;
const u8 *pos, *end;
u16 i, num;
Interworking: Make bounds checking easier for static analyzers 'num * 5 > end - pos' handles bounds checking a bit more efficiently, but apparently that is not clear enough for all static analyzers. Replace with 'num > left / 5' to avoid false reports. (CID 68117) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-06 17:51:23 +01:00
size_t left;
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
Interworking: Make bounds checking easier for static analyzers 'num * 5 > end - pos' handles bounds checking a bit more efficiently, but apparently that is not clear enough for all static analyzers. Replace with 'num > left / 5' to avoid false reports. (CID 68117) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-06 17:51:23 +01:00
if (anqp == NULL)
return NULL;
left = wpabuf_len(anqp);
if (left < 2)
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
return NULL;
pos = wpabuf_head_u8(anqp);
Interworking: Make bounds checking easier for static analyzers 'num * 5 > end - pos' handles bounds checking a bit more efficiently, but apparently that is not clear enough for all static analyzers. Replace with 'num > left / 5' to avoid false reports. (CID 68117) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-06 17:51:23 +01:00
end = pos + left;
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
num = WPA_GET_LE16(pos);
wpa_printf(MSG_DEBUG, "NAI Realm Count: %u", num);
pos += 2;
Interworking: Make bounds checking easier for static analyzers 'num * 5 > end - pos' handles bounds checking a bit more efficiently, but apparently that is not clear enough for all static analyzers. Replace with 'num > left / 5' to avoid false reports. (CID 68117) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-06 17:51:23 +01:00
left -= 2;
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
Interworking: Make bounds checking easier for static analyzers 'num * 5 > end - pos' handles bounds checking a bit more efficiently, but apparently that is not clear enough for all static analyzers. Replace with 'num > left / 5' to avoid false reports. (CID 68117) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-06 17:51:23 +01:00
if (num > left / 5) {
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
wpa_printf(MSG_DEBUG, "Invalid NAI Realm Count %u - not "
"enough data (%u octets) for that many realms",
Interworking: Make bounds checking easier for static analyzers 'num * 5 > end - pos' handles bounds checking a bit more efficiently, but apparently that is not clear enough for all static analyzers. Replace with 'num > left / 5' to avoid false reports. (CID 68117) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-06 17:51:23 +01:00
num, (unsigned int) left);
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
return NULL;
}
Convert os_zalloc() for an array to use os_calloc() Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-13 19:44:21 +02:00
realm = os_calloc(num, sizeof(struct nai_realm));
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
if (realm == NULL)
return NULL;
for (i = 0; i < num; i++) {
pos = nai_realm_parse_realm(&realm[i], pos, end);
if (pos == NULL) {
nai_realm_free(realm, num);
return NULL;
}
}
*count = num;
return realm;
}
static int nai_realm_match(struct nai_realm *realm, const char *home_realm)
{
char *tmp, *pos, *end;
int match = 0;
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
if (realm->realm == NULL || home_realm == NULL)
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
return 0;
if (os_strchr(realm->realm, ';') == NULL)
return os_strcasecmp(realm->realm, home_realm) == 0;
tmp = os_strdup(realm->realm);
if (tmp == NULL)
return 0;
pos = tmp;
while (*pos) {
end = os_strchr(pos, ';');
if (end)
*end = '\0';
if (os_strcasecmp(pos, home_realm) == 0) {
match = 1;
break;
}
if (end == NULL)
break;
pos = end + 1;
}
os_free(tmp);
return match;
}
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
static int nai_realm_cred_username(struct wpa_supplicant *wpa_s,
struct nai_realm_eap *eap)
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
{
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
if (eap_get_name(EAP_VENDOR_IETF, eap->method) == NULL) {
wpa_msg(wpa_s, MSG_DEBUG,
"nai-realm-cred-username: EAP method not supported: %d",
eap->method);
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
return 0; /* method not supported */
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
}
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
Interworking: Allow EAP-FAST to be used This behaves like PEAP as far as Interworking network selection is concerned. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-26 12:48:35 +01:00
if (eap->method != EAP_TYPE_TTLS && eap->method != EAP_TYPE_PEAP &&
eap->method != EAP_TYPE_FAST) {
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
/* Only tunneled methods with username/password supported */
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"nai-realm-cred-username: Method: %d is not TTLS, PEAP, or FAST",
eap->method);
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
return 0;
}
Interworking: Allow EAP-FAST to be used This behaves like PEAP as far as Interworking network selection is concerned. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-26 12:48:35 +01:00
if (eap->method == EAP_TYPE_PEAP || eap->method == EAP_TYPE_FAST) {
Interworking: Default to EAP-MSCHAPv2 with EAP-PEAP If the NAI Realm list indicates that EAP-PEAP is used, use EAP-MSCHAPv2 as the Phase 2 method by default if the NAI Realm list does not specify the tunneled method. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-17 22:27:15 +01:00
if (eap->inner_method &&
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
eap_get_name(EAP_VENDOR_IETF, eap->inner_method) == NULL) {
wpa_msg(wpa_s, MSG_DEBUG,
"nai-realm-cred-username: PEAP/FAST: Inner method not supported: %d",
eap->inner_method);
Interworking: Default to EAP-MSCHAPv2 with EAP-PEAP If the NAI Realm list indicates that EAP-PEAP is used, use EAP-MSCHAPv2 as the Phase 2 method by default if the NAI Realm list does not specify the tunneled method. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-17 22:27:15 +01:00
return 0;
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
}
Interworking: Default to EAP-MSCHAPv2 with EAP-PEAP If the NAI Realm list indicates that EAP-PEAP is used, use EAP-MSCHAPv2 as the Phase 2 method by default if the NAI Realm list does not specify the tunneled method. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-17 22:27:15 +01:00
if (!eap->inner_method &&
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
eap_get_name(EAP_VENDOR_IETF, EAP_TYPE_MSCHAPV2) == NULL) {
wpa_msg(wpa_s, MSG_DEBUG,
"nai-realm-cred-username: MSCHAPv2 not supported");
Interworking: Default to EAP-MSCHAPv2 with EAP-PEAP If the NAI Realm list indicates that EAP-PEAP is used, use EAP-MSCHAPv2 as the Phase 2 method by default if the NAI Realm list does not specify the tunneled method. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-17 22:27:15 +01:00
return 0;
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
}
Interworking: Default to EAP-MSCHAPv2 with EAP-PEAP If the NAI Realm list indicates that EAP-PEAP is used, use EAP-MSCHAPv2 as the Phase 2 method by default if the NAI Realm list does not specify the tunneled method. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-17 22:27:15 +01:00
}
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
if (eap->method == EAP_TYPE_TTLS) {
if (eap->inner_method == 0 && eap->inner_non_eap == 0)
Interworking: Default to TTLS/MSCHAPv2 for NAI Realm list matching If the AP does not advertize EAP parameters, default to TTLS/MSCHAPv2 when using username/password credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-16 11:00:06 +01:00
return 1; /* Assume TTLS/MSCHAPv2 is used */
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
if (eap->inner_method &&
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
eap_get_name(EAP_VENDOR_IETF, eap->inner_method) == NULL) {
wpa_msg(wpa_s, MSG_DEBUG,
"nai-realm-cred-username: TTLS, but inner not supported: %d",
eap->inner_method);
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
return 0;
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
}
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
if (eap->inner_non_eap &&
eap->inner_non_eap != NAI_REALM_INNER_NON_EAP_PAP &&
eap->inner_non_eap != NAI_REALM_INNER_NON_EAP_CHAP &&
eap->inner_non_eap != NAI_REALM_INNER_NON_EAP_MSCHAP &&
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
eap->inner_non_eap != NAI_REALM_INNER_NON_EAP_MSCHAPV2) {
wpa_msg(wpa_s, MSG_DEBUG,
"nai-realm-cred-username: TTLS, inner-non-eap not supported: %d",
eap->inner_non_eap);
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
return 0;
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
}
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
}
if (eap->inner_method &&
eap->inner_method != EAP_TYPE_GTC &&
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
eap->inner_method != EAP_TYPE_MSCHAPV2) {
wpa_msg(wpa_s, MSG_DEBUG,
"nai-realm-cred-username: inner-method not GTC or MSCHAPv2: %d",
eap->inner_method);
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
return 0;
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
}
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
return 1;
}
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
static int nai_realm_cred_cert(struct wpa_supplicant *wpa_s,
struct nai_realm_eap *eap)
Interworking: Add support for certificate credentials (EAP-TLS) This allows Interworking network selection to be used with EAP-TLS (client certificate/private key based credential). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-29 15:40:17 +01:00
{
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
if (eap_get_name(EAP_VENDOR_IETF, eap->method) == NULL) {
wpa_msg(wpa_s, MSG_DEBUG,
"nai-realm-cred-cert: Method not supported: %d",
eap->method);
Interworking: Add support for certificate credentials (EAP-TLS) This allows Interworking network selection to be used with EAP-TLS (client certificate/private key based credential). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-29 15:40:17 +01:00
return 0; /* method not supported */
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
}
Interworking: Add support for certificate credentials (EAP-TLS) This allows Interworking network selection to be used with EAP-TLS (client certificate/private key based credential). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-29 15:40:17 +01:00
if (eap->method != EAP_TYPE_TLS) {
/* Only EAP-TLS supported for credential authentication */
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"nai-realm-cred-cert: Method not TLS: %d",
eap->method);
Interworking: Add support for certificate credentials (EAP-TLS) This allows Interworking network selection to be used with EAP-TLS (client certificate/private key based credential). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-29 15:40:17 +01:00
return 0;
}
return 1;
}
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
static struct nai_realm_eap * nai_realm_find_eap(struct wpa_supplicant *wpa_s,
struct wpa_cred *cred,
Mark local functions static These functions are not used outside the file in which they are defined. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-11-18 20:53:36 +01:00
struct nai_realm *realm)
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
{
u8 e;
Interworking: Remove unnecessary NULL check nai_realm_find_eap() is called only in cases where the cred pointer is not NULL. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-24 18:36:55 +01:00
if (cred->username == NULL ||
Interworking: Add support for multiple credentials This replaces the global home_* parameters with a list of credentials that can be configured similarly to network blocks. For example: cred={ realm="example.com" username="user@example.com" password="password" ca_cert="/etc/wpa_supplicant/ca.pem" domain="example.com" } cred={ imsi="310026-000000000" milenage="90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123" } Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:34:22 +01:00
cred->username[0] == '\0' ||
Interworking: Add support for certificate credentials (EAP-TLS) This allows Interworking network selection to be used with EAP-TLS (client certificate/private key based credential). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-29 15:40:17 +01:00
((cred->password == NULL ||
cred->password[0] == '\0') &&
(cred->private_key == NULL ||
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
cred->private_key[0] == '\0'))) {
wpa_msg(wpa_s, MSG_DEBUG,
"nai-realm-find-eap: incomplete cred info: username: %s password: %s private_key: %s",
cred->username ? cred->username : "NULL",
cred->password ? cred->password : "NULL",
cred->private_key ? cred->private_key : "NULL");
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
return NULL;
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
}
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
for (e = 0; e < realm->eap_count; e++) {
struct nai_realm_eap *eap = &realm->eap[e];
Interworking: Add support for certificate credentials (EAP-TLS) This allows Interworking network selection to be used with EAP-TLS (client certificate/private key based credential). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-29 15:40:17 +01:00
if (cred->password && cred->password[0] &&
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
nai_realm_cred_username(wpa_s, eap))
Interworking: Add support for certificate credentials (EAP-TLS) This allows Interworking network selection to be used with EAP-TLS (client certificate/private key based credential). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-29 15:40:17 +01:00
return eap;
if (cred->private_key && cred->private_key[0] &&
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
nai_realm_cred_cert(wpa_s, eap))
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
return eap;
}
return NULL;
}
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
#ifdef INTERWORKING_3GPP
Interworking: Make plmn_id_match() for generic Use separate mnc_len parameter instead of expecting the imsi parameter to be in special MCC|MNC|-|<MSIN> format to make this function more generic. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-03-04 10:27:38 +01:00
static int plmn_id_match(struct wpabuf *anqp, const char *imsi, int mnc_len)
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
{
Interworking: Relax 3GPP info PLMN matching for MNC 3GPP TS 24.232 Annex A.3 allows network operator to advertise only two digits of MNC even if MNC has three digits. Allow such matches in network selection. In addition, allow three digit matches of MNC even if MNC length was assumed to be two to avoid missing networks if MNC length cannot be determined reliably. Remove the '-' separator from simulated SIM/USIM cases to allow the new matching rules to work. Fix the PLMN List information element parsing loop to use the length of the PLMN List instead of the length of the full 3GPP Cellular Info to avoid unexpected matches should a new element ever be added by 3GPP. Finally, add more debug prints from PLMN matching to make the logs easier to understand. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-08 15:53:05 +02:00
u8 plmn[3], plmn2[3];
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
const u8 *pos, *end;
u8 udhl;
Interworking: Relax 3GPP info PLMN matching for MNC 3GPP TS 24.232 Annex A.3 allows network operator to advertise only two digits of MNC even if MNC has three digits. Allow such matches in network selection. In addition, allow three digit matches of MNC even if MNC length was assumed to be two to avoid missing networks if MNC length cannot be determined reliably. Remove the '-' separator from simulated SIM/USIM cases to allow the new matching rules to work. Fix the PLMN List information element parsing loop to use the length of the PLMN List instead of the length of the full 3GPP Cellular Info to avoid unexpected matches should a new element ever be added by 3GPP. Finally, add more debug prints from PLMN matching to make the logs easier to understand. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-08 15:53:05 +02:00
/*
* See Annex A of 3GPP TS 24.234 v8.1.0 for description. The network
* operator is allowed to include only two digits of the MNC, so allow
* matches based on both two and three digit MNC assumptions. Since some
* SIM/USIM cards may not expose MNC length conveniently, we may be
* provided the default MNC length 3 here and as such, checking with MNC
* length 2 is justifiable even though 3GPP TS 24.234 does not mention
* that case. Anyway, MCC/MNC pair where both 2 and 3 digit MNC is used
* with otherwise matching values would not be good idea in general, so
* this should not result in selecting incorrect networks.
*/
/* Match with 3 digit MNC */
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
plmn[0] = (imsi[0] - '0') | ((imsi[1] - '0') << 4);
Interworking: Relax 3GPP info PLMN matching for MNC 3GPP TS 24.232 Annex A.3 allows network operator to advertise only two digits of MNC even if MNC has three digits. Allow such matches in network selection. In addition, allow three digit matches of MNC even if MNC length was assumed to be two to avoid missing networks if MNC length cannot be determined reliably. Remove the '-' separator from simulated SIM/USIM cases to allow the new matching rules to work. Fix the PLMN List information element parsing loop to use the length of the PLMN List instead of the length of the full 3GPP Cellular Info to avoid unexpected matches should a new element ever be added by 3GPP. Finally, add more debug prints from PLMN matching to make the logs easier to understand. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-08 15:53:05 +02:00
plmn[1] = (imsi[2] - '0') | ((imsi[5] - '0') << 4);
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
plmn[2] = (imsi[3] - '0') | ((imsi[4] - '0') << 4);
Interworking: Relax 3GPP info PLMN matching for MNC 3GPP TS 24.232 Annex A.3 allows network operator to advertise only two digits of MNC even if MNC has three digits. Allow such matches in network selection. In addition, allow three digit matches of MNC even if MNC length was assumed to be two to avoid missing networks if MNC length cannot be determined reliably. Remove the '-' separator from simulated SIM/USIM cases to allow the new matching rules to work. Fix the PLMN List information element parsing loop to use the length of the PLMN List instead of the length of the full 3GPP Cellular Info to avoid unexpected matches should a new element ever be added by 3GPP. Finally, add more debug prints from PLMN matching to make the logs easier to understand. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-08 15:53:05 +02:00
/* Match with 2 digit MNC */
plmn2[0] = (imsi[0] - '0') | ((imsi[1] - '0') << 4);
plmn2[1] = (imsi[2] - '0') | 0xf0;
plmn2[2] = (imsi[3] - '0') | ((imsi[4] - '0') << 4);
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
if (anqp == NULL)
return 0;
pos = wpabuf_head_u8(anqp);
end = pos + wpabuf_len(anqp);
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
if (end - pos < 2)
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
return 0;
if (*pos != 0) {
wpa_printf(MSG_DEBUG, "Unsupported GUD version 0x%x", *pos);
return 0;
}
pos++;
udhl = *pos++;
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
if (udhl > end - pos) {
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
wpa_printf(MSG_DEBUG, "Invalid UDHL");
return 0;
}
end = pos + udhl;
Interworking: Relax 3GPP info PLMN matching for MNC 3GPP TS 24.232 Annex A.3 allows network operator to advertise only two digits of MNC even if MNC has three digits. Allow such matches in network selection. In addition, allow three digit matches of MNC even if MNC length was assumed to be two to avoid missing networks if MNC length cannot be determined reliably. Remove the '-' separator from simulated SIM/USIM cases to allow the new matching rules to work. Fix the PLMN List information element parsing loop to use the length of the PLMN List instead of the length of the full 3GPP Cellular Info to avoid unexpected matches should a new element ever be added by 3GPP. Finally, add more debug prints from PLMN matching to make the logs easier to understand. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-08 15:53:05 +02:00
wpa_printf(MSG_DEBUG, "Interworking: Matching against MCC/MNC alternatives: %02x:%02x:%02x or %02x:%02x:%02x (IMSI %s, MNC length %d)",
plmn[0], plmn[1], plmn[2], plmn2[0], plmn2[1], plmn2[2],
imsi, mnc_len);
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
while (end - pos >= 2) {
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
u8 iei, len;
const u8 *l_end;
iei = *pos++;
len = *pos++ & 0x7f;
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
if (len > end - pos)
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
break;
l_end = pos + len;
if (iei == 0 && len > 0) {
/* PLMN List */
u8 num, i;
Interworking: Relax 3GPP info PLMN matching for MNC 3GPP TS 24.232 Annex A.3 allows network operator to advertise only two digits of MNC even if MNC has three digits. Allow such matches in network selection. In addition, allow three digit matches of MNC even if MNC length was assumed to be two to avoid missing networks if MNC length cannot be determined reliably. Remove the '-' separator from simulated SIM/USIM cases to allow the new matching rules to work. Fix the PLMN List information element parsing loop to use the length of the PLMN List instead of the length of the full 3GPP Cellular Info to avoid unexpected matches should a new element ever be added by 3GPP. Finally, add more debug prints from PLMN matching to make the logs easier to understand. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-08 15:53:05 +02:00
wpa_hexdump(MSG_DEBUG, "Interworking: PLMN List information element",
pos, len);
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
num = *pos++;
for (i = 0; i < num; i++) {
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
if (l_end - pos < 3)
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
break;
Interworking: Relax 3GPP info PLMN matching for MNC 3GPP TS 24.232 Annex A.3 allows network operator to advertise only two digits of MNC even if MNC has three digits. Allow such matches in network selection. In addition, allow three digit matches of MNC even if MNC length was assumed to be two to avoid missing networks if MNC length cannot be determined reliably. Remove the '-' separator from simulated SIM/USIM cases to allow the new matching rules to work. Fix the PLMN List information element parsing loop to use the length of the PLMN List instead of the length of the full 3GPP Cellular Info to avoid unexpected matches should a new element ever be added by 3GPP. Finally, add more debug prints from PLMN matching to make the logs easier to understand. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-08 15:53:05 +02:00
if (os_memcmp(pos, plmn, 3) == 0 ||
os_memcmp(pos, plmn2, 3) == 0)
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
return 1; /* Found matching PLMN */
Interworking: Fix PLMN matching with multiple entries The pos variable was not advanced when comparing PLMN entries in 3GPP Cellular Network information and as such, only the first entry was really used. Signed-hostap: Jouni Malinen <j@w1.fi> intended-for: hostap-1
2012-08-26 19:37:11 +02:00
pos += 3;
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
}
Interworking: Relax 3GPP info PLMN matching for MNC 3GPP TS 24.232 Annex A.3 allows network operator to advertise only two digits of MNC even if MNC has three digits. Allow such matches in network selection. In addition, allow three digit matches of MNC even if MNC length was assumed to be two to avoid missing networks if MNC length cannot be determined reliably. Remove the '-' separator from simulated SIM/USIM cases to allow the new matching rules to work. Fix the PLMN List information element parsing loop to use the length of the PLMN List instead of the length of the full 3GPP Cellular Info to avoid unexpected matches should a new element ever be added by 3GPP. Finally, add more debug prints from PLMN matching to make the logs easier to understand. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-08 15:53:05 +02:00
} else {
wpa_hexdump(MSG_DEBUG, "Interworking: Unrecognized 3GPP information element",
pos, len);
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
}
pos = l_end;
}
return 0;
}
Interworking: Fix SIM/USIM NAI construction Commit 9914c96febff964374a863bbd6986ade13a2215a moved sizeof(nai) to a helper function and broke the determination of maximum buffer length. Fix this by moving the sizeof() to the functions that define the buffer. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-19 13:24:45 +01:00
static int build_root_nai(char *nai, size_t nai_len, const char *imsi,
Interworking: Fix home SP check with real SIM card The NAI building routine assumed that the credential included the IMSI, but that is not the case when using a real SIM card. Build the NAI based on the IMSI read for the card in such a case. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-26 19:52:19 +02:00
size_t mnc_len, char prefix)
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
{
const char *sep, *msin;
Interworking: Use 3gppnetwork.org for matching home SP for SIM/USIM Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:33:31 +01:00
char *end, *pos;
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
size_t msin_len, plmn_len;
/*
* TS 23.003, Clause 14 (3GPP to WLAN Interworking)
* Root NAI:
* <aka:0|sim:1><IMSI>@wlan.mnc<MNC>.mcc<MCC>.3gppnetwork.org
* <MNC> is zero-padded to three digits in case two-digit MNC is used
*/
if (imsi == NULL || os_strlen(imsi) > 16) {
wpa_printf(MSG_DEBUG, "No valid IMSI available");
return -1;
}
sep = os_strchr(imsi, '-');
Interworking: Fix home SP check with real SIM card The NAI building routine assumed that the credential included the IMSI, but that is not the case when using a real SIM card. Build the NAI based on the IMSI read for the card in such a case. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-26 19:52:19 +02:00
if (sep) {
plmn_len = sep - imsi;
msin = sep + 1;
} else if (mnc_len && os_strlen(imsi) >= 3 + mnc_len) {
plmn_len = 3 + mnc_len;
msin = imsi + plmn_len;
} else
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
return -1;
if (plmn_len != 5 && plmn_len != 6)
return -1;
msin_len = os_strlen(msin);
pos = nai;
Interworking: Fix SIM/USIM NAI construction Commit 9914c96febff964374a863bbd6986ade13a2215a moved sizeof(nai) to a helper function and broke the determination of maximum buffer length. Fix this by moving the sizeof() to the functions that define the buffer. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-19 13:24:45 +01:00
end = nai + nai_len;
Interworking: Use 3gppnetwork.org for matching home SP for SIM/USIM Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:33:31 +01:00
if (prefix)
*pos++ = prefix;
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
os_memcpy(pos, imsi, plmn_len);
pos += plmn_len;
os_memcpy(pos, msin, msin_len);
pos += msin_len;
pos += os_snprintf(pos, end - pos, "@wlan.mnc");
if (plmn_len == 5) {
*pos++ = '0';
*pos++ = imsi[3];
*pos++ = imsi[4];
} else {
*pos++ = imsi[3];
*pos++ = imsi[4];
*pos++ = imsi[5];
}
Interworking: Remove unnecessary dead increment build_root_nai() will not be extended to write something after the domain, so there is no need to update the pos pointer after the final os_snprintf() call in the function. Remove this to make a static analyzer happier. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-30 00:08:49 +02:00
os_snprintf(pos, end - pos, ".mcc%c%c%c.3gppnetwork.org",
imsi[0], imsi[1], imsi[2]);
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
Interworking: Use 3gppnetwork.org for matching home SP for SIM/USIM Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:33:31 +01:00
return 0;
}
static int set_root_nai(struct wpa_ssid *ssid, const char *imsi, char prefix)
{
char nai[100];
Interworking: Fix home SP check with real SIM card The NAI building routine assumed that the credential included the IMSI, but that is not the case when using a real SIM card. Build the NAI based on the IMSI read for the card in such a case. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-26 19:52:19 +02:00
if (build_root_nai(nai, sizeof(nai), imsi, 0, prefix) < 0)
Interworking: Use 3gppnetwork.org for matching home SP for SIM/USIM Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:33:31 +01:00
return -1;
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
return wpa_config_set_quoted(ssid, "identity", nai);
}
#endif /* INTERWORKING_3GPP */
Interworking: Do not reconnect if already connected If we are already connected to the selected AP with a network block that was created based on the selected credential, do not force a reconnection or network block update. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 22:20:27 +01:00
static int already_connected(struct wpa_supplicant *wpa_s,
struct wpa_cred *cred, struct wpa_bss *bss)
{
Interworking: Fix already-connected check to verify network priority Commit d28f4e44f10a8549d969e5434f7d4d16f462dfcc optimized Interworking network selection in a case where the operation is run while already connected to the selected network by skipping the reconnection. However, this did not take into account that a higher priority network may have shown up in the new scan results. Fix this by checking whether network selection based on the latest scan results (the ones from the interworking_select operation) would result in a network with higher priority being selected. If so, skip the optimization and force normal network connection (which will select this newly found higher priority network). This fixes cases where a non-Hotspot 2.0 network with higher priority (e.g., home network) shows up while connected to a Hotspot 2.0 network with lower priority. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-02-27 13:06:23 +01:00
struct wpa_ssid *ssid, *sel_ssid;
struct wpa_bss *selected;
Interworking: Do not reconnect if already connected If we are already connected to the selected AP with a network block that was created based on the selected credential, do not force a reconnection or network block update. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 22:20:27 +01:00
if (wpa_s->wpa_state < WPA_ASSOCIATED || wpa_s->current_ssid == NULL)
return 0;
ssid = wpa_s->current_ssid;
if (ssid->parent_cred != cred)
return 0;
if (ssid->ssid_len != bss->ssid_len ||
os_memcmp(ssid->ssid, bss->ssid, bss->ssid_len) != 0)
return 0;
Interworking: Fix already-connected check to verify network priority Commit d28f4e44f10a8549d969e5434f7d4d16f462dfcc optimized Interworking network selection in a case where the operation is run while already connected to the selected network by skipping the reconnection. However, this did not take into account that a higher priority network may have shown up in the new scan results. Fix this by checking whether network selection based on the latest scan results (the ones from the interworking_select operation) would result in a network with higher priority being selected. If so, skip the optimization and force normal network connection (which will select this newly found higher priority network). This fixes cases where a non-Hotspot 2.0 network with higher priority (e.g., home network) shows up while connected to a Hotspot 2.0 network with lower priority. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-02-27 13:06:23 +01:00
sel_ssid = NULL;
selected = wpa_supplicant_pick_network(wpa_s, &sel_ssid);
if (selected && sel_ssid && sel_ssid->priority > ssid->priority)
return 0; /* higher priority network in scan results */
Interworking: Do not reconnect if already connected If we are already connected to the selected AP with a network block that was created based on the selected credential, do not force a reconnection or network block update. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 22:20:27 +01:00
return 1;
}
Interworking: Avoid duplicated network blocks Do not add multiple network blocks for the same network from a single credential. INTERWORKING_CONNECT used to generate a new network block for each instance regardless of what network blocks have already been configured. While this allows the connection to go through, it is not efficient to leave behind potentially large number of network blocks with the same contents (or worse, changed contents). Address this by removing an older network block for the same credential before adding a new one. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 22:32:43 +01:00
static void remove_duplicate_network(struct wpa_supplicant *wpa_s,
struct wpa_cred *cred,
struct wpa_bss *bss)
{
struct wpa_ssid *ssid;
for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next) {
if (ssid->parent_cred != cred)
continue;
if (ssid->ssid_len != bss->ssid_len ||
os_memcmp(ssid->ssid, bss->ssid, bss->ssid_len) != 0)
continue;
break;
}
if (ssid == NULL)
return;
wpa_printf(MSG_DEBUG, "Interworking: Remove duplicate network entry for the same credential");
if (ssid == wpa_s->current_ssid) {
wpa_sm_set_config(wpa_s->wpa, NULL);
eapol_sm_notify_config(wpa_s->eapol, NULL, NULL);
Do not add blacklist entries based on normal disconnect request cases There are number of cases where wpa_supplicant requests the current connection to be disconnected before starting a new operation. Such cases do not really indicate that there was an error in connecting or a disconnection initiated by the AP, so do not add a temporary blacklist entry in such sequences. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 14:54:24 +01:00
wpa_s->own_disconnect_req = 1;
Interworking: Avoid duplicated network blocks Do not add multiple network blocks for the same network from a single credential. INTERWORKING_CONNECT used to generate a new network block for each instance regardless of what network blocks have already been configured. While this allows the connection to go through, it is not efficient to leave behind potentially large number of network blocks with the same contents (or worse, changed contents). Address this by removing an older network block for the same credential before adding a new one. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 22:32:43 +01:00
wpa_supplicant_deauthenticate(wpa_s,
WLAN_REASON_DEAUTH_LEAVING);
}
wpas_notify_network_removed(wpa_s, ssid);
wpa_config_remove_network(wpa_s->conf, ssid->id);
}
Interworking: Enable key_mgmt WPA-EAP-SHA256 if PMF is enabled If the global pmf=1/2 parameter is used to enable PMF for Interworking networks, add WPA-EAP-SHA256 to the temporary network block to allow connection to PMF required APs. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-24 21:31:17 +01:00
static int interworking_set_hs20_params(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid)
Interworking: Enforce WPA2-Enterprise/CCMP Since we currently support only HS 2.0 networks with Interworking network selection, enforce that WPA2-Enterprise/CCMP is used on the AP instead of allowing any WPA-Enterprise combination. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-19 11:39:39 +02:00
{
Interworking: Allow FT to be used for connection This extends Interworking network selection to enable FT-EAP as an optional key_mgmt value to allow FT to be used instead of hardcoding WPA2-Enterprise without FT. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-05-10 15:15:20 +02:00
const char *key_mgmt = NULL;
#ifdef CONFIG_IEEE80211R
int res;
struct wpa_driver_capa capa;
res = wpa_drv_get_capa(wpa_s, &capa);
if (res == 0 && capa.key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_FT) {
key_mgmt = wpa_s->conf->pmf != NO_MGMT_FRAME_PROTECTION ?
"WPA-EAP WPA-EAP-SHA256 FT-EAP" :
"WPA-EAP FT-EAP";
}
#endif /* CONFIG_IEEE80211R */
if (!key_mgmt)
key_mgmt = wpa_s->conf->pmf != NO_MGMT_FRAME_PROTECTION ?
"WPA-EAP WPA-EAP-SHA256" : "WPA-EAP";
if (wpa_config_set(ssid, "key_mgmt", key_mgmt, 0) < 0)
Interworking: Enforce WPA2-Enterprise/CCMP Since we currently support only HS 2.0 networks with Interworking network selection, enforce that WPA2-Enterprise/CCMP is used on the AP instead of allowing any WPA-Enterprise combination. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-19 11:39:39 +02:00
return -1;
if (wpa_config_set(ssid, "proto", "RSN", 0) < 0)
return -1;
if (wpa_config_set(ssid, "pairwise", "CCMP", 0) < 0)
return -1;
return 0;
}
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
static int interworking_connect_3gpp(struct wpa_supplicant *wpa_s,
Interworking: Select highest priority cred if multiple matches Previously, the credential to use for a connection with a specific BSS was picked arbitrary based on first found match of each matching mechanism. While the credential priorities were used elsewhere, this did not take into account that different mechanisms could find multiple matching credentials. As such, the highest priority credential was not always used in case more than one credential matched with the selected BSS. Fix this by checking credential priorities again during connection request. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-16 18:54:09 +01:00
struct wpa_cred *cred,
Add INTERWORKING_ADD_NETWORK command This can be used to provide more control to upper layers on network blocks generated as part of Interworking network selection. INTERWORKING_ADD_NETWORK behaves otherwise identically to INTERWORKING_CONNECT, but it does not request a new connection after having added the network block and it returns the network id of the added network. INTERWORKING_ADD_NETWORK followed by REASSOCIATE would behave more or less identically to INTERWORKING_CONNECT, but this allows the created network profile to be modified, if desired, and/or stored externally. SELECT_NETWORK can also be used with the network id returned from INTERWORKING_ADD_NETWORK to enforce that specific network profile to be used for the next connection (though, it should be noted that this behavior may not meet all Hotspot 2.0 requirements if there were other enabled networks that could have higher priority). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 15:56:04 +01:00
struct wpa_bss *bss, int only_add)
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
{
#ifdef INTERWORKING_3GPP
struct wpa_ssid *ssid;
Interworking: Allow EAP-SIM/AKA/AKA' override in cred block The eap parameter in the cred block can now be used to override automatic EAP-SIM/AKA/AKA' selection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:50:52 +02:00
int eap_type;
int res;
char prefix;
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
Interworking: Move BSS ANQP information into separate struct This is an initial step in allowing the ANQP responses to be shared among multiple BSSes if the BSSes are determined to be operating under identical configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:02:29 +02:00
if (bss->anqp == NULL || bss->anqp->anqp_3gpp == NULL)
Interworking: Add support for multiple credentials This replaces the global home_* parameters with a list of credentials that can be configured similarly to network blocks. For example: cred={ realm="example.com" username="user@example.com" password="password" ca_cert="/etc/wpa_supplicant/ca.pem" domain="example.com" } cred={ imsi="310026-000000000" milenage="90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123" } Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:34:22 +01:00
return -1;
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Connect with " MACSTR
" (3GPP)", MAC2STR(bss->bssid));
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
Interworking: Do not reconnect if already connected If we are already connected to the selected AP with a network block that was created based on the selected credential, do not force a reconnection or network block update. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 22:20:27 +01:00
if (already_connected(wpa_s, cred, bss)) {
wpa_msg(wpa_s, MSG_INFO, INTERWORKING_ALREADY_CONNECTED MACSTR,
MAC2STR(bss->bssid));
Add INTERWORKING_ADD_NETWORK command This can be used to provide more control to upper layers on network blocks generated as part of Interworking network selection. INTERWORKING_ADD_NETWORK behaves otherwise identically to INTERWORKING_CONNECT, but it does not request a new connection after having added the network block and it returns the network id of the added network. INTERWORKING_ADD_NETWORK followed by REASSOCIATE would behave more or less identically to INTERWORKING_CONNECT, but this allows the created network profile to be modified, if desired, and/or stored externally. SELECT_NETWORK can also be used with the network id returned from INTERWORKING_ADD_NETWORK to enforce that specific network profile to be used for the next connection (though, it should be noted that this behavior may not meet all Hotspot 2.0 requirements if there were other enabled networks that could have higher priority). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 15:56:04 +01:00
return wpa_s->current_ssid->id;
Interworking: Do not reconnect if already connected If we are already connected to the selected AP with a network block that was created based on the selected credential, do not force a reconnection or network block update. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 22:20:27 +01:00
}
Interworking: Avoid duplicated network blocks Do not add multiple network blocks for the same network from a single credential. INTERWORKING_CONNECT used to generate a new network block for each instance regardless of what network blocks have already been configured. While this allows the connection to go through, it is not efficient to leave behind potentially large number of network blocks with the same contents (or worse, changed contents). Address this by removing an older network block for the same credential before adding a new one. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 22:32:43 +01:00
remove_duplicate_network(wpa_s, cred, bss);
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
ssid = wpa_config_add_network(wpa_s->conf);
if (ssid == NULL)
return -1;
HS 2.0: Remove temporary network block on cred block removal If the credential that was used to create a temporary HS 2.0 network block is removed, remove the network block, too. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-22 16:53:27 +01:00
ssid->parent_cred = cred;
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
wpas_notify_network_added(wpa_s, ssid);
wpa_config_set_network_defaults(ssid);
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
ssid->priority = cred->priority;
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
ssid->temporary = 1;
Interworking: Use SSID from the BSS entry There is no need to parse the IE buffer again to find the SSID of the BSS since that information is already stored in struct wpa_bss. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 23:17:48 +01:00
ssid->ssid = os_zalloc(bss->ssid_len + 1);
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
if (ssid->ssid == NULL)
goto fail;
Interworking: Use SSID from the BSS entry There is no need to parse the IE buffer again to find the SSID of the BSS since that information is already stored in struct wpa_bss. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 23:17:48 +01:00
os_memcpy(ssid->ssid, bss->ssid, bss->ssid_len);
ssid->ssid_len = bss->ssid_len;
Add SIM identifier to the network profile and cred block This allows the specific SIM to be identified for authentication purposes in multi-SIM devices. This SIM number represents the index of the SIM slot. This SIM number shall be used for the authentication using the respective SIM for the Wi-Fi connection to the corresponding network. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-28 16:01:44 +01:00
ssid->eap.sim_num = cred->sim_num;
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
Interworking: Enable key_mgmt WPA-EAP-SHA256 if PMF is enabled If the global pmf=1/2 parameter is used to enable PMF for Interworking networks, add WPA-EAP-SHA256 to the temporary network block to allow connection to PMF required APs. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-24 21:31:17 +01:00
if (interworking_set_hs20_params(wpa_s, ssid) < 0)
Interworking: Set key_mgmt parameter for the temporary network block Previously, this was left to the default (WPA-EAP WPA-PSK) value which could potentially result in unexpected behavior if an AP were to enable both WPA2-Enterprise and WPA2-Personal in the same BSS. While this is not really that likely for APs supporting Interworking, it is good to get the PSK option removed to avoid any issues with missing passphrase/PSK configuration parameter. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-03 21:13:32 +02:00
goto fail;
Interworking: Allow EAP-SIM/AKA/AKA' override in cred block The eap parameter in the cred block can now be used to override automatic EAP-SIM/AKA/AKA' selection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:50:52 +02:00
eap_type = EAP_TYPE_SIM;
if (cred->pcsc && wpa_s->scard && scard_supports_umts(wpa_s->scard))
eap_type = EAP_TYPE_AKA;
if (cred->eap_method && cred->eap_method[0].vendor == EAP_VENDOR_IETF) {
if (cred->eap_method[0].method == EAP_TYPE_SIM ||
cred->eap_method[0].method == EAP_TYPE_AKA ||
cred->eap_method[0].method == EAP_TYPE_AKA_PRIME)
eap_type = cred->eap_method[0].method;
}
switch (eap_type) {
case EAP_TYPE_SIM:
prefix = '1';
res = wpa_config_set(ssid, "eap", "SIM", 0);
break;
case EAP_TYPE_AKA:
prefix = '0';
res = wpa_config_set(ssid, "eap", "AKA", 0);
break;
case EAP_TYPE_AKA_PRIME:
prefix = '6';
res = wpa_config_set(ssid, "eap", "AKA'", 0);
break;
default:
res = -1;
break;
}
if (res < 0) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Selected EAP method (%d) not supported", eap_type);
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
goto fail;
}
Interworking: Allow EAP-SIM/AKA/AKA' override in cred block The eap parameter in the cred block can now be used to override automatic EAP-SIM/AKA/AKA' selection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:50:52 +02:00
if (!cred->pcsc && set_root_nai(ssid, cred->imsi, prefix) < 0) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG, "Failed to set Root NAI");
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
goto fail;
}
Interworking: Add support for multiple credentials This replaces the global home_* parameters with a list of credentials that can be configured similarly to network blocks. For example: cred={ realm="example.com" username="user@example.com" password="password" ca_cert="/etc/wpa_supplicant/ca.pem" domain="example.com" } cred={ imsi="310026-000000000" milenage="90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123" } Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:34:22 +01:00
if (cred->milenage && cred->milenage[0]) {
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
if (wpa_config_set_quoted(ssid, "password",
Interworking: Add support for multiple credentials This replaces the global home_* parameters with a list of credentials that can be configured similarly to network blocks. For example: cred={ realm="example.com" username="user@example.com" password="password" ca_cert="/etc/wpa_supplicant/ca.pem" domain="example.com" } cred={ imsi="310026-000000000" milenage="90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123" } Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:34:22 +01:00
cred->milenage) < 0)
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
goto fail;
Interworking: Support real SIM/USIM card for network selection Signed-hostap: Jouni Malinen <j@w1.fi>
2012-03-04 15:02:56 +01:00
} else if (cred->pcsc) {
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
if (wpa_config_set_quoted(ssid, "pcsc", "") < 0)
goto fail;
Interworking: Support real SIM/USIM card for network selection Signed-hostap: Jouni Malinen <j@w1.fi>
2012-03-04 15:02:56 +01:00
if (wpa_s->conf->pcsc_pin &&
wpa_config_set_quoted(ssid, "pin", wpa_s->conf->pcsc_pin)
< 0)
goto fail;
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
}
Interworking: Prefer last added network during network selection Previously, any network block could be used to select the BSS to connect to when processing scan results after Interworking network selection. This can result in somewhat unexpected network selection in cases where credential preferences indicated that a specific network was selected, but another network ended up getting used for the connection. While the older networks continue to be valid, add special processing for this initial post-interworking-connect case to get more consistent network selection to match with the Interworking network selection result. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-02-25 21:37:57 +01:00
wpa_s->next_ssid = ssid;
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
wpa_config_update_prio_list(wpa_s->conf);
Add INTERWORKING_ADD_NETWORK command This can be used to provide more control to upper layers on network blocks generated as part of Interworking network selection. INTERWORKING_ADD_NETWORK behaves otherwise identically to INTERWORKING_CONNECT, but it does not request a new connection after having added the network block and it returns the network id of the added network. INTERWORKING_ADD_NETWORK followed by REASSOCIATE would behave more or less identically to INTERWORKING_CONNECT, but this allows the created network profile to be modified, if desired, and/or stored externally. SELECT_NETWORK can also be used with the network id returned from INTERWORKING_ADD_NETWORK to enforce that specific network profile to be used for the next connection (though, it should be noted that this behavior may not meet all Hotspot 2.0 requirements if there were other enabled networks that could have higher priority). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 15:56:04 +01:00
if (!only_add)
interworking_reconnect(wpa_s);
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
Add INTERWORKING_ADD_NETWORK command This can be used to provide more control to upper layers on network blocks generated as part of Interworking network selection. INTERWORKING_ADD_NETWORK behaves otherwise identically to INTERWORKING_CONNECT, but it does not request a new connection after having added the network block and it returns the network id of the added network. INTERWORKING_ADD_NETWORK followed by REASSOCIATE would behave more or less identically to INTERWORKING_CONNECT, but this allows the created network profile to be modified, if desired, and/or stored externally. SELECT_NETWORK can also be used with the network id returned from INTERWORKING_ADD_NETWORK to enforce that specific network profile to be used for the next connection (though, it should be noted that this behavior may not meet all Hotspot 2.0 requirements if there were other enabled networks that could have higher priority). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 15:56:04 +01:00
return ssid->id;
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
fail:
wpas_notify_network_removed(wpa_s, ssid);
wpa_config_remove_network(wpa_s->conf, ssid->id);
#endif /* INTERWORKING_3GPP */
return -1;
}
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
static int roaming_consortium_element_match(const u8 *ie, const u8 *rc_id,
size_t rc_len)
{
const u8 *pos, *end;
u8 lens;
if (ie == NULL)
return 0;
pos = ie + 2;
end = ie + 2 + ie[1];
/* Roaming Consortium element:
* Number of ANQP OIs
* OI #1 and #2 lengths
* OI #1, [OI #2], [OI #3]
*/
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
if (end - pos < 2)
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
return 0;
pos++; /* skip Number of ANQP OIs */
lens = *pos++;
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
if ((lens & 0x0f) + (lens >> 4) > end - pos)
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
return 0;
if ((lens & 0x0f) == rc_len && os_memcmp(pos, rc_id, rc_len) == 0)
return 1;
pos += lens & 0x0f;
if ((lens >> 4) == rc_len && os_memcmp(pos, rc_id, rc_len) == 0)
return 1;
pos += lens >> 4;
if (pos < end && (size_t) (end - pos) == rc_len &&
os_memcmp(pos, rc_id, rc_len) == 0)
return 1;
return 0;
}
static int roaming_consortium_anqp_match(const struct wpabuf *anqp,
const u8 *rc_id, size_t rc_len)
{
const u8 *pos, *end;
u8 len;
if (anqp == NULL)
return 0;
pos = wpabuf_head(anqp);
end = pos + wpabuf_len(anqp);
/* Set of <OI Length, OI> duples */
while (pos < end) {
len = *pos++;
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
if (len > end - pos)
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
break;
if (len == rc_len && os_memcmp(pos, rc_id, rc_len) == 0)
return 1;
pos += len;
}
return 0;
}
static int roaming_consortium_match(const u8 *ie, const struct wpabuf *anqp,
const u8 *rc_id, size_t rc_len)
{
return roaming_consortium_element_match(ie, rc_id, rc_len) ||
roaming_consortium_anqp_match(anqp, rc_id, rc_len);
}
Interworking: Add required_roaming_consortium parameter for credentials This allows credentials to be limited from being used to connect to a network unless the AP advertises a matching roaming consortium OI. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-30 06:34:47 +01:00
static int cred_no_required_oi_match(struct wpa_cred *cred, struct wpa_bss *bss)
{
const u8 *ie;
if (cred->required_roaming_consortium_len == 0)
return 0;
ie = wpa_bss_get_ie(bss, WLAN_EID_ROAMING_CONSORTIUM);
if (ie == NULL &&
(bss->anqp == NULL || bss->anqp->roaming_consortium == NULL))
return 1;
return !roaming_consortium_match(ie,
bss->anqp ?
bss->anqp->roaming_consortium : NULL,
cred->required_roaming_consortium,
cred->required_roaming_consortium_len);
}
Interworking: Allow SSID-based network exclusion for credentials The new excluded_ssid parameter within a cred block can be used to excluded networks from matching with credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-16 11:01:50 +01:00
static int cred_excluded_ssid(struct wpa_cred *cred, struct wpa_bss *bss)
{
size_t i;
if (!cred->excluded_ssid)
return 0;
for (i = 0; i < cred->num_excluded_ssid; i++) {
struct excluded_ssid *e = &cred->excluded_ssid[i];
if (bss->ssid_len == e->ssid_len &&
os_memcmp(bss->ssid, e->ssid, e->ssid_len) == 0)
return 1;
}
return 0;
}
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
static int cred_below_min_backhaul(struct wpa_supplicant *wpa_s,
struct wpa_cred *cred, struct wpa_bss *bss)
{
Interworking: Fix wpa_supplicant build without CONFIG_HS20=y Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-07 15:57:32 +02:00
#ifdef CONFIG_HS20
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
int res;
unsigned int dl_bandwidth, ul_bandwidth;
const u8 *wan;
u8 wan_info, dl_load, ul_load;
u16 lmd;
u32 ul_speed, dl_speed;
if (!cred->min_dl_bandwidth_home &&
!cred->min_ul_bandwidth_home &&
!cred->min_dl_bandwidth_roaming &&
!cred->min_ul_bandwidth_roaming)
return 0; /* No bandwidth constraint specified */
if (bss->anqp == NULL || bss->anqp->hs20_wan_metrics == NULL)
return 0; /* No WAN Metrics known - ignore constraint */
wan = wpabuf_head(bss->anqp->hs20_wan_metrics);
wan_info = wan[0];
if (wan_info & BIT(3))
return 1; /* WAN link at capacity */
lmd = WPA_GET_LE16(wan + 11);
if (lmd == 0)
return 0; /* Downlink/Uplink Load was not measured */
dl_speed = WPA_GET_LE32(wan + 1);
ul_speed = WPA_GET_LE32(wan + 5);
dl_load = wan[9];
ul_load = wan[10];
if (dl_speed >= 0xffffff)
dl_bandwidth = dl_speed / 255 * (255 - dl_load);
else
dl_bandwidth = dl_speed * (255 - dl_load) / 255;
if (ul_speed >= 0xffffff)
ul_bandwidth = ul_speed / 255 * (255 - ul_load);
else
ul_bandwidth = ul_speed * (255 - ul_load) / 255;
res = interworking_home_sp_cred(wpa_s, cred, bss->anqp ?
bss->anqp->domain_name : NULL);
if (res > 0) {
if (cred->min_dl_bandwidth_home > dl_bandwidth)
return 1;
if (cred->min_ul_bandwidth_home > ul_bandwidth)
return 1;
} else {
if (cred->min_dl_bandwidth_roaming > dl_bandwidth)
return 1;
if (cred->min_ul_bandwidth_roaming > ul_bandwidth)
return 1;
}
Interworking: Fix wpa_supplicant build without CONFIG_HS20=y Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-07 15:57:32 +02:00
#endif /* CONFIG_HS20 */
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
return 0;
}
HS 2.0R2: Add support for Policy/MaximumBSSLoadValue The new credential parameter max_bss_load can be used to specify restrictions on BSS Load in the home network. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 15:14:25 +02:00
static int cred_over_max_bss_load(struct wpa_supplicant *wpa_s,
struct wpa_cred *cred, struct wpa_bss *bss)
{
const u8 *ie;
int res;
if (!cred->max_bss_load)
return 0; /* No BSS Load constraint specified */
ie = wpa_bss_get_ie(bss, WLAN_EID_BSS_LOAD);
if (ie == NULL || ie[1] < 3)
return 0; /* No BSS Load advertised */
res = interworking_home_sp_cred(wpa_s, cred, bss->anqp ?
bss->anqp->domain_name : NULL);
if (res <= 0)
return 0; /* Not a home network */
return ie[4] > cred->max_bss_load;
}
Interworking: Fix wpa_supplicant build without CONFIG_HS20=y Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-07 15:57:32 +02:00
#ifdef CONFIG_HS20
HS 2.0R2: Add support for Policy/RequiredProtoPortTuple The new credential parameter req_conn_capab can be used to specify restrictions on roaming networks providing connectivity for a set of protocols/ports. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-08 19:31:41 +02:00
static int has_proto_match(const u8 *pos, const u8 *end, u8 proto)
{
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
while (end - pos >= 4) {
HS 2.0R2: Add support for Policy/RequiredProtoPortTuple The new credential parameter req_conn_capab can be used to specify restrictions on roaming networks providing connectivity for a set of protocols/ports. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-08 19:31:41 +02:00
if (pos[0] == proto && pos[3] == 1 /* Open */)
return 1;
pos += 4;
}
return 0;
}
static int has_proto_port_match(const u8 *pos, const u8 *end, u8 proto,
u16 port)
{
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
while (end - pos >= 4) {
HS 2.0R2: Add support for Policy/RequiredProtoPortTuple The new credential parameter req_conn_capab can be used to specify restrictions on roaming networks providing connectivity for a set of protocols/ports. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-08 19:31:41 +02:00
if (pos[0] == proto && WPA_GET_LE16(&pos[1]) == port &&
pos[3] == 1 /* Open */)
return 1;
pos += 4;
}
return 0;
}
Interworking: Fix wpa_supplicant build without CONFIG_HS20=y Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-07 15:57:32 +02:00
#endif /* CONFIG_HS20 */
HS 2.0R2: Add support for Policy/RequiredProtoPortTuple The new credential parameter req_conn_capab can be used to specify restrictions on roaming networks providing connectivity for a set of protocols/ports. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-08 19:31:41 +02:00
static int cred_conn_capab_missing(struct wpa_supplicant *wpa_s,
struct wpa_cred *cred, struct wpa_bss *bss)
{
Interworking: Fix wpa_supplicant build without CONFIG_HS20=y Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-07 15:57:32 +02:00
#ifdef CONFIG_HS20
HS 2.0R2: Add support for Policy/RequiredProtoPortTuple The new credential parameter req_conn_capab can be used to specify restrictions on roaming networks providing connectivity for a set of protocols/ports. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-08 19:31:41 +02:00
int res;
const u8 *capab, *end;
unsigned int i, j;
int *ports;
if (!cred->num_req_conn_capab)
return 0; /* No connection capability constraint specified */
if (bss->anqp == NULL || bss->anqp->hs20_connection_capability == NULL)
return 0; /* No Connection Capability known - ignore constraint
*/
res = interworking_home_sp_cred(wpa_s, cred, bss->anqp ?
bss->anqp->domain_name : NULL);
if (res > 0)
return 0; /* No constraint in home network */
capab = wpabuf_head(bss->anqp->hs20_connection_capability);
end = capab + wpabuf_len(bss->anqp->hs20_connection_capability);
for (i = 0; i < cred->num_req_conn_capab; i++) {
ports = cred->req_conn_capab_port[i];
if (!ports) {
if (!has_proto_match(capab, end,
cred->req_conn_capab_proto[i]))
return 1;
} else {
for (j = 0; ports[j] > -1; j++) {
if (!has_proto_port_match(
capab, end,
cred->req_conn_capab_proto[i],
ports[j]))
return 1;
}
}
}
Interworking: Fix wpa_supplicant build without CONFIG_HS20=y Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-07 15:57:32 +02:00
#endif /* CONFIG_HS20 */
HS 2.0R2: Add support for Policy/RequiredProtoPortTuple The new credential parameter req_conn_capab can be used to specify restrictions on roaming networks providing connectivity for a set of protocols/ports. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-08 19:31:41 +02:00
return 0;
}
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
static struct wpa_cred * interworking_credentials_available_roaming_consortium(
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
struct wpa_supplicant *wpa_s, struct wpa_bss *bss, int ignore_bw,
int *excluded)
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
{
struct wpa_cred *cred, *selected = NULL;
const u8 *ie;
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
int is_excluded = 0;
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
ie = wpa_bss_get_ie(bss, WLAN_EID_ROAMING_CONSORTIUM);
Interworking: Move BSS ANQP information into separate struct This is an initial step in allowing the ANQP responses to be shared among multiple BSSes if the BSSes are determined to be operating under identical configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:02:29 +02:00
if (ie == NULL &&
(bss->anqp == NULL || bss->anqp->roaming_consortium == NULL))
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
return NULL;
if (wpa_s->conf->cred == NULL)
return NULL;
for (cred = wpa_s->conf->cred; cred; cred = cred->next) {
if (cred->roaming_consortium_len == 0)
continue;
Interworking: Move BSS ANQP information into separate struct This is an initial step in allowing the ANQP responses to be shared among multiple BSSes if the BSSes are determined to be operating under identical configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:02:29 +02:00
if (!roaming_consortium_match(ie,
bss->anqp ?
bss->anqp->roaming_consortium :
NULL,
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
cred->roaming_consortium,
cred->roaming_consortium_len))
continue;
Interworking: Add required_roaming_consortium parameter for credentials This allows credentials to be limited from being used to connect to a network unless the AP advertises a matching roaming consortium OI. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-30 06:34:47 +01:00
if (cred_no_required_oi_match(cred, bss))
continue;
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
if (!ignore_bw && cred_below_min_backhaul(wpa_s, cred, bss))
continue;
HS 2.0R2: Add support for Policy/MaximumBSSLoadValue The new credential parameter max_bss_load can be used to specify restrictions on BSS Load in the home network. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 15:14:25 +02:00
if (!ignore_bw && cred_over_max_bss_load(wpa_s, cred, bss))
continue;
HS 2.0R2: Add support for Policy/RequiredProtoPortTuple The new credential parameter req_conn_capab can be used to specify restrictions on roaming networks providing connectivity for a set of protocols/ports. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-08 19:31:41 +02:00
if (!ignore_bw && cred_conn_capab_missing(wpa_s, cred, bss))
continue;
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
if (cred_excluded_ssid(cred, bss)) {
if (excluded == NULL)
continue;
if (selected == NULL) {
selected = cred;
is_excluded = 1;
}
} else {
if (selected == NULL || is_excluded ||
Interworking: Use a helper function to compare cred priority This makes it easier to extend credential priority comparison beyond a single priority variable. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 18:06:49 +01:00
cred_prio_cmp(selected, cred) < 0) {
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
selected = cred;
is_excluded = 0;
}
}
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
}
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
if (excluded)
*excluded = is_excluded;
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
return selected;
}
Interworking: Move EAP parameter setting into a separate function This makes it easier to share the common code with other credential matching cases in the future. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:35:18 +02:00
static int interworking_set_eap_params(struct wpa_ssid *ssid,
struct wpa_cred *cred, int ttls)
{
Interworking: Allow pre-configuration of EAP parameters The new cred block parameters eap, phase1, and phase2 can be used to select which EAP method is used with network selection instead of using the value specified in ANQP information (e.g., NAI Realm). Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:40:45 +02:00
if (cred->eap_method) {
ttls = cred->eap_method->vendor == EAP_VENDOR_IETF &&
cred->eap_method->method == EAP_TYPE_TTLS;
os_free(ssid->eap.eap_methods);
ssid->eap.eap_methods =
os_malloc(sizeof(struct eap_method_type) * 2);
if (ssid->eap.eap_methods == NULL)
return -1;
os_memcpy(ssid->eap.eap_methods, cred->eap_method,
sizeof(*cred->eap_method));
ssid->eap.eap_methods[1].vendor = EAP_VENDOR_IETF;
ssid->eap.eap_methods[1].method = EAP_TYPE_NONE;
}
Interworking: Move EAP parameter setting into a separate function This makes it easier to share the common code with other credential matching cases in the future. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:35:18 +02:00
if (ttls && cred->username && cred->username[0]) {
const char *pos;
char *anon;
/* Use anonymous NAI in Phase 1 */
pos = os_strchr(cred->username, '@');
if (pos) {
size_t buflen = 9 + os_strlen(pos) + 1;
anon = os_malloc(buflen);
if (anon == NULL)
return -1;
os_snprintf(anon, buflen, "anonymous%s", pos);
} else if (cred->realm) {
size_t buflen = 10 + os_strlen(cred->realm) + 1;
anon = os_malloc(buflen);
if (anon == NULL)
return -1;
os_snprintf(anon, buflen, "anonymous@%s", cred->realm);
} else {
anon = os_strdup("anonymous");
if (anon == NULL)
return -1;
}
if (wpa_config_set_quoted(ssid, "anonymous_identity", anon) <
0) {
os_free(anon);
return -1;
}
os_free(anon);
}
Interworking: Add credential realm to EAP-TLS identity If the configured credential includes a username without '@' (i.e., no realm) in it and a realm, combine these to form the EAP-Request/Identity value as "<username>@<realm>" for EAP-TLS. This was already done for EAP-TTLS as part of the anonymous NAI conversion, but EAP-TLS could have ended up using a username without any realm information which would be unlikely to work properly with roaming cases. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-03-11 19:18:51 +01:00
if (!ttls && cred->username && cred->username[0] && cred->realm &&
!os_strchr(cred->username, '@')) {
char *id;
size_t buflen;
int res;
buflen = os_strlen(cred->username) + 1 +
os_strlen(cred->realm) + 1;
id = os_malloc(buflen);
if (!id)
return -1;
os_snprintf(id, buflen, "%s@%s", cred->username, cred->realm);
res = wpa_config_set_quoted(ssid, "identity", id);
os_free(id);
if (res < 0)
return -1;
} else if (cred->username && cred->username[0] &&
Interworking: Move EAP parameter setting into a separate function This makes it easier to share the common code with other credential matching cases in the future. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:35:18 +02:00
wpa_config_set_quoted(ssid, "identity", cred->username) < 0)
return -1;
EXT PW: Allow Interwork cred block to use external storage for password Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-03 21:12:55 +02:00
if (cred->password && cred->password[0]) {
if (cred->ext_password &&
wpa_config_set(ssid, "password", cred->password, 0) < 0)
return -1;
if (!cred->ext_password &&
wpa_config_set_quoted(ssid, "password", cred->password) <
0)
return -1;
}
Interworking: Move EAP parameter setting into a separate function This makes it easier to share the common code with other credential matching cases in the future. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:35:18 +02:00
if (cred->client_cert && cred->client_cert[0] &&
wpa_config_set_quoted(ssid, "client_cert", cred->client_cert) < 0)
return -1;
Interworking: Support Android JB keystore with EAP-TLS If the keystore:// prefix is used in the private_key entry, convert that to the OpenSSL engine style configuration used for Android JB keystore. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-28 16:12:27 +02:00
#ifdef ANDROID
if (cred->private_key &&
os_strncmp(cred->private_key, "keystore://", 11) == 0) {
/* Use OpenSSL engine configuration for Android keystore */
if (wpa_config_set_quoted(ssid, "engine_id", "keystore") < 0 ||
wpa_config_set_quoted(ssid, "key_id",
cred->private_key + 11) < 0 ||
wpa_config_set(ssid, "engine", "1", 0) < 0)
return -1;
} else
#endif /* ANDROID */
Interworking: Move EAP parameter setting into a separate function This makes it easier to share the common code with other credential matching cases in the future. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:35:18 +02:00
if (cred->private_key && cred->private_key[0] &&
wpa_config_set_quoted(ssid, "private_key", cred->private_key) < 0)
return -1;
if (cred->private_key_passwd && cred->private_key_passwd[0] &&
wpa_config_set_quoted(ssid, "private_key_passwd",
cred->private_key_passwd) < 0)
return -1;
Interworking: Allow pre-configuration of EAP parameters The new cred block parameters eap, phase1, and phase2 can be used to select which EAP method is used with network selection instead of using the value specified in ANQP information (e.g., NAI Realm). Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:40:45 +02:00
if (cred->phase1) {
os_free(ssid->eap.phase1);
ssid->eap.phase1 = os_strdup(cred->phase1);
}
if (cred->phase2) {
os_free(ssid->eap.phase2);
ssid->eap.phase2 = os_strdup(cred->phase2);
}
Interworking: Move EAP parameter setting into a separate function This makes it easier to share the common code with other credential matching cases in the future. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:35:18 +02:00
if (cred->ca_cert && cred->ca_cert[0] &&
wpa_config_set_quoted(ssid, "ca_cert", cred->ca_cert) < 0)
return -1;
Interworking: Add domain_suffix_match for credentials This allow domain_suffix_match to be specified for a cred block and then get this copied for the network blocks generated from this credential as part of Interworking network selection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-07 03:14:51 +02:00
if (cred->domain_suffix_match && cred->domain_suffix_match[0] &&
wpa_config_set_quoted(ssid, "domain_suffix_match",
cred->domain_suffix_match) < 0)
return -1;
Interworking: Add OCSP parameter to the cred block This new parameter can be used to configure credentials to mandate use of OCSP stapling for AAA server authentication. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-12-09 02:30:01 +01:00
ssid->eap.ocsp = cred->ocsp;
Interworking: Move EAP parameter setting into a separate function This makes it easier to share the common code with other credential matching cases in the future. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:35:18 +02:00
return 0;
}
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
static int interworking_connect_roaming_consortium(
struct wpa_supplicant *wpa_s, struct wpa_cred *cred,
Add INTERWORKING_ADD_NETWORK command This can be used to provide more control to upper layers on network blocks generated as part of Interworking network selection. INTERWORKING_ADD_NETWORK behaves otherwise identically to INTERWORKING_CONNECT, but it does not request a new connection after having added the network block and it returns the network id of the added network. INTERWORKING_ADD_NETWORK followed by REASSOCIATE would behave more or less identically to INTERWORKING_CONNECT, but this allows the created network profile to be modified, if desired, and/or stored externally. SELECT_NETWORK can also be used with the network id returned from INTERWORKING_ADD_NETWORK to enforce that specific network profile to be used for the next connection (though, it should be noted that this behavior may not meet all Hotspot 2.0 requirements if there were other enabled networks that could have higher priority). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 15:56:04 +01:00
struct wpa_bss *bss, int only_add)
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
{
struct wpa_ssid *ssid;
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Connect with " MACSTR
" based on roaming consortium match", MAC2STR(bss->bssid));
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
Interworking: Do not reconnect if already connected If we are already connected to the selected AP with a network block that was created based on the selected credential, do not force a reconnection or network block update. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 22:20:27 +01:00
if (already_connected(wpa_s, cred, bss)) {
wpa_msg(wpa_s, MSG_INFO, INTERWORKING_ALREADY_CONNECTED MACSTR,
MAC2STR(bss->bssid));
Add INTERWORKING_ADD_NETWORK command This can be used to provide more control to upper layers on network blocks generated as part of Interworking network selection. INTERWORKING_ADD_NETWORK behaves otherwise identically to INTERWORKING_CONNECT, but it does not request a new connection after having added the network block and it returns the network id of the added network. INTERWORKING_ADD_NETWORK followed by REASSOCIATE would behave more or less identically to INTERWORKING_CONNECT, but this allows the created network profile to be modified, if desired, and/or stored externally. SELECT_NETWORK can also be used with the network id returned from INTERWORKING_ADD_NETWORK to enforce that specific network profile to be used for the next connection (though, it should be noted that this behavior may not meet all Hotspot 2.0 requirements if there were other enabled networks that could have higher priority). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 15:56:04 +01:00
return wpa_s->current_ssid->id;
Interworking: Do not reconnect if already connected If we are already connected to the selected AP with a network block that was created based on the selected credential, do not force a reconnection or network block update. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 22:20:27 +01:00
}
Interworking: Avoid duplicated network blocks Do not add multiple network blocks for the same network from a single credential. INTERWORKING_CONNECT used to generate a new network block for each instance regardless of what network blocks have already been configured. While this allows the connection to go through, it is not efficient to leave behind potentially large number of network blocks with the same contents (or worse, changed contents). Address this by removing an older network block for the same credential before adding a new one. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 22:32:43 +01:00
remove_duplicate_network(wpa_s, cred, bss);
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
ssid = wpa_config_add_network(wpa_s->conf);
if (ssid == NULL)
return -1;
HS 2.0: Remove temporary network block on cred block removal If the credential that was used to create a temporary HS 2.0 network block is removed, remove the network block, too. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-22 16:53:27 +01:00
ssid->parent_cred = cred;
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
wpas_notify_network_added(wpa_s, ssid);
wpa_config_set_network_defaults(ssid);
ssid->priority = cred->priority;
ssid->temporary = 1;
Interworking: Use SSID from the BSS entry There is no need to parse the IE buffer again to find the SSID of the BSS since that information is already stored in struct wpa_bss. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 23:17:48 +01:00
ssid->ssid = os_zalloc(bss->ssid_len + 1);
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
if (ssid->ssid == NULL)
goto fail;
Interworking: Use SSID from the BSS entry There is no need to parse the IE buffer again to find the SSID of the BSS since that information is already stored in struct wpa_bss. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 23:17:48 +01:00
os_memcpy(ssid->ssid, bss->ssid, bss->ssid_len);
ssid->ssid_len = bss->ssid_len;
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
Interworking: Enable key_mgmt WPA-EAP-SHA256 if PMF is enabled If the global pmf=1/2 parameter is used to enable PMF for Interworking networks, add WPA-EAP-SHA256 to the temporary network block to allow connection to PMF required APs. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-24 21:31:17 +01:00
if (interworking_set_hs20_params(wpa_s, ssid) < 0)
Interworking: Set key_mgmt parameter for the temporary network block Previously, this was left to the default (WPA-EAP WPA-PSK) value which could potentially result in unexpected behavior if an AP were to enable both WPA2-Enterprise and WPA2-Personal in the same BSS. While this is not really that likely for APs supporting Interworking, it is good to get the PSK option removed to avoid any issues with missing passphrase/PSK configuration parameter. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-03 21:13:32 +02:00
goto fail;
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
if (cred->eap_method == NULL) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: No EAP method set for credential using roaming consortium");
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
goto fail;
}
if (interworking_set_eap_params(
ssid, cred,
cred->eap_method->vendor == EAP_VENDOR_IETF &&
cred->eap_method->method == EAP_TYPE_TTLS) < 0)
goto fail;
Interworking: Prefer last added network during network selection Previously, any network block could be used to select the BSS to connect to when processing scan results after Interworking network selection. This can result in somewhat unexpected network selection in cases where credential preferences indicated that a specific network was selected, but another network ended up getting used for the connection. While the older networks continue to be valid, add special processing for this initial post-interworking-connect case to get more consistent network selection to match with the Interworking network selection result. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-02-25 21:37:57 +01:00
wpa_s->next_ssid = ssid;
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
wpa_config_update_prio_list(wpa_s->conf);
Add INTERWORKING_ADD_NETWORK command This can be used to provide more control to upper layers on network blocks generated as part of Interworking network selection. INTERWORKING_ADD_NETWORK behaves otherwise identically to INTERWORKING_CONNECT, but it does not request a new connection after having added the network block and it returns the network id of the added network. INTERWORKING_ADD_NETWORK followed by REASSOCIATE would behave more or less identically to INTERWORKING_CONNECT, but this allows the created network profile to be modified, if desired, and/or stored externally. SELECT_NETWORK can also be used with the network id returned from INTERWORKING_ADD_NETWORK to enforce that specific network profile to be used for the next connection (though, it should be noted that this behavior may not meet all Hotspot 2.0 requirements if there were other enabled networks that could have higher priority). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 15:56:04 +01:00
if (!only_add)
interworking_reconnect(wpa_s);
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
Add INTERWORKING_ADD_NETWORK command This can be used to provide more control to upper layers on network blocks generated as part of Interworking network selection. INTERWORKING_ADD_NETWORK behaves otherwise identically to INTERWORKING_CONNECT, but it does not request a new connection after having added the network block and it returns the network id of the added network. INTERWORKING_ADD_NETWORK followed by REASSOCIATE would behave more or less identically to INTERWORKING_CONNECT, but this allows the created network profile to be modified, if desired, and/or stored externally. SELECT_NETWORK can also be used with the network id returned from INTERWORKING_ADD_NETWORK to enforce that specific network profile to be used for the next connection (though, it should be noted that this behavior may not meet all Hotspot 2.0 requirements if there were other enabled networks that could have higher priority). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 15:56:04 +01:00
return ssid->id;
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
fail:
wpas_notify_network_removed(wpa_s, ssid);
wpa_config_remove_network(wpa_s->conf, ssid->id);
return -1;
}
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
static int interworking_connect_helper(struct wpa_supplicant *wpa_s,
Add INTERWORKING_ADD_NETWORK command This can be used to provide more control to upper layers on network blocks generated as part of Interworking network selection. INTERWORKING_ADD_NETWORK behaves otherwise identically to INTERWORKING_CONNECT, but it does not request a new connection after having added the network block and it returns the network id of the added network. INTERWORKING_ADD_NETWORK followed by REASSOCIATE would behave more or less identically to INTERWORKING_CONNECT, but this allows the created network profile to be modified, if desired, and/or stored externally. SELECT_NETWORK can also be used with the network id returned from INTERWORKING_ADD_NETWORK to enforce that specific network profile to be used for the next connection (though, it should be noted that this behavior may not meet all Hotspot 2.0 requirements if there were other enabled networks that could have higher priority). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 15:56:04 +01:00
struct wpa_bss *bss, int allow_excluded,
int only_add)
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
{
Interworking: Select highest priority cred if multiple matches Previously, the credential to use for a connection with a specific BSS was picked arbitrary based on first found match of each matching mechanism. While the credential priorities were used elsewhere, this did not take into account that different mechanisms could find multiple matching credentials. As such, the highest priority credential was not always used in case more than one credential matched with the selected BSS. Fix this by checking credential priorities again during connection request. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-16 18:54:09 +01:00
struct wpa_cred *cred, *cred_rc, *cred_3gpp;
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
struct wpa_ssid *ssid;
struct nai_realm *realm;
struct nai_realm_eap *eap = NULL;
u16 count, i;
char buf[100];
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
int excluded = 0, *excl = allow_excluded ? &excluded : NULL;
Interworking: Reject EAP configuration with unsupported inner method Instead of allowing the connection attempt to occur with an unsupported inner method, check for that explicitly at the time the network block is added and drop the network if the identified inner method is not supported. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-07 15:18:30 +02:00
const char *name;
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
Interworking: Add support for multiple credentials This replaces the global home_* parameters with a list of credentials that can be configured similarly to network blocks. For example: cred={ realm="example.com" username="user@example.com" password="password" ca_cert="/etc/wpa_supplicant/ca.pem" domain="example.com" } cred={ imsi="310026-000000000" milenage="90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123" } Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:34:22 +01:00
if (wpa_s->conf->cred == NULL || bss == NULL)
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
return -1;
Interworking: Reject BSS based on disallow_aps If a BSS is disallowed temporarily with disallow_aps, the network connection is going to fail. As such, there is not much point in allowing Interworking network selection to try to connect with such BSS. As such, do not consider disallowed networks for automatic network selection and reject requests to connect to them through INTERWORKING_CONNECT. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 23:01:48 +01:00
if (disallowed_bssid(wpa_s, bss->bssid) ||
disallowed_ssid(wpa_s, bss->ssid, bss->ssid_len)) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: Reject connection to disallowed BSS "
MACSTR, MAC2STR(bss->bssid));
Interworking: Reject BSS based on disallow_aps If a BSS is disallowed temporarily with disallow_aps, the network connection is going to fail. As such, there is not much point in allowing Interworking network selection to try to connect with such BSS. As such, do not consider disallowed networks for automatic network selection and reject requests to connect to them through INTERWORKING_CONNECT. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 23:01:48 +01:00
return -1;
}
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
HS 2.0R2: Fix bandwidth policy BSS selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-18 01:04:34 +02:00
wpa_printf(MSG_DEBUG, "Interworking: Considering BSS " MACSTR
" for connection (allow_excluded=%d)",
MAC2STR(bss->bssid), allow_excluded);
Interworking: Do not match credentials without WPA2-Enterprise Since we currently support only HS 2.0 networks with Interworking network selection, do not indicate credential match unless the network uses WPA2-Enterprise. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-19 11:47:20 +02:00
if (!wpa_bss_get_ie(bss, WLAN_EID_RSN)) {
/*
* We currently support only HS 2.0 networks and those are
* required to use WPA2-Enterprise.
*/
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: Network does not use RSN");
Interworking: Do not match credentials without WPA2-Enterprise Since we currently support only HS 2.0 networks with Interworking network selection, do not indicate credential match unless the network uses WPA2-Enterprise. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-19 11:47:20 +02:00
return -1;
}
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
cred_rc = interworking_credentials_available_roaming_consortium(
wpa_s, bss, 0, excl);
Interworking: Select highest priority cred if multiple matches Previously, the credential to use for a connection with a specific BSS was picked arbitrary based on first found match of each matching mechanism. While the credential priorities were used elsewhere, this did not take into account that different mechanisms could find multiple matching credentials. As such, the highest priority credential was not always used in case more than one credential matched with the selected BSS. Fix this by checking credential priorities again during connection request. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-16 18:54:09 +01:00
if (cred_rc) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: Highest roaming consortium matching credential priority %d sp_priority %d",
cred_rc->priority, cred_rc->sp_priority);
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
if (allow_excluded && excl && !(*excl))
excl = NULL;
Interworking: Select highest priority cred if multiple matches Previously, the credential to use for a connection with a specific BSS was picked arbitrary based on first found match of each matching mechanism. While the credential priorities were used elsewhere, this did not take into account that different mechanisms could find multiple matching credentials. As such, the highest priority credential was not always used in case more than one credential matched with the selected BSS. Fix this by checking credential priorities again during connection request. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-16 18:54:09 +01:00
}
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
cred = interworking_credentials_available_realm(wpa_s, bss, 0, excl);
Interworking: Select highest priority cred if multiple matches Previously, the credential to use for a connection with a specific BSS was picked arbitrary based on first found match of each matching mechanism. While the credential priorities were used elsewhere, this did not take into account that different mechanisms could find multiple matching credentials. As such, the highest priority credential was not always used in case more than one credential matched with the selected BSS. Fix this by checking credential priorities again during connection request. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-16 18:54:09 +01:00
if (cred) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: Highest NAI Realm list matching credential priority %d sp_priority %d",
cred->priority, cred->sp_priority);
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
if (allow_excluded && excl && !(*excl))
excl = NULL;
Interworking: Select highest priority cred if multiple matches Previously, the credential to use for a connection with a specific BSS was picked arbitrary based on first found match of each matching mechanism. While the credential priorities were used elsewhere, this did not take into account that different mechanisms could find multiple matching credentials. As such, the highest priority credential was not always used in case more than one credential matched with the selected BSS. Fix this by checking credential priorities again during connection request. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-16 18:54:09 +01:00
}
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
cred_3gpp = interworking_credentials_available_3gpp(wpa_s, bss, 0,
excl);
Interworking: Select highest priority cred if multiple matches Previously, the credential to use for a connection with a specific BSS was picked arbitrary based on first found match of each matching mechanism. While the credential priorities were used elsewhere, this did not take into account that different mechanisms could find multiple matching credentials. As such, the highest priority credential was not always used in case more than one credential matched with the selected BSS. Fix this by checking credential priorities again during connection request. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-16 18:54:09 +01:00
if (cred_3gpp) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: Highest 3GPP matching credential priority %d sp_priority %d",
cred_3gpp->priority, cred_3gpp->sp_priority);
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
if (allow_excluded && excl && !(*excl))
excl = NULL;
Interworking: Select highest priority cred if multiple matches Previously, the credential to use for a connection with a specific BSS was picked arbitrary based on first found match of each matching mechanism. While the credential priorities were used elsewhere, this did not take into account that different mechanisms could find multiple matching credentials. As such, the highest priority credential was not always used in case more than one credential matched with the selected BSS. Fix this by checking credential priorities again during connection request. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-16 18:54:09 +01:00
}
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
if (!cred_rc && !cred && !cred_3gpp) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: No full credential matches - consider options without BW(etc.) limits");
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
cred_rc = interworking_credentials_available_roaming_consortium(
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
wpa_s, bss, 1, excl);
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
if (cred_rc) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: Highest roaming consortium matching credential priority %d sp_priority %d (ignore BW)",
cred_rc->priority, cred_rc->sp_priority);
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
if (allow_excluded && excl && !(*excl))
excl = NULL;
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
}
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
cred = interworking_credentials_available_realm(wpa_s, bss, 1,
excl);
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
if (cred) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: Highest NAI Realm list matching credential priority %d sp_priority %d (ignore BW)",
cred->priority, cred->sp_priority);
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
if (allow_excluded && excl && !(*excl))
excl = NULL;
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
}
cred_3gpp = interworking_credentials_available_3gpp(wpa_s, bss,
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
1, excl);
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
if (cred_3gpp) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: Highest 3GPP matching credential priority %d sp_priority %d (ignore BW)",
cred_3gpp->priority, cred_3gpp->sp_priority);
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
if (allow_excluded && excl && !(*excl))
excl = NULL;
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
}
}
Interworking: Select highest priority cred if multiple matches Previously, the credential to use for a connection with a specific BSS was picked arbitrary based on first found match of each matching mechanism. While the credential priorities were used elsewhere, this did not take into account that different mechanisms could find multiple matching credentials. As such, the highest priority credential was not always used in case more than one credential matched with the selected BSS. Fix this by checking credential priorities again during connection request. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-16 18:54:09 +01:00
if (cred_rc &&
Interworking: Use a helper function to compare cred priority This makes it easier to extend credential priority comparison beyond a single priority variable. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 18:06:49 +01:00
(cred == NULL || cred_prio_cmp(cred_rc, cred) >= 0) &&
(cred_3gpp == NULL || cred_prio_cmp(cred_rc, cred_3gpp) >= 0))
Interworking: Select highest priority cred if multiple matches Previously, the credential to use for a connection with a specific BSS was picked arbitrary based on first found match of each matching mechanism. While the credential priorities were used elsewhere, this did not take into account that different mechanisms could find multiple matching credentials. As such, the highest priority credential was not always used in case more than one credential matched with the selected BSS. Fix this by checking credential priorities again during connection request. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-16 18:54:09 +01:00
return interworking_connect_roaming_consortium(wpa_s, cred_rc,
Add INTERWORKING_ADD_NETWORK command This can be used to provide more control to upper layers on network blocks generated as part of Interworking network selection. INTERWORKING_ADD_NETWORK behaves otherwise identically to INTERWORKING_CONNECT, but it does not request a new connection after having added the network block and it returns the network id of the added network. INTERWORKING_ADD_NETWORK followed by REASSOCIATE would behave more or less identically to INTERWORKING_CONNECT, but this allows the created network profile to be modified, if desired, and/or stored externally. SELECT_NETWORK can also be used with the network id returned from INTERWORKING_ADD_NETWORK to enforce that specific network profile to be used for the next connection (though, it should be noted that this behavior may not meet all Hotspot 2.0 requirements if there were other enabled networks that could have higher priority). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 15:56:04 +01:00
bss, only_add);
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
Interworking: Select highest priority cred if multiple matches Previously, the credential to use for a connection with a specific BSS was picked arbitrary based on first found match of each matching mechanism. While the credential priorities were used elsewhere, this did not take into account that different mechanisms could find multiple matching credentials. As such, the highest priority credential was not always used in case more than one credential matched with the selected BSS. Fix this by checking credential priorities again during connection request. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-16 18:54:09 +01:00
if (cred_3gpp &&
Interworking: Use a helper function to compare cred priority This makes it easier to extend credential priority comparison beyond a single priority variable. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 18:06:49 +01:00
(cred == NULL || cred_prio_cmp(cred_3gpp, cred) >= 0)) {
Add INTERWORKING_ADD_NETWORK command This can be used to provide more control to upper layers on network blocks generated as part of Interworking network selection. INTERWORKING_ADD_NETWORK behaves otherwise identically to INTERWORKING_CONNECT, but it does not request a new connection after having added the network block and it returns the network id of the added network. INTERWORKING_ADD_NETWORK followed by REASSOCIATE would behave more or less identically to INTERWORKING_CONNECT, but this allows the created network profile to be modified, if desired, and/or stored externally. SELECT_NETWORK can also be used with the network id returned from INTERWORKING_ADD_NETWORK to enforce that specific network profile to be used for the next connection (though, it should be noted that this behavior may not meet all Hotspot 2.0 requirements if there were other enabled networks that could have higher priority). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 15:56:04 +01:00
return interworking_connect_3gpp(wpa_s, cred_3gpp, bss,
only_add);
Interworking: Select highest priority cred if multiple matches Previously, the credential to use for a connection with a specific BSS was picked arbitrary based on first found match of each matching mechanism. While the credential priorities were used elsewhere, this did not take into account that different mechanisms could find multiple matching credentials. As such, the highest priority credential was not always used in case more than one credential matched with the selected BSS. Fix this by checking credential priorities again during connection request. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-16 18:54:09 +01:00
}
if (cred == NULL) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: No matching credentials found for "
MACSTR, MAC2STR(bss->bssid));
Interworking: Select highest priority cred if multiple matches Previously, the credential to use for a connection with a specific BSS was picked arbitrary based on first found match of each matching mechanism. While the credential priorities were used elsewhere, this did not take into account that different mechanisms could find multiple matching credentials. As such, the highest priority credential was not always used in case more than one credential matched with the selected BSS. Fix this by checking credential priorities again during connection request. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-16 18:54:09 +01:00
return -1;
}
Interworking: Move BSS ANQP information into separate struct This is an initial step in allowing the ANQP responses to be shared among multiple BSSes if the BSSes are determined to be operating under identical configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:02:29 +02:00
realm = nai_realm_parse(bss->anqp ? bss->anqp->nai_realm : NULL,
&count);
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
if (realm == NULL) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: Could not parse NAI Realm list from "
MACSTR, MAC2STR(bss->bssid));
Interworking: Select highest priority cred if multiple matches Previously, the credential to use for a connection with a specific BSS was picked arbitrary based on first found match of each matching mechanism. While the credential priorities were used elsewhere, this did not take into account that different mechanisms could find multiple matching credentials. As such, the highest priority credential was not always used in case more than one credential matched with the selected BSS. Fix this by checking credential priorities again during connection request. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-16 18:54:09 +01:00
return -1;
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
}
Interworking: Select highest priority cred if multiple matches Previously, the credential to use for a connection with a specific BSS was picked arbitrary based on first found match of each matching mechanism. While the credential priorities were used elsewhere, this did not take into account that different mechanisms could find multiple matching credentials. As such, the highest priority credential was not always used in case more than one credential matched with the selected BSS. Fix this by checking credential priorities again during connection request. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-16 18:54:09 +01:00
for (i = 0; i < count; i++) {
if (!nai_realm_match(&realm[i], cred->realm))
continue;
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
eap = nai_realm_find_eap(wpa_s, cred, &realm[i]);
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
if (eap)
break;
}
if (!eap) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: No matching credentials and EAP method found for "
MACSTR, MAC2STR(bss->bssid));
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
nai_realm_free(realm, count);
return -1;
}
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Connect with " MACSTR,
MAC2STR(bss->bssid));
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
Interworking: Do not reconnect if already connected If we are already connected to the selected AP with a network block that was created based on the selected credential, do not force a reconnection or network block update. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 22:20:27 +01:00
if (already_connected(wpa_s, cred, bss)) {
wpa_msg(wpa_s, MSG_INFO, INTERWORKING_ALREADY_CONNECTED MACSTR,
MAC2STR(bss->bssid));
nai_realm_free(realm, count);
return 0;
}
Interworking: Avoid duplicated network blocks Do not add multiple network blocks for the same network from a single credential. INTERWORKING_CONNECT used to generate a new network block for each instance regardless of what network blocks have already been configured. While this allows the connection to go through, it is not efficient to leave behind potentially large number of network blocks with the same contents (or worse, changed contents). Address this by removing an older network block for the same credential before adding a new one. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 22:32:43 +01:00
remove_duplicate_network(wpa_s, cred, bss);
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
ssid = wpa_config_add_network(wpa_s->conf);
if (ssid == NULL) {
nai_realm_free(realm, count);
return -1;
}
HS 2.0: Remove temporary network block on cred block removal If the credential that was used to create a temporary HS 2.0 network block is removed, remove the network block, too. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-22 16:53:27 +01:00
ssid->parent_cred = cred;
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
wpas_notify_network_added(wpa_s, ssid);
wpa_config_set_network_defaults(ssid);
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
ssid->priority = cred->priority;
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
ssid->temporary = 1;
Interworking: Use SSID from the BSS entry There is no need to parse the IE buffer again to find the SSID of the BSS since that information is already stored in struct wpa_bss. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 23:17:48 +01:00
ssid->ssid = os_zalloc(bss->ssid_len + 1);
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
if (ssid->ssid == NULL)
goto fail;
Interworking: Use SSID from the BSS entry There is no need to parse the IE buffer again to find the SSID of the BSS since that information is already stored in struct wpa_bss. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 23:17:48 +01:00
os_memcpy(ssid->ssid, bss->ssid, bss->ssid_len);
ssid->ssid_len = bss->ssid_len;
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
Interworking: Enable key_mgmt WPA-EAP-SHA256 if PMF is enabled If the global pmf=1/2 parameter is used to enable PMF for Interworking networks, add WPA-EAP-SHA256 to the temporary network block to allow connection to PMF required APs. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-24 21:31:17 +01:00
if (interworking_set_hs20_params(wpa_s, ssid) < 0)
Interworking: Set key_mgmt parameter for the temporary network block Previously, this was left to the default (WPA-EAP WPA-PSK) value which could potentially result in unexpected behavior if an AP were to enable both WPA2-Enterprise and WPA2-Personal in the same BSS. While this is not really that likely for APs supporting Interworking, it is good to get the PSK option removed to avoid any issues with missing passphrase/PSK configuration parameter. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-03 21:13:32 +02:00
goto fail;
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
if (wpa_config_set(ssid, "eap", eap_get_name(EAP_VENDOR_IETF,
eap->method), 0) < 0)
goto fail;
switch (eap->method) {
case EAP_TYPE_TTLS:
if (eap->inner_method) {
os_snprintf(buf, sizeof(buf), "\"autheap=%s\"",
eap_get_name(EAP_VENDOR_IETF,
eap->inner_method));
if (wpa_config_set(ssid, "phase2", buf, 0) < 0)
goto fail;
break;
}
switch (eap->inner_non_eap) {
case NAI_REALM_INNER_NON_EAP_PAP:
if (wpa_config_set(ssid, "phase2", "\"auth=PAP\"", 0) <
0)
goto fail;
break;
case NAI_REALM_INNER_NON_EAP_CHAP:
if (wpa_config_set(ssid, "phase2", "\"auth=CHAP\"", 0)
< 0)
goto fail;
break;
case NAI_REALM_INNER_NON_EAP_MSCHAP:
Interworking: Fix EAP-TTLS/MSCHAP configuration Copy-paste error ended up using CHAP when MSCHAP was supposed to be set. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-01-31 15:20:43 +01:00
if (wpa_config_set(ssid, "phase2", "\"auth=MSCHAP\"",
0) < 0)
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
goto fail;
break;
case NAI_REALM_INNER_NON_EAP_MSCHAPV2:
if (wpa_config_set(ssid, "phase2", "\"auth=MSCHAPV2\"",
Interworking: Default to TTLS/MSCHAPv2 for NAI Realm list matching If the AP does not advertize EAP parameters, default to TTLS/MSCHAPv2 when using username/password credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-16 11:00:06 +01:00
0) < 0)
goto fail;
break;
default:
/* EAP params were not set - assume TTLS/MSCHAPv2 */
if (wpa_config_set(ssid, "phase2", "\"auth=MSCHAPV2\"",
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
0) < 0)
goto fail;
break;
}
break;
case EAP_TYPE_PEAP:
Interworking: Allow EAP-FAST to be used This behaves like PEAP as far as Interworking network selection is concerned. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-26 12:48:35 +01:00
case EAP_TYPE_FAST:
if (wpa_config_set(ssid, "phase1", "\"fast_provisioning=2\"",
0) < 0)
goto fail;
if (wpa_config_set(ssid, "pac_file",
"\"blob://pac_interworking\"", 0) < 0)
goto fail;
Interworking: Reject EAP configuration with unsupported inner method Instead of allowing the connection attempt to occur with an unsupported inner method, check for that explicitly at the time the network block is added and drop the network if the identified inner method is not supported. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-07 15:18:30 +02:00
name = eap_get_name(EAP_VENDOR_IETF,
eap->inner_method ? eap->inner_method :
EAP_TYPE_MSCHAPV2);
if (name == NULL)
goto fail;
os_snprintf(buf, sizeof(buf), "\"auth=%s\"", name);
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
if (wpa_config_set(ssid, "phase2", buf, 0) < 0)
goto fail;
break;
Interworking: Add support for certificate credentials (EAP-TLS) This allows Interworking network selection to be used with EAP-TLS (client certificate/private key based credential). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-29 15:40:17 +01:00
case EAP_TYPE_TLS:
break;
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
}
Interworking: Move EAP parameter setting into a separate function This makes it easier to share the common code with other credential matching cases in the future. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:35:18 +02:00
if (interworking_set_eap_params(ssid, cred,
eap->method == EAP_TYPE_TTLS) < 0)
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
goto fail;
nai_realm_free(realm, count);
Interworking: Prefer last added network during network selection Previously, any network block could be used to select the BSS to connect to when processing scan results after Interworking network selection. This can result in somewhat unexpected network selection in cases where credential preferences indicated that a specific network was selected, but another network ended up getting used for the connection. While the older networks continue to be valid, add special processing for this initial post-interworking-connect case to get more consistent network selection to match with the Interworking network selection result. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-02-25 21:37:57 +01:00
wpa_s->next_ssid = ssid;
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
wpa_config_update_prio_list(wpa_s->conf);
Add INTERWORKING_ADD_NETWORK command This can be used to provide more control to upper layers on network blocks generated as part of Interworking network selection. INTERWORKING_ADD_NETWORK behaves otherwise identically to INTERWORKING_CONNECT, but it does not request a new connection after having added the network block and it returns the network id of the added network. INTERWORKING_ADD_NETWORK followed by REASSOCIATE would behave more or less identically to INTERWORKING_CONNECT, but this allows the created network profile to be modified, if desired, and/or stored externally. SELECT_NETWORK can also be used with the network id returned from INTERWORKING_ADD_NETWORK to enforce that specific network profile to be used for the next connection (though, it should be noted that this behavior may not meet all Hotspot 2.0 requirements if there were other enabled networks that could have higher priority). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 15:56:04 +01:00
if (!only_add)
interworking_reconnect(wpa_s);
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
Add INTERWORKING_ADD_NETWORK command This can be used to provide more control to upper layers on network blocks generated as part of Interworking network selection. INTERWORKING_ADD_NETWORK behaves otherwise identically to INTERWORKING_CONNECT, but it does not request a new connection after having added the network block and it returns the network id of the added network. INTERWORKING_ADD_NETWORK followed by REASSOCIATE would behave more or less identically to INTERWORKING_CONNECT, but this allows the created network profile to be modified, if desired, and/or stored externally. SELECT_NETWORK can also be used with the network id returned from INTERWORKING_ADD_NETWORK to enforce that specific network profile to be used for the next connection (though, it should be noted that this behavior may not meet all Hotspot 2.0 requirements if there were other enabled networks that could have higher priority). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 15:56:04 +01:00
return ssid->id;
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
fail:
wpas_notify_network_removed(wpa_s, ssid);
wpa_config_remove_network(wpa_s->conf, ssid->id);
nai_realm_free(realm, count);
return -1;
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
}
Add INTERWORKING_ADD_NETWORK command This can be used to provide more control to upper layers on network blocks generated as part of Interworking network selection. INTERWORKING_ADD_NETWORK behaves otherwise identically to INTERWORKING_CONNECT, but it does not request a new connection after having added the network block and it returns the network id of the added network. INTERWORKING_ADD_NETWORK followed by REASSOCIATE would behave more or less identically to INTERWORKING_CONNECT, but this allows the created network profile to be modified, if desired, and/or stored externally. SELECT_NETWORK can also be used with the network id returned from INTERWORKING_ADD_NETWORK to enforce that specific network profile to be used for the next connection (though, it should be noted that this behavior may not meet all Hotspot 2.0 requirements if there were other enabled networks that could have higher priority). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 15:56:04 +01:00
int interworking_connect(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
int only_add)
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
{
Add INTERWORKING_ADD_NETWORK command This can be used to provide more control to upper layers on network blocks generated as part of Interworking network selection. INTERWORKING_ADD_NETWORK behaves otherwise identically to INTERWORKING_CONNECT, but it does not request a new connection after having added the network block and it returns the network id of the added network. INTERWORKING_ADD_NETWORK followed by REASSOCIATE would behave more or less identically to INTERWORKING_CONNECT, but this allows the created network profile to be modified, if desired, and/or stored externally. SELECT_NETWORK can also be used with the network id returned from INTERWORKING_ADD_NETWORK to enforce that specific network profile to be used for the next connection (though, it should be noted that this behavior may not meet all Hotspot 2.0 requirements if there were other enabled networks that could have higher priority). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 15:56:04 +01:00
return interworking_connect_helper(wpa_s, bss, 1, only_add);
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
}
Interworking: Read IMSI if not read at supplicant start It is required to read IMSI from SIM if it has not already been done when comparing HS 2.0 AP 3GPP information with the local credentials. Signed-off-by: Jean Trivelly <jean.trivelly@intel.com>
2014-03-28 17:30:32 +01:00
#ifdef PCSC_FUNCS
static int interworking_pcsc_read_imsi(struct wpa_supplicant *wpa_s)
{
size_t len;
if (wpa_s->imsi[0] && wpa_s->mnc_len)
return 0;
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);
return 0;
}
#endif /* PCSC_FUNCS */
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
static struct wpa_cred * interworking_credentials_available_3gpp(
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
struct wpa_supplicant *wpa_s, struct wpa_bss *bss, int ignore_bw,
int *excluded)
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
{
Interworking: Remove unused variable warnings This patch removes these warnings. interworking.c: In function 'interworking_credentials_available_3gpp': interworking.c:1330:6: warning: unused variable 'ret' [-Wunused-variable] interworking.c:1329:19: warning: unused variable 'cred' [-Wunused-variable] Signed-hostap: Masashi Honma <masashi.honma@gmail.com>
2013-02-28 14:01:09 +01:00
struct wpa_cred *selected = NULL;
#ifdef INTERWORKING_3GPP
struct wpa_cred *cred;
Interworking: Add support for multiple credentials This replaces the global home_* parameters with a list of credentials that can be configured similarly to network blocks. For example: cred={ realm="example.com" username="user@example.com" password="password" ca_cert="/etc/wpa_supplicant/ca.pem" domain="example.com" } cred={ imsi="310026-000000000" milenage="90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123" } Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:34:22 +01:00
int ret;
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
int is_excluded = 0;
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
Interworking: More debug messages And convert some wpa_printf to wpa_msg. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:48 +01:00
if (bss->anqp == NULL || bss->anqp->anqp_3gpp == NULL) {
wpa_msg(wpa_s, MSG_DEBUG,
"interworking-avail-3gpp: not avail, anqp: %p anqp_3gpp: %p",
bss->anqp, bss->anqp ? bss->anqp->anqp_3gpp : NULL);
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
return NULL;
Interworking: More debug messages And convert some wpa_printf to wpa_msg. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:48 +01:00
}
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
eap_proxy: Re-read IMSI from proxy in Interworking functionality Try to read the IMSI values through the eap_proxy layer for Interworking functionality again if the value was not available at startup. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-01 19:48:03 +01:00
#ifdef CONFIG_EAP_PROXY
if (!wpa_s->imsi[0]) {
size_t len;
Interworking: More debug messages And convert some wpa_printf to wpa_msg. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:48 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: IMSI not available - try to read again through eap_proxy");
eap_proxy: Re-read IMSI from proxy in Interworking functionality Try to read the IMSI values through the eap_proxy layer for Interworking functionality again if the value was not available at startup. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-01 19:48:03 +01:00
wpa_s->mnc_len = eapol_sm_get_eap_proxy_imsi(wpa_s->eapol,
wpa_s->imsi,
&len);
if (wpa_s->mnc_len > 0) {
wpa_s->imsi[len] = '\0';
Interworking: More debug messages And convert some wpa_printf to wpa_msg. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:48 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"eap_proxy: IMSI %s (MNC length %d)",
wpa_s->imsi, wpa_s->mnc_len);
eap_proxy: Re-read IMSI from proxy in Interworking functionality Try to read the IMSI values through the eap_proxy layer for Interworking functionality again if the value was not available at startup. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-01 19:48:03 +01:00
} else {
Interworking: More debug messages And convert some wpa_printf to wpa_msg. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:48 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"eap_proxy: IMSI not available");
eap_proxy: Re-read IMSI from proxy in Interworking functionality Try to read the IMSI values through the eap_proxy layer for Interworking functionality again if the value was not available at startup. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-01 19:48:03 +01:00
}
}
#endif /* CONFIG_EAP_PROXY */
Interworking: Add support for multiple credentials This replaces the global home_* parameters with a list of credentials that can be configured similarly to network blocks. For example: cred={ realm="example.com" username="user@example.com" password="password" ca_cert="/etc/wpa_supplicant/ca.pem" domain="example.com" } cred={ imsi="310026-000000000" milenage="90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123" } Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:34:22 +01:00
for (cred = wpa_s->conf->cred; cred; cred = cred->next) {
Interworking: Make plmn_id_match() for generic Use separate mnc_len parameter instead of expecting the imsi parameter to be in special MCC|MNC|-|<MSIN> format to make this function more generic. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-03-04 10:27:38 +01:00
char *sep;
Interworking: Support real SIM/USIM card for network selection Signed-hostap: Jouni Malinen <j@w1.fi>
2012-03-04 15:02:56 +01:00
const char *imsi;
int mnc_len;
Interworking: Relax 3GPP info PLMN matching for MNC 3GPP TS 24.232 Annex A.3 allows network operator to advertise only two digits of MNC even if MNC has three digits. Allow such matches in network selection. In addition, allow three digit matches of MNC even if MNC length was assumed to be two to avoid missing networks if MNC length cannot be determined reliably. Remove the '-' separator from simulated SIM/USIM cases to allow the new matching rules to work. Fix the PLMN List information element parsing loop to use the length of the PLMN List instead of the length of the full 3GPP Cellular Info to avoid unexpected matches should a new element ever be added by 3GPP. Finally, add more debug prints from PLMN matching to make the logs easier to understand. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-08 15:53:05 +02:00
char imsi_buf[16];
size_t msin_len;
Interworking: Support real SIM/USIM card for network selection Signed-hostap: Jouni Malinen <j@w1.fi>
2012-03-04 15:02:56 +01:00
#ifdef PCSC_FUNCS
Interworking: Read IMSI if not read at supplicant start It is required to read IMSI from SIM if it has not already been done when comparing HS 2.0 AP 3GPP information with the local credentials. Signed-off-by: Jean Trivelly <jean.trivelly@intel.com>
2014-03-28 17:30:32 +01:00
if (cred->pcsc && wpa_s->scard) {
if (interworking_pcsc_read_imsi(wpa_s) < 0)
continue;
Interworking: Support real SIM/USIM card for network selection Signed-hostap: Jouni Malinen <j@w1.fi>
2012-03-04 15:02:56 +01:00
imsi = wpa_s->imsi;
mnc_len = wpa_s->mnc_len;
goto compare;
}
#endif /* PCSC_FUNCS */
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
if (cred->pcsc && wpa_s->mnc_len > 0 && wpa_s->imsi[0]) {
imsi = wpa_s->imsi;
mnc_len = wpa_s->mnc_len;
goto compare;
}
#endif /* CONFIG_EAP_PROXY */
Interworking: Make plmn_id_match() for generic Use separate mnc_len parameter instead of expecting the imsi parameter to be in special MCC|MNC|-|<MSIN> format to make this function more generic. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-03-04 10:27:38 +01:00
Interworking: Add support for multiple credentials This replaces the global home_* parameters with a list of credentials that can be configured similarly to network blocks. For example: cred={ realm="example.com" username="user@example.com" password="password" ca_cert="/etc/wpa_supplicant/ca.pem" domain="example.com" } cred={ imsi="310026-000000000" milenage="90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123" } Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:34:22 +01:00
if (cred->imsi == NULL || !cred->imsi[0] ||
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
(!wpa_s->conf->external_sim &&
(cred->milenage == NULL || !cred->milenage[0])))
Interworking: Add support for multiple credentials This replaces the global home_* parameters with a list of credentials that can be configured similarly to network blocks. For example: cred={ realm="example.com" username="user@example.com" password="password" ca_cert="/etc/wpa_supplicant/ca.pem" domain="example.com" } cred={ imsi="310026-000000000" milenage="90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123" } Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:34:22 +01:00
continue;
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
Interworking: Make plmn_id_match() for generic Use separate mnc_len parameter instead of expecting the imsi parameter to be in special MCC|MNC|-|<MSIN> format to make this function more generic. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-03-04 10:27:38 +01:00
sep = os_strchr(cred->imsi, '-');
if (sep == NULL ||
(sep - cred->imsi != 5 && sep - cred->imsi != 6))
continue;
Interworking: Support real SIM/USIM card for network selection Signed-hostap: Jouni Malinen <j@w1.fi>
2012-03-04 15:02:56 +01:00
mnc_len = sep - cred->imsi - 3;
Interworking: Relax 3GPP info PLMN matching for MNC 3GPP TS 24.232 Annex A.3 allows network operator to advertise only two digits of MNC even if MNC has three digits. Allow such matches in network selection. In addition, allow three digit matches of MNC even if MNC length was assumed to be two to avoid missing networks if MNC length cannot be determined reliably. Remove the '-' separator from simulated SIM/USIM cases to allow the new matching rules to work. Fix the PLMN List information element parsing loop to use the length of the PLMN List instead of the length of the full 3GPP Cellular Info to avoid unexpected matches should a new element ever be added by 3GPP. Finally, add more debug prints from PLMN matching to make the logs easier to understand. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-08 15:53:05 +02:00
os_memcpy(imsi_buf, cred->imsi, 3 + mnc_len);
sep++;
msin_len = os_strlen(cred->imsi);
if (3 + mnc_len + msin_len >= sizeof(imsi_buf) - 1)
msin_len = sizeof(imsi_buf) - 3 - mnc_len - 1;
os_memcpy(&imsi_buf[3 + mnc_len], sep, msin_len);
imsi_buf[3 + mnc_len + msin_len] = '\0';
imsi = imsi_buf;
Interworking: Make plmn_id_match() for generic Use separate mnc_len parameter instead of expecting the imsi parameter to be in special MCC|MNC|-|<MSIN> format to make this function more generic. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-03-04 10:27:38 +01:00
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 defined(PCSC_FUNCS) || defined(CONFIG_EAP_PROXY)
Interworking: Support real SIM/USIM card for network selection Signed-hostap: Jouni Malinen <j@w1.fi>
2012-03-04 15:02:56 +01:00
compare:
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
#endif /* PCSC_FUNCS || CONFIG_EAP_PROXY */
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: Parsing 3GPP info from " MACSTR,
MAC2STR(bss->bssid));
Interworking: Move BSS ANQP information into separate struct This is an initial step in allowing the ANQP responses to be shared among multiple BSSes if the BSSes are determined to be operating under identical configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:02:29 +02:00
ret = plmn_id_match(bss->anqp->anqp_3gpp, imsi, mnc_len);
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG, "PLMN match %sfound",
ret ? "" : "not ");
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
if (ret) {
Interworking: Add required_roaming_consortium parameter for credentials This allows credentials to be limited from being used to connect to a network unless the AP advertises a matching roaming consortium OI. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-30 06:34:47 +01:00
if (cred_no_required_oi_match(cred, bss))
continue;
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
if (!ignore_bw &&
cred_below_min_backhaul(wpa_s, cred, bss))
continue;
HS 2.0R2: Add support for Policy/MaximumBSSLoadValue The new credential parameter max_bss_load can be used to specify restrictions on BSS Load in the home network. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 15:14:25 +02:00
if (!ignore_bw &&
cred_over_max_bss_load(wpa_s, cred, bss))
continue;
HS 2.0R2: Add support for Policy/RequiredProtoPortTuple The new credential parameter req_conn_capab can be used to specify restrictions on roaming networks providing connectivity for a set of protocols/ports. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-08 19:31:41 +02:00
if (!ignore_bw &&
cred_conn_capab_missing(wpa_s, cred, bss))
continue;
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
if (cred_excluded_ssid(cred, bss)) {
if (excluded == NULL)
continue;
if (selected == NULL) {
selected = cred;
is_excluded = 1;
}
} else {
if (selected == NULL || is_excluded ||
Interworking: Use a helper function to compare cred priority This makes it easier to extend credential priority comparison beyond a single priority variable. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 18:06:49 +01:00
cred_prio_cmp(selected, cred) < 0) {
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
selected = cred;
is_excluded = 0;
}
}
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
}
Interworking: Add support for multiple credentials This replaces the global home_* parameters with a list of credentials that can be configured similarly to network blocks. For example: cred={ realm="example.com" username="user@example.com" password="password" ca_cert="/etc/wpa_supplicant/ca.pem" domain="example.com" } cred={ imsi="310026-000000000" milenage="90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123" } Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:34:22 +01:00
}
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
if (excluded)
*excluded = is_excluded;
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
#endif /* INTERWORKING_3GPP */
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
return selected;
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
}
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
static struct wpa_cred * interworking_credentials_available_realm(
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
struct wpa_supplicant *wpa_s, struct wpa_bss *bss, int ignore_bw,
int *excluded)
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
{
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
struct wpa_cred *cred, *selected = NULL;
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
struct nai_realm *realm;
u16 count, i;
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
int is_excluded = 0;
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
Interworking: Move BSS ANQP information into separate struct This is an initial step in allowing the ANQP responses to be shared among multiple BSSes if the BSSes are determined to be operating under identical configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:02:29 +02:00
if (bss->anqp == NULL || bss->anqp->nai_realm == NULL)
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
return NULL;
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
Interworking: Add support for multiple credentials This replaces the global home_* parameters with a list of credentials that can be configured similarly to network blocks. For example: cred={ realm="example.com" username="user@example.com" password="password" ca_cert="/etc/wpa_supplicant/ca.pem" domain="example.com" } cred={ imsi="310026-000000000" milenage="90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123" } Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:34:22 +01:00
if (wpa_s->conf->cred == NULL)
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
return NULL;
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Parsing NAI Realm list from "
MACSTR, MAC2STR(bss->bssid));
Interworking: Move BSS ANQP information into separate struct This is an initial step in allowing the ANQP responses to be shared among multiple BSSes if the BSSes are determined to be operating under identical configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:02:29 +02:00
realm = nai_realm_parse(bss->anqp->nai_realm, &count);
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
if (realm == NULL) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: Could not parse NAI Realm list from "
MACSTR, MAC2STR(bss->bssid));
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
return NULL;
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
}
Interworking: Add support for multiple credentials This replaces the global home_* parameters with a list of credentials that can be configured similarly to network blocks. For example: cred={ realm="example.com" username="user@example.com" password="password" ca_cert="/etc/wpa_supplicant/ca.pem" domain="example.com" } cred={ imsi="310026-000000000" milenage="90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123" } Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:34:22 +01:00
for (cred = wpa_s->conf->cred; cred; cred = cred->next) {
if (cred->realm == NULL)
Interworking: Support username/password based network selection Add support for network selection for username/password credentials with EAP-TTLS and EAP-PEAP. The new global configuration parameters home_username, home_password, and home_ca_cert can be used to specify credentials for network selection.
2011-10-05 16:08:18 +02:00
continue;
Interworking: Add support for multiple credentials This replaces the global home_* parameters with a list of credentials that can be configured similarly to network blocks. For example: cred={ realm="example.com" username="user@example.com" password="password" ca_cert="/etc/wpa_supplicant/ca.pem" domain="example.com" } cred={ imsi="310026-000000000" milenage="90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123" } Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:34:22 +01:00
for (i = 0; i < count; i++) {
if (!nai_realm_match(&realm[i], cred->realm))
continue;
Interworking: Add logging to track nai_realm_find_eap failures There are lots of reasons we can fail to match an EAP credential, so add logging to help determine why it is happening in various cases. Signed-off-by: Ben Greear <greearb@candelatech.com>
2015-01-12 23:15:47 +01:00
if (nai_realm_find_eap(wpa_s, cred, &realm[i])) {
Interworking: Add required_roaming_consortium parameter for credentials This allows credentials to be limited from being used to connect to a network unless the AP advertises a matching roaming consortium OI. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-30 06:34:47 +01:00
if (cred_no_required_oi_match(cred, bss))
continue;
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
if (!ignore_bw &&
cred_below_min_backhaul(wpa_s, cred, bss))
continue;
HS 2.0R2: Add support for Policy/MaximumBSSLoadValue The new credential parameter max_bss_load can be used to specify restrictions on BSS Load in the home network. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 15:14:25 +02:00
if (!ignore_bw &&
cred_over_max_bss_load(wpa_s, cred, bss))
continue;
HS 2.0R2: Add support for Policy/RequiredProtoPortTuple The new credential parameter req_conn_capab can be used to specify restrictions on roaming networks providing connectivity for a set of protocols/ports. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-08 19:31:41 +02:00
if (!ignore_bw &&
cred_conn_capab_missing(wpa_s, cred, bss))
continue;
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
if (cred_excluded_ssid(cred, bss)) {
if (excluded == NULL)
continue;
if (selected == NULL) {
selected = cred;
is_excluded = 1;
}
} else {
if (selected == NULL || is_excluded ||
Interworking: Use a helper function to compare cred priority This makes it easier to extend credential priority comparison beyond a single priority variable. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 18:06:49 +01:00
cred_prio_cmp(selected, cred) < 0)
{
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
selected = cred;
is_excluded = 0;
}
}
Interworking: Add support for multiple credentials This replaces the global home_* parameters with a list of credentials that can be configured similarly to network blocks. For example: cred={ realm="example.com" username="user@example.com" password="password" ca_cert="/etc/wpa_supplicant/ca.pem" domain="example.com" } cred={ imsi="310026-000000000" milenage="90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123" } Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:34:22 +01:00
break;
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
} else {
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: realm-find-eap returned false");
Interworking: Add support for multiple credentials This replaces the global home_* parameters with a list of credentials that can be configured similarly to network blocks. For example: cred={ realm="example.com" username="user@example.com" password="password" ca_cert="/etc/wpa_supplicant/ca.pem" domain="example.com" } cred={ imsi="310026-000000000" milenage="90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123" } Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:34:22 +01:00
}
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
}
}
nai_realm_free(realm, count);
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
if (excluded)
*excluded = is_excluded;
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
return selected;
Interworking: Parse NAI Realms and match against home realm
2011-10-05 13:38:13 +02:00
}
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
static struct wpa_cred * interworking_credentials_available_helper(
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
struct wpa_supplicant *wpa_s, struct wpa_bss *bss, int ignore_bw,
int *excluded)
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
{
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
struct wpa_cred *cred, *cred2;
Interworking: Fix network selection warning without SIM/USIM support interworking_credentials_available_3gpp() would have left excluded2 uninitialized without INTERWORKING_3GPP in the build. This could result in a static analyzer warning within interworking_credentials_available_helper() about use of uninitialized variable. Get rid of that warning by explicitly initializing excluded2 even though this does not really result in any difference in behavior since the excluded2 value would be used only if the non-NULL is returned and that could not have been the case here without INTERWORKING_3GPP. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-04-26 16:00:26 +02:00
int excluded1, excluded2 = 0;
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
Interworking: Reject BSS based on disallow_aps If a BSS is disallowed temporarily with disallow_aps, the network connection is going to fail. As such, there is not much point in allowing Interworking network selection to try to connect with such BSS. As such, do not consider disallowed networks for automatic network selection and reject requests to connect to them through INTERWORKING_CONNECT. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 23:01:48 +01:00
if (disallowed_bssid(wpa_s, bss->bssid) ||
disallowed_ssid(wpa_s, bss->ssid, bss->ssid_len)) {
wpa_printf(MSG_DEBUG, "Interworking: Ignore disallowed BSS "
MACSTR, MAC2STR(bss->bssid));
return NULL;
}
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
cred = interworking_credentials_available_realm(wpa_s, bss, ignore_bw,
&excluded1);
cred2 = interworking_credentials_available_3gpp(wpa_s, bss, ignore_bw,
&excluded2);
if (cred && cred2 &&
Interworking: Use a helper function to compare cred priority This makes it easier to extend credential priority comparison beyond a single priority variable. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 18:06:49 +01:00
(cred_prio_cmp(cred2, cred) >= 0 || (!excluded2 && excluded1))) {
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
cred = cred2;
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
excluded1 = excluded2;
}
if (!cred) {
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
cred = cred2;
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
excluded1 = excluded2;
}
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
cred2 = interworking_credentials_available_roaming_consortium(
wpa_s, bss, ignore_bw, &excluded2);
if (cred && cred2 &&
Interworking: Use a helper function to compare cred priority This makes it easier to extend credential priority comparison beyond a single priority variable. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 18:06:49 +01:00
(cred_prio_cmp(cred2, cred) >= 0 || (!excluded2 && excluded1))) {
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
cred = cred2;
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
excluded1 = excluded2;
}
if (!cred) {
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
cred = cred2;
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
excluded1 = excluded2;
}
Interworking: Add support for using Roaming Consortium OI for matching Each cred block can now be matched based on Roaming Consortium OI as an alternative mechanism to using NAI Realm information. This may be optimized for efficiency in the future since Roaming Consortium information is available in scan results without having to go through ANQP queries. In addition, this is easier to support in case there is a large number of realms that can be used for authentication. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-02 17:48:31 +02:00
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
if (excluded)
*excluded = excluded1;
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
return cred;
Interworking: Support for using EAP-SIM credentials in network selection New configuration parameters home_imsi and home_milenage can be used to configure SIM/USIM simulator parameters for network selection based on SIM/USIM credentials. home_imsi=(MCC | MNC | '-' | rest of IMSI) home_milenage=(Ki):(OPc):(SQN) For example: home_imsi=310026-000000000 home_milenage=90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123
2011-10-06 21:26:33 +02:00
}
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
static struct wpa_cred * interworking_credentials_available(
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
struct wpa_supplicant *wpa_s, struct wpa_bss *bss, int *excluded)
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
{
struct wpa_cred *cred;
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
if (excluded)
*excluded = 0;
cred = interworking_credentials_available_helper(wpa_s, bss, 0,
excluded);
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
if (cred)
return cred;
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
return interworking_credentials_available_helper(wpa_s, bss, 1,
excluded);
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
}
HS 2.0R2: Add tracking of provisioning SP The new provisioning_sp cred field can now be used to track which SP provisioned the credential. This makes it easier to find the matching PPS MO from the management tree (./Wi-Fi/<provisioning_sp>). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-02 18:09:11 +02:00
int domain_name_list_contains(struct wpabuf *domain_names,
const char *domain, int exact_match)
Interworking: Add support for home vs. visited SP determination Use Domain Name List (ANQP) and the new home_domain configuration parameter to figure out whether a network is operated by the home service provider and if so, prefer it over networks that would require roaming. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:32:00 +01:00
{
const u8 *pos, *end;
size_t len;
Interworking: Use 3gppnetwork.org for matching home SP for SIM/USIM Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:33:31 +01:00
len = os_strlen(domain);
Interworking: Add support for home vs. visited SP determination Use Domain Name List (ANQP) and the new home_domain configuration parameter to figure out whether a network is operated by the home service provider and if so, prefer it over networks that would require roaming. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:32:00 +01:00
pos = wpabuf_head(domain_names);
end = pos + wpabuf_len(domain_names);
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
while (end - pos > 1) {
u8 elen;
elen = *pos++;
if (elen > end - pos)
Interworking: Add support for home vs. visited SP determination Use Domain Name List (ANQP) and the new home_domain configuration parameter to figure out whether a network is operated by the home service provider and if so, prefer it over networks that would require roaming. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:32:00 +01:00
break;
Interworking: Use 3gppnetwork.org for matching home SP for SIM/USIM Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:33:31 +01:00
wpa_hexdump_ascii(MSG_DEBUG, "Interworking: AP domain name",
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
pos, elen);
if (elen == len &&
os_strncasecmp(domain, (const char *) pos, len) == 0)
Interworking: Add support for home vs. visited SP determination Use Domain Name List (ANQP) and the new home_domain configuration parameter to figure out whether a network is operated by the home service provider and if so, prefer it over networks that would require roaming. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:32:00 +01:00
return 1;
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
if (!exact_match && elen > len && pos[elen - len - 1] == '.') {
const char *ap = (const char *) pos;
int offset = elen - len;
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
if (os_strncasecmp(domain, ap + offset, len) == 0)
return 1;
}
Interworking: Add support for home vs. visited SP determination Use Domain Name List (ANQP) and the new home_domain configuration parameter to figure out whether a network is operated by the home service provider and if so, prefer it over networks that would require roaming. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:32:00 +01:00
Interworking: Avoid undefined behavior in pointer arithmetic Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-10-18 00:37:38 +02:00
pos += elen;
Interworking: Add support for home vs. visited SP determination Use Domain Name List (ANQP) and the new home_domain configuration parameter to figure out whether a network is operated by the home service provider and if so, prefer it over networks that would require roaming. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:32:00 +01:00
}
return 0;
}
HS 2.0: Add Home SP FQDN and roaming/home to status command This allows the ctrl_iface STATUS information to be used to determine which Home SP credential (domain in the cred block) was used and whether the network is operated by the home SP. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-22 19:51:49 +01:00
int interworking_home_sp_cred(struct wpa_supplicant *wpa_s,
struct wpa_cred *cred,
struct wpabuf *domain_names)
Interworking: Use 3gppnetwork.org for matching home SP for SIM/USIM Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:33:31 +01:00
{
Interworking: Add support for multiple home FQDNs Credentials can now be configured with more than one FQDN ('domain' field in the cred block) to perform Domain Name List matching against multiple home domains. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-02 17:42:54 +02:00
size_t i;
Interworking: Report STATUS:sp_type even if domain is not configured This allows sp_type={home,roaming,unknown} to be used to determine network type with SIM-based credentials even if the domain name parameter is not configured explicitly. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 12:51:18 +01:00
int ret = -1;
Interworking: Use 3gppnetwork.org for matching home SP for SIM/USIM Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:33:31 +01:00
#ifdef INTERWORKING_3GPP
char nai[100], *realm;
HS 2.0: Add Home SP FQDN and roaming/home to status command This allows the ctrl_iface STATUS information to be used to determine which Home SP credential (domain in the cred block) was used and whether the network is operated by the home SP. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-22 19:51:49 +01:00
char *imsi = NULL;
int mnc_len = 0;
if (cred->imsi)
imsi = cred->imsi;
Interworking: Fix incorrect compile PCSC flag CONFIG_PCSC is used instead of PCSC_FUNCS. Signed-off-by: Jean Trivelly <jean.trivelly@intel.com>
2014-03-26 16:54:35 +01:00
#ifdef PCSC_FUNCS
Interworking: Read IMSI if not read at supplicant start It is required to read IMSI from SIM if it has not already been done when comparing HS 2.0 AP 3GPP information with the local credentials. Signed-off-by: Jean Trivelly <jean.trivelly@intel.com>
2014-03-28 17:30:32 +01:00
else if (cred->pcsc && wpa_s->scard) {
if (interworking_pcsc_read_imsi(wpa_s) < 0)
return -1;
HS 2.0: Add Home SP FQDN and roaming/home to status command This allows the ctrl_iface STATUS information to be used to determine which Home SP credential (domain in the cred block) was used and whether the network is operated by the home SP. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-22 19:51:49 +01:00
imsi = wpa_s->imsi;
mnc_len = wpa_s->mnc_len;
}
Interworking: Fix incorrect compile PCSC flag CONFIG_PCSC is used instead of PCSC_FUNCS. Signed-off-by: Jean Trivelly <jean.trivelly@intel.com>
2014-03-26 16:54:35 +01:00
#endif /* PCSC_FUNCS */
eap_proxy: Fix IMSI fetch for home vs. visited network determination Use similar mechanism to CONFIG_PCSC=y case to set the IMSI and MNC length for eap_proxy. This allows automatic 3GPP realm comparison against the domain list. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-20 11:10:53 +02:00
#ifdef CONFIG_EAP_PROXY
else if (cred->pcsc && wpa_s->mnc_len > 0 && wpa_s->imsi[0]) {
imsi = wpa_s->imsi;
mnc_len = wpa_s->mnc_len;
}
#endif /* CONFIG_EAP_PROXY */
HS 2.0: Fix sp_type check in ctrl_iface status command Commit e99b4f3a14755473d6d0e2413de6d82e785a6a30 added functionality to check whether the current association is with the home SP. This commit did not take into account that the domain name ANQP information could be NULL and that could result to a NULL pointer dereference. Fix that by validation that domain_names != NULL before calling domain_name_list_contains(). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-17 11:12:13 +01:00
if (domain_names &&
imsi && build_root_nai(nai, sizeof(nai), imsi, mnc_len, 0) == 0) {
HS 2.0: Add Home SP FQDN and roaming/home to status command This allows the ctrl_iface STATUS information to be used to determine which Home SP credential (domain in the cred block) was used and whether the network is operated by the home SP. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-22 19:51:49 +01:00
realm = os_strchr(nai, '@');
if (realm)
realm++;
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: Search for match with SIM/USIM domain %s",
realm);
HS 2.0: Add Home SP FQDN and roaming/home to status command This allows the ctrl_iface STATUS information to be used to determine which Home SP credential (domain in the cred block) was used and whether the network is operated by the home SP. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-22 19:51:49 +01:00
if (realm &&
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
domain_name_list_contains(domain_names, realm, 1))
HS 2.0: Add Home SP FQDN and roaming/home to status command This allows the ctrl_iface STATUS information to be used to determine which Home SP credential (domain in the cred block) was used and whether the network is operated by the home SP. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-22 19:51:49 +01:00
return 1;
Interworking: Report STATUS:sp_type even if domain is not configured This allows sp_type={home,roaming,unknown} to be used to determine network type with SIM-based credentials even if the domain name parameter is not configured explicitly. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 12:51:18 +01:00
if (realm)
ret = 0;
HS 2.0: Add Home SP FQDN and roaming/home to status command This allows the ctrl_iface STATUS information to be used to determine which Home SP credential (domain in the cred block) was used and whether the network is operated by the home SP. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-22 19:51:49 +01:00
}
Interworking: Add support for multiple credentials This replaces the global home_* parameters with a list of credentials that can be configured similarly to network blocks. For example: cred={ realm="example.com" username="user@example.com" password="password" ca_cert="/etc/wpa_supplicant/ca.pem" domain="example.com" } cred={ imsi="310026-000000000" milenage="90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123" } Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:34:22 +01:00
#endif /* INTERWORKING_3GPP */
HS 2.0: Fix sp_type check in ctrl_iface status command Commit e99b4f3a14755473d6d0e2413de6d82e785a6a30 added functionality to check whether the current association is with the home SP. This commit did not take into account that the domain name ANQP information could be NULL and that could result to a NULL pointer dereference. Fix that by validation that domain_names != NULL before calling domain_name_list_contains(). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-17 11:12:13 +01:00
if (domain_names == NULL || cred->domain == NULL)
Interworking: Report STATUS:sp_type even if domain is not configured This allows sp_type={home,roaming,unknown} to be used to determine network type with SIM-based credentials even if the domain name parameter is not configured explicitly. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 12:51:18 +01:00
return ret;
Interworking: Add support for multiple credentials This replaces the global home_* parameters with a list of credentials that can be configured similarly to network blocks. For example: cred={ realm="example.com" username="user@example.com" password="password" ca_cert="/etc/wpa_supplicant/ca.pem" domain="example.com" } cred={ imsi="310026-000000000" milenage="90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123" } Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:34:22 +01:00
Interworking: Add support for multiple home FQDNs Credentials can now be configured with more than one FQDN ('domain' field in the cred block) to perform Domain Name List matching against multiple home domains. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-02 17:42:54 +02:00
for (i = 0; i < cred->num_domain; i++) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: Search for match with home SP FQDN %s",
cred->domain[i]);
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
if (domain_name_list_contains(domain_names, cred->domain[i], 1))
Interworking: Add support for multiple home FQDNs Credentials can now be configured with more than one FQDN ('domain' field in the cred block) to perform Domain Name List matching against multiple home domains. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-02 17:42:54 +02:00
return 1;
}
HS 2.0: Add Home SP FQDN and roaming/home to status command This allows the ctrl_iface STATUS information to be used to determine which Home SP credential (domain in the cred block) was used and whether the network is operated by the home SP. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-22 19:51:49 +01:00
return 0;
}
static int interworking_home_sp(struct wpa_supplicant *wpa_s,
struct wpabuf *domain_names)
{
struct wpa_cred *cred;
if (domain_names == NULL || wpa_s->conf->cred == NULL)
return -1;
for (cred = wpa_s->conf->cred; cred; cred = cred->next) {
int res = interworking_home_sp_cred(wpa_s, cred, domain_names);
if (res)
return res;
Interworking: Use 3gppnetwork.org for matching home SP for SIM/USIM Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:33:31 +01:00
}
Interworking: Add support for multiple credentials This replaces the global home_* parameters with a list of credentials that can be configured similarly to network blocks. For example: cred={ realm="example.com" username="user@example.com" password="password" ca_cert="/etc/wpa_supplicant/ca.pem" domain="example.com" } cred={ imsi="310026-000000000" milenage="90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:000000000123" } Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:34:22 +01:00
return 0;
Interworking: Use 3gppnetwork.org for matching home SP for SIM/USIM Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:33:31 +01:00
}
Interworking: Allow network block -based connection without ANQP matches Previously, network block -based connection could have been used to override ANQP-based selection. However, if no ANQP-based matches were present, no connection was started. Fix this by trying to connect if any enabled network block has a match in the BSS table. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:38:50 +01:00
static int interworking_find_network_match(struct wpa_supplicant *wpa_s)
{
struct wpa_bss *bss;
struct wpa_ssid *ssid;
dl_list_for_each(bss, &wpa_s->bss, struct wpa_bss, list) {
for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next) {
Validate WEP key lengths based on driver capabilities The nl80211 driver interface does not allow 128-bit WEP to be used without a vendor specific cipher suite and no such suite is defined for this purpose. Do not accept WEP key length 16 for nl80211 driver interface forn ow. wext-interface can still try to use these for backwards compatibility. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-10 13:34:46 +02:00
if (wpas_network_disabled(wpa_s, ssid) ||
Ignore network blocks that have invalid WEP key length Do not try to associate with a network that has an invalid or incomplete configuration because the association or at least data connection would fail anyway. This commits adds a common function for checking whether a network block is disabled to make it easier to check network blocks without having to reject them during configuration file parsing (which would prevent wpa_supplicant from starting). The only additional check added in this commit is to verify the WEP key length. Similar checks for other parameters can be added in future commits. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-07 12:39:33 +02:00
ssid->mode != WPAS_MODE_INFRA)
Interworking: Allow network block -based connection without ANQP matches Previously, network block -based connection could have been used to override ANQP-based selection. However, if no ANQP-based matches were present, no connection was started. Fix this by trying to connect if any enabled network block has a match in the BSS table. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:38:50 +01:00
continue;
if (ssid->ssid_len != bss->ssid_len ||
os_memcmp(ssid->ssid, bss->ssid, ssid->ssid_len) !=
0)
continue;
/*
* TODO: Consider more accurate matching of security
* configuration similarly to what is done in events.c
*/
return 1;
}
}
return 0;
}
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
static int roaming_partner_match(struct wpa_supplicant *wpa_s,
struct roaming_partner *partner,
struct wpabuf *domain_names)
{
Interworking: Add more debug info on roaming partner preferences This can be useful in debugging selection of roaming partner preference. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-04 13:27:07 +01:00
wpa_printf(MSG_DEBUG, "Interworking: Comparing roaming_partner info fqdn='%s' exact_match=%d priority=%u country='%s'",
partner->fqdn, partner->exact_match, partner->priority,
partner->country);
wpa_hexdump_ascii(MSG_DEBUG, "Interworking: Domain names",
wpabuf_head(domain_names),
wpabuf_len(domain_names));
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
if (!domain_name_list_contains(domain_names, partner->fqdn,
partner->exact_match))
return 0;
/* TODO: match Country */
return 1;
}
static u8 roaming_prio(struct wpa_supplicant *wpa_s, struct wpa_cred *cred,
struct wpa_bss *bss)
{
size_t i;
Interworking: Add more debug info on roaming partner preferences This can be useful in debugging selection of roaming partner preference. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-04 13:27:07 +01:00
if (bss->anqp == NULL || bss->anqp->domain_name == NULL) {
wpa_printf(MSG_DEBUG, "Interworking: No ANQP domain name info -> use default roaming partner priority 128");
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
return 128; /* cannot check preference with domain name */
Interworking: Add more debug info on roaming partner preferences This can be useful in debugging selection of roaming partner preference. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-04 13:27:07 +01:00
}
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
if (interworking_home_sp_cred(wpa_s, cred, bss->anqp->domain_name) > 0)
Interworking: Add more debug info on roaming partner preferences This can be useful in debugging selection of roaming partner preference. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-04 13:27:07 +01:00
{
wpa_printf(MSG_DEBUG, "Interworking: Determined to be home SP -> use maximum preference 0 as roaming partner priority");
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
return 0; /* max preference for home SP network */
Interworking: Add more debug info on roaming partner preferences This can be useful in debugging selection of roaming partner preference. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-04 13:27:07 +01:00
}
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
for (i = 0; i < cred->num_roaming_partner; i++) {
if (roaming_partner_match(wpa_s, &cred->roaming_partner[i],
Interworking: Add more debug info on roaming partner preferences This can be useful in debugging selection of roaming partner preference. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-04 13:27:07 +01:00
bss->anqp->domain_name)) {
wpa_printf(MSG_DEBUG, "Interworking: Roaming partner preference match - priority %u",
cred->roaming_partner[i].priority);
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
return cred->roaming_partner[i].priority;
Interworking: Add more debug info on roaming partner preferences This can be useful in debugging selection of roaming partner preference. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-04 13:27:07 +01:00
}
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
}
Interworking: Add more debug info on roaming partner preferences This can be useful in debugging selection of roaming partner preference. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-04 13:27:07 +01:00
wpa_printf(MSG_DEBUG, "Interworking: No roaming partner preference match - use default roaming partner priority 128");
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
return 128;
}
static struct wpa_bss * pick_best_roaming_partner(struct wpa_supplicant *wpa_s,
struct wpa_bss *selected,
struct wpa_cred *cred)
{
struct wpa_bss *bss;
u8 best_prio, prio;
HS 2.0R2: Fix bandwidth policy BSS selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-18 01:04:34 +02:00
struct wpa_cred *cred2;
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
/*
* Check if any other BSS is operated by a more preferred roaming
* partner.
*/
best_prio = roaming_prio(wpa_s, cred, selected);
HS 2.0R2: Add more debug to network selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-09 02:38:47 +02:00
wpa_printf(MSG_DEBUG, "Interworking: roaming_prio=%u for selected BSS "
MACSTR " (cred=%d)", best_prio, MAC2STR(selected->bssid),
cred->id);
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
dl_list_for_each(bss, &wpa_s->bss, struct wpa_bss, list) {
if (bss == selected)
continue;
HS 2.0R2: Fix bandwidth policy BSS selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-18 01:04:34 +02:00
cred2 = interworking_credentials_available(wpa_s, bss, NULL);
if (!cred2)
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
continue;
if (!wpa_bss_get_ie(bss, WLAN_EID_RSN))
continue;
HS 2.0R2: Fix bandwidth policy BSS selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-18 01:04:34 +02:00
prio = roaming_prio(wpa_s, cred2, bss);
HS 2.0R2: Add more debug to network selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-09 02:38:47 +02:00
wpa_printf(MSG_DEBUG, "Interworking: roaming_prio=%u for BSS "
MACSTR " (cred=%d)", prio, MAC2STR(bss->bssid),
cred2->id);
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
if (prio < best_prio) {
HS 2.0R2: Fix bandwidth policy BSS selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-18 01:04:34 +02:00
int bh1, bh2, load1, load2, conn1, conn2;
bh1 = cred_below_min_backhaul(wpa_s, cred, selected);
load1 = cred_over_max_bss_load(wpa_s, cred, selected);
conn1 = cred_conn_capab_missing(wpa_s, cred, selected);
bh2 = cred_below_min_backhaul(wpa_s, cred2, bss);
load2 = cred_over_max_bss_load(wpa_s, cred2, bss);
conn2 = cred_conn_capab_missing(wpa_s, cred2, bss);
HS 2.0R2: Add more debug to network selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-09 02:38:47 +02:00
wpa_printf(MSG_DEBUG, "Interworking: old: %d %d %d new: %d %d %d",
bh1, load1, conn1, bh2, load2, conn2);
HS 2.0R2: Fix bandwidth policy BSS selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-18 01:04:34 +02:00
if (bh1 || load1 || conn1 || !(bh2 || load2 || conn2)) {
wpa_printf(MSG_DEBUG, "Interworking: Better roaming partner " MACSTR " selected", MAC2STR(bss->bssid));
best_prio = prio;
selected = bss;
}
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
}
}
return selected;
}
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
static void interworking_select_network(struct wpa_supplicant *wpa_s)
{
Interworking: Add support for home vs. visited SP determination Use Domain Name List (ANQP) and the new home_domain configuration parameter to figure out whether a network is operated by the home service provider and if so, prefer it over networks that would require roaming. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:32:00 +01:00
struct wpa_bss *bss, *selected = NULL, *selected_home = NULL;
HS 2.0R2: Fix bandwidth policy BSS selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-18 01:04:34 +02:00
struct wpa_bss *selected2 = NULL, *selected2_home = NULL;
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
unsigned int count = 0;
Interworking: Add support for home vs. visited SP determination Use Domain Name List (ANQP) and the new home_domain configuration parameter to figure out whether a network is operated by the home service provider and if so, prefer it over networks that would require roaming. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:32:00 +01:00
const char *type;
int res;
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
struct wpa_cred *cred, *selected_cred = NULL;
struct wpa_cred *selected_home_cred = NULL;
HS 2.0R2: Fix bandwidth policy BSS selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-18 01:04:34 +02:00
struct wpa_cred *selected2_cred = NULL;
struct wpa_cred *selected2_home_cred = NULL;
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
wpa_s->network_select = 0;
HS 2.0R2: Add more debug to network selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-09 02:38:47 +02:00
wpa_printf(MSG_DEBUG, "Interworking: Select network (auto_select=%d)",
wpa_s->auto_select);
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
dl_list_for_each(bss, &wpa_s->bss, struct wpa_bss, list) {
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
int excluded = 0;
HS 2.0R2: Fix bandwidth policy BSS selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-18 01:04:34 +02:00
int bh, bss_load, conn_capab;
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
cred = interworking_credentials_available(wpa_s, bss,
&excluded);
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
if (!cred)
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
continue;
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
Interworking: Do not match credentials without WPA2-Enterprise Since we currently support only HS 2.0 networks with Interworking network selection, do not indicate credential match unless the network uses WPA2-Enterprise. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-19 11:47:20 +02:00
if (!wpa_bss_get_ie(bss, WLAN_EID_RSN)) {
/*
* We currently support only HS 2.0 networks and those
* are required to use WPA2-Enterprise.
*/
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: Credential match with " MACSTR
" but network does not use RSN",
MAC2STR(bss->bssid));
Interworking: Do not match credentials without WPA2-Enterprise Since we currently support only HS 2.0 networks with Interworking network selection, do not indicate credential match unless the network uses WPA2-Enterprise. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-19 11:47:20 +02:00
continue;
}
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
if (!excluded)
count++;
Interworking: Move BSS ANQP information into separate struct This is an initial step in allowing the ANQP responses to be shared among multiple BSSes if the BSSes are determined to be operating under identical configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:02:29 +02:00
res = interworking_home_sp(wpa_s, bss->anqp ?
bss->anqp->domain_name : NULL);
Interworking: Add support for home vs. visited SP determination Use Domain Name List (ANQP) and the new home_domain configuration parameter to figure out whether a network is operated by the home service provider and if so, prefer it over networks that would require roaming. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:32:00 +01:00
if (res > 0)
type = "home";
else if (res == 0)
type = "roaming";
else
type = "unknown";
HS 2.0R2: Fix bandwidth policy BSS selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-18 01:04:34 +02:00
bh = cred_below_min_backhaul(wpa_s, cred, bss);
bss_load = cred_over_max_bss_load(wpa_s, cred, bss);
conn_capab = cred_conn_capab_missing(wpa_s, cred, bss);
Interworking: Add sp_priority cred parameter This new priority parameter can be used to specify priorities between credentials provisioned by the same SP. cred->priority is checked first and if it is same and the provisioning_sp parameter matches, the new sp_priority is used to order the credentials. It should be noted that the order of priorities is different (higher 'priority' value indicates higher priority of the credential, while higher 'sp_priority' indicates lower priority of the credential). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 18:14:40 +01:00
wpa_msg(wpa_s, MSG_INFO, "%s" MACSTR " type=%s%s%s%s id=%d priority=%d sp_priority=%d",
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
excluded ? INTERWORKING_BLACKLISTED : INTERWORKING_AP,
HS 2.0R2: Add support for Policy/MinBackhaulThreshold The new credential parameters min_{dl,ul}_bandwidth_{home,roaming} can be used to specify restrictions on available backhaul bandwidth. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-06 00:06:44 +02:00
MAC2STR(bss->bssid), type,
HS 2.0R2: Fix bandwidth policy BSS selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-18 01:04:34 +02:00
bh ? " below_min_backhaul=1" : "",
bss_load ? " over_max_bss_load=1" : "",
HS 2.0R2: Add more debug to network selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-09 02:38:47 +02:00
conn_capab ? " conn_capab_missing=1" : "",
Interworking: Add sp_priority cred parameter This new priority parameter can be used to specify priorities between credentials provisioned by the same SP. cred->priority is checked first and if it is same and the provisioning_sp parameter matches, the new sp_priority is used to order the credentials. It should be noted that the order of priorities is different (higher 'priority' value indicates higher priority of the credential, while higher 'sp_priority' indicates lower priority of the credential). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 18:14:40 +01:00
cred->id, cred->priority, cred->sp_priority);
HS 2.0R2: Allow excluded network to be selected based on user override Move excluded SSID filtering step to the end of credential validation process and return list of BSSes that would otherwise have matching credentials, but have an excluded SSID. Automatic network selection will not select such a network, but interworking_connect command can be used to pick excluded networks. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-09 19:37:28 +02:00
if (excluded)
continue;
Interworking: Add optional use of network selection on normal scans auto_interworking=1 configuration parameter can be used to request wpa_supplicant to use Interworking network selection automatically as a part of the normal (non-Interworking) network selection if the scan results do not match with enabled networks. This makes scanning work similarly to the "interworking_select auto" command. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-28 15:14:13 +02:00
if (wpa_s->auto_select ||
(wpa_s->conf->auto_interworking &&
wpa_s->auto_network_select)) {
HS 2.0R2: Fix bandwidth policy BSS selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-18 01:04:34 +02:00
if (bh || bss_load || conn_capab) {
Interworking: Remove separate credential priority tracking There is no need to keep the separate local variable for tracking the highest selected priority since we track a pointer to the selected credential with that information. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 17:57:18 +01:00
if (selected2_cred == NULL ||
Interworking: Use a helper function to compare cred priority This makes it easier to extend credential priority comparison beyond a single priority variable. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 18:06:49 +01:00
cred_prio_cmp(cred, selected2_cred) > 0) {
HS 2.0R2: Add more debug to network selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-09 02:38:47 +02:00
wpa_printf(MSG_DEBUG, "Interworking: Mark as selected2");
HS 2.0R2: Fix bandwidth policy BSS selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-18 01:04:34 +02:00
selected2 = bss;
selected2_cred = cred;
}
if (res > 0 &&
Interworking: Remove separate credential priority tracking There is no need to keep the separate local variable for tracking the highest selected priority since we track a pointer to the selected credential with that information. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 17:57:18 +01:00
(selected2_home_cred == NULL ||
Interworking: Use a helper function to compare cred priority This makes it easier to extend credential priority comparison beyond a single priority variable. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 18:06:49 +01:00
cred_prio_cmp(cred, selected2_home_cred) >
0)) {
HS 2.0R2: Add more debug to network selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-09 02:38:47 +02:00
wpa_printf(MSG_DEBUG, "Interworking: Mark as selected2_home");
HS 2.0R2: Fix bandwidth policy BSS selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-18 01:04:34 +02:00
selected2_home = bss;
selected2_home_cred = cred;
}
} else {
Interworking: Remove separate credential priority tracking There is no need to keep the separate local variable for tracking the highest selected priority since we track a pointer to the selected credential with that information. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 17:57:18 +01:00
if (selected_cred == NULL ||
Interworking: Use a helper function to compare cred priority This makes it easier to extend credential priority comparison beyond a single priority variable. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 18:06:49 +01:00
cred_prio_cmp(cred, selected_cred) > 0) {
HS 2.0R2: Add more debug to network selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-09 02:38:47 +02:00
wpa_printf(MSG_DEBUG, "Interworking: Mark as selected");
HS 2.0R2: Fix bandwidth policy BSS selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-18 01:04:34 +02:00
selected = bss;
selected_cred = cred;
}
if (res > 0 &&
Interworking: Remove separate credential priority tracking There is no need to keep the separate local variable for tracking the highest selected priority since we track a pointer to the selected credential with that information. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 17:57:18 +01:00
(selected_home_cred == NULL ||
Interworking: Use a helper function to compare cred priority This makes it easier to extend credential priority comparison beyond a single priority variable. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 18:06:49 +01:00
cred_prio_cmp(cred, selected_home_cred) >
0)) {
HS 2.0R2: Add more debug to network selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-09 02:38:47 +02:00
wpa_printf(MSG_DEBUG, "Interworking: Mark as selected_home");
HS 2.0R2: Fix bandwidth policy BSS selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-18 01:04:34 +02:00
selected_home = bss;
selected_home_cred = cred;
}
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
}
Interworking: Add support for home vs. visited SP determination Use Domain Name List (ANQP) and the new home_domain configuration parameter to figure out whether a network is operated by the home service provider and if so, prefer it over networks that would require roaming. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:32:00 +01:00
}
}
Interworking: Add support for credential priorities This allows credentials to be set with a specific priority to allow the automatic network selection behavior to be controlled with user preferences. The priority values are configured to the network block and BSS selection will select the network based on priorities from both pre-configured network blocks and credentials. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:37:21 +01:00
if (selected_home && selected_home != selected &&
Interworking: Remove separate credential priority tracking There is no need to keep the separate local variable for tracking the highest selected priority since we track a pointer to the selected credential with that information. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 17:57:18 +01:00
selected_home_cred &&
(selected_cred == NULL ||
Interworking: Use a helper function to compare cred priority This makes it easier to extend credential priority comparison beyond a single priority variable. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-29 18:06:49 +01:00
cred_prio_cmp(selected_home_cred, selected_cred) >= 0)) {
Interworking: Add support for home vs. visited SP determination Use Domain Name List (ANQP) and the new home_domain configuration parameter to figure out whether a network is operated by the home service provider and if so, prefer it over networks that would require roaming. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:32:00 +01:00
/* Prefer network operated by the Home SP */
HS 2.0R2: Add more debug to network selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-09 02:38:47 +02:00
wpa_printf(MSG_DEBUG, "Interworking: Overrided selected with selected_home");
Interworking: Add support for home vs. visited SP determination Use Domain Name List (ANQP) and the new home_domain configuration parameter to figure out whether a network is operated by the home service provider and if so, prefer it over networks that would require roaming. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:32:00 +01:00
selected = selected_home;
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
selected_cred = selected_home_cred;
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
}
HS 2.0R2: Fix bandwidth policy BSS selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-18 01:04:34 +02:00
if (!selected) {
if (selected2_home) {
wpa_printf(MSG_DEBUG, "Interworking: Use home BSS with BW limit mismatch since no other network could be selected");
selected = selected2_home;
selected_cred = selected2_home_cred;
} else if (selected2) {
wpa_printf(MSG_DEBUG, "Interworking: Use visited BSS with BW limit mismatch since no other network could be selected");
selected = selected2;
selected_cred = selected2_cred;
}
}
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
if (count == 0) {
Interworking: Allow network block -based connection without ANQP matches Previously, network block -based connection could have been used to override ANQP-based selection. However, if no ANQP-based matches were present, no connection was started. Fix this by trying to connect if any enabled network block has a match in the BSS table. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:38:50 +01:00
/*
* No matching network was found based on configured
* credentials. Check whether any of the enabled network blocks
* have matching APs.
*/
if (interworking_find_network_match(wpa_s)) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: Possible BSS match for enabled network configurations");
Interworking: Re-trigger scan if no connect attempt is done For one specific case when running with Interworking enabled the re-initialisation of the scan timer is missing. This makes auto connect to a configured network fail. The case is: - Interworking credentials available, but do not match - Auto interworking is enabled (auto_interworking=1) - Interworking auto select is disabled (i.e., this is from auto_interworking=1, not from INTERWORKING_SELECT auto) - No configured (enabled and non blacklisted) networks are present in scan results list with full match - Interworking finds matching networks (it does not do full security policy match) This patch covers the case and re-initialises the scan timer to allow search for a suitable network to continue. Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
2014-05-31 12:23:00 +02:00
if (wpa_s->auto_select) {
Interworking: Do not reconnect without "auto" parameter When there was no credential match, but an enabled network block matched with a scan result, wpa_supplicant reconnected at the end of interworking_select command even if "auto" parameter was not used. Fix this by running the reconnect only if requested to automatically select a network. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-19 11:26:21 +02:00
interworking_reconnect(wpa_s);
Interworking: Re-trigger scan if no connect attempt is done For one specific case when running with Interworking enabled the re-initialisation of the scan timer is missing. This makes auto connect to a configured network fail. The case is: - Interworking credentials available, but do not match - Auto interworking is enabled (auto_interworking=1) - Interworking auto select is disabled (i.e., this is from auto_interworking=1, not from INTERWORKING_SELECT auto) - No configured (enabled and non blacklisted) networks are present in scan results list with full match - Interworking finds matching networks (it does not do full security policy match) This patch covers the case and re-initialises the scan timer to allow search for a suitable network to continue. Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
2014-05-31 12:23:00 +02:00
return;
}
Interworking: Allow network block -based connection without ANQP matches Previously, network block -based connection could have been used to override ANQP-based selection. However, if no ANQP-based matches were present, no connection was started. Fix this by trying to connect if any enabled network block has a match in the BSS table. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-16 15:38:50 +01:00
}
Interworking: Add optional use of network selection on normal scans auto_interworking=1 configuration parameter can be used to request wpa_supplicant to use Interworking network selection automatically as a part of the normal (non-Interworking) network selection if the scan results do not match with enabled networks. This makes scanning work similarly to the "interworking_select auto" command. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-28 15:14:13 +02:00
if (wpa_s->auto_network_select) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: Continue scanning after ANQP fetch");
Interworking: Add optional use of network selection on normal scans auto_interworking=1 configuration parameter can be used to request wpa_supplicant to use Interworking network selection automatically as a part of the normal (non-Interworking) network selection if the scan results do not match with enabled networks. This makes scanning work similarly to the "interworking_select auto" command. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-28 15:14:13 +02:00
wpa_supplicant_req_scan(wpa_s, wpa_s->scan_interval,
0);
return;
}
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
wpa_msg(wpa_s, MSG_INFO, INTERWORKING_NO_MATCH "No network "
"with matching credentials found");
Interworking: Clear SCANNING state if no match found Previously, it was possible for wpa_state to be left at SCANNING if INTERWORKING_SELECT command failed to find any match. Now the state is set to DISCONNECTED if the operation terminates because of no matching networks. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-03-03 16:03:25 +01:00
if (wpa_s->wpa_state == WPA_SCANNING)
wpa_supplicant_set_state(wpa_s, WPA_DISCONNECTED);
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
}
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
if (selected) {
HS 2.0R2: Add more debug to network selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-09 02:38:47 +02:00
wpa_printf(MSG_DEBUG, "Interworking: Selected " MACSTR,
MAC2STR(selected->bssid));
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
selected = pick_best_roaming_partner(wpa_s, selected,
selected_cred);
HS 2.0R2: Add more debug to network selection Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-09 02:38:47 +02:00
wpa_printf(MSG_DEBUG, "Interworking: Selected " MACSTR
" (after best roaming partner selection)",
MAC2STR(selected->bssid));
wpa_msg(wpa_s, MSG_INFO, INTERWORKING_SELECTED MACSTR,
MAC2STR(selected->bssid));
Add INTERWORKING_ADD_NETWORK command This can be used to provide more control to upper layers on network blocks generated as part of Interworking network selection. INTERWORKING_ADD_NETWORK behaves otherwise identically to INTERWORKING_CONNECT, but it does not request a new connection after having added the network block and it returns the network id of the added network. INTERWORKING_ADD_NETWORK followed by REASSOCIATE would behave more or less identically to INTERWORKING_CONNECT, but this allows the created network profile to be modified, if desired, and/or stored externally. SELECT_NETWORK can also be used with the network id returned from INTERWORKING_ADD_NETWORK to enforce that specific network profile to be used for the next connection (though, it should be noted that this behavior may not meet all Hotspot 2.0 requirements if there were other enabled networks that could have higher priority). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 15:56:04 +01:00
interworking_connect(wpa_s, selected, 0);
Interworking: Allow roaming partner configuration The new roaming_partner parameter within a cred block can be used to configure priorities for roaming partners. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-06 07:48:18 +01:00
}
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
}
Interworking: Share ANQP data within homogenous ESS If two BSS entries have the same HESSID and SSID, share the fetched ANQP information between these BSS entries to save memory and GAS/ANQP operations. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 16:22:42 +02:00
static struct wpa_bss_anqp *
interworking_match_anqp_info(struct wpa_supplicant *wpa_s, struct wpa_bss *bss)
{
struct wpa_bss *other;
if (is_zero_ether_addr(bss->hessid))
return NULL; /* Cannot be in the same homegenous ESS */
dl_list_for_each(other, &wpa_s->bss, struct wpa_bss, list) {
if (other == bss)
continue;
if (other->anqp == NULL)
continue;
Interworking: Do not share ANQP info if none was received Verify that the other BSS has actually received some valid ANQP information before sharing the results from it. This fixes potential issues with cases where some of the APs with the same HESSID has invalid ANQP configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-07 17:41:51 +01:00
if (other->anqp->roaming_consortium == NULL &&
other->anqp->nai_realm == NULL &&
other->anqp->anqp_3gpp == NULL &&
other->anqp->domain_name == NULL)
continue;
Interworking: Share ANQP data within homogenous ESS If two BSS entries have the same HESSID and SSID, share the fetched ANQP information between these BSS entries to save memory and GAS/ANQP operations. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 16:22:42 +02:00
if (!(other->flags & WPA_BSS_ANQP_FETCH_TRIED))
continue;
if (os_memcmp(bss->hessid, other->hessid, ETH_ALEN) != 0)
continue;
if (bss->ssid_len != other->ssid_len ||
os_memcmp(bss->ssid, other->ssid, bss->ssid_len) != 0)
continue;
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: Share ANQP data with already fetched BSSID "
MACSTR " and " MACSTR,
MAC2STR(other->bssid), MAC2STR(bss->bssid));
Interworking: Share ANQP data within homogenous ESS If two BSS entries have the same HESSID and SSID, share the fetched ANQP information between these BSS entries to save memory and GAS/ANQP operations. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 16:22:42 +02:00
other->anqp->users++;
return other->anqp;
}
return NULL;
}
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
static void interworking_next_anqp_fetch(struct wpa_supplicant *wpa_s)
{
struct wpa_bss *bss;
int found = 0;
const u8 *ie;
HS 2.0R2: Add routine for fetching OSU provider information The new wpa_cli fetch_osu command can be used to fetch information about all OSU providers and write that to a text file with the icons in separate files. cancel_osu_fetch command can be used to stop ongoing OSU provider list fetch. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-25 23:10:41 +01:00
wpa_printf(MSG_DEBUG, "Interworking: next_anqp_fetch - "
"fetch_anqp_in_progress=%d fetch_osu_icon_in_progress=%d",
wpa_s->fetch_anqp_in_progress,
wpa_s->fetch_osu_icon_in_progress);
if (eloop_terminated() || !wpa_s->fetch_anqp_in_progress) {
wpa_printf(MSG_DEBUG, "Interworking: Stop next-ANQP-fetch");
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
return;
HS 2.0R2: Add routine for fetching OSU provider information The new wpa_cli fetch_osu command can be used to fetch information about all OSU providers and write that to a text file with the icons in separate files. cancel_osu_fetch command can be used to stop ongoing OSU provider list fetch. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-25 23:10:41 +01:00
}
Interworking: Fix wpa_supplicant build without CONFIG_HS20=y Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-07 15:57:32 +02:00
#ifdef CONFIG_HS20
HS 2.0R2: Add routine for fetching OSU provider information The new wpa_cli fetch_osu command can be used to fetch information about all OSU providers and write that to a text file with the icons in separate files. cancel_osu_fetch command can be used to stop ongoing OSU provider list fetch. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-25 23:10:41 +01:00
if (wpa_s->fetch_osu_icon_in_progress) {
wpa_printf(MSG_DEBUG, "Interworking: Next icon (in progress)");
hs20_next_osu_icon(wpa_s);
return;
}
Interworking: Fix wpa_supplicant build without CONFIG_HS20=y Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-07 15:57:32 +02:00
#endif /* CONFIG_HS20 */
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
dl_list_for_each(bss, &wpa_s->bss, struct wpa_bss, list) {
if (!(bss->caps & IEEE80211_CAP_ESS))
continue;
ie = wpa_bss_get_ie(bss, WLAN_EID_EXT_CAPAB);
if (ie == NULL || ie[1] < 4 || !(ie[5] & 0x80))
continue; /* AP does not support Interworking */
Interworking: Reject BSS based on disallow_aps If a BSS is disallowed temporarily with disallow_aps, the network connection is going to fail. As such, there is not much point in allowing Interworking network selection to try to connect with such BSS. As such, do not consider disallowed networks for automatic network selection and reject requests to connect to them through INTERWORKING_CONNECT. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-06 23:01:48 +01:00
if (disallowed_bssid(wpa_s, bss->bssid) ||
disallowed_ssid(wpa_s, bss->ssid, bss->ssid_len))
continue; /* Disallowed BSS */
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
if (!(bss->flags & WPA_BSS_ANQP_FETCH_TRIED)) {
Interworking: Move BSS ANQP information into separate struct This is an initial step in allowing the ANQP responses to be shared among multiple BSSes if the BSSes are determined to be operating under identical configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:02:29 +02:00
if (bss->anqp == NULL) {
Interworking: Share ANQP data within homogenous ESS If two BSS entries have the same HESSID and SSID, share the fetched ANQP information between these BSS entries to save memory and GAS/ANQP operations. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 16:22:42 +02:00
bss->anqp = interworking_match_anqp_info(wpa_s,
bss);
if (bss->anqp) {
/* Shared data already fetched */
continue;
}
Interworking: Move BSS ANQP information into separate struct This is an initial step in allowing the ANQP responses to be shared among multiple BSSes if the BSSes are determined to be operating under identical configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:02:29 +02:00
bss->anqp = wpa_bss_anqp_alloc();
if (bss->anqp == NULL)
break;
}
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
found++;
bss->flags |= WPA_BSS_ANQP_FETCH_TRIED;
wpa_msg(wpa_s, MSG_INFO, "Starting ANQP fetch for "
MACSTR, MAC2STR(bss->bssid));
interworking_anqp_send_req(wpa_s, bss);
break;
}
}
if (found == 0) {
Interworking: Fix wpa_supplicant build without CONFIG_HS20=y Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-07 15:57:32 +02:00
#ifdef CONFIG_HS20
HS 2.0R2: Add routine for fetching OSU provider information The new wpa_cli fetch_osu command can be used to fetch information about all OSU providers and write that to a text file with the icons in separate files. cancel_osu_fetch command can be used to stop ongoing OSU provider list fetch. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-25 23:10:41 +01:00
if (wpa_s->fetch_osu_info) {
HS 2.0R2: Try to scan multiple times for OSU providers Scan operation is not that reliable, so try couple of times if no OSU provider matches are found during fetch_osu command. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-12-13 03:39:00 +01:00
if (wpa_s->num_prov_found == 0 &&
HS 2.0: Allow CANCEL_FETCH_OSU to stop at scan completion There is no need to start the GAS/ANQP fetch if the FETCH_OSU operation has already been canceled. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-14 01:14:29 +01:00
wpa_s->fetch_osu_waiting_scan &&
HS 2.0R2: Try to scan multiple times for OSU providers Scan operation is not that reliable, so try couple of times if no OSU provider matches are found during fetch_osu command. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-12-13 03:39:00 +01:00
wpa_s->num_osu_scans < 3) {
wpa_printf(MSG_DEBUG, "HS 2.0: No OSU providers seen - try to scan again");
hs20_start_osu_scan(wpa_s);
return;
}
HS 2.0R2: Add routine for fetching OSU provider information The new wpa_cli fetch_osu command can be used to fetch information about all OSU providers and write that to a text file with the icons in separate files. cancel_osu_fetch command can be used to stop ongoing OSU provider list fetch. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-25 23:10:41 +01:00
wpa_printf(MSG_DEBUG, "Interworking: Next icon");
hs20_osu_icon_fetch(wpa_s);
return;
}
Interworking: Fix wpa_supplicant build without CONFIG_HS20=y Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-07 15:57:32 +02:00
#endif /* CONFIG_HS20 */
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
wpa_msg(wpa_s, MSG_INFO, "ANQP fetch completed");
wpa_s->fetch_anqp_in_progress = 0;
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
if (wpa_s->network_select)
interworking_select_network(wpa_s);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
}
}
Interworking: Add optional use of network selection on normal scans auto_interworking=1 configuration parameter can be used to request wpa_supplicant to use Interworking network selection automatically as a part of the normal (non-Interworking) network selection if the scan results do not match with enabled networks. This makes scanning work similarly to the "interworking_select auto" command. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-28 15:14:13 +02:00
void interworking_start_fetch_anqp(struct wpa_supplicant *wpa_s)
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
{
struct wpa_bss *bss;
dl_list_for_each(bss, &wpa_s->bss, struct wpa_bss, list)
bss->flags &= ~WPA_BSS_ANQP_FETCH_TRIED;
wpa_s->fetch_anqp_in_progress = 1;
Interworking: Start ANQP fetch from eloop callback Reduce maximum stack use by starting next ANQP fetch operation from an eloop callback rather than calling interworking_next_anqp_fetch() directly from interworking_start_fetch_anqp(). This avoids issues that could potentially make the process run out of stack if long loops of ANQP operations are executed in cases where automatic Interworking network selection is used and scan results do not have a full match for a network. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-17 00:39:34 +01:00
/*
* Start actual ANQP operation from eloop call to make sure the loop
* does not end up using excessive recursion.
*/
eloop_register_timeout(0, 0, interworking_continue_anqp, wpa_s, NULL);
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
}
int interworking_fetch_anqp(struct wpa_supplicant *wpa_s)
{
if (wpa_s->fetch_anqp_in_progress || wpa_s->network_select)
return 0;
wpa_s->network_select = 0;
Interworking: Fetch only the needed ANQP information Use configured credentials to figure out which ANQP information needs to be fetched and only fetch those when using Interworking network selection. The fetch_anqp command is still fetching all ANQP information. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 20:05:54 +02:00
wpa_s->fetch_all_anqp = 1;
HS 2.0R2: Add routine for fetching OSU provider information The new wpa_cli fetch_osu command can be used to fetch information about all OSU providers and write that to a text file with the icons in separate files. cancel_osu_fetch command can be used to stop ongoing OSU provider list fetch. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-25 23:10:41 +01:00
wpa_s->fetch_osu_info = 0;
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
interworking_start_fetch_anqp(wpa_s);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
return 0;
}
void interworking_stop_fetch_anqp(struct wpa_supplicant *wpa_s)
{
if (!wpa_s->fetch_anqp_in_progress)
return;
wpa_s->fetch_anqp_in_progress = 0;
}
int anqp_send_req(struct wpa_supplicant *wpa_s, const u8 *dst,
HS 2.0: Extend ANQP_GET to accept Hotspot 2.0 subtypes This allows a single ANQP query to be used to fetch both IEEE 802.11 defined ANQP elements and Hotspot 2.0 vendor specific elements. ANQP_GET <addr> <info id>[,<info id>]... [,hs20:<subtype>][...,hs20:<subtype>] For example: ANQP_GET 00:11:22:33:44:55:66 258,268,hs20:3,hs20:4 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-03-25 01:36:13 +01:00
u16 info_ids[], size_t num_ids, u32 subtypes)
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
{
struct wpabuf *buf;
HS 2.0: Extend ANQP_GET to accept Hotspot 2.0 subtypes This allows a single ANQP query to be used to fetch both IEEE 802.11 defined ANQP elements and Hotspot 2.0 vendor specific elements. ANQP_GET <addr> <info id>[,<info id>]... [,hs20:<subtype>][...,hs20:<subtype>] For example: ANQP_GET 00:11:22:33:44:55:66 258,268,hs20:3,hs20:4 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-03-25 01:36:13 +01:00
struct wpabuf *hs20_buf = NULL;
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
int ret = 0;
int freq;
struct wpa_bss *bss;
int res;
bss = wpa_bss_get_bssid(wpa_s, dst);
Fix sending ANQP request to an unknown BSS while associated While being associated, if an ANQP request is received for a different AP that doesn't exist in the BSS list, the ANQP request will be sent on the frequency of the AP that we are currently associated to. In such a case, it is possible that the ANQP request would be sent on a channel different than that of the requested AP, potentially delaying other requests/activities. Avoid sending the ANQP request to an AP that is not in the BSS list. Signed-off-by: Matti Gottlieb <matti.gottlieb@intel.com>
2015-04-28 13:01:04 +02:00
if (!bss) {
wpa_printf(MSG_WARNING,
"ANQP: Cannot send query to unknown BSS "
MACSTR, MAC2STR(dst));
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
return -1;
Fix sending ANQP request to an unknown BSS while associated While being associated, if an ANQP request is received for a different AP that doesn't exist in the BSS list, the ANQP request will be sent on the frequency of the AP that we are currently associated to. In such a case, it is possible that the ANQP request would be sent on a channel different than that of the requested AP, potentially delaying other requests/activities. Avoid sending the ANQP request to an AP that is not in the BSS list. Signed-off-by: Matti Gottlieb <matti.gottlieb@intel.com>
2015-04-28 13:01:04 +02:00
}
wpa_bss_anqp_unshare_alloc(bss);
freq = bss->freq;
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"ANQP: Query Request to " MACSTR " for %u id(s)",
MAC2STR(dst), (unsigned int) num_ids);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
HS 2.0: Extend ANQP_GET to accept Hotspot 2.0 subtypes This allows a single ANQP query to be used to fetch both IEEE 802.11 defined ANQP elements and Hotspot 2.0 vendor specific elements. ANQP_GET <addr> <info id>[,<info id>]... [,hs20:<subtype>][...,hs20:<subtype>] For example: ANQP_GET 00:11:22:33:44:55:66 258,268,hs20:3,hs20:4 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-03-25 01:36:13 +01:00
#ifdef CONFIG_HS20
if (subtypes != 0) {
hs20_buf = wpabuf_alloc(100);
if (hs20_buf == NULL)
return -1;
hs20_put_anqp_req(subtypes, NULL, 0, hs20_buf);
}
#endif /* CONFIG_HS20 */
buf = anqp_build_req(info_ids, num_ids, hs20_buf);
wpabuf_free(hs20_buf);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
if (buf == NULL)
return -1;
res = gas_query_req(wpa_s->gas, dst, freq, buf, anqp_resp_cb, wpa_s);
if (res < 0) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG, "ANQP: Failed to send Query Request");
GAS: Delay GAS query Tx while another query is in progress It would be possible to issue another GAS query when a previous one is still in progress and this could result in conflicting offchannel operations. Prevent that by delaying GAS query initiation until the previous operation has been completed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-21 12:13:42 +02:00
wpabuf_free(buf);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
ret = -1;
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
} else {
wpa_msg(wpa_s, MSG_DEBUG,
"ANQP: Query started with dialog token %u", res);
}
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
return ret;
}
Interworking: Support unknown ANQP-elements in BSS table This allows wpa_supplicant to expose internally unknown ANQP-elements in the BSS command. For example, "ANQP_GET <BSSID> 265" can be used to fetch the AP Geospatial Location ANQP-element and if the AP has this information, the "BSS <BSSID>" command will include the response as "anqp[265]=<hexdump>". Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-07 15:10:38 +02:00
static void anqp_add_extra(struct wpa_supplicant *wpa_s,
struct wpa_bss_anqp *anqp, u16 info_id,
const u8 *data, size_t slen)
{
struct wpa_bss_anqp_elem *tmp, *elem = NULL;
if (!anqp)
return;
dl_list_for_each(tmp, &anqp->anqp_elems, struct wpa_bss_anqp_elem,
list) {
if (tmp->infoid == info_id) {
elem = tmp;
break;
}
}
if (!elem) {
elem = os_zalloc(sizeof(*elem));
if (!elem)
return;
elem->infoid = info_id;
dl_list_add(&anqp->anqp_elems, &elem->list);
} else {
wpabuf_free(elem->payload);
}
elem->payload = wpabuf_alloc_copy(data, slen);
if (!elem->payload) {
dl_list_del(&elem->list);
os_free(elem);
}
}
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
static void interworking_parse_rx_anqp_resp(struct wpa_supplicant *wpa_s,
Interworking: Try to use same BSS entry for storing GAS results There may be cases where multiple BSS entries for a single BSSID are in the table. This is mostly in automated test cases due to the AP configuration changes, but something similar could potentially happen as a corner case in more realistic networks, too, e.g., when an AP changes its operating channel. Make network selection more robust by trying to find the exact BSS entry instead of any BSS entry with a matching BSSID when storing GAS/ANQP response. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 10:44:04 +02:00
struct wpa_bss *bss, const u8 *sa,
u16 info_id,
HS 2.0: Add a command to retrieve icon with in-memory storage This adds a new command based Hotspot 2.0 icon retrieval option. In short, here is the new command sequence: 1. REQ_HS20_ICON <bssid> <file-name> 2. event: RX-HS20-ICON <bssid> <file-name> <size> 3. GET_HS20_ICON <bssid> <file-name> <offset> <size> (if needed, repeat with larger offset values until full icon is fetched) 5. DEL_HS20_ICON <bssid> <file-name> REQ_HS20_ICON is a new command that is analogous to HS20_ICON_REQUEST with the slight difference that an entry to store the icon in memory is prepared. The RX-HS20-ICON event has been augmented with BSSID, file-name and size, and GET_HS20_ICON is used to retrieve a chunk of up to <size> bytes of icon data at offset <offset>. Each chunk is returned as a base64 encoded fragment, preceded by "HS20-ICON-DATA", BSSID, and file-name as well as the starting offset of the data. If there is no entry prepared for the icon when the ANQP result comes back, hs20_process_icon_binary_file falls back to legacy behavior. Finally the DEL_HS20_ICON command deletes (all) icons associated with BSSID and file-name (there could be several if retries are used and they have different dialog tokens). Signed-off-by: Jan Nordqvist <jannq@google.com>
2015-12-11 02:01:46 +01:00
const u8 *data, size_t slen,
u8 dialog_token)
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
{
const u8 *pos = data;
Interworking: Move BSS ANQP information into separate struct This is an initial step in allowing the ANQP responses to be shared among multiple BSSes if the BSSes are determined to be operating under identical configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:02:29 +02:00
struct wpa_bss_anqp *anqp = NULL;
HS 2.0: Add Hotspot 2.0 ANQP elements to Interworking queries Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-10-16 21:25:42 +02:00
#ifdef CONFIG_HS20
u8 type;
#endif /* CONFIG_HS20 */
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
Interworking: Move BSS ANQP information into separate struct This is an initial step in allowing the ANQP responses to be shared among multiple BSSes if the BSSes are determined to be operating under identical configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:02:29 +02:00
if (bss)
anqp = bss->anqp;
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
switch (info_id) {
case ANQP_CAPABILITY_LIST:
wpa_msg(wpa_s, MSG_INFO, "RX-ANQP " MACSTR
" ANQP Capability list", MAC2STR(sa));
Inteworking: Add support to update the ANQP Capability List into the BSS In addition, add support for returning the capability list through the BSS control interface command. Signed-off-by: ASHUTOSH NARAYAN <ashutoshx.narayan@intel.com>
2015-02-18 03:35:10 +01:00
wpa_hexdump_ascii(MSG_DEBUG, "ANQP: Capability list",
pos, slen);
if (anqp) {
wpabuf_free(anqp->capability_list);
anqp->capability_list = wpabuf_alloc_copy(pos, slen);
}
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
break;
case ANQP_VENUE_NAME:
wpa_msg(wpa_s, MSG_INFO, "RX-ANQP " MACSTR
" Venue Name", MAC2STR(sa));
wpa_hexdump_ascii(MSG_DEBUG, "ANQP: Venue Name", pos, slen);
Interworking: Move BSS ANQP information into separate struct This is an initial step in allowing the ANQP responses to be shared among multiple BSSes if the BSSes are determined to be operating under identical configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:02:29 +02:00
if (anqp) {
wpabuf_free(anqp->venue_name);
anqp->venue_name = wpabuf_alloc_copy(pos, slen);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
}
break;
case ANQP_NETWORK_AUTH_TYPE:
wpa_msg(wpa_s, MSG_INFO, "RX-ANQP " MACSTR
" Network Authentication Type information",
MAC2STR(sa));
wpa_hexdump_ascii(MSG_DEBUG, "ANQP: Network Authentication "
"Type", pos, slen);
Interworking: Move BSS ANQP information into separate struct This is an initial step in allowing the ANQP responses to be shared among multiple BSSes if the BSSes are determined to be operating under identical configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:02:29 +02:00
if (anqp) {
wpabuf_free(anqp->network_auth_type);
anqp->network_auth_type = wpabuf_alloc_copy(pos, slen);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
}
break;
case ANQP_ROAMING_CONSORTIUM:
wpa_msg(wpa_s, MSG_INFO, "RX-ANQP " MACSTR
" Roaming Consortium list", MAC2STR(sa));
wpa_hexdump_ascii(MSG_DEBUG, "ANQP: Roaming Consortium",
pos, slen);
Interworking: Move BSS ANQP information into separate struct This is an initial step in allowing the ANQP responses to be shared among multiple BSSes if the BSSes are determined to be operating under identical configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:02:29 +02:00
if (anqp) {
wpabuf_free(anqp->roaming_consortium);
anqp->roaming_consortium = wpabuf_alloc_copy(pos, slen);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
}
break;
case ANQP_IP_ADDR_TYPE_AVAILABILITY:
wpa_msg(wpa_s, MSG_INFO, "RX-ANQP " MACSTR
" IP Address Type Availability information",
MAC2STR(sa));
wpa_hexdump(MSG_MSGDUMP, "ANQP: IP Address Availability",
pos, slen);
Interworking: Move BSS ANQP information into separate struct This is an initial step in allowing the ANQP responses to be shared among multiple BSSes if the BSSes are determined to be operating under identical configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:02:29 +02:00
if (anqp) {
wpabuf_free(anqp->ip_addr_type_availability);
anqp->ip_addr_type_availability =
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
wpabuf_alloc_copy(pos, slen);
}
break;
case ANQP_NAI_REALM:
wpa_msg(wpa_s, MSG_INFO, "RX-ANQP " MACSTR
" NAI Realm list", MAC2STR(sa));
wpa_hexdump_ascii(MSG_DEBUG, "ANQP: NAI Realm", pos, slen);
Interworking: Move BSS ANQP information into separate struct This is an initial step in allowing the ANQP responses to be shared among multiple BSSes if the BSSes are determined to be operating under identical configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:02:29 +02:00
if (anqp) {
wpabuf_free(anqp->nai_realm);
anqp->nai_realm = wpabuf_alloc_copy(pos, slen);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
}
break;
case ANQP_3GPP_CELLULAR_NETWORK:
wpa_msg(wpa_s, MSG_INFO, "RX-ANQP " MACSTR
" 3GPP Cellular Network information", MAC2STR(sa));
wpa_hexdump_ascii(MSG_DEBUG, "ANQP: 3GPP Cellular Network",
pos, slen);
Interworking: Move BSS ANQP information into separate struct This is an initial step in allowing the ANQP responses to be shared among multiple BSSes if the BSSes are determined to be operating under identical configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:02:29 +02:00
if (anqp) {
wpabuf_free(anqp->anqp_3gpp);
anqp->anqp_3gpp = wpabuf_alloc_copy(pos, slen);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
}
break;
case ANQP_DOMAIN_NAME:
wpa_msg(wpa_s, MSG_INFO, "RX-ANQP " MACSTR
" Domain Name list", MAC2STR(sa));
wpa_hexdump_ascii(MSG_MSGDUMP, "ANQP: Domain Name", pos, slen);
Interworking: Move BSS ANQP information into separate struct This is an initial step in allowing the ANQP responses to be shared among multiple BSSes if the BSSes are determined to be operating under identical configuration. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-04 15:02:29 +02:00
if (anqp) {
wpabuf_free(anqp->domain_name);
anqp->domain_name = wpabuf_alloc_copy(pos, slen);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
}
break;
case ANQP_VENDOR_SPECIFIC:
if (slen < 3)
return;
switch (WPA_GET_BE24(pos)) {
HS 2.0: Add Hotspot 2.0 ANQP elements to Interworking queries Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-10-16 21:25:42 +02:00
#ifdef CONFIG_HS20
case OUI_WFA:
pos += 3;
slen -= 3;
if (slen < 1)
return;
type = *pos++;
slen--;
switch (type) {
case HS20_ANQP_OUI_TYPE:
HS 2.0: Try to use same BSS entry for storing GAS results Commit 17b8995cf5813d7c027cd7a6884700e791d72392 ('Interworking: Try to use same BSS entry for storing GAS results') added a mechanism to try to pair GAS request and response to a single BSS entry to cover cases where multiple BSS entries may exists for the same BSSID. However, that commit did not cover the Hotspot 2.0 ANQP elements. Extend this mechanism to all ANQP elements. This can help in cases where information in the Hotspot 2.0 specific ANQP elements got lost if a hidden SSID or some other reason of duplicated BSS entries was present while doing ANQP fetches. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-01-17 16:47:32 +01:00
hs20_parse_rx_hs20_anqp_resp(wpa_s, bss, sa,
HS 2.0: Add a command to retrieve icon with in-memory storage This adds a new command based Hotspot 2.0 icon retrieval option. In short, here is the new command sequence: 1. REQ_HS20_ICON <bssid> <file-name> 2. event: RX-HS20-ICON <bssid> <file-name> <size> 3. GET_HS20_ICON <bssid> <file-name> <offset> <size> (if needed, repeat with larger offset values until full icon is fetched) 5. DEL_HS20_ICON <bssid> <file-name> REQ_HS20_ICON is a new command that is analogous to HS20_ICON_REQUEST with the slight difference that an entry to store the icon in memory is prepared. The RX-HS20-ICON event has been augmented with BSSID, file-name and size, and GET_HS20_ICON is used to retrieve a chunk of up to <size> bytes of icon data at offset <offset>. Each chunk is returned as a base64 encoded fragment, preceded by "HS20-ICON-DATA", BSSID, and file-name as well as the starting offset of the data. If there is no entry prepared for the icon when the ANQP result comes back, hs20_process_icon_binary_file falls back to legacy behavior. Finally the DEL_HS20_ICON command deletes (all) icons associated with BSSID and file-name (there could be several if retries are used and they have different dialog tokens). Signed-off-by: Jan Nordqvist <jannq@google.com>
2015-12-11 02:01:46 +01:00
pos, slen,
dialog_token);
HS 2.0: Add Hotspot 2.0 ANQP elements to Interworking queries Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-10-16 21:25:42 +02:00
break;
default:
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"HS20: Unsupported ANQP vendor type %u",
type);
HS 2.0: Add Hotspot 2.0 ANQP elements to Interworking queries Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-10-16 21:25:42 +02:00
break;
}
break;
#endif /* CONFIG_HS20 */
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
default:
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: Unsupported vendor-specific ANQP OUI %06x",
WPA_GET_BE24(pos));
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
return;
}
break;
default:
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: Unsupported ANQP Info ID %u", info_id);
Interworking: Support unknown ANQP-elements in BSS table This allows wpa_supplicant to expose internally unknown ANQP-elements in the BSS command. For example, "ANQP_GET <BSSID> 265" can be used to fetch the AP Geospatial Location ANQP-element and if the AP has this information, the "BSS <BSSID>" command will include the response as "anqp[265]=<hexdump>". Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-07 15:10:38 +02:00
anqp_add_extra(wpa_s, anqp, info_id, data, slen);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
break;
}
}
void anqp_resp_cb(void *ctx, const u8 *dst, u8 dialog_token,
enum gas_query_result result,
const struct wpabuf *adv_proto,
const struct wpabuf *resp, u16 status_code)
{
struct wpa_supplicant *wpa_s = ctx;
const u8 *pos;
const u8 *end;
u16 info_id;
u16 slen;
Interworking: Try to use same BSS entry for storing GAS results There may be cases where multiple BSS entries for a single BSSID are in the table. This is mostly in automated test cases due to the AP configuration changes, but something similar could potentially happen as a corner case in more realistic networks, too, e.g., when an AP changes its operating channel. Make network selection more robust by trying to find the exact BSS entry instead of any BSS entry with a matching BSSID when storing GAS/ANQP response. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 10:44:04 +02:00
struct wpa_bss *bss = NULL, *tmp;
Interworking: Notify the ANQP parsing status The ANQP verification/parsing is done only after the GAS_DONE indication is sent over the control interface. This means that in case the ANQP parsing fails there is no indication to the upper layers. Add an ANQP-QUERY-DONE event that reports the status of the ANQP parsing. Signed-off-by: ASHUTOSH NARAYAN <ashutoshx.narayan@intel.com>
2015-01-19 02:45:02 +01:00
const char *anqp_result = "SUCCESS";
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
HS 2.0R2: Add routine for fetching OSU provider information The new wpa_cli fetch_osu command can be used to fetch information about all OSU providers and write that to a text file with the icons in separate files. cancel_osu_fetch command can be used to stop ongoing OSU provider list fetch. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-25 23:10:41 +01:00
wpa_printf(MSG_DEBUG, "Interworking: anqp_resp_cb dst=" MACSTR
" dialog_token=%u result=%d status_code=%u",
MAC2STR(dst), dialog_token, result, status_code);
if (result != GAS_QUERY_SUCCESS) {
Interworking: Fix wpa_supplicant build without CONFIG_HS20=y Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-07 15:57:32 +02:00
#ifdef CONFIG_HS20
HS 2.0R2: Add routine for fetching OSU provider information The new wpa_cli fetch_osu command can be used to fetch information about all OSU providers and write that to a text file with the icons in separate files. cancel_osu_fetch command can be used to stop ongoing OSU provider list fetch. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-25 23:10:41 +01:00
if (wpa_s->fetch_osu_icon_in_progress)
hs20_icon_fetch_failed(wpa_s);
Interworking: Fix wpa_supplicant build without CONFIG_HS20=y Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-07 15:57:32 +02:00
#endif /* CONFIG_HS20 */
Interworking: Notify the ANQP parsing status The ANQP verification/parsing is done only after the GAS_DONE indication is sent over the control interface. This means that in case the ANQP parsing fails there is no indication to the upper layers. Add an ANQP-QUERY-DONE event that reports the status of the ANQP parsing. Signed-off-by: ASHUTOSH NARAYAN <ashutoshx.narayan@intel.com>
2015-01-19 02:45:02 +01:00
anqp_result = "FAILURE";
goto out;
HS 2.0R2: Add routine for fetching OSU provider information The new wpa_cli fetch_osu command can be used to fetch information about all OSU providers and write that to a text file with the icons in separate files. cancel_osu_fetch command can be used to stop ongoing OSU provider list fetch. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-25 23:10:41 +01:00
}
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
pos = wpabuf_head(adv_proto);
if (wpabuf_len(adv_proto) < 4 || pos[0] != WLAN_EID_ADV_PROTO ||
pos[1] < 2 || pos[3] != ACCESS_NETWORK_QUERY_PROTOCOL) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"ANQP: Unexpected Advertisement Protocol in response");
Interworking: Fix wpa_supplicant build without CONFIG_HS20=y Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-07 15:57:32 +02:00
#ifdef CONFIG_HS20
HS 2.0R2: Add routine for fetching OSU provider information The new wpa_cli fetch_osu command can be used to fetch information about all OSU providers and write that to a text file with the icons in separate files. cancel_osu_fetch command can be used to stop ongoing OSU provider list fetch. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-25 23:10:41 +01:00
if (wpa_s->fetch_osu_icon_in_progress)
hs20_icon_fetch_failed(wpa_s);
Interworking: Fix wpa_supplicant build without CONFIG_HS20=y Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-07 15:57:32 +02:00
#endif /* CONFIG_HS20 */
Interworking: Notify the ANQP parsing status The ANQP verification/parsing is done only after the GAS_DONE indication is sent over the control interface. This means that in case the ANQP parsing fails there is no indication to the upper layers. Add an ANQP-QUERY-DONE event that reports the status of the ANQP parsing. Signed-off-by: ASHUTOSH NARAYAN <ashutoshx.narayan@intel.com>
2015-01-19 02:45:02 +01:00
anqp_result = "INVALID_FRAME";
goto out;
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
}
Interworking: Try to use same BSS entry for storing GAS results There may be cases where multiple BSS entries for a single BSSID are in the table. This is mostly in automated test cases due to the AP configuration changes, but something similar could potentially happen as a corner case in more realistic networks, too, e.g., when an AP changes its operating channel. Make network selection more robust by trying to find the exact BSS entry instead of any BSS entry with a matching BSSID when storing GAS/ANQP response. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 10:44:04 +02:00
/*
* If possible, select the BSS entry based on which BSS entry was used
* for the request. This can help in cases where multiple BSS entries
* may exist for the same AP.
*/
dl_list_for_each_reverse(tmp, &wpa_s->bss, struct wpa_bss, list) {
if (tmp == wpa_s->interworking_gas_bss &&
os_memcmp(tmp->bssid, dst, ETH_ALEN) == 0) {
bss = tmp;
break;
}
}
if (bss == NULL)
bss = wpa_bss_get_bssid(wpa_s, dst);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
pos = wpabuf_head(resp);
end = pos + wpabuf_len(resp);
while (pos < end) {
Interworking: Clearer ANQP element length validation The upper bound for the element length was already verified, but that was not apparently noticed by a static analyzer (CID 68128). Signed-off-by: Jouni Malinen <j@w1.fi>
2014-11-23 16:13:47 +01:00
unsigned int left = end - pos;
if (left < 4) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG, "ANQP: Invalid element");
Interworking: Notify the ANQP parsing status The ANQP verification/parsing is done only after the GAS_DONE indication is sent over the control interface. This means that in case the ANQP parsing fails there is no indication to the upper layers. Add an ANQP-QUERY-DONE event that reports the status of the ANQP parsing. Signed-off-by: ASHUTOSH NARAYAN <ashutoshx.narayan@intel.com>
2015-01-19 02:45:02 +01:00
anqp_result = "INVALID_FRAME";
goto out_parse_done;
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
}
info_id = WPA_GET_LE16(pos);
pos += 2;
slen = WPA_GET_LE16(pos);
pos += 2;
Interworking: Clearer ANQP element length validation The upper bound for the element length was already verified, but that was not apparently noticed by a static analyzer (CID 68128). Signed-off-by: Jouni Malinen <j@w1.fi>
2014-11-23 16:13:47 +01:00
left -= 4;
if (left < slen) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"ANQP: Invalid element length for Info ID %u",
info_id);
Interworking: Notify the ANQP parsing status The ANQP verification/parsing is done only after the GAS_DONE indication is sent over the control interface. This means that in case the ANQP parsing fails there is no indication to the upper layers. Add an ANQP-QUERY-DONE event that reports the status of the ANQP parsing. Signed-off-by: ASHUTOSH NARAYAN <ashutoshx.narayan@intel.com>
2015-01-19 02:45:02 +01:00
anqp_result = "INVALID_FRAME";
goto out_parse_done;
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
}
Interworking: Try to use same BSS entry for storing GAS results There may be cases where multiple BSS entries for a single BSSID are in the table. This is mostly in automated test cases due to the AP configuration changes, but something similar could potentially happen as a corner case in more realistic networks, too, e.g., when an AP changes its operating channel. Make network selection more robust by trying to find the exact BSS entry instead of any BSS entry with a matching BSSID when storing GAS/ANQP response. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-01 10:44:04 +02:00
interworking_parse_rx_anqp_resp(wpa_s, bss, dst, info_id, pos,
HS 2.0: Add a command to retrieve icon with in-memory storage This adds a new command based Hotspot 2.0 icon retrieval option. In short, here is the new command sequence: 1. REQ_HS20_ICON <bssid> <file-name> 2. event: RX-HS20-ICON <bssid> <file-name> <size> 3. GET_HS20_ICON <bssid> <file-name> <offset> <size> (if needed, repeat with larger offset values until full icon is fetched) 5. DEL_HS20_ICON <bssid> <file-name> REQ_HS20_ICON is a new command that is analogous to HS20_ICON_REQUEST with the slight difference that an entry to store the icon in memory is prepared. The RX-HS20-ICON event has been augmented with BSSID, file-name and size, and GET_HS20_ICON is used to retrieve a chunk of up to <size> bytes of icon data at offset <offset>. Each chunk is returned as a base64 encoded fragment, preceded by "HS20-ICON-DATA", BSSID, and file-name as well as the starting offset of the data. If there is no entry prepared for the icon when the ANQP result comes back, hs20_process_icon_binary_file falls back to legacy behavior. Finally the DEL_HS20_ICON command deletes (all) icons associated with BSSID and file-name (there could be several if retries are used and they have different dialog tokens). Signed-off-by: Jan Nordqvist <jannq@google.com>
2015-12-11 02:01:46 +01:00
slen, dialog_token);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
pos += slen;
}
HS 2.0R2: Add routine for fetching OSU provider information The new wpa_cli fetch_osu command can be used to fetch information about all OSU providers and write that to a text file with the icons in separate files. cancel_osu_fetch command can be used to stop ongoing OSU provider list fetch. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-25 23:10:41 +01:00
Interworking: Notify the ANQP parsing status The ANQP verification/parsing is done only after the GAS_DONE indication is sent over the control interface. This means that in case the ANQP parsing fails there is no indication to the upper layers. Add an ANQP-QUERY-DONE event that reports the status of the ANQP parsing. Signed-off-by: ASHUTOSH NARAYAN <ashutoshx.narayan@intel.com>
2015-01-19 02:45:02 +01:00
out_parse_done:
Interworking: Fix wpa_supplicant build without CONFIG_HS20=y Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-07 15:57:32 +02:00
#ifdef CONFIG_HS20
HS 2.0R2: Add routine for fetching OSU provider information The new wpa_cli fetch_osu command can be used to fetch information about all OSU providers and write that to a text file with the icons in separate files. cancel_osu_fetch command can be used to stop ongoing OSU provider list fetch. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-25 23:10:41 +01:00
hs20_notify_parse_done(wpa_s);
Interworking: Fix wpa_supplicant build without CONFIG_HS20=y Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-07 15:57:32 +02:00
#endif /* CONFIG_HS20 */
Interworking: Notify the ANQP parsing status The ANQP verification/parsing is done only after the GAS_DONE indication is sent over the control interface. This means that in case the ANQP parsing fails there is no indication to the upper layers. Add an ANQP-QUERY-DONE event that reports the status of the ANQP parsing. Signed-off-by: ASHUTOSH NARAYAN <ashutoshx.narayan@intel.com>
2015-01-19 02:45:02 +01:00
out:
wpa_msg(wpa_s, MSG_INFO, ANQP_QUERY_DONE "addr=" MACSTR " result=%s",
MAC2STR(dst), anqp_result);
Interworking: Add ANQP query requests Add mechanism for using GAS/ANQP to query Interworking related information from APs. The received information is stored in the BSS table and can be viewed with ctrl_iface BSS command. New ctrl_iface command ANQP_GET can be used to fetch ANQP elements from a specific AP. Additional commands FETCH_ANQP and STOP_FETCH_ANQP can be used to initiate and stop an iteration through all APs in the BSS table that indicate support Interworking to fetch ANQP elements from them.
2011-10-16 21:44:28 +02:00
}
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
static void interworking_scan_res_handler(struct wpa_supplicant *wpa_s,
struct wpa_scan_results *scan_res)
{
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: Scan results available - start ANQP fetch");
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
interworking_start_fetch_anqp(wpa_s);
}
Interworking: Add optional freq argument to INTERWORKING_SELECT This can be used to limit which channels are scanned using the specified list of frequency ranges in the same format that the SCAN command uses. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-05 11:25:13 +01:00
int interworking_select(struct wpa_supplicant *wpa_s, int auto_select,
int *freqs)
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
{
interworking_stop_fetch_anqp(wpa_s);
wpa_s->network_select = 1;
Interworking: Add optional use of network selection on normal scans auto_interworking=1 configuration parameter can be used to request wpa_supplicant to use Interworking network selection automatically as a part of the normal (non-Interworking) network selection if the scan results do not match with enabled networks. This makes scanning work similarly to the "interworking_select auto" command. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-28 15:14:13 +02:00
wpa_s->auto_network_select = 0;
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
wpa_s->auto_select = !!auto_select;
Interworking: Fetch only the needed ANQP information Use configured credentials to figure out which ANQP information needs to be fetched and only fetch those when using Interworking network selection. The fetch_anqp command is still fetching all ANQP information. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-02 20:05:54 +02:00
wpa_s->fetch_all_anqp = 0;
HS 2.0R2: Add routine for fetching OSU provider information The new wpa_cli fetch_osu command can be used to fetch information about all OSU providers and write that to a text file with the icons in separate files. cancel_osu_fetch command can be used to stop ongoing OSU provider list fetch. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-25 23:10:41 +01:00
wpa_s->fetch_osu_info = 0;
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"Interworking: Start scan for network selection");
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
wpa_s->scan_res_handler = interworking_scan_res_handler;
Interworking: Force normal scan for network selection Make sure special optimized scans (like WPS-single-channel or sched_scan) do not get used during the network selection scan. This could have been hit in cases where a previous operation has been stopped in a state where special scan parameters were going to be used. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-27 10:26:58 +01:00
wpa_s->normal_scans = 0;
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;
Interworking: Add optional freq argument to INTERWORKING_SELECT This can be used to limit which channels are scanned using the specified list of frequency ranges in the same format that the SCAN command uses. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-05 11:25:13 +01:00
os_free(wpa_s->manual_scan_freqs);
wpa_s->manual_scan_freqs = freqs;
Interworking: Force normal scan for network selection Make sure special optimized scans (like WPS-single-channel or sched_scan) do not get used during the network selection scan. This could have been hit in cases where a previous operation has been stopped in a state where special scan parameters were going to be used. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-27 10:26:58 +01:00
wpa_s->after_wps = 0;
Interworking: Clear known_wps_freq for network selection This was forgotten from the previous commit which allowed some cases to trigger single-channel scan incorrectly if an optimized WPS scan had not yet been completed at the time network selection was started. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-27 11:55:09 +01:00
wpa_s->known_wps_freq = 0;
Interworking: Add commands for network selection This adds the basic mechanism for running through network selection: scan, ANQP fetch, network selection, and connection. Actual rules for network selection and the creation of the network block are still missing, but will be added in separate commits.
2011-10-04 21:13:22 +02:00
wpa_supplicant_req_scan(wpa_s, 0, 0);
return 0;
}
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
static void gas_resp_cb(void *ctx, const u8 *addr, u8 dialog_token,
enum gas_query_result result,
const struct wpabuf *adv_proto,
const struct wpabuf *resp, u16 status_code)
{
struct wpa_supplicant *wpa_s = ctx;
Interworking: Keep up to two pending GAS_REQUEST responses Previously, only the last response data was kept in memory. This increases that to hold up to two last responses to allow some more parallel operations to be requested. In addition, the response data is now freed as soon as the external program has fetched it. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-06 06:53:37 +01:00
struct wpabuf *n;
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
wpa_msg(wpa_s, MSG_INFO, GAS_RESPONSE_INFO "addr=" MACSTR
" dialog_token=%d status_code=%d resp_len=%d",
MAC2STR(addr), dialog_token, status_code,
resp ? (int) wpabuf_len(resp) : -1);
if (!resp)
return;
Interworking: Keep up to two pending GAS_REQUEST responses Previously, only the last response data was kept in memory. This increases that to hold up to two last responses to allow some more parallel operations to be requested. In addition, the response data is now freed as soon as the external program has fetched it. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-06 06:53:37 +01:00
n = wpabuf_dup(resp);
if (n == 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
return;
Interworking: Keep up to two pending GAS_REQUEST responses Previously, only the last response data was kept in memory. This increases that to hold up to two last responses to allow some more parallel operations to be requested. In addition, the response data is now freed as soon as the external program has fetched it. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-06 06:53:37 +01:00
wpabuf_free(wpa_s->prev_gas_resp);
wpa_s->prev_gas_resp = wpa_s->last_gas_resp;
os_memcpy(wpa_s->prev_gas_addr, wpa_s->last_gas_addr, ETH_ALEN);
wpa_s->prev_gas_dialog_token = wpa_s->last_gas_dialog_token;
wpa_s->last_gas_resp = n;
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
os_memcpy(wpa_s->last_gas_addr, addr, ETH_ALEN);
wpa_s->last_gas_dialog_token = dialog_token;
}
int gas_send_request(struct wpa_supplicant *wpa_s, const u8 *dst,
const struct wpabuf *adv_proto,
const struct wpabuf *query)
{
struct wpabuf *buf;
int ret = 0;
int freq;
struct wpa_bss *bss;
int res;
size_t len;
Interworking: Remove unnecessary placeholder for PAME-BI The PAME-BI bit in the Advertisement Protocol element is reserved for non-AP STA, so this function will never set that bit to one and as such, there is not much point in maintaining the placeholder dead code for this either. (CID 68107) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-07-26 19:28:03 +02:00
u8 query_resp_len_limit = 0;
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
freq = wpa_s->assoc_freq;
bss = wpa_bss_get_bssid(wpa_s, dst);
if (bss)
freq = bss->freq;
if (freq <= 0)
return -1;
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG, "GAS request to " MACSTR " (freq %d MHz)",
MAC2STR(dst), freq);
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
wpa_hexdump_buf(MSG_DEBUG, "Advertisement Protocol ID", adv_proto);
wpa_hexdump_buf(MSG_DEBUG, "GAS Query", query);
len = 3 + wpabuf_len(adv_proto) + 2;
if (query)
len += wpabuf_len(query);
buf = gas_build_initial_req(0, len);
if (buf == NULL)
return -1;
/* Advertisement Protocol IE */
wpabuf_put_u8(buf, WLAN_EID_ADV_PROTO);
wpabuf_put_u8(buf, 1 + wpabuf_len(adv_proto)); /* Length */
Interworking: Remove unnecessary placeholder for PAME-BI The PAME-BI bit in the Advertisement Protocol element is reserved for non-AP STA, so this function will never set that bit to one and as such, there is not much point in maintaining the placeholder dead code for this either. (CID 68107) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-07-26 19:28:03 +02:00
wpabuf_put_u8(buf, query_resp_len_limit & 0x7f);
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_put_buf(buf, adv_proto);
/* GAS Query */
if (query) {
wpabuf_put_le16(buf, wpabuf_len(query));
wpabuf_put_buf(buf, query);
} else
wpabuf_put_le16(buf, 0);
res = gas_query_req(wpa_s->gas, dst, freq, buf, gas_resp_cb, wpa_s);
if (res < 0) {
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG, "GAS: Failed to send Query Request");
GAS: Delay GAS query Tx while another query is in progress It would be possible to issue another GAS query when a previous one is still in progress and this could result in conflicting offchannel operations. Prevent that by delaying GAS query initiation until the previous operation has been completed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-21 12:13:42 +02:00
wpabuf_free(buf);
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
ret = -1;
} else
Interworking: Convert wpa_printf() to wpa_msg() Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear <greearb@candelatech.com>
2014-03-06 01:19:51 +01:00
wpa_msg(wpa_s, MSG_DEBUG,
"GAS: Query started with dialog token %u", res);
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
return ret;
}
Reference in a new issue Copy permalink