#include "eapol_supp/eapol_supp_sm.h"
#include "wpa.h"
#include "eloop.h"
-#include "drivers/driver.h"
#include "config.h"
#include "l2_packet/l2_packet.h"
#include "wpa_supplicant_i.h"
+#include "driver_i.h"
#include "pcsc_funcs.h"
#include "preauth.h"
#include "pmksa_cache.h"
#include "ieee802_11_defs.h"
#include "blacklist.h"
#include "wpas_glue.h"
-#include "wps/wps.h"
+#include "wps_supplicant.h"
+#include "ibss_rsn.h"
+#include "sme.h"
static int wpa_supplicant_select_config(struct wpa_supplicant *wpa_s)
if (ssid->mixed_cell)
return 1;
+#ifdef CONFIG_WPS
+ if (ssid->key_mgmt & WPA_KEY_MGMT_WPS)
+ return 1;
+#endif /* CONFIG_WPS */
+
for (i = 0; i < NUM_WEP_KEYS; i++) {
if (ssid->wep_key_len[i]) {
privacy = 1;
}
-static int wpa_supplicant_ssid_bss_match(struct wpa_ssid *ssid,
+static int wpa_supplicant_ssid_bss_match(struct wpa_supplicant *wpa_s,
+ struct wpa_ssid *ssid,
struct wpa_scan_res *bss)
{
struct wpa_ie_data ie;
int proto_match = 0;
const u8 *rsn_ie, *wpa_ie;
+ int ret;
-#ifdef CONFIG_WPS
- if (ssid->key_mgmt & WPA_KEY_MGMT_WPS) {
- const u8 *wps_ie;
- wps_ie = wpa_scan_get_vendor_ie(bss, WPS_IE_VENDOR_TYPE);
- if (eap_is_wps_pbc_enrollee(&ssid->eap)) {
- if (!wps_ie) {
- wpa_printf(MSG_DEBUG, " skip - non-WPS AP");
- return 0;
- }
-
- if (!wps_is_selected_pbc_registrar(wps_ie + 6,
- wps_ie[1] - 4)) {
- wpa_printf(MSG_DEBUG, " skip - WPS AP "
- "without active PBC Registrar");
- return 0;
- }
-
- /* TODO: overlap detection */
- wpa_printf(MSG_DEBUG, " selected based on WPS IE "
- "(Active PBC)");
- return 1;
- }
-
- if (eap_is_wps_pin_enrollee(&ssid->eap)) {
- if (!wps_ie) {
- wpa_printf(MSG_DEBUG, " skip - non-WPS AP");
- return 0;
- }
-
- if (!wps_is_selected_pin_registrar(wps_ie + 6,
- wps_ie[1] - 4)) {
- wpa_printf(MSG_DEBUG, " skip - WPS AP "
- "without active PIN Registrar");
- return 0;
- }
- wpa_printf(MSG_DEBUG, " selected based on WPS IE "
- "(Active PIN)");
- return 1;
- }
-
- if (wps_ie) {
- wpa_printf(MSG_DEBUG, " selected based on WPS IE");
- return 1;
- }
- }
-#endif /* CONFIG_WPS */
+ ret = wpas_wps_ssid_bss_match(wpa_s, ssid, bss);
+ if (ret >= 0)
+ return ret;
rsn_ie = wpa_scan_get_ie(bss, WLAN_EID_RSN);
while ((ssid->proto & WPA_PROTO_RSN) && rsn_ie) {
}
-#ifdef CONFIG_WPS
-static int wps_ssid_wildcard_ok(struct wpa_ssid *ssid,
- struct wpa_scan_res *bss)
-{
- const u8 *wps_ie;
-
- if (eap_is_wps_pbc_enrollee(&ssid->eap)) {
- wps_ie = wpa_scan_get_vendor_ie(bss, WPS_IE_VENDOR_TYPE);
- if (wps_ie &&
- wps_is_selected_pbc_registrar(wps_ie + 6, wps_ie[1] - 4)) {
- /* allow wildcard SSID for WPS PBC */
- return 1;
- }
- }
-
- if (eap_is_wps_pin_enrollee(&ssid->eap)) {
- wps_ie = wpa_scan_get_vendor_ie(bss, WPS_IE_VENDOR_TYPE);
- if (wps_ie &&
- wps_is_selected_pin_registrar(wps_ie + 6, wps_ie[1] - 4)) {
- /* allow wildcard SSID for WPS PIN */
- return 1;
- }
- }
-
- return 0;
-}
-#endif /* CONFIG_WPS */
-
static struct wpa_scan_res *
wpa_supplicant_select_bss_wpa(struct wpa_supplicant *wpa_s,
struct wpa_ssid *group,
#ifdef CONFIG_WPS
if (ssid->ssid_len == 0 &&
- wps_ssid_wildcard_ok(ssid, bss))
+ wpas_wps_ssid_wildcard_ok(wpa_s, ssid, bss))
check_ssid = 0;
#endif /* CONFIG_WPS */
continue;
}
- if (!wpa_supplicant_ssid_bss_match(ssid, bss))
+ if (!wpa_supplicant_ssid_bss_match(wpa_s, ssid, bss))
continue;
wpa_printf(MSG_DEBUG, " selected WPA AP "
* with our mode. */
check_ssid = 1;
if (ssid->ssid_len == 0 &&
- wps_ssid_wildcard_ok(ssid, bss))
+ wpas_wps_ssid_wildcard_ok(wpa_s, ssid,
+ bss))
check_ssid = 0;
}
#endif /* CONFIG_WPS */
}
-#ifdef CONFIG_WPS
-
-static int wpa_scan_pbc_overlap(struct wpa_supplicant *wpa_s,
- struct wpa_scan_res *selected,
- struct wpa_ssid *ssid)
-{
- const u8 *sel_uuid, *uuid;
- size_t i;
- const u8 *wps_ie;
-
- if (!eap_is_wps_pbc_enrollee(&ssid->eap))
- return 0;
-
- /* Make sure that only one AP is in active PBC mode */
- wps_ie = wpa_scan_get_vendor_ie(selected, WPS_IE_VENDOR_TYPE);
- if (wps_ie)
- sel_uuid = wps_get_uuid_e(wps_ie + 6, wps_ie[1] - 4);
- else
- sel_uuid = NULL;
- if (!sel_uuid) {
- wpa_printf(MSG_DEBUG, "WPS: UUID-E not "
- "available for PBC overlap "
- "detection");
- return 1;
- }
-
- for (i = 0; i < wpa_s->scan_res->num; i++) {
- struct wpa_scan_res *bss = wpa_s->scan_res->res[i];
- if (bss == selected)
- continue;
- wps_ie = wpa_scan_get_vendor_ie(bss, WPS_IE_VENDOR_TYPE);
- if (!wps_ie)
- continue;
- if (!wps_is_selected_pbc_registrar(wps_ie + 6,
- wps_ie[1] - 4))
- continue;
- uuid = wps_get_uuid_e(wps_ie + 6, wps_ie[1] - 4);
- if (uuid == NULL) {
- wpa_printf(MSG_DEBUG, "WPS: UUID-E not "
- "available for PBC overlap "
- "detection (other BSS)");
- return 1;
- }
- if (os_memcmp(sel_uuid, uuid, 16) != 0)
- return 1; /* PBC overlap */
-
- /* TODO: verify that this is reasonable dual-band situation */
- }
-
- return 0;
-}
-
-#else /* CONFIG_WPS */
-
-#define wpa_scan_pbc_overlap(w, s, i) 0
-
-#endif /* CONFIG_WPS */
-
-
static void wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s)
{
int prio, timeout;
} else {
wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS);
wpa_supplicant_dbus_notify_scan_results(wpa_s);
+ wpas_wps_notify_scan_results(wpa_s);
}
- if (wpa_s->conf->ap_scan == 2 || wpa_s->disconnected)
+ if ((wpa_s->conf->ap_scan == 2 && !wpas_wps_searching(wpa_s)) ||
+ wpa_s->disconnected)
return;
while (selected == NULL) {
wpa_printf(MSG_DEBUG, "No APs found - clear blacklist "
"and try again");
wpa_blacklist_clear(wpa_s);
+ wpa_s->blacklist_cleared++;
} else if (selected == NULL) {
break;
}
}
if (selected) {
- if (wpa_scan_pbc_overlap(wpa_s, selected, ssid)) {
+ if (wpas_wps_scan_pbc_overlap(wpa_s, selected, ssid)) {
wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_OVERLAP
"PBC session overlap");
timeout = 10;
#endif /* CONFIG_NO_SCAN_PROCESSING */
+#ifdef CONFIG_IEEE80211R
+static void wpa_assoc_set_ft_params(struct wpa_supplicant *wpa_s,
+ const u8 *ftie, const u8 *mdie)
+{
+ const u8 *mobility_domain = NULL;
+ const u8 *r0kh_id = NULL;
+ size_t r0kh_id_len = 0;
+ const u8 *r1kh_id = NULL;
+ struct rsn_ftie *hdr;
+ const u8 *pos, *end;
+
+ if (mdie == NULL || ftie == NULL)
+ return;
+
+ if (mdie[1] >= MOBILITY_DOMAIN_ID_LEN) {
+ mobility_domain = mdie + 2;
+#ifdef CONFIG_SME
+ wpa_s->sme.ft_used = 1;
+ os_memcpy(wpa_s->sme.mobility_domain, mobility_domain, 2);
+#endif /* CONFIG_SME */
+ }
+ if (ftie[1] >= sizeof(struct rsn_ftie)) {
+ end = ftie + 2 + ftie[1];
+ hdr = (struct rsn_ftie *) (ftie + 2);
+ pos = (const u8 *) (hdr + 1);
+ while (pos + 1 < end) {
+ if (pos + 2 + pos[1] > end)
+ break;
+ if (pos[0] == FTIE_SUBELEM_R1KH_ID &&
+ pos[1] == FT_R1KH_ID_LEN)
+ r1kh_id = pos + 2;
+ else if (pos[0] == FTIE_SUBELEM_R0KH_ID &&
+ pos[1] >= 1 && pos[1] <= FT_R0KH_ID_MAX_LEN) {
+ r0kh_id = pos + 2;
+ r0kh_id_len = pos[1];
+ }
+ pos += 2 + pos[1];
+ }
+ }
+ wpa_sm_set_ft_params(wpa_s->wpa, mobility_domain, r0kh_id,
+ r0kh_id_len, r1kh_id);
+}
+#endif /* CONFIG_IEEE80211R */
+
static void wpa_supplicant_event_associnfo(struct wpa_supplicant *wpa_s,
union wpa_event_data *data)
{
int l, len, found = 0, wpa_found, rsn_found;
- u8 *p;
+ const u8 *p;
+#ifdef CONFIG_IEEE80211R
+ const u8 *mdie = NULL, *ftie = NULL;
+#endif /* CONFIG_IEEE80211R */
wpa_printf(MSG_DEBUG, "Association info event");
if (data->assoc_info.req_ies)
if (!found && data->assoc_info.req_ies)
wpa_sm_set_assoc_wpa_ie(wpa_s->wpa, NULL, 0);
+#ifdef CONFIG_IEEE80211R
+ p = data->assoc_info.resp_ies;
+ l = data->assoc_info.resp_ies_len;
+
+ /* Go through the IEs and make a copy of the WPA/RSN IE, if present. */
+ while (p && l >= 2) {
+ len = p[1] + 2;
+ if (len > l) {
+ wpa_hexdump(MSG_DEBUG, "Truncated IE in assoc_info",
+ p, l);
+ break;
+ }
+ if (p[0] == WLAN_EID_FAST_BSS_TRANSITION)
+ ftie = p;
+ else if (p[0] == WLAN_EID_MOBILITY_DOMAIN)
+ mdie = p;
+ l -= len;
+ p += len;
+ }
+
+ wpa_assoc_set_ft_params(wpa_s, ftie, mdie);
+#endif /* CONFIG_IEEE80211R */
+
/* WPA/RSN IE from Beacon/ProbeResp */
p = data->assoc_info.beacon_ies;
l = data->assoc_info.beacon_ies_len;
wpa_supplicant_event_associnfo(wpa_s, data);
wpa_supplicant_set_state(wpa_s, WPA_ASSOCIATED);
- if (wpa_s->use_client_mlme)
+ if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_USER_SPACE_MLME)
os_memcpy(bssid, wpa_s->bssid, ETH_ALEN);
- if (wpa_s->use_client_mlme ||
+ if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_USER_SPACE_MLME) ||
(wpa_drv_get_bssid(wpa_s, bssid) >= 0 &&
os_memcmp(bssid, wpa_s->bssid, ETH_ALEN) != 0)) {
wpa_msg(wpa_s, MSG_DEBUG, "Associated to a new BSS: BSSID="
}
wpa_supplicant_cancel_scan(wpa_s);
- if (wpa_s->driver_4way_handshake &&
+ if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE) &&
wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt)) {
/*
* We are done; the driver will take care of RSN 4-way
}
+#ifdef CONFIG_TERMINATE_ONLASTIF
+static int any_interfaces(struct wpa_supplicant *head)
+{
+ struct wpa_supplicant *wpa_s;
+
+ for (wpa_s = head; wpa_s != NULL; wpa_s = wpa_s->next)
+ if (!wpa_s->interface_removed)
+ return 1;
+ return 0;
+}
+#endif /* CONFIG_TERMINATE_ONLASTIF */
+
+
static void
wpa_supplicant_event_interface_status(struct wpa_supplicant *wpa_s,
union wpa_event_data *data)
wpa_supplicant_mark_disassoc(wpa_s);
l2_packet_deinit(wpa_s->l2);
wpa_s->l2 = NULL;
+#ifdef CONFIG_TERMINATE_ONLASTIF
+ /* check if last interface */
+ if (!any_interfaces(wpa_s->global->ifaces))
+ eloop_terminate();
+#endif /* CONFIG_TERMINATE_ONLASTIF */
break;
}
}
if (wpa_ft_process_response(wpa_s->wpa, data->ft_ies.ies,
data->ft_ies.ies_len,
data->ft_ies.ft_action,
- data->ft_ies.target_ap) < 0) {
+ data->ft_ies.target_ap,
+ data->ft_ies.ric_ies,
+ data->ft_ies.ric_ies_len) < 0) {
/* TODO: prevent MLME/driver from trying to associate? */
}
}
#endif /* CONFIG_IEEE80211R */
+#ifdef CONFIG_IBSS_RSN
+static void wpa_supplicant_event_ibss_rsn_start(struct wpa_supplicant *wpa_s,
+ union wpa_event_data *data)
+{
+ if (data == NULL)
+ return;
+ ibss_rsn_start(wpa_s->ibss_rsn, data->ibss_rsn_start.peer);
+}
+#endif /* CONFIG_IBSS_RSN */
+
+
void wpa_supplicant_event(void *ctx, wpa_event_type event,
union wpa_event_data *data)
{
struct wpa_supplicant *wpa_s = ctx;
switch (event) {
+ case EVENT_AUTH:
+ sme_event_auth(wpa_s, data);
+ break;
case EVENT_ASSOC:
wpa_supplicant_event_assoc(wpa_s, data);
break;
+ case EVENT_DEAUTH:
case EVENT_DISASSOC:
wpa_supplicant_event_disassoc(wpa_s);
break;
wpa_supplicant_event_ft_response(wpa_s, data);
break;
#endif /* CONFIG_IEEE80211R */
+#ifdef CONFIG_IBSS_RSN
+ case EVENT_IBSS_RSN_START:
+ wpa_supplicant_event_ibss_rsn_start(wpa_s, data);
+ break;
+#endif /* CONFIG_IBSS_RSN */
+ case EVENT_ASSOC_REJECT:
+ sme_event_assoc_reject(wpa_s, data);
+ break;
+ case EVENT_AUTH_TIMED_OUT:
+ sme_event_auth_timed_out(wpa_s, data);
+ break;
+ case EVENT_ASSOC_TIMED_OUT:
+ sme_event_assoc_timed_out(wpa_s, data);
+ break;
default:
wpa_printf(MSG_INFO, "Unknown event %d", event);
break;
projects / wpasupplicant / blobdiff