autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0005-backport-hostapd-MLO-avoid-usage-of-mld_id-as-user-c.patch

From 77481b5b773f02e2a9cf11b42de22d5fef0fa017 Mon Sep 17 00:00:00 2001
From: Evelyn Tsai <evelyn.tsai@mediatek.com>
Date: Wed, 20 Mar 2024 13:24:06 +0800
Subject: [PATCH 05/69] backport: hostapd: MLO: avoid usage of mld_id as user
 configuration

From: Sriram R <quic_srirrama@quicinc.com>

Currently mld_id is provided as a user configuration to
identify partner bss belonging to the same MLD. The same
id is used at protocol level also to indicate the MLD ID
of the MLD.

But, in general mld_id is a relative reference of the MLD
where 0 is used as the mld_id to represent the self MLD and
in case of MLO MBSSID mld_id of a non transmitted BSS affiliated
to a MLD is based on the relative bss index of the non transmitted
BSS from the transmitted BSS. Hence mld_id need not be fetched
from users, rather it can be identified wherever required.

To verify if the partners are belonging to the same MLD the
interface name can be checked, since all link BSS partners
of the same MLD belongs to the same interface.

Hence, remove usage of mld_id user config and instead introduce two
functions hostapd_is_ml_partner() and hostapd_get_mld_id(). The
former is used to verfiy if partneres belong to same MLD or not and
the later is used the get the MLD ID of the bss.

Signed-off-by: Sriram R <quic_srirrama@quicinc.com>
Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
---
 hostapd/config_file.c   |  2 --
 hostapd/ctrl_iface.c    |  6 +++---
 hostapd/hostapd.conf    |  3 ---
 hostapd/main.c          | 10 ++++++++--
 src/ap/beacon.c         |  5 ++---
 src/ap/ctrl_iface_ap.c  |  2 +-
 src/ap/drv_callbacks.c  |  2 +-
 src/ap/hostapd.c        | 24 +++++++++++++++++++++---
 src/ap/hostapd.h        |  6 +++++-
 src/ap/ieee802_11.c     | 16 +++++++---------
 src/ap/ieee802_11_eht.c |  6 +++---
 src/ap/ieee802_1x.c     |  2 +-
 src/ap/sta_info.c       |  4 ++--
 src/ap/wpa_auth_glue.c  |  4 ++--
 14 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index b83df99ac..261905368 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -5306,8 +5306,6 @@ static int hostapd_config_fill(struct hostapd_config *conf,
 		conf->punct_acs_threshold = val;
 	} else if (os_strcmp(buf, "mld_ap") == 0) {
 		bss->mld_ap = !!atoi(pos);
-	} else if (os_strcmp(buf, "mld_id") == 0) {
-		bss->mld_id = atoi(pos);
 	} else if (os_strcmp(buf, "mld_addr") == 0) {
 		if (hwaddr_aton(pos, bss->mld_addr)) {
 			wpa_printf(MSG_ERROR, "Line %d: Invalid mld_addr",
diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index 8a12fee88..6f2b31eaf 100644
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -3479,7 +3479,7 @@ static int hostapd_ctrl_iface_enable_mld(struct hostapd_iface *iface)
 		struct hostapd_bss_config *h_conf = h_hapd->conf;
 
 		if (!h_conf->mld_ap ||
-		    h_conf->mld_id != iface->bss[0]->conf->mld_id)
+		    !hostapd_is_ml_partner(h_hapd, iface->bss[0]))
 			continue;
 
 		if (hostapd_enable_iface(h_iface)) {
@@ -3520,7 +3520,7 @@ static int hostapd_ctrl_iface_disable_mld(struct hostapd_iface *iface)
 		struct hostapd_bss_config *h_conf = h_hapd->conf;
 
 		if (!h_conf->mld_ap ||
-		    h_conf->mld_id != iface->bss[0]->conf->mld_id)
+		    !hostapd_is_ml_partner(h_hapd, iface->bss[0]))
 			continue;
 
 		if (!h_hapd->mld_first_bss) {
@@ -3541,7 +3541,7 @@ static int hostapd_ctrl_iface_disable_mld(struct hostapd_iface *iface)
 		struct hostapd_bss_config *h_conf = h_hapd->conf;
 
 		if (!h_conf->mld_ap ||
-		    h_conf->mld_id != iface->bss[0]->conf->mld_id ||
+		    !hostapd_is_ml_partner(h_hapd, iface->bss[0]) ||
 		    !h_hapd->mld_first_bss)
 			continue;
 
diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
index 377139947..0d10998af 100644
--- a/hostapd/hostapd.conf
+++ b/hostapd/hostapd.conf
@@ -1113,9 +1113,6 @@ wmm_ac_vo_acm=0
 # 1 = yes (MLO)
 #mld_ap=0
 
-# MLD ID - Affiliated MLD ID
-#mld_id=1
-
 # AP MLD MAC address
 # The configured address will be set as the interface hardware address and used
 # as the AP MLD MAC address. If not set, the current interface hardware address
diff --git a/hostapd/main.c b/hostapd/main.c
index c95cf8a71..a7610b8a5 100644
--- a/hostapd/main.c
+++ b/hostapd/main.c
@@ -175,9 +175,15 @@ static int hostapd_driver_init(struct hostapd_iface *iface)
 			continue;
 		}
 
-		if (!hconf->mld_ap || hconf->mld_id != conf->mld_id) {
+		if (!hconf->mld_ap) {
 			wpa_printf(MSG_DEBUG,
-				   "MLD: Skip non matching mld_id");
+				   "MLD: Skip non MLD");
+			continue;
+		}
+
+		if (!hostapd_is_ml_partner(hapd, h_hapd)) {
+			wpa_printf(MSG_DEBUG,
+				   "MLD: Skip non matching mld vif name");
 			continue;
 		}
 
diff --git a/src/ap/beacon.c b/src/ap/beacon.c
index e339c2002..32865f667 100644
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
@@ -960,7 +960,7 @@ static void hostapd_fill_probe_resp_ml_params(struct hostapd_data *hapd,
 	 * We want to include the AP MLD ID in the response if it was
 	 * included in the request.
 	 */
-	probed_mld_id = mld_id != -1 ? mld_id : hapd->conf->mld_id;
+	probed_mld_id = mld_id != -1 ? mld_id : hostapd_get_mld_id(hapd);
 
 	for_each_mld_link(link, i, j, hapd->iface->interfaces,
 			  probed_mld_id) {
@@ -2676,8 +2676,7 @@ int ieee802_11_set_beacon(struct hostapd_data *hapd)
 			continue;
 
 #ifdef CONFIG_IEEE80211BE
-		if (hapd->conf->mld_ap && other->bss[0]->conf->mld_ap &&
-		    hapd->conf->mld_id == other->bss[0]->conf->mld_id)
+		if (hostapd_is_ml_partner(hapd, other->bss[0]))
 			mld_ap = true;
 #endif /* CONFIG_IEEE80211BE */
 
diff --git a/src/ap/ctrl_iface_ap.c b/src/ap/ctrl_iface_ap.c
index e65c3c4b2..cdd777287 100644
--- a/src/ap/ctrl_iface_ap.c
+++ b/src/ap/ctrl_iface_ap.c
@@ -1013,7 +1013,7 @@ int hostapd_ctrl_iface_status(struct hostapd_data *hapd, char *buf,
 					  "mld_id[%d]=%d\n"
 					  "mld_link_id[%d]=%d\n",
 					  (int) i, MAC2STR(bss->mld_addr),
-					  (int) i, bss->conf->mld_id,
+					  (int) i, hostapd_get_mld_id(bss),
 					  (int) i, bss->mld_link_id);
 			if (os_snprintf_error(buflen - len, ret))
 				return len;
diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
index 814901977..3b89c700d 100644
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
@@ -1965,7 +1965,7 @@ static bool search_mld_sta(struct hostapd_data **p_hapd, const u8 *src)
 		struct hostapd_bss_config *hconf = h_hapd->conf;
 
 		if (!hconf->mld_ap ||
-		    hconf->mld_id != hapd->conf->mld_id)
+		    !hostapd_is_ml_partner(h_hapd, hapd))
 			continue;
 
 		h_hapd = hostapd_find_by_sta(h, src, false);
diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index 69bb2b4a4..615e0d201 100644
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -3234,8 +3234,7 @@ int hostapd_disable_iface(struct hostapd_iface *hapd_iface)
 			struct hostapd_bss_config *h_conf = h_hapd->conf;
 
 			if (!h_conf->mld_ap ||
-			    h_conf->mld_id !=
-			    hapd_iface->bss[0]->conf->mld_id ||
+			    !hostapd_is_ml_partner(h_hapd, hapd_iface->bss[0]) ||
 			    h_iface == hapd_iface)
 				continue;
 
@@ -4430,7 +4429,7 @@ struct hostapd_data * hostapd_mld_get_link_bss(struct hostapd_data *hapd,
 		struct hostapd_data *h_hapd = h->bss[0];
 		struct hostapd_bss_config *hconf = h_hapd->conf;
 
-		if (!hconf->mld_ap || hconf->mld_id != hapd->conf->mld_id)
+		if (!hconf->mld_ap || !hostapd_is_ml_partner(hapd, h_hapd))
 			continue;
 
 		if (h_hapd->mld_link_id == link_id)
@@ -4439,6 +4438,25 @@ struct hostapd_data * hostapd_mld_get_link_bss(struct hostapd_data *hapd,
 
 	return NULL;
 }
+
+bool hostapd_is_ml_partner(struct hostapd_data *hapd1, struct hostapd_data *hapd2)
+{
+	if (!hapd1->conf->mld_ap || !hapd2->conf->mld_ap)
+		return false;
+
+	return !(os_strcmp(hapd1->conf->iface, hapd2->conf->iface));
+}
+
+u8 hostapd_get_mld_id(struct hostapd_data *hapd)
+{
+	if (!hapd->conf->mld_ap)
+		return 255;
+
+	/* MLD ID 0 represents self */
+	return 0;
+
+	/* TODO MLD ID for MBSS cases */
+}
 #endif /* CONFIG_IEEE80211BE */
 
 
diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
index e60481361..a7035c35c 100644
--- a/src/ap/hostapd.h
+++ b/src/ap/hostapd.h
@@ -814,6 +814,10 @@ struct hostapd_data * hostapd_mld_get_link_bss(struct hostapd_data *hapd,
 int hostapd_link_remove(struct hostapd_data *hapd, u32 count);
 
 #ifdef CONFIG_IEEE80211BE
+u8 hostapd_get_mld_id(struct hostapd_data *hapd);
+bool hostapd_is_ml_partner(struct hostapd_data *hapd1,
+			   struct hostapd_data *hapd2);
+
 #define for_each_mld_link(_link, _bss_idx, _iface_idx, _ifaces, _mld_id) \
 	for (_iface_idx = 0;						\
 	     _iface_idx < (_ifaces)->count;				\
@@ -825,7 +829,7 @@ int hostapd_link_remove(struct hostapd_data *hapd, u32 count);
 			for (_link =					\
 			     (_ifaces)->iface[_iface_idx]->bss[_bss_idx]; \
 			    _link && _link->conf->mld_ap &&		\
-				_link->conf->mld_id == _mld_id;		\
+				hostapd_get_mld_id(_link) == _mld_id;		\
 			    _link = NULL)
 #else /* CONFIG_IEEE80211BE */
 #define for_each_mld_link(_link, _bss_idx, _iface_idx, _ifaces, _mld_id) \
diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index 9fe6b127b..ea6666301 100644
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -4599,7 +4599,7 @@ int hostapd_process_assoc_ml_info(struct hostapd_data *hapd,
 				continue;
 
 			if (iface->bss[0]->conf->mld_ap &&
-			    hapd->conf->mld_id == iface->bss[0]->conf->mld_id &&
+			    hostapd_is_ml_partner(hapd, iface->bss[0]) &&
 			    i == iface->bss[0]->mld_link_id)
 				break;
 		}
@@ -5815,7 +5815,7 @@ static bool hostapd_ml_handle_disconnect(struct hostapd_data *hapd,
 				assoc_hapd->iface->interfaces->iface[i]->bss[0];
 
 			if (!tmp_hapd->conf->mld_ap ||
-			    assoc_hapd->conf->mld_id != tmp_hapd->conf->mld_id)
+			    !hostapd_is_ml_partner(assoc_hapd, tmp_hapd))
 				continue;
 
 			for (tmp_sta = tmp_hapd->sta_list; tmp_sta;
@@ -6483,7 +6483,7 @@ static void hostapd_ml_handle_assoc_cb(struct hostapd_data *hapd,
 				hapd->iface->interfaces->iface[i]->bss[0];
 
 			if (!tmp_hapd->conf->mld_ap ||
-			    hapd->conf->mld_id != tmp_hapd->conf->mld_id)
+			    !hostapd_is_ml_partner(tmp_hapd, hapd))
 				continue;
 
 			for (tmp_sta = tmp_hapd->sta_list; tmp_sta;
@@ -7457,8 +7457,7 @@ static size_t hostapd_eid_rnr_multi_iface_len(struct hostapd_data *hapd,
 		bool ap_mld = false;
 
 #ifdef CONFIG_IEEE80211BE
-		if (hapd->conf->mld_ap && iface->bss[0]->conf->mld_ap &&
-		    hapd->conf->mld_id == iface->bss[0]->conf->mld_id)
+		if (hostapd_is_ml_partner(hapd, iface->bss[0]))
 			ap_mld = true;
 #endif /* CONFIG_IEEE80211BE */
 
@@ -7631,10 +7630,10 @@ static bool hostapd_eid_rnr_bss(struct hostapd_data *hapd,
 		u8 param_ch = hapd->eht_mld_bss_param_change;
 
 		if (reporting_hapd->conf->mld_ap &&
-		    bss->conf->mld_id == reporting_hapd->conf->mld_id)
+		    hostapd_is_ml_partner(bss, reporting_hapd))
 			*eid++ = 0;
 		else
-			*eid++ = hapd->conf->mld_id;
+			*eid++ = hostapd_get_mld_id(hapd);
 
 		*eid++ = hapd->mld_link_id | ((param_ch & 0xF) << 4);
 		*eid = (param_ch >> 4) & 0xF;
@@ -7732,8 +7731,7 @@ static u8 * hostapd_eid_rnr_multi_iface(struct hostapd_data *hapd, u8 *eid,
 		bool ap_mld = false;
 
 #ifdef CONFIG_IEEE80211BE
-		if (hapd->conf->mld_ap && iface->bss[0]->conf->mld_ap &&
-		    hapd->conf->mld_id == iface->bss[0]->conf->mld_id)
+		if (hostapd_is_ml_partner(hapd, iface->bss[0]))
 			ap_mld = true;
 #endif /* CONFIG_IEEE80211BE */
 
diff --git a/src/ap/ieee802_11_eht.c b/src/ap/ieee802_11_eht.c
index e4590b9ff..6ffc5dd57 100644
--- a/src/ap/ieee802_11_eht.c
+++ b/src/ap/ieee802_11_eht.c
@@ -505,8 +505,8 @@ static u8 * hostapd_eid_eht_basic_ml_common(struct hostapd_data *hapd,
 
 	if (include_mld_id) {
 		wpa_printf(MSG_DEBUG, "MLD: AP MLD ID=0x%x",
-			   hapd->conf->mld_id);
-		wpabuf_put_u8(buf, hapd->conf->mld_id);
+			   hostapd_get_mld_id(hapd));
+		wpabuf_put_u8(buf, hostapd_get_mld_id(hapd));
 	}
 
 	if (!mld_info)
@@ -1040,7 +1040,7 @@ static int hostapd_mld_validate_assoc_info(struct hostapd_data *hapd,
 				continue;
 
 			if (other_hapd->conf->mld_ap &&
-			    other_hapd->conf->mld_id == hapd->conf->mld_id &&
+			    hostapd_is_ml_partner(hapd, other_hapd) &&
 			    link_id == other_hapd->mld_link_id)
 				break;
 		}
diff --git a/src/ap/ieee802_1x.c b/src/ap/ieee802_1x.c
index f13c60a9e..42eb5a173 100644
--- a/src/ap/ieee802_1x.c
+++ b/src/ap/ieee802_1x.c
@@ -173,7 +173,7 @@ static void ieee802_1x_ml_set_sta_authorized(struct hostapd_data *hapd,
 				hapd->iface->interfaces->iface[i]->bss[0];
 
 			if (!tmp_hapd->conf->mld_ap ||
-			    hapd->conf->mld_id != tmp_hapd->conf->mld_id)
+			    !hostapd_is_ml_partner(hapd, tmp_hapd))
 				continue;
 
 			for (tmp_sta = tmp_hapd->sta_list; tmp_sta;
diff --git a/src/ap/sta_info.c b/src/ap/sta_info.c
index dc5e3b419..97ed805ca 100644
--- a/src/ap/sta_info.c
+++ b/src/ap/sta_info.c
@@ -979,7 +979,7 @@ static bool ap_sta_ml_disconnect(struct hostapd_data *hapd,
 			tmp_hapd = interfaces->iface[i]->bss[0];
 
 			if (!tmp_hapd->conf->mld_ap ||
-			    assoc_hapd->conf->mld_id != tmp_hapd->conf->mld_id)
+			    !hostapd_is_ml_partner(tmp_hapd, assoc_hapd))
 				continue;
 
 			for (tmp_sta = tmp_hapd->sta_list; tmp_sta;
@@ -1731,7 +1731,7 @@ static void ap_sta_remove_link_sta(struct hostapd_data *hapd,
 	unsigned int i, j;
 
 	for_each_mld_link(tmp_hapd, i, j, hapd->iface->interfaces,
-			  hapd->conf->mld_id) {
+			  hostapd_get_mld_id(hapd)) {
 		struct sta_info *tmp_sta;
 
 		if (hapd == tmp_hapd)
diff --git a/src/ap/wpa_auth_glue.c b/src/ap/wpa_auth_glue.c
index 9ce58f246..d23f21835 100644
--- a/src/ap/wpa_auth_glue.c
+++ b/src/ap/wpa_auth_glue.c
@@ -1557,7 +1557,7 @@ static int hostapd_wpa_auth_get_ml_rsn_info(void *ctx,
 				hapd->iface->interfaces->iface[j];
 
 			if (!iface->bss[0]->conf->mld_ap ||
-			    hapd->conf->mld_id != iface->bss[0]->conf->mld_id ||
+			    !hostapd_is_ml_partner(hapd, iface->bss[0]) ||
 			    link_id != iface->bss[0]->mld_link_id ||
 			    !iface->bss[0]->wpa_auth)
 				continue;
@@ -1600,7 +1600,7 @@ static int hostapd_wpa_auth_get_ml_key_info(void *ctx,
 				hapd->iface->interfaces->iface[j];
 
 			if (!iface->bss[0]->conf->mld_ap ||
-			    hapd->conf->mld_id != iface->bss[0]->conf->mld_id ||
+			    !hostapd_is_ml_partner(hapd, iface->bss[0]) ||
 			    link_id != iface->bss[0]->mld_link_id ||
 			    !iface->bss[0]->wpa_auth)
 				continue;
-- 
2.39.2