* Enable Wi-Fi PAF commissioning by default on Linux platform

* Postpone to start Wi-Fi Management while needed

Signed-off-by: Lo,Chin-Ran <[email protected]>

Author: crlonxp

src/controller/CHIPDeviceController.cpp

@@ -832,11 +832,6 @@ CHIP_ERROR DeviceCommissioner::EstablishPASEConnection(NodeId remoteDeviceId, Re
         {
             ChipLogProgress(Controller, "WiFi-PAF: Subscribing to the NAN-USD devices, nodeId: %lu",
                             params.GetPeerAddress().GetRemoteId());
-            if (!DeviceLayer::ConnectivityMgrImpl().IsWiFiManagementStarted())
-            {
-                ChipLogError(Controller, "Wi-Fi Management should have been started now.");
-                ExitNow(CHIP_ERROR_INTERNAL);
-            }
             mRendezvousParametersForDeviceDiscoveredOverWiFiPAF = params;
             auto nodeId                                         = params.GetPeerAddress().GetRemoteId();
             const SetupDiscriminator connDiscriminator(params.GetSetupDiscriminator().value());

src/platform/Linux/ConnectivityManagerImpl.cpp

@@ -783,6 +783,33 @@ void ConnectivityManagerImpl::StartWiFiManagement()
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(DeviceLayer, "Failed to start WiFi management"));
 }
 
+CHIP_ERROR ConnectivityManagerImpl::StartWiFiManagementSync()
+{
+    if (IsWiFiManagementStarted())
+    {
+        return CHIP_NO_ERROR;
+    }
+    ChipLogProgress(DeviceLayer, "Start and sync Wi-Fi Management.");
+    static constexpr useconds_t kWiFiStartCheckTimeUsec = WIFI_START_CHECK_TIME_USEC;
+    static constexpr uint8_t kWiFiStartCheckAttempts    = WIFI_START_CHECK_ATTEMPTS;
+    StartWiFiManagement();
+    for (int cnt = 0; cnt < kWiFiStartCheckAttempts; cnt++)
+    {
+        if (IsWiFiManagementStarted())
+        {
+            break;
+        }
+        usleep(kWiFiStartCheckTimeUsec);
+    }
+    if (!IsWiFiManagementStarted())
+    {
+        ChipLogError(DeviceLayer, "Wi-Fi Management can't be started.");
+        return CHIP_ERROR_INTERNAL;
+    }
+    ChipLogProgress(DeviceLayer, "Wi-Fi Management is started");
+    return CHIP_NO_ERROR;
+}
+
 bool ConnectivityManagerImpl::IsWiFiManagementStarted()
 {
     std::lock_guard<std::mutex> lock(mWpaSupplicantMutex);
@@ -818,6 +845,9 @@ enum nan_service_protocol_type
 
 CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFPublish(ConnectivityManager::WiFiPAFAdvertiseParam & InArgs)
 {
+    CHIP_ERROR result = StartWiFiManagementSync();
+    VerifyOrReturnError(result == CHIP_NO_ERROR, result);
+
     GAutoPtr<GError> err;
     guint publish_id;
     enum nan_service_protocol_type srv_proto_type = nan_service_protocol_type::NAN_SRV_PROTO_CSA_MATTER;
@@ -1561,6 +1591,9 @@ void ConnectivityManagerImpl::OnNanSubscribeTerminated(guint subscribe_id, gchar
 CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFSubscribe(const uint16_t & connDiscriminator, void * appState,
                                                       OnConnectionCompleteFunct onSuccess, OnConnectionErrorFunct onError)
 {
+    CHIP_ERROR result = StartWiFiManagementSync();
+    VerifyOrReturnError(result == CHIP_NO_ERROR, result);
+
     ChipLogProgress(Controller, "WiFi-PAF: Try to subscribe the NAN-USD devices");
 
     guint subscribe_id;

src/platform/Linux/ConnectivityManagerImpl.h

@@ -257,6 +257,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
     void _OnWpaInterfaceReady(GObject * sourceObject, GAsyncResult * res);
     void _OnWpaInterfaceProxyReady(GObject * sourceObject, GAsyncResult * res);
     void _OnWpaBssProxyReady(GObject * sourceObject, GAsyncResult * res);
+    CHIP_ERROR StartWiFiManagementSync();
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
     OnConnectionCompleteFunct mOnPafSubscribeComplete;
     OnConnectionErrorFunct mOnPafSubscribeError;

src/platform/device.gni

@@ -24,8 +24,6 @@ declare_args() {
   # Substitute fake platform when building with chip_device_platform=auto.
   chip_fake_platform = false
 
-  # Include wifi-paf to commission the device or not
-  chip_device_config_enable_wifipaf = false
 }
 
 if (chip_device_platform == "auto") {
@@ -128,6 +126,14 @@ declare_args() {
   chip_device_config_enable_joint_fabric = false
 }
 
+declare_args() {
+  # Include wifi-paf to commission the device or not
+  # This is a feature of Wi-Fi spec that it can be enabled if wifi is enabled
+  # and the supplicant can support.
+  chip_device_config_enable_wifipaf =
+      chip_enable_wifi && chip_device_platform == "linux"
+}
+
 declare_args() {
   # Enable subscription resumption after timeout - separate configuration for power use measurement
   chip_subscription_timeout_resumption = chip_persist_subscriptions

src/transport/raw/WiFiPAF.cpp

@@ -40,29 +40,6 @@ CHIP_ERROR WiFiPAFBase::Init(const WiFiPAFListenParameters & param)
     mWiFiPAFLayer = DeviceLayer::ConnectivityMgr().GetWiFiPAF();
     SetWiFiPAFLayerTransportToSelf();
     mWiFiPAFLayer->SetWiFiPAFState(State::kInitialized);
-
-    if (!DeviceLayer::ConnectivityMgrImpl().IsWiFiManagementStarted())
-    {
-        ChipLogError(Inet, "Wi-Fi Management has not started, do it now.");
-        static constexpr useconds_t kWiFiStartCheckTimeUsec = WIFI_START_CHECK_TIME_USEC;
-        static constexpr uint8_t kWiFiStartCheckAttempts    = WIFI_START_CHECK_ATTEMPTS;
-        DeviceLayer::ConnectivityMgrImpl().StartWiFiManagement();
-        {
-            for (int cnt = 0; cnt < kWiFiStartCheckAttempts; cnt++)
-            {
-                if (DeviceLayer::ConnectivityMgrImpl().IsWiFiManagementStarted())
-                {
-                    break;
-                }
-                usleep(kWiFiStartCheckTimeUsec);
-            }
-        }
-        if (!DeviceLayer::ConnectivityMgrImpl().IsWiFiManagementStarted())
-        {
-            ChipLogError(Inet, "Wi-Fi Management taking too long to start - device configuration will be reset.");
-        }
-        ChipLogProgress(Inet, "Wi-Fi Management is started");
-    }
     return CHIP_NO_ERROR;
 }