[Ameba][v1.4-branch] Add OnConnectWiFiNetworkFailed to AmebaWiFiDriver (project-chip#40941)

* OnConnectWiFiNetworkFailed is called when Ameba failed to connect into the network
* This fixes issue when chip-tool failed to commission Ameba after one failed attempt

Author: pankore

src/platform/Ameba/ConnectivityManagerImpl.cpp

@@ -601,7 +601,6 @@ void ConnectivityManagerImpl::OnStationDisconnected()
     {
         switch (reason)
         {
-        case RTW_NO_ERROR:
         case RTW_NONE_NETWORK:
             associationFailureCause =
                 chip::to_underlying(chip::app::Clusters::WiFiNetworkDiagnostics::AssociationFailureCauseEnum::kSsidNotFound);
@@ -612,18 +611,16 @@ void ConnectivityManagerImpl::OnStationDisconnected()
                 chip::to_underlying(chip::app::Clusters::WiFiNetworkDiagnostics::AssociationFailureCauseEnum::kAssociationFailed);
             delegate->OnAssociationFailureDetected(associationFailureCause, reason);
             break;
+#if defined(CONFIG_PLATFORM_8710C)
+        case RTW_4WAY_HANDSHAKE_TIMEOUT:
+#endif
         case RTW_WRONG_PASSWORD:
             associationFailureCause = chip::to_underlying(
                 chip::app::Clusters::WiFiNetworkDiagnostics::AssociationFailureCauseEnum::kAuthenticationFailed);
             delegate->OnAssociationFailureDetected(associationFailureCause, reason);
             break;
-#if defined(CONFIG_PLATFORM_8710C)
-        case RTW_4WAY_HANDSHAKE_TIMEOUT:
-#endif
         case RTW_DHCP_FAIL:
         case RTW_UNKNOWN:
-            break;
-
         default:
             delegate->OnAssociationFailureDetected(associationFailureCause, reason);
             break;
@@ -633,6 +630,11 @@ void ConnectivityManagerImpl::OnStationDisconnected()
             chip::to_underlying(chip::app::Clusters::WiFiNetworkDiagnostics::ConnectionStatusEnum::kNotConnected));
     }
 
+    if (reason != RTW_NO_ERROR)
+    {
+        NetworkCommissioning::AmebaWiFiDriver::GetInstance().OnConnectWiFiNetworkFailed(reason);
+    }
+
     UpdateInternetConnectivityState();
 }
 

src/platform/Ameba/NetworkCommissioningDriver.h

@@ -110,6 +110,7 @@ class AmebaWiFiDriver final : public WiFiDriver
 
     CHIP_ERROR ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen);
     void OnConnectWiFiNetwork();
+    void OnConnectWiFiNetworkFailed(uint16_t reason);
     void OnScanWiFiNetworkDone();
     void OnNetworkStatusChange();
 

src/platform/Ameba/NetworkCommissioningWiFiDriver.cpp

@@ -172,6 +172,34 @@ void AmebaWiFiDriver::OnConnectWiFiNetwork()
     }
 }
 
+void AmebaWiFiDriver::OnConnectWiFiNetworkFailed(uint16_t reason)
+{
+    if (mpConnectCallback)
+    {
+        Status status;
+        switch (reason)
+        {
+        case RTW_NONE_NETWORK:
+            status = Status::kNetworkNotFound;
+            break;
+        case RTW_CONNECT_FAIL:
+#if defined(CONFIG_PLATFORM_8710C)
+        case RTW_4WAY_HANDSHAKE_TIMEOUT:
+#endif
+        case RTW_WRONG_PASSWORD:
+            status = Status::kAuthFailure;
+            break;
+        case RTW_DHCP_FAIL:
+        case RTW_UNKNOWN:
+        default:
+            status = Status::kUnknownError;
+            break;
+        }
+        mpConnectCallback->OnResult(status, CharSpan(), 0);
+        mpConnectCallback = nullptr;
+    }
+}
+
 void AmebaWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback)
 {
     CHIP_ERROR err          = CHIP_NO_ERROR;
@@ -189,6 +217,7 @@ void AmebaWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callb
     {
         networkingStatus = Status::kUnknownError;
     }
+
     if (networkingStatus != Status::kSuccess)
     {
         ChipLogError(NetworkProvisioning, "Failed to connect to WiFi network:%s", chip::ErrorStr(err));