MSCS: Add support to populate MSCS Descriptor IE in (Re)AssocReq

Include the MSCS Descriptor IE in the (Re)Association Request frames to
setup MSCS between the AP and the STA during association.

Signed-off-by: Vinita S. Maloo <vmaloo@codeaurora.org>

diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c
index c761fdad196e86de8d14f6e01030b9f2e8b5b733..789846905c807750f965116144ef30a665bb50ff 100644 (file)
--- a/wpa_supplicant/sme.c
+++ b/wpa_supplicant/sme.c
@@ -1880,6 +1880,42 @@ void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode,
 pfs_fail:
 #endif /* CONFIG_DPP2 */
 
+       if (wpa_s->current_bss && wpa_s->robust_av.valid_config) {
+               struct wpabuf *mscs_ie;
+               size_t mscs_ie_len, buf_len, *wpa_ie_len, max_ie_len;
+
+               if (!wpa_bss_ext_capab(wpa_s->current_bss, WLAN_EXT_CAPAB_MSCS))
+                       goto mscs_fail;
+
+               buf_len = 3 +   /* MSCS descriptor IE header */
+                         1 +   /* Request type */
+                         2 +   /* User priority control */
+                         4 +   /* Stream timeout */
+                         3 +   /* TCLAS Mask IE header */
+                         wpa_s->robust_av.frame_classifier_len;
+               mscs_ie = wpabuf_alloc(buf_len);
+               if (!mscs_ie) {
+                       wpa_printf(MSG_INFO,
+                                  "MSCS: Failed to allocate MSCS IE");
+                       goto mscs_fail;
+               }
+
+               wpa_ie_len = &wpa_s->sme.assoc_req_ie_len;
+               max_ie_len = sizeof(wpa_s->sme.assoc_req_ie);
+               wpas_populate_mscs_descriptor_ie(&wpa_s->robust_av, mscs_ie);
+               if ((*wpa_ie_len + wpabuf_len(mscs_ie)) <= max_ie_len) {
+                       wpa_hexdump_buf(MSG_MSGDUMP, "MSCS IE",
+                                       wpabuf_head(mscs_ie));
+                       mscs_ie_len = wpabuf_len(mscs_ie);
+                       os_memcpy(wpa_s->sme.assoc_req_ie + *wpa_ie_len,
+                                 wpabuf_head(mscs_ie), mscs_ie_len);
+                       *wpa_ie_len += mscs_ie_len;
+               }
+
+               wpabuf_free(mscs_ie);
+       }
+mscs_fail:
+
        if (ssid && ssid->multi_ap_backhaul_sta) {
                size_t multi_ap_ie_len;
 

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 4134d089b986007b66d7166b322d23dd99c26545..9365c07177cc3f682fc69afdb15088be9e17c58c 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -3192,6 +3192,40 @@ pfs_fail:
                wpa_ie_len += wpa_s->rsnxe_len;
        }
 
+       if (bss && wpa_s->robust_av.valid_config) {
+               struct wpabuf *mscs_ie;
+               size_t mscs_ie_len, buf_len;
+
+               if (!wpa_bss_ext_capab(bss, WLAN_EXT_CAPAB_MSCS))
+                       goto mscs_fail;
+
+               buf_len = 3 +   /* MSCS descriptor IE header */
+                         1 +   /* Request type */
+                         2 +   /* User priority control */
+                         4 +   /* Stream timeout */
+                         3 +   /* TCLAS Mask IE header */
+                         wpa_s->robust_av.frame_classifier_len;
+               mscs_ie = wpabuf_alloc(buf_len);
+               if (!mscs_ie) {
+                       wpa_printf(MSG_INFO,
+                                  "MSCS: Failed to allocate MSCS IE");
+                       goto mscs_fail;
+               }
+
+               wpas_populate_mscs_descriptor_ie(&wpa_s->robust_av, mscs_ie);
+               if ((wpa_ie_len + wpabuf_len(mscs_ie)) <= max_wpa_ie_len) {
+                       wpa_hexdump_buf(MSG_MSGDUMP, "MSCS IE",
+                                       wpabuf_head(mscs_ie));
+                       mscs_ie_len = wpabuf_len(mscs_ie);
+                       os_memcpy(wpa_ie + wpa_ie_len, wpabuf_head(mscs_ie),
+                                 mscs_ie_len);
+                       wpa_ie_len += mscs_ie_len;
+               }
+
+               wpabuf_free(mscs_ie);
+       }
+mscs_fail:
+
        if (ssid->multi_ap_backhaul_sta) {
                size_t multi_ap_ie_len;