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

OWE: Enable roaming between OWE APs

Browse source 
This allows to use the ROAM control interface command to force roaming
on a transition network. Previously, this was not possible, as the open
SSID is stored for the connection profile. Add a new function to also
return OWE transition networks if the profile SSID is set as the
transition-ssid for the OWE RSN network.

Signed-off-by: David Bauer <mail@david-bauer.net>
This commit is contained in:
David Bauer 2024-04-28 15:13:41 +02:00 committed by Jouni Malinen
parent ddfed3f084
commit 56e8f8bf34
3 changed files with 55 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
wpa_supplicant/bss.c
View file

@ -273,6 +273,57 @@ struct wpa_bss * wpa_bss_get(struct wpa_supplicant *wpa_s, const u8 *bssid,
return NULL;
}
/**
* wpa_bss_get_connection - Fetch a BSS table entry based on BSSID and SSID.
* @wpa_s: Pointer to wpa_supplicant data
* @bssid: BSSID, or %NULL to match any BSSID
* @ssid: SSID
* @ssid_len: Length of @ssid
* Returns: Pointer to the BSS entry or %NULL if not found
*
* This function is similar to wpa_bss_get() but it will also return OWE
* transition mode encrypted networks for which transition-element matches
* @ssid.
*/
struct wpa_bss * wpa_bss_get_connection(struct wpa_supplicant *wpa_s,
const u8 *bssid,
const u8 *ssid, size_t ssid_len)
{
struct wpa_bss *bss;
#ifdef CONFIG_OWE
const u8 *owe, *owe_bssid, *owe_ssid;
size_t owe_ssid_len;
#endif /* CONFIG_OWE */
if (bssid && !wpa_supplicant_filter_bssid_match(wpa_s, bssid))
return NULL;
dl_list_for_each(bss, &wpa_s->bss, struct wpa_bss, list) {
if (bssid && !ether_addr_equal(bss->bssid, bssid))
continue;
if (bss->ssid_len == ssid_len &&
os_memcmp(bss->ssid, ssid, ssid_len) == 0)
return bss;
#ifdef CONFIG_OWE
/* Check if OWE transition mode element is present and matches
* the SSID */
owe = wpa_bss_get_vendor_ie(bss, OWE_IE_VENDOR_TYPE);
if (!owe)
continue;
if (wpas_get_owe_trans_network(owe, &owe_bssid, &owe_ssid,
&owe_ssid_len))
continue;
if (owe_ssid_len == ssid_len &&
os_memcmp(owe_ssid, ssid, ssid_len) == 0)
return bss;
#endif /* CONFIG_OWE */
}
return NULL;
}
void calculate_update_time(const struct os_reltime *fetch_time,
unsigned int age_ms,

3
wpa_supplicant/bss.h
View file

@ -165,6 +165,9 @@ void wpa_bss_flush(struct wpa_supplicant *wpa_s);
void wpa_bss_flush_by_age(struct wpa_supplicant *wpa_s, int age);
struct wpa_bss * wpa_bss_get(struct wpa_supplicant *wpa_s, const u8 *bssid,
const u8 *ssid, size_t ssid_len);
struct wpa_bss * wpa_bss_get_connection(struct wpa_supplicant *wpa_s,
const u8 *bssid,
const u8 *ssid, size_t ssid_len);
struct wpa_bss * wpa_bss_get_bssid(struct wpa_supplicant *wpa_s,
const u8 *bssid);
struct wpa_bss * wpa_bss_get_bssid_latest(struct wpa_supplicant *wpa_s,

2
wpa_supplicant/ctrl_iface.c
View file

@ -6035,7 +6035,7 @@ static int wpa_supplicant_ctrl_iface_roam(struct wpa_supplicant *wpa_s,
return -1;
}
bss = wpa_bss_get(wpa_s, bssid, ssid->ssid, ssid->ssid_len);
bss = wpa_bss_get_connection(wpa_s, bssid, ssid->ssid, ssid->ssid_len);
if (!bss) {
wpa_printf(MSG_DEBUG, "CTRL_IFACE ROAM: Target AP not found "
"from BSS table");