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

nl80211: Parsing of MLO connection info from roam+auth event

Browse source 
Add support to parse MLO connection information from
QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_MLO_LINKS for
QCA_NL80211_VENDOR_SUBCMD_KEY_MGMT_ROAM_AUTH event.

Signed-off-by: Veerendranath Jakkam <quic_vjakkam@quicinc.com>
This commit is contained in:
Veerendranath Jakkam 2022-09-23 17:36:06 +05:30 committed by Jouni Malinen
parent 18f75df416
commit 61c6e7c62c
1 changed files with 96 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

139
src/drivers/driver_nl80211_event.c
View file

@ -420,52 +420,52 @@ convert_connect_fail_reason_codes(enum qca_sta_connect_fail_reason_codes
} }
} }
#endif /* CONFIG_DRIVER_NL80211_QCA */
static void
static int nl80211_get_assoc_link_id(const u8 *data, u8 len) nl80211_parse_qca_vendor_mlo_link_info(struct driver_sta_mlo_info *mlo,
{ struct nlattr *mlo_links)
if (!(data[0] & BASIC_MULTI_LINK_CTRL0_PRES_LINK_ID))
return -1;
#define BASIC_ML_IE_COMMON_INFO_LINK_ID_IDX \
(2 + /* Multi-Link Control field */ \
1 + /* Common Info Length field (Basic) */ \
ETH_ALEN) /* MLD MAC Address field (Basic) */
if (len <= BASIC_ML_IE_COMMON_INFO_LINK_ID_IDX)
return -1;
return data[BASIC_ML_IE_COMMON_INFO_LINK_ID_IDX] & 0x0F;
}
static void nl80211_parse_mlo_info(struct wpa_driver_nl80211_data *drv,
struct nlattr *addr,
struct nlattr *mlo_links,
struct nlattr *resp_ie)
{ {
struct nlattr *link; struct nlattr *link;
int rem_links; int rem_links;
const u8 *ml_ie;
struct driver_sta_mlo_info *mlo = &drv->sta_mlo_info;
if (!addr || !mlo_links || !resp_ie) nla_for_each_nested(link, mlo_links, rem_links) {
return; struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_MLO_LINK_MAX + 1];
int link_id;
ml_ie = get_ml_ie(nla_data(resp_ie), nla_len(resp_ie), nla_parse(tb,QCA_WLAN_VENDOR_ATTR_MLO_LINK_MAX, nla_data(link),
MULTI_LINK_CONTROL_TYPE_BASIC); nla_len(link), NULL);
if (!ml_ie)
return;
drv->mlo_assoc_link_id = nl80211_get_assoc_link_id(&ml_ie[3], if (!tb[QCA_WLAN_VENDOR_ATTR_MLO_LINK_ID] ||
ml_ie[1] - 1); !tb[QCA_WLAN_VENDOR_ATTR_MLO_LINK_MAC_ADDR] ||
if (drv->mlo_assoc_link_id < 0 || !tb[QCA_WLAN_VENDOR_ATTR_MLO_LINK_BSSID])
drv->mlo_assoc_link_id >= MAX_NUM_MLD_LINKS) continue;
return;
os_memcpy(mlo->ap_mld_addr, nla_data(addr), ETH_ALEN); link_id = nla_get_u8(tb[QCA_WLAN_VENDOR_ATTR_MLO_LINK_ID]);
wpa_printf(MSG_DEBUG, "nl80211: AP MLD MAC Address " MACSTR, if (link_id >= MAX_NUM_MLD_LINKS)
MAC2STR(mlo->ap_mld_addr)); continue;
mlo->valid_links |= BIT(link_id);
os_memcpy(mlo->links[link_id].addr,
nla_data(tb[QCA_WLAN_VENDOR_ATTR_MLO_LINK_MAC_ADDR]),
ETH_ALEN);
os_memcpy(mlo->links[link_id].bssid,
nla_data(tb[QCA_WLAN_VENDOR_ATTR_MLO_LINK_BSSID]),
ETH_ALEN);
wpa_printf(MSG_DEBUG, "nl80211: MLO link[%u] addr " MACSTR
" bssid " MACSTR,
link_id, MAC2STR(mlo->links[link_id].addr),
MAC2STR(mlo->links[link_id].bssid));
}
}
#endif /* CONFIG_DRIVER_NL80211_QCA */
static void nl80211_parse_mlo_link_info(struct driver_sta_mlo_info *mlo,
struct nlattr *mlo_links)
{
struct nlattr *link;
int rem_links;
nla_for_each_nested(link, mlo_links, rem_links) { nla_for_each_nested(link, mlo_links, rem_links) {
struct nlattr *tb[NL80211_ATTR_MAX + 1]; struct nlattr *tb[NL80211_ATTR_MAX + 1];
@ -492,6 +492,58 @@ static void nl80211_parse_mlo_info(struct wpa_driver_nl80211_data *drv,
link_id, MAC2STR(mlo->links[link_id].addr), link_id, MAC2STR(mlo->links[link_id].addr),
MAC2STR(mlo->links[link_id].bssid)); MAC2STR(mlo->links[link_id].bssid));
} }
}
static int nl80211_get_assoc_link_id(const u8 *data, u8 len)
{
if (!(data[0] & BASIC_MULTI_LINK_CTRL0_PRES_LINK_ID))
return -1;
#define BASIC_ML_IE_COMMON_INFO_LINK_ID_IDX \
(2 + /* Multi-Link Control field */ \
1 + /* Common Info Length field (Basic) */ \
ETH_ALEN) /* MLD MAC Address field (Basic) */
if (len <= BASIC_ML_IE_COMMON_INFO_LINK_ID_IDX)
return -1;
return data[BASIC_ML_IE_COMMON_INFO_LINK_ID_IDX] & 0x0F;
}
static void nl80211_parse_mlo_info(struct wpa_driver_nl80211_data *drv,
bool qca_roam_auth,
struct nlattr *addr,
struct nlattr *mlo_links,
struct nlattr *resp_ie)
{
const u8 *ml_ie;
struct driver_sta_mlo_info *mlo = &drv->sta_mlo_info;
if (!addr || !mlo_links || !resp_ie)
return;
ml_ie = get_ml_ie(nla_data(resp_ie), nla_len(resp_ie),
MULTI_LINK_CONTROL_TYPE_BASIC);
if (!ml_ie)
return;
drv->mlo_assoc_link_id = nl80211_get_assoc_link_id(&ml_ie[3],
ml_ie[1] - 1);
if (drv->mlo_assoc_link_id < 0 ||
drv->mlo_assoc_link_id >= MAX_NUM_MLD_LINKS)
return;
os_memcpy(mlo->ap_mld_addr, nla_data(addr), ETH_ALEN);
wpa_printf(MSG_DEBUG, "nl80211: AP MLD MAC Address " MACSTR,
MAC2STR(mlo->ap_mld_addr));
if (!qca_roam_auth)
nl80211_parse_mlo_link_info(mlo, mlo_links);
#ifdef CONFIG_DRIVER_NL80211_QCA
if (qca_roam_auth)
nl80211_parse_qca_vendor_mlo_link_info(mlo, mlo_links);
#endif /* CONFIG_DRIVER_NL80211_QCA */
if (!(mlo->valid_links & BIT(drv->mlo_assoc_link_id))) { if (!(mlo->valid_links & BIT(drv->mlo_assoc_link_id))) {
wpa_printf(MSG_ERROR, "nl80211: Invalid MLO assoc link ID %d", wpa_printf(MSG_ERROR, "nl80211: Invalid MLO assoc link ID %d",
@ -507,7 +559,8 @@ static void nl80211_parse_mlo_info(struct wpa_driver_nl80211_data *drv,
static void mlme_event_connect(struct wpa_driver_nl80211_data *drv, static void mlme_event_connect(struct wpa_driver_nl80211_data *drv,
enum nl80211_commands cmd, struct nlattr *status, enum nl80211_commands cmd, bool qca_roam_auth,
struct nlattr *status,
struct nlattr *addr, struct nlattr *req_ie, struct nlattr *addr, struct nlattr *req_ie,
struct nlattr *resp_ie, struct nlattr *resp_ie,
struct nlattr *timed_out, struct nlattr *timed_out,
@ -613,7 +666,7 @@ static void mlme_event_connect(struct wpa_driver_nl80211_data *drv,
drv->associated = 1; drv->associated = 1;
drv->sta_mlo_info.valid_links = 0; drv->sta_mlo_info.valid_links = 0;
nl80211_parse_mlo_info(drv, addr, mlo_links, resp_ie); nl80211_parse_mlo_info(drv, qca_roam_auth, addr, mlo_links, resp_ie);
if (!drv->sta_mlo_info.valid_links && addr) { if (!drv->sta_mlo_info.valid_links && addr) {
os_memcpy(drv->bssid, nla_data(addr), ETH_ALEN); os_memcpy(drv->bssid, nla_data(addr), ETH_ALEN);
os_memcpy(drv->prev_bssid, drv->bssid, ETH_ALEN); os_memcpy(drv->prev_bssid, drv->bssid, ETH_ALEN);
@ -2228,7 +2281,7 @@ static void qca_nl80211_key_mgmt_auth(struct wpa_driver_nl80211_data *drv,
bssid = nla_data(tb[QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_BSSID]); bssid = nla_data(tb[QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_BSSID]);
wpa_printf(MSG_DEBUG, " * roam BSSID " MACSTR, MAC2STR(bssid)); wpa_printf(MSG_DEBUG, " * roam BSSID " MACSTR, MAC2STR(bssid));
mlme_event_connect(drv, NL80211_CMD_ROAM, NULL, mlme_event_connect(drv, NL80211_CMD_ROAM, true, NULL,
tb[QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_BSSID], tb[QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_BSSID],
tb[QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_REQ_IE], tb[QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_REQ_IE],
tb[QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_RESP_IE], tb[QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_RESP_IE],
@ -2241,7 +2294,7 @@ static void qca_nl80211_key_mgmt_auth(struct wpa_driver_nl80211_data *drv,
tb[QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_FILS_ERP_NEXT_SEQ_NUM], tb[QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_FILS_ERP_NEXT_SEQ_NUM],
tb[QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_PMK], tb[QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_PMK],
tb[QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_PMKID], tb[QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_PMKID],
NULL); tb[QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_MLO_LINKS]);
} }
@ -3304,7 +3357,7 @@ static void do_process_drv_event(struct i802_bss *bss, int cmd,
break; break;
case NL80211_CMD_CONNECT: case NL80211_CMD_CONNECT:
case NL80211_CMD_ROAM: case NL80211_CMD_ROAM:
mlme_event_connect(drv, cmd, mlme_event_connect(drv, cmd, false,
tb[NL80211_ATTR_STATUS_CODE], tb[NL80211_ATTR_STATUS_CODE],
tb[NL80211_ATTR_MAC], tb[NL80211_ATTR_MAC],
tb[NL80211_ATTR_REQ_IE], tb[NL80211_ATTR_REQ_IE],