enable mld_ap configuration (#352)

* enable mld_ap configuration

* don't break old linux for backward compitibility

Author: wptestyyh

api/protos/WifiCore.proto

@@ -208,11 +208,12 @@ message Dot11AccessPointConfiguration
     Dot11MacAddress Bssid = 2;
     Dot11PhyType PhyType = 3;
     Dot11AuthenticationData AuthenticationData = 4;
-    Dot11AuthenticationDot1x AuthenticationDot1x = 9;
     repeated Dot11AuthenticationAlgorithm AuthenticationAlgorithms = 5;
     repeated Dot11CipherSuiteConfiguration PairwiseCipherSuites = 6;
     repeated Dot11AkmSuite AkmSuites = 7;
     repeated Dot11FrequencyBand FrequencyBands = 8;
+    Dot11AuthenticationDot1x AuthenticationDot1x = 9;
+    bool mldAp = 10;
 }
 
 message Dot11AccessPointCapabilities

src/common/net/wifi/core/include/microsoft/net/wifi/IAccessPointController.hxx

@@ -157,6 +157,15 @@ struct IAccessPointController
      */
     virtual AccessPointOperationStatus
     SetRadiusConfiguration(Ieee8021xRadiusConfiguration radiusConfiguration) noexcept = 0;
+
+    /**
+     * @brief Set whether the access point is a Multi-Link Device (MLD) AP.
+     *
+     * @param mldAp True if the access point is an MLD AP, false otherwise.
+     * @return AccessPointOperationStatus
+     */
+    virtual AccessPointOperationStatus
+    SetMldAp(bool mldAp) noexcept = 0;
 };
 
 /**

src/common/service/NetRemoteService.cxx

@@ -10,6 +10,7 @@
 #include <ranges>
 #include <string>
 #include <string_view>
+#include <sys/utsname.h>
 #include <thread>
 #include <utility>
 #include <vector>
@@ -613,6 +614,32 @@ NetRemoteService::WifiAccessPointEnableImpl(std::string_view accessPointId, cons
                 return wifiOperationStatus;
             }
         }
+
+        // Check Linux kernel version before setting MLD AP
+        bool shouldSetMldAp = false;
+        struct utsname buffer;
+        if (uname(&buffer) == 0) {
+            std::string release(buffer.release);
+            std::smatch match;
+            std::regex versionRegex(R"((\d+)\.(\d+))");
+            if (std::regex_search(release, match, versionRegex) && match.size() >= 3) {
+                int major = std::stoi(match[1]);
+                int minor = std::stoi(match[2]);
+                if (major > 6 || (major == 6 && minor >= 11)) {
+                    shouldSetMldAp = true;
+                }
+            }
+        }
+
+        if (shouldSetMldAp) {
+            bool mldAp = dot11AccessPointConfiguration->mldap();
+            wifiOperationStatus = WifiAccessPointSetMldApImpl(accessPointId, mldAp, accessPointController);
+            if (wifiOperationStatus.code() != WifiAccessPointOperationStatusCode::WifiAccessPointOperationStatusCodeSucceeded) {
+                return wifiOperationStatus;
+            }
+        } else {
+            LOGW << "Skipping setting MLD AP configuration due to unsupported kernel version";
+        }
     }
 
     // Obtain current operational state.
@@ -1467,6 +1494,36 @@ NetRemoteService::WifiAccessPointSetAuthenticationDot1xImpl(std::string_view acc
     return wifiOperationStatus;
 }
 
+WifiAccessPointOperationStatus
+NetRemoteService::WifiAccessPointSetMldApImpl(std::string_view accessPointId, bool mldAp, std::shared_ptr<IAccessPointController> accessPointController)
+{
+    WifiAccessPointOperationStatus wifiOperationStatus{};
+
+    AccessPointOperationStatus operationStatus{ accessPointId };
+
+    // Create an AP controller for the requested AP if one wasn't specified.
+    if (accessPointController == nullptr) {
+        operationStatus = TryGetAccessPointController(accessPointId, accessPointController);
+        if (!operationStatus.Succeeded() || accessPointController == nullptr) {
+            wifiOperationStatus.set_code(ToDot11AccessPointOperationStatusCode(operationStatus.Code));
+            wifiOperationStatus.set_message(std::format("Failed to create access point controller for access point {} - {}", accessPointId, operationStatus.ToString()));
+            return wifiOperationStatus;
+        }
+    }
+
+    // Attempt to set the MLD AP setting.
+    operationStatus = accessPointController->SetMldAp(mldAp);
+    if (!operationStatus.Succeeded()) {
+        wifiOperationStatus.set_code(ToDot11AccessPointOperationStatusCode(operationStatus.Code));
+        wifiOperationStatus.set_message(std::format("Failed to set MLD AP setting for access point {} - {}", accessPointId, operationStatus.ToString()));
+        return wifiOperationStatus;
+    }
+
+    wifiOperationStatus.set_code(WifiAccessPointOperationStatusCode::WifiAccessPointOperationStatusCodeSucceeded);
+
+    return wifiOperationStatus;
+}
+
 using google::protobuf::Map;
 
 WifiAccessPointOperationStatus

src/common/service/include/microsoft/net/remote/service/NetRemoteService.hxx

@@ -370,6 +370,17 @@ protected:
     Microsoft::Net::Remote::Wifi::WifiAccessPointOperationStatus
     WifiAccessPointSetAuthenticationDot1xImpl(std::string_view accessPointId, const Microsoft::Net::Wifi::Dot11AuthenticationDot1x& dot11AuthenticationDot1x, std::shared_ptr<Microsoft::Net::Wifi::IAccessPointController> accessPointController = nullptr);
 
+    /**
+     * @brief Set whether the access point is a Multi-Link Device Access Point (MLD AP).
+     *
+     * @param accessPointId The access point identifier.
+     * @param mldAp True to configure the access point as an MLD AP, false otherwise.
+     * @param accessPointController The access point controller for the specified access point (optional).
+     * @return Microsoft::Net::Remote::Wifi::WifiAccessPointOperationStatus
+     */
+    Microsoft::Net::Remote::Wifi::WifiAccessPointOperationStatus
+    WifiAccessPointSetMldApImpl(std::string_view accessPointId, bool mldAp, std::shared_ptr<Microsoft::Net::Wifi::IAccessPointController> accessPointController = nullptr);
+
     /**
      * @brief Get the sttaic attributes of the specified access point.
      *

src/linux/net/wifi/core/AccessPointControllerLinux.cxx

@@ -664,6 +664,29 @@ AccessPointControllerLinux::SetRadiusConfiguration(Ieee8021xRadiusConfiguration
     return status;
 }
 
+AccessPointOperationStatus
+AccessPointControllerLinux::SetMldAp(bool mldAp) noexcept
+{
+    AccessPointOperationStatus status{ GetInterfaceName() };
+    const AccessPointOperationStatusLogOnExit logStatusOnExit(&status);
+
+    AUDITD << std::format("Attempting to set MLD AP for AP {} to {}", status.AccessPointId, mldAp ? "enabled" : "disabled");
+
+    std::string_view propertyValueToSet = mldAp ? Wpa::ProtocolHostapd::PropertyEnabled : Wpa::ProtocolHostapd::PropertyDisabled;
+
+    // Set the hostapd "mld_ap" property.
+    try {
+        m_hostapd.SetProperty(Wpa::ProtocolHostapd::PropertyNameMldAp, propertyValueToSet, EnforceConfigurationChange::Now);
+    } catch (const Wpa::HostapdException& ex) {
+        status.Code = AccessPointOperationStatusCode::InternalError;
+        status.Details = std::format("failed to set hostapd property '{}' to '{}' - {}", Wpa::ProtocolHostapd::PropertyNameMldAp, propertyValueToSet, ex.what());
+        return status;
+    }
+
+    status.Code = AccessPointOperationStatusCode::Succeeded;
+    return status;
+}
+
 std::unique_ptr<IAccessPointController>
 AccessPointControllerLinuxFactory::Create(std::string_view interfaceName)
 {

src/linux/net/wifi/core/include/microsoft/net/wifi/AccessPointControllerLinux.hxx

@@ -156,6 +156,15 @@ struct AccessPointControllerLinux :
     AccessPointOperationStatus
     SetRadiusConfiguration(Microsoft::Net::Ieee8021xRadiusConfiguration radiusConfiguration) noexcept override;
 
+    /**
+     * @brief Set whether the access point is a Multi-Link Device (MLD) AP.
+     *
+     * @param mldAp True if the access point is an MLD AP, false otherwise.
+     * @return AccessPointOperationStatus
+     */
+    AccessPointOperationStatus
+    SetMldAp(bool mldAp) noexcept override;
+
 private:
     Wpa::Hostapd m_hostapd;
 };

src/linux/net/wifi/wpa-controller/include/Wpa/ProtocolHostapd.hxx

@@ -684,6 +684,9 @@ struct ProtocolHostapd :
     static constexpr auto PropertyValueSaePasswordClearAll = "";
     static constexpr auto PropertyValueSaeKeyValueSeparator = "|";
 
+    // Wi-Fi 7 (IEEE 802.11be) properties.
+    static constexpr auto PropertyNameMldAp = "mld_ap";
+
     // Property names for "GET_CONFIG" command.
     static constexpr auto PropertyNameKeyManagement = "key_mgmt";
     static constexpr auto PropertyNameGroupCipher = "group_cipher";

tests/unit/TestNetRemoteServiceClient.cxx

@@ -314,6 +314,48 @@ TEST_CASE("WifiAccessPointEnable API", "[basic][rpc][client][remote]")
         REQUIRE(result.has_status());
         REQUIRE(result.status().code() == WifiAccessPointOperationStatusCode::WifiAccessPointOperationStatusCodeSucceeded);
     }
+
+    SECTION("Enable MLD AP")
+    {
+        // Enable the MLD AP flag via the configuration and verify it sticks.
+        Dot11AccessPointConfiguration apConfiguration{};
+        apConfiguration.set_mldap(true);
+
+        WifiAccessPointEnableRequest request{};
+        request.set_accesspointid(InterfaceName1);
+        *request.mutable_configuration() = std::move(apConfiguration);
+
+        WifiAccessPointEnableResult result{};
+        grpc::ClientContext clientContext{};
+
+        auto status = client->WifiAccessPointEnable(&clientContext, request, &result);
+        REQUIRE(status.ok());
+        REQUIRE(result.accesspointid() == request.accesspointid());
+        REQUIRE(result.has_status());
+        REQUIRE(result.status().code() == WifiAccessPointOperationStatusCode::WifiAccessPointOperationStatusCodeSucceeded);
+        REQUIRE(apTest1->MldAp == true);
+    }
+
+    SECTION("Disable MLD AP")
+    {
+        // Disable the MLD AP flag via the configuration and verify it sticks.
+        Dot11AccessPointConfiguration apConfiguration{};
+        apConfiguration.set_mldap(false);
+
+        WifiAccessPointEnableRequest request{};
+        request.set_accesspointid(InterfaceName2);
+        *request.mutable_configuration() = std::move(apConfiguration);
+
+        WifiAccessPointEnableResult result{};
+        grpc::ClientContext clientContext{};
+
+        auto status = client->WifiAccessPointEnable(&clientContext, request, &result);
+        REQUIRE(status.ok());
+        REQUIRE(result.accesspointid() == request.accesspointid());
+        REQUIRE(result.has_status());
+        REQUIRE(result.status().code() == WifiAccessPointOperationStatusCode::WifiAccessPointOperationStatusCodeSucceeded);
+        REQUIRE(apTest2->MldAp == false);
+    }
 }
 
 TEST_CASE("WifiAccessPointDisable API", "[basic][rpc][client][remote]")

tests/unit/net/wifi/helpers/AccessPointControllerTest.cxx

@@ -203,6 +203,18 @@ AccessPointControllerTest::SetRadiusConfiguration(Ieee8021xRadiusConfiguration r
     return AccessPointOperationStatus::MakeSucceeded(AccessPoint->InterfaceName);
 }
 
+AccessPointOperationStatus
+AccessPointControllerTest::SetMldAp(bool mldAp) noexcept
+{
+    assert(AccessPoint != nullptr);
+    if (AccessPoint == nullptr) {
+        return AccessPointOperationStatus::InvalidAccessPoint("null AccessPoint");
+    }
+
+    AccessPoint->MldAp = mldAp;
+    return AccessPointOperationStatus::MakeSucceeded(AccessPoint->InterfaceName);
+}
+
 AccessPointControllerFactoryTest::AccessPointControllerFactoryTest(AccessPointTest *accessPoint) :
     AccessPoint(accessPoint)
 {}

tests/unit/net/wifi/helpers/include/microsoft/net/wifi/test/AccessPointControllerTest.hxx

@@ -166,6 +166,15 @@ struct AccessPointControllerTest final :
      */
     AccessPointOperationStatus
     SetRadiusConfiguration(Ieee8021xRadiusConfiguration radiusConfiguration) noexcept override;
+
+    /**
+     * @brief Set whether the access point is a Multi-Link Device (MLD) AP.
+     *
+     * @param mldAp True if the access point is an MLD AP, false otherwise.
+     * @return AccessPointOperationStatus
+     */
+    AccessPointOperationStatus
+    SetMldAp(bool mldAp) noexcept override;
 };
 
 /**