MLD STA: Indicate AP MLD address in CTRL-EVENT-CONNECTED

Append the AP MLD address to CTRL-EVENT-CONNECTED when the current
connection uses MLO.

Signed-off-by: Aleti Nageshwar Reddy <quic_anageshw@quicinc.com>
This commit is contained in:
Aleti Nageshwar Reddy 2022-09-08 20:14:17 +05:30 committed by Jouni Malinen
parent db99e7341a
commit 22ba81cfed
2 changed files with 20 additions and 4 deletions

View file

@ -2537,12 +2537,21 @@ static int wpa_supplicant_ctrl_iface_status(struct wpa_supplicant *wpa_s,
wpa_s->current_ssid->ssid_len) : ""); wpa_s->current_ssid->ssid_len) : "");
if (wpa_s->wpa_state == WPA_COMPLETED) { if (wpa_s->wpa_state == WPA_COMPLETED) {
struct wpa_ssid *ssid = wpa_s->current_ssid; struct wpa_ssid *ssid = wpa_s->current_ssid;
char mld_addr[50];
mld_addr[0] = '\0';
if (wpa_s->valid_links)
os_snprintf(mld_addr, sizeof(mld_addr),
" ap_mld_addr=" MACSTR,
MAC2STR(wpa_s->ap_mld_addr));
wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_CONNECTED wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_CONNECTED
"- connection to " MACSTR "- connection to " MACSTR
" completed %s [id=%d id_str=%s]", " completed %s [id=%d id_str=%s]%s",
MAC2STR(wpa_s->bssid), "(auth)", MAC2STR(wpa_s->bssid), "(auth)",
ssid ? ssid->id : -1, ssid ? ssid->id : -1,
ssid && ssid->id_str ? ssid->id_str : ""); ssid && ssid->id_str ? ssid->id_str : "",
mld_addr);
} }
} }
#endif /* ANDROID */ #endif /* ANDROID */

View file

@ -985,6 +985,13 @@ void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s,
if (state == WPA_COMPLETED && wpa_s->new_connection) { if (state == WPA_COMPLETED && wpa_s->new_connection) {
struct wpa_ssid *ssid = wpa_s->current_ssid; struct wpa_ssid *ssid = wpa_s->current_ssid;
int fils_hlp_sent = 0; int fils_hlp_sent = 0;
char mld_addr[50];
mld_addr[0] = '\0';
if (wpa_s->valid_links)
os_snprintf(mld_addr, sizeof(mld_addr),
" ap_mld_addr=" MACSTR,
MAC2STR(wpa_s->ap_mld_addr));
#ifdef CONFIG_SME #ifdef CONFIG_SME
if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME) && if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME) &&
@ -997,11 +1004,11 @@ void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s,
#if defined(CONFIG_CTRL_IFACE) || !defined(CONFIG_NO_STDOUT_DEBUG) #if defined(CONFIG_CTRL_IFACE) || !defined(CONFIG_NO_STDOUT_DEBUG)
wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_CONNECTED "- Connection to " wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_CONNECTED "- Connection to "
MACSTR " completed [id=%d id_str=%s%s]", MACSTR " completed [id=%d id_str=%s%s]%s",
MAC2STR(wpa_s->bssid), MAC2STR(wpa_s->bssid),
ssid ? ssid->id : -1, ssid ? ssid->id : -1,
ssid && ssid->id_str ? ssid->id_str : "", ssid && ssid->id_str ? ssid->id_str : "",
fils_hlp_sent ? " FILS_HLP_SENT" : ""); fils_hlp_sent ? " FILS_HLP_SENT" : "", mld_addr);
#endif /* CONFIG_CTRL_IFACE || !CONFIG_NO_STDOUT_DEBUG */ #endif /* CONFIG_CTRL_IFACE || !CONFIG_NO_STDOUT_DEBUG */
wpas_clear_temp_disabled(wpa_s, ssid, 1); wpas_clear_temp_disabled(wpa_s, ssid, 1);
wpa_s->consecutive_conn_failures = 0; wpa_s->consecutive_conn_failures = 0;