[nrf noup] Directed network scan implementation

Implementation of directed scaning, to adjust to newer matter version specification. Signed-off-by: Patryk Lipinski <patryk.lipinski@nordicsemi.no>
LipinskiPNordicSemi · Mar 12, 2024 · b54e8c5 · b54e8c5
1 parent 7653e6c
commit b54e8c5
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 3 deletions.
diff --git a/src/app/clusters/network-commissioning/network-commissioning.cpp b/src/app/clusters/network-commissioning/network-commissioning.cpp
@@ -244,6 +244,8 @@ void Instance::OnNetworkingStatusChange(NetworkCommissioning::Status aCommission
 void Instance::HandleScanNetworks(HandlerContext & ctx, const Commands::ScanNetworks::DecodableType & req)
 {
     MATTER_TRACE_SCOPE("HandleScanNetwork", "NetworkCommissioning");
+
+    mScanningWasDirected = false;
     if (mFeatureFlags.Has(Feature::kWiFiNetworkInterface))
     {
         ByteSpan ssid;
@@ -266,6 +268,7 @@ void Instance::HandleScanNetworks(HandlerContext & ctx, const Commands::ScanNetw
             ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::InvalidCommand);
             return;
         }
+        mScanningWasDirected        = !ssid.empty();
         mCurrentOperationBreadcrumb = req.breadcrumb;
         mAsyncCommandHandle         = CommandHandler::Handle(&ctx.mCommandHandler);
         ctx.mCommandHandler.FlushAcksRightAwayOnSlowCommand();
@@ -518,6 +521,13 @@ void Instance::OnFinished(Status status, CharSpan debugText, ThreadScanResponseI
         return;
     }
 
+    // If drivers are failing to respond NetworkNotFound on empty results, force it for them.
+    bool resultsMissing = !networks || (networks->Count() == 0);
+    if ((status == Status::kSuccess) && mScanningWasDirected && resultsMissing)
+    {
+        status = Status::kNetworkNotFound;
+    }
+
     mLastNetworkingStatusValue.SetNonNull(status);
 
     TLV::TLVWriter * writer;

diff --git a/src/app/clusters/network-commissioning/network-commissioning.h b/src/app/clusters/network-commissioning/network-commissioning.h
@@ -102,6 +102,8 @@ class Instance : public CommandHandlerInterface,
 
     Optional<uint64_t> mCurrentOperationBreadcrumb;
 
+    bool mScanningWasDirected = false;
+
     // Commits the breadcrumb value saved in mCurrentOperationBreadcrumb to the breadcrumb attribute in GeneralCommissioning
     // cluster. Will set mCurrentOperationBreadcrumb to NullOptional.
     void CommitSavedBreadcrumb();

diff --git a/src/platform/nrfconnect/wifi/WiFiManager.cpp b/src/platform/nrfconnect/wifi/WiFiManager.cpp
@@ -188,6 +188,13 @@ CHIP_ERROR WiFiManager::Scan(const ByteSpan & ssid, ScanResultCallback resultCal
     mWiFiState          = WIFI_STATE_SCANNING;
     mSsidFound          = false;
 
+    if ((ssid.size() > 0) && (!mInternalScan))
+    {
+        mDirectScanNetwork.Erase();
+        memcpy(mDirectScanNetwork.ssid, ssid.data(), ssid.size());
+        mDirectScanNetwork.ssidLen = ssid.size();
+    }
+
     if (0 != net_mgmt(NET_REQUEST_WIFI_SCAN, mNetIf, NULL, 0))
     {
         ChipLogError(DeviceLayer, "Scan request failed");
@@ -334,7 +341,14 @@ void WiFiManager::ScanResultHandler(Platform::UniquePtr<uint8_t> data)
 
     if (Instance().mScanResultCallback && !Instance().mInternalScan)
     {
-        Instance().mScanResultCallback(ToScanResponse(scanResult));
+        if (Instance().mDirectScanNetwork.GetSsidSpan().size() == 0)
+        {
+            Instance().mScanResultCallback(ToScanResponse(scanResult));
+        }
+        else if (Instance().mDirectScanNetwork.GetSsidSpan().data_equal(ByteSpan(scanResult->ssid, scanResult->ssid_length)))
+        {
+            Instance().mScanResultCallback(ToScanResponse(scanResult));
+        }
     }
 }
 
@@ -345,6 +359,11 @@ void WiFiManager::ScanDoneHandler(Platform::UniquePtr<uint8_t> data)
         uint8_t * rawData          = safePtr.get();
         const wifi_status * status = reinterpret_cast<const wifi_status *>(rawData);
 
+        if (Instance().mDirectScanNetwork.GetSsidSpan().size() > 0)
+        {
+            Instance().mDirectScanNetwork.Erase();
+        }
+
         if (status->status)
         {
             ChipLogError(DeviceLayer, "Wi-Fi scan finalization failure (%d)", status->status);
@@ -420,8 +439,8 @@ void WiFiManager::ConnectHandler(Platform::UniquePtr<uint8_t> data)
 {
     CHIP_ERROR err = SystemLayer().ScheduleLambda([capturedData = data.get()] {
         Platform::UniquePtr<uint8_t> safePtr(capturedData);
-        uint8_t * rawData               = safePtr.get();
-        const wifi_status * status      = reinterpret_cast<const wifi_status *>(rawData);
+        uint8_t * rawData          = safePtr.get();
+        const wifi_status * status = reinterpret_cast<const wifi_status *>(rawData);
 
         if (status->status)
         {

diff --git a/src/platform/nrfconnect/wifi/WiFiManager.h b/src/platform/nrfconnect/wifi/WiFiManager.h
@@ -226,6 +226,7 @@ class WiFiManager
     ScanResultCallback mScanResultCallback{ nullptr };
     ScanDoneCallback mScanDoneCallback{ nullptr };
     WiFiNetwork mWantedNetwork{};
+    WiFiNetwork mDirectScanNetwork{};
     bool mInternalScan{ false };
     uint8_t mRouterSolicitationCounter = 0;
     bool mSsidFound{ false };