[NXP] Fix read last-networking-status and read last-network-id issue for ethernet and wifi (#42031)

* [NXP][wifi] Fix read last-networking-status and read last-network-id issue

Signed-off-by: Martin Girardot <martin.girardot@nxp.com>

* [NXP][ethernet] Fix read last-networking-status and read last-network-id issue

Signed-off-by: Martin Girardot <martin.girardot@nxp.com>

* [NXP] fix PR comment

Signed-off-by: Martin Girardot <martin.girardot@nxp.com>

* Restyled by whitespace

* Restyled by clang-format

---------

Signed-off-by: Martin Girardot <martin.girardot@nxp.com>
Co-authored-by: Restyled.io <commits@restyled.io>

Author: Martin-NXP

examples/platform/nxp/common/wifi_connect/source/WifiConnect.cpp

@@ -45,6 +45,10 @@ CHIP_ERROR WifiConnectAtboot(chip::DeviceLayer::NetworkCommissioning::WiFiDriver
         VerifyOrReturnError(status == chip::DeviceLayer::NetworkCommissioning::Status::kSuccess, CHIP_ERROR_CONNECTION_ABORTED);
         wifiDriver->ConnectNetwork(ssidSpan, nullptr);
     }
+    if (networks != nullptr)
+    {
+        networks->Release();
+    }
     return CHIP_NO_ERROR;
 }
 

src/platform/nxp/common/ConnectivityManagerImpl.cpp

@@ -399,6 +399,7 @@ void ConnectivityManagerImpl::ProcessWlanEvent(enum wlan_event_reason wlanEvent)
         {
             sInstance._SetWiFiStationState(kWiFiStationState_Connecting_Succeeded);
             sInstance._SetWiFiStationState(kWiFiStationState_Connected);
+            NetworkCommissioning::NXPWiFiDriver::GetInstance().OnNetworkStatusChange();
             NetworkCommissioning::NXPWiFiDriver::GetInstance().OnConnectWiFiNetwork(NetworkCommissioning::Status::kSuccess,
                                                                                     CharSpan(), wlanEvent);
             sInstance.OnStationConnected();

src/platform/nxp/common/Ethernet/NxpEthDriver.cpp

@@ -64,12 +64,39 @@ void NxpEthDriver::eth_netif_ext_status_callback(struct netif * netif, netif_nsc
         {
             ChipLogError(DeviceLayer, "Failed to schedule work: %" CHIP_ERROR_FORMAT, err.Format());
         }
+        SystemLayer().ScheduleLambda([]() { NxpEthDriver::Instance().OnNetworkStatusChange(); });
+    }
+}
+
+void NxpEthDriver::OnNetworkStatusChange()
+{
+    ChipLogProgress(NetworkProvisioning, "NxpEthDriver::OnNetworkStatusChange\r\n");
+    VerifyOrReturn(mpStatusChangeCallback != nullptr);
+    NetworkIterator * networkIterator = GetNetworks();
+
+    if (networkIterator != nullptr)
+    {
+        EthernetNetworkIterator * ethIterator = static_cast<EthernetNetworkIterator *>(networkIterator);
+
+        if (ethIterator->interfaceNameLen)
+        {
+            mpStatusChangeCallback->OnNetworkingStatusChange(
+                Status::kSuccess, MakeOptional(ByteSpan(ethIterator->interfaceName, ethIterator->interfaceNameLen)), NullOptional);
+        }
+        else
+        {
+            mpStatusChangeCallback->OnNetworkingStatusChange(
+                Status::kUnknownError, MakeOptional(ByteSpan(ethIterator->interfaceName, ethIterator->interfaceNameLen)),
+                NullOptional);
+        }
+        networkIterator->Release();
     }
 }
 
 CHIP_ERROR NxpEthDriver::Init(NetworkStatusChangeCallback * networkStatusChangeCallback)
 {
     err_t err;
+    mpStatusChangeCallback          = networkStatusChangeCallback;
     ethernetif_config_t enet_config = {
         .phyHandle   = &phyHandle,
         .phyAddr     = EXAMPLE_PHY_ADDRESS,

src/platform/nxp/common/Ethernet/NxpEthDriver.h

@@ -76,11 +76,13 @@ class NxpEthDriver final : public EthernetDriver
     }
 
 private:
+    void OnNetworkStatusChange();
     static void print_ip_addresses(struct netif * netif);
     static void eth_netif_ext_status_callback(struct netif * netif, netif_nsc_reason_t reason,
                                               const netif_ext_callback_args_t * args);
     phy_handle_t phyHandle;
     struct netif netif_app;
+    NetworkStatusChangeCallback * mpStatusChangeCallback = nullptr;
 };
 
 } // namespace NetworkCommissioning

src/platform/nxp/common/NetworkCommissioningDriver.h

@@ -72,6 +72,7 @@ class NXPWiFiDriver final : public WiFiDriver
     Status ReorderNetwork(ByteSpan networkId, uint8_t index, MutableCharSpan & outDebugText) override;
     void ConnectNetwork(ByteSpan networkId, ConnectCallback * callback) override;
     CHIP_ERROR ConnectWiFiStagedNetwork();
+    void OnNetworkStatusChange();
 
     /* Returns the network SSID. User needs to allocate a buffer of size >= DeviceLayer::Internal::kMaxWiFiSSIDLength.
      * ssid - pointer to the returned SSID
@@ -104,6 +105,7 @@ class NXPWiFiDriver final : public WiFiDriver
 private:
     bool NetworkMatch(const WiFiNetwork & network, ByteSpan networkId);
     CHIP_ERROR StartScanWiFiNetworks(ByteSpan ssid);
+    CHIP_ERROR GetConnectedNetwork(Network & network);
 
     WiFiNetworkIterator mWiFiIterator = WiFiNetworkIterator(this);
     WiFiNetwork mSavedNetwork;

src/platform/nxp/common/NetworkCommissioningWiFiDriver.cpp

@@ -240,6 +240,32 @@ void NXPWiFiDriver::OnConnectWiFiNetwork(Status commissioningError, CharSpan deb
     }
 }
 
+void NXPWiFiDriver::OnNetworkStatusChange()
+{
+    ChipLogProgress(NetworkProvisioning, "NXPWiFiDriver::OnNetworkStatusChange\r\n");
+    Network configuredNetwork;
+
+    VerifyOrReturn(mpStatusChangeCallback != nullptr);
+    CHIP_ERROR err = GetConnectedNetwork(configuredNetwork);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "Failed to get configured network when updating network status: %s", err.AsString());
+        return;
+    }
+
+    if (configuredNetwork.networkIDLen)
+    {
+        mpStatusChangeCallback->OnNetworkingStatusChange(
+            Status::kSuccess, MakeOptional(ByteSpan(configuredNetwork.networkID, configuredNetwork.networkIDLen)), NullOptional);
+    }
+    else
+    {
+        mpStatusChangeCallback->OnNetworkingStatusChange(
+            Status::kUnknownError, MakeOptional(ByteSpan(configuredNetwork.networkID, configuredNetwork.networkIDLen)),
+            NullOptional);
+    }
+}
+
 void NXPWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback)
 {
     CHIP_ERROR err          = CHIP_NO_ERROR;
@@ -448,7 +474,7 @@ uint32_t NXPWiFiDriver::GetSupportedWiFiBandsMask() const
     return bands;
 }
 
-static CHIP_ERROR GetConnectedNetwork(Network & network)
+CHIP_ERROR NXPWiFiDriver::GetConnectedNetwork(Network & network)
 {
     struct wlan_network wlan_network;
     int result;
@@ -490,7 +516,7 @@ bool NXPWiFiDriver::WiFiNetworkIterator::Next(Network & item)
     mExhausted        = true;
 
     Network connectedNetwork;
-    CHIP_ERROR err = GetConnectedNetwork(connectedNetwork);
+    CHIP_ERROR err = mDriver->GetConnectedNetwork(connectedNetwork);
 
     if (err == CHIP_NO_ERROR)
     {