Add some checks to SlWifiDriver usage

Author: jmartinez-silabs

examples/platform/silabs/MatterConfig.cpp

@@ -99,7 +99,7 @@ using namespace ::chip::Credentials;
 using namespace chip::DeviceLayer::Silabs;
 
 #ifdef SL_WIFI
-app::Clusters::NetworkDriverObj<NetworkCommissioning::SlWiFiDriver> networkDriver(chip::kRootEndpointId);
+app::Clusters::NetworkDriverObj<NetworkCommissioning::SlWiFiDriver> wifiNetworkDriver(chip::kRootEndpointId);
 #endif /* SL_WIFI */
 
 #if CHIP_ENABLE_OPENTHREAD
@@ -118,7 +118,7 @@ app::Clusters::NetworkDriverObj<NetworkCommissioning::SlWiFiDriver> networkDrive
 #include <platform/OpenThread/GenericNetworkCommissioningThreadDriver.h>
 #include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h>
 
-app::Clusters::NetworkDriverObj<NetworkCommissioning::GenericThreadDriver> networkDriver(chip::kRootEndpointId);
+app::Clusters::NetworkDriverObj<NetworkCommissioning::GenericThreadDriver> threadNetworkDriver(chip::kRootEndpointId);
 // ================================================================================
 // Matter Networking Callbacks
 // ================================================================================
@@ -154,6 +154,8 @@ CHIP_ERROR SilabsMatterConfig::InitOpenThread(void)
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 #endif // CHIP_DEVICE_CONFIG_THREAD_FTD
 
+    threadNetworkDriver.Init();
+
     ChipLogProgress(DeviceLayer, "Starting OpenThread task");
     return ThreadStackMgrImpl().StartThreadTask();
 }
@@ -264,7 +266,6 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
 #if CHIP_ENABLE_OPENTHREAD
     ReturnErrorOnFailure(InitOpenThread());
 #endif
-    networkDriver.Init();
 
     // Stop Matter event handling while setting up resources
     chip::DeviceLayer::PlatformMgr().LockChipStack();
@@ -331,6 +332,7 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
 #ifdef SL_WIFI
 CHIP_ERROR SilabsMatterConfig::InitWiFi(void)
 {
+    wifiNetworkDriver.Init();
     return WifiInterface::GetInstance().InitWiFiStack();
 }
 #endif // SL_WIFI

src/platform/silabs/ConnectivityManagerImpl_WIFI.cpp

@@ -329,7 +329,10 @@ void ConnectivityManagerImpl::DriveStationState()
 
 void ConnectivityManagerImpl::OnStationConnected()
 {
-    NetworkCommissioning::SlWiFiDriver::GetInstance()->OnConnectWiFiNetwork();
+    SlWiFiDriver * nwDriver = NetworkCommissioning::SlWiFiDriver::GetInstance();
+    // Cannot use the driver if the instance is not initialized.
+    VerifyOrDie(nwDriver != nullptr); // should never be null
+    nwDriver->OnConnectWiFiNetwork();
 
     UpdateInternetConnectivityState();
     // Alert other components of the new state.
@@ -361,8 +364,11 @@ void ConnectivityManagerImpl::ChangeWiFiStationState(WiFiStationState newState)
     {
         ChipLogProgress(DeviceLayer, "WiFi station state change: %s -> %s", WiFiStationStateToStr(mWiFiStationState),
                         WiFiStationStateToStr(newState));
-        mWiFiStationState = newState;
-        NetworkCommissioning::SlWiFiDriver::GetInstance()->UpdateNetworkingStatus();
+        mWiFiStationState       = newState;
+        SlWiFiDriver * nwDriver = NetworkCommissioning::SlWiFiDriver::GetInstance();
+        // Cannot use the driver if the instance is not initialized.
+        VerifyOrDie(nwDriver != nullptr); // should never be null
+        nwDriver->UpdateNetworkingStatus();
     }
 }
 

src/platform/silabs/NetworkCommissioningWiFiDriver.cpp

@@ -282,32 +282,36 @@ bool SlWiFiDriver::StartScanWiFiNetworks(ByteSpan ssid)
 
 void SlWiFiDriver::OnScanWiFiNetworkDone(wfx_wifi_scan_result_t * aScanResult)
 {
+    SlWiFiDriver * nwDriver = NetworkCommissioning::SlWiFiDriver::GetInstance();
+    // Cannot use the driver if the instance is not initialized.
+    VerifyOrDie(nwDriver != nullptr); // should never be null
+
     if (!aScanResult)
     {
         ChipLogProgress(DeviceLayer, "OnScanWiFiNetworkDone: Receive all scanned networks information.");
 
-        if (GetInstance()->mpScanCallback != nullptr)
+        if (nwDriver->mpScanCallback != nullptr)
         {
             if (mScanResponseIter.Count() == 0)
             {
                 // if there is no network found, return kNetworkNotFound
                 DeviceLayer::SystemLayer().ScheduleLambda([]() {
-                    GetInstance()->mpScanCallback->OnFinished(NetworkCommissioning::Status::kNetworkNotFound, CharSpan(), nullptr);
-                    GetInstance()->mpScanCallback = nullptr;
+                    nwDriver->mpScanCallback->OnFinished(NetworkCommissioning::Status::kNetworkNotFound, CharSpan(), nullptr);
+                    nwDriver->mpScanCallback = nullptr;
                 });
                 return;
             }
             DeviceLayer::SystemLayer().ScheduleLambda([]() {
-                GetInstance()->mpScanCallback->OnFinished(NetworkCommissioning::Status::kSuccess, CharSpan(), &mScanResponseIter);
-                GetInstance()->mpScanCallback = nullptr;
+                nwDriver->mpScanCallback->OnFinished(NetworkCommissioning::Status::kSuccess, CharSpan(), &mScanResponseIter);
+                nwDriver->mpScanCallback = nullptr;
             });
         }
     }
     else
     {
         NetworkCommissioning::WiFiScanResponse scanResponse = {};
 
-        scanResponse.security.Set(GetInstance()->ConvertSecuritytype(aScanResult->security));
+        scanResponse.security.Set(nwDriver->ConvertSecuritytype(aScanResult->security));
         scanResponse.channel = aScanResult->chan;
         scanResponse.rssi    = aScanResult->rssi;
         scanResponse.ssidLen = aScanResult->ssid_length;