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

bss: Parse and store MLD address of the AP from Multi-Link element

Browse source 
Parse Multi-Link element received in scan result to get AP MLD address
and cache it in the wpa_bss structure.

Signed-off-by: Shivani Baranwal <quic_shivbara@quicinc.com>
Signed-off-by: Veerendranath Jakkam <quic_vjakkam@quicinc.com>
This commit is contained in:
Veerendranath Jakkam 2022-09-08 20:14:15 +05:30 committed by Jouni Malinen
parent cc29cadf2e
commit 4bd3165249
2 changed files with 41 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
wpa_supplicant/bss.c
View file

@ -457,7 +457,11 @@ static struct wpa_bss * wpa_bss_add(struct wpa_supplicant *wpa_s,
struct os_reltime *fetch_time) struct os_reltime *fetch_time)
{ {
struct wpa_bss *bss; struct wpa_bss *bss;
char extra[50]; char extra[100];
const u8 *ml_ie;
char *pos, *end;
int ret = 0;
const u8 *mld_addr;
bss = os_zalloc(sizeof(*bss) + res->ie_len + res->beacon_ie_len); bss = os_zalloc(sizeof(*bss) + res->ie_len + res->beacon_ie_len);
if (bss == NULL) if (bss == NULL)
@ -472,6 +476,14 @@ static struct wpa_bss * wpa_bss_add(struct wpa_supplicant *wpa_s,
os_memcpy(bss->ies, res + 1, res->ie_len + res->beacon_ie_len); os_memcpy(bss->ies, res + 1, res->ie_len + res->beacon_ie_len);
wpa_bss_set_hessid(bss); wpa_bss_set_hessid(bss);
os_memset(bss->mld_addr, 0, ETH_ALEN);
ml_ie = wpa_scan_get_ml_ie(res, MULTI_LINK_CONTROL_TYPE_BASIC);
if (ml_ie) {
mld_addr = get_basic_mle_mld_addr(&ml_ie[3], ml_ie[1] - 1);
if (mld_addr)
os_memcpy(bss->mld_addr, mld_addr, ETH_ALEN);
}
if (wpa_s->num_bss + 1 > wpa_s->conf->bss_max_count && if (wpa_s->num_bss + 1 > wpa_s->conf->bss_max_count &&
wpa_bss_remove_oldest(wpa_s) != 0) { wpa_bss_remove_oldest(wpa_s) != 0) {
wpa_printf(MSG_ERROR, "Increasing the MAX BSS count to %d " wpa_printf(MSG_ERROR, "Increasing the MAX BSS count to %d "
@ -483,11 +495,21 @@ static struct wpa_bss * wpa_bss_add(struct wpa_supplicant *wpa_s,
dl_list_add_tail(&wpa_s->bss, &bss->list); dl_list_add_tail(&wpa_s->bss, &bss->list);
dl_list_add_tail(&wpa_s->bss_id, &bss->list_id); dl_list_add_tail(&wpa_s->bss_id, &bss->list_id);
wpa_s->num_bss++; wpa_s->num_bss++;
if (!is_zero_ether_addr(bss->hessid))
os_snprintf(extra, sizeof(extra), " HESSID " MACSTR,
MAC2STR(bss->hessid));
else
extra[0] = '\0'; extra[0] = '\0';
pos = extra;
end = pos + sizeof(extra);
if (!is_zero_ether_addr(bss->hessid))
ret = os_snprintf(pos, end - pos, " HESSID " MACSTR,
MAC2STR(bss->hessid));
if (!is_zero_ether_addr(bss->mld_addr) &&
!os_snprintf_error(end - pos, ret)) {
pos += ret;
ret = os_snprintf(pos, end - pos, " MLD ADDR " MACSTR,
MAC2STR(bss->mld_addr));
}
wpa_dbg(wpa_s, MSG_DEBUG, "BSS: Add new id %u BSSID " MACSTR wpa_dbg(wpa_s, MSG_DEBUG, "BSS: Add new id %u BSSID " MACSTR
" SSID '%s' freq %d%s", " SSID '%s' freq %d%s",
bss->id, MAC2STR(bss->bssid), wpa_ssid_txt(ssid, ssid_len), bss->id, MAC2STR(bss->bssid), wpa_ssid_txt(ssid, ssid_len),
@ -724,8 +746,19 @@ wpa_bss_update(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
} }
dl_list_add(prev, &bss->list_id); dl_list_add(prev, &bss->list_id);
} }
if (changes & WPA_BSS_IES_CHANGED_FLAG) if (changes & WPA_BSS_IES_CHANGED_FLAG) {
const u8 *ml_ie, *mld_addr;
wpa_bss_set_hessid(bss); wpa_bss_set_hessid(bss);
os_memset(bss->mld_addr, 0, ETH_ALEN);
ml_ie = wpa_scan_get_ml_ie(res, MULTI_LINK_CONTROL_TYPE_BASIC);
if (ml_ie) {
mld_addr = get_basic_mle_mld_addr(&ml_ie[3],
ml_ie[1] - 1);
if (mld_addr)
os_memcpy(bss->mld_addr, mld_addr, ETH_ALEN);
}
}
dl_list_add_tail(&wpa_s->bss, &bss->list); dl_list_add_tail(&wpa_s->bss, &bss->list);
notify_bss_changes(wpa_s, changes, bss); notify_bss_changes(wpa_s, changes, bss);

2
wpa_supplicant/bss.h
View file

@ -122,6 +122,8 @@ struct wpa_bss {
size_t ie_len; size_t ie_len;
/** Length of the following Beacon IE field in octets */ /** Length of the following Beacon IE field in octets */
size_t beacon_ie_len; size_t beacon_ie_len;
/** MLD address of the AP */
u8 mld_addr[ETH_ALEN];
/* followed by ie_len octets of IEs */ /* followed by ie_len octets of IEs */
/* followed by beacon_ie_len octets of IEs */ /* followed by beacon_ie_len octets of IEs */
u8 ies[]; u8 ies[];