[WiFi][Shell] Simplify WiFi shell and add missing header to fix build

Author: mihai-ignat

src/include/platform/ConnectivityManager.h

@@ -182,8 +182,6 @@ class ConnectivityManager
     void MaintainOnDemandWiFiAP();
     System::Clock::Timeout GetWiFiAPIdleTimeout();
     void SetWiFiAPIdleTimeout(System::Clock::Timeout val);
-    CHIP_ERROR GetNetworkSSID(MutableCharSpan & ssid);
-    CHIP_ERROR GetNetworkPassword(MutableCharSpan & credentials);
     CHIP_ERROR DisconnectNetwork(void);
 
     // Thread Methods
@@ -563,16 +561,6 @@ inline void ConnectivityManager::OnWiFiStationProvisionChange()
     static_cast<ImplClass *>(this)->_OnWiFiStationProvisionChange();
 }
 
-inline CHIP_ERROR ConnectivityManager::GetNetworkSSID(MutableCharSpan & ssid)
-{
-    return static_cast<ImplClass *>(this)->_GetNetworkSSID(ssid);
-}
-
-inline CHIP_ERROR ConnectivityManager::GetNetworkPassword(MutableCharSpan & credentials)
-{
-    return static_cast<ImplClass *>(this)->_GetNetworkPassword(credentials);
-}
-
 inline CHIP_ERROR ConnectivityManager::DisconnectNetwork(void)
 {
     return static_cast<ImplClass *>(this)->_DisconnectNetwork();

src/include/platform/internal/GenericConfigurationManagerImpl.h

@@ -103,6 +103,7 @@ class GenericConfigurationManagerImpl : public ConfigurationManager
     CHIP_ERROR GetUniqueId(char * buf, size_t bufSize) override;
     CHIP_ERROR StoreUniqueId(const char * uniqueId, size_t uniqueIdLen) override;
     CHIP_ERROR GenerateUniqueId(char * buf, size_t bufSize) override;
+    CHIP_ERROR _DisconnectNetwork(void);
 #if CHIP_CONFIG_TEST
     void RunUnitTests() override;
 #endif

src/include/platform/internal/GenericConnectivityManagerImpl_NoWiFi.h

@@ -76,8 +76,6 @@ class GenericConnectivityManagerImpl_NoWiFi
     bool _CanStartWiFiScan();
     void _OnWiFiScanDone();
     void _OnWiFiStationProvisionChange();
-    CHIP_ERROR _GetNetworkSSID(MutableCharSpan & ssid);
-    CHIP_ERROR _GetNetworkPassword(MutableCharSpan & credentials);
     CHIP_ERROR _DisconnectNetwork(void);
     static const char * _WiFiStationModeToStr(ConnectivityManager::WiFiStationMode mode);
     static const char * _WiFiAPModeToStr(ConnectivityManager::WiFiAPMode mode);
@@ -226,18 +224,6 @@ inline const char * GenericConnectivityManagerImpl_NoWiFi<ImplClass>::_WiFiAPSta
     return nullptr;
 }
 
-template <class ImplClass>
-inline CHIP_ERROR GenericConnectivityManagerImpl_NoWiFi<ImplClass>::_GetNetworkSSID(MutableCharSpan & ssid)
-{
-    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
-}
-
-template <class ImplClass>
-inline CHIP_ERROR GenericConnectivityManagerImpl_NoWiFi<ImplClass>::_GetNetworkPassword(MutableCharSpan & credentials)
-{
-    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
-}
-
 template <class ImplClass>
 inline CHIP_ERROR GenericConnectivityManagerImpl_NoWiFi<ImplClass>::_DisconnectNetwork(void)
 {

src/include/platform/internal/GenericConnectivityManagerImpl_WiFi.h

@@ -82,8 +82,6 @@ class GenericConnectivityManagerImpl_WiFi
 #if CHIP_CONFIG_ENABLE_ICD_SERVER && !CHIP_DEVICE_CONFIG_ENABLE_THREAD
     CHIP_ERROR _SetPollingInterval(System::Clock::Milliseconds32 pollingInterval);
 #endif
-    CHIP_ERROR _GetNetworkSSID(MutableCharSpan & ssid);
-    CHIP_ERROR _GetNetworkPassword(MutableCharSpan & credentials);
     CHIP_ERROR _DisconnectNetwork(void);
     static const char * _WiFiStationModeToStr(ConnectivityManager::WiFiStationMode mode);
     static const char * _WiFiAPModeToStr(ConnectivityManager::WiFiAPMode mode);
@@ -198,18 +196,6 @@ inline CHIP_ERROR GenericConnectivityManagerImpl_WiFi<ImplClass>::_SetPollingInt
 }
 #endif
 
-template <class ImplClass>
-inline CHIP_ERROR GenericConnectivityManagerImpl_WiFi<ImplClass>::_GetNetworkSSID(MutableCharSpan & ssid)
-{
-    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
-}
-
-template <class ImplClass>
-inline CHIP_ERROR GenericConnectivityManagerImpl_WiFi<ImplClass>::_GetNetworkPassword(MutableCharSpan & credentials)
-{
-    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
-}
-
 template <class ImplClass>
 inline CHIP_ERROR GenericConnectivityManagerImpl_WiFi<ImplClass>::_DisconnectNetwork(void)
 {

src/lib/shell/commands/WiFi.cpp

@@ -107,7 +107,7 @@ static CHIP_ERROR WiFiModeHandler(int argc, char ** argv)
     return SetWiFiMode(argv[0]);
 }
 
-static CHIP_ERROR WifiAddNetwork(char * ssid, char * password)
+static CHIP_ERROR WiFiConnectHandler(int argc, char ** argv)
 {
     CHIP_ERROR error = CHIP_NO_ERROR;
     uint8_t networkIndex;
@@ -117,78 +117,28 @@ static CHIP_ERROR WifiAddNetwork(char * ssid, char * password)
 
     VerifyOrReturnError(GetWiFiDriver() != nullptr, error = CHIP_ERROR_NOT_IMPLEMENTED);
 
-    ssidSpan     = ByteSpan(reinterpret_cast<const uint8_t *>(ssid), strlen(ssid));
-    passwordSpan = ByteSpan(reinterpret_cast<const uint8_t *>(password), strlen(password));
+    /* Command accepts running with SSID and password as parameters */
+    VerifyOrReturnError((argc == 2), error = CHIP_ERROR_INVALID_ARGUMENT);
+
+    ssidSpan     = ByteSpan(reinterpret_cast<const uint8_t *>(argv[0]), strlen(argv[0]));
+    passwordSpan = ByteSpan(reinterpret_cast<const uint8_t *>(argv[1]), strlen(argv[1]));
 
     if (IsSpanUsable(ssidSpan) && IsSpanUsable(passwordSpan))
     {
         ChipLogProgress(DeviceLayer, "[Shell] Adding/Updating network %s", ssidSpan.data());
 
         /* AddOrUpdateNetwork() checks ssid length and password length. The network info is not persistent. */
         GetWiFiDriver()->AddOrUpdateNetwork(ssidSpan, passwordSpan, debugText, networkIndex);
-    }
-    else
-    {
-        error = CHIP_ERROR_INVALID_ARGUMENT;
-    }
-
-    return error;
-}
-
-static CHIP_ERROR WiFiConnectHandler(int argc, char ** argv)
-{
-    CHIP_ERROR error = CHIP_NO_ERROR;
-    bool connectToNetwork = false;
-    ByteSpan ssidSpan;
-
-    VerifyOrReturnError(GetWiFiDriver() != nullptr, error = CHIP_ERROR_NOT_IMPLEMENTED);
-
-    /* Command accepts running either without arguments or either with SSID and password */
-    /* Running without arguments implies that "wifi add ssid password" was executed before */
-    VerifyOrReturnError((argc == 0) || (argc == 2), error = CHIP_ERROR_INVALID_ARGUMENT);
-
-    if (argc == 0)
-    {
-        /* Retrieve previously added SSID */
-        char ssid[DeviceLayer::Internal::kMaxWiFiSSIDLength + 1] = { 0 };
-        MutableCharSpan ssidMutableSpan(ssid);
-
-        VerifyOrReturnError(ConnectivityMgr().GetNetworkSSID(ssidMutableSpan) == CHIP_NO_ERROR, error = CHIP_ERROR_BUFFER_TOO_SMALL);
-
-        if (IsSpanUsable(ssidMutableSpan))
-        {
-            connectToNetwork = true;
-            ssidSpan = ByteSpan(reinterpret_cast<const uint8_t *>(ssidMutableSpan.data()), ssidMutableSpan.size());
-        }
-        else
-        {
-            ChipLogError(
-                DeviceLayer,
-                "[Shell] No network credentials found! Please add using <wifi add ssid password> or <wifi connect ssid password>");
-            error = CHIP_ERROR_INVALID_ARGUMENT;
-        }
-    }
-    else if (argc == 2)
-    {
-        ssidSpan = ByteSpan(reinterpret_cast<const uint8_t *>(argv[0]), strlen(argv[0]));
-
-        if ((IsSpanUsable(ssidSpan)) && (WifiAddNetwork(argv[0], argv[1]) == CHIP_NO_ERROR))
-        {
-            connectToNetwork = true;
-        }
-        else
-        {
-            ChipLogError(DeviceLayer, "[Shell] Failed to add network credentials!");
-            error = CHIP_ERROR_INVALID_ARGUMENT;
-        }
-    }
 
-    if (connectToNetwork == true)
-    {
         ChipLogProgress(DeviceLayer, "[Shell] Progress: Connecting to network");
         /* Connection event will be returned in OnWiFiConnectivityChange from DeviceCallbacks.cpp */
         GetWiFiDriver()->ConnectNetwork(ssidSpan, nullptr);
     }
+    else
+    {
+        ChipLogError(DeviceLayer, "[Shell] Failed to add network credentials!");
+        error = CHIP_ERROR_INVALID_ARGUMENT;
+    }
 
     return error;
 }
@@ -200,38 +150,6 @@ static CHIP_ERROR WiFiDisconnectHandler(int argc, char ** argv)
     return ConnectivityMgr().DisconnectNetwork();
 }
 
-static CHIP_ERROR WiFiAddNwkHandler(int argc, char ** argv)
-{
-    VerifyOrReturnError((argc == 2), CHIP_ERROR_INVALID_ARGUMENT);
-
-    return WifiAddNetwork(argv[0], argv[1]);
-}
-
-static CHIP_ERROR WiFiRemoveNwkHandler(int argc, char ** argv)
-{
-    VerifyOrReturnError(GetWiFiDriver() != nullptr, CHIP_ERROR_NOT_IMPLEMENTED);
-
-    DeviceLayer::NetworkCommissioning::Status status;
-    uint8_t networkIndex;
-    ByteSpan ssidSpan;
-    char ssid[DeviceLayer::Internal::kMaxWiFiSSIDLength + 1] = { 0 };
-    MutableCharSpan debugText;
-    MutableCharSpan ssidMutableSpan(ssid);
-
-    VerifyOrReturnError(ConnectivityMgr().GetNetworkSSID(ssidMutableSpan) == CHIP_NO_ERROR, CHIP_ERROR_BUFFER_TOO_SMALL);
-
-    ssidSpan = ByteSpan(reinterpret_cast<const uint8_t *>(ssidMutableSpan.data()), ssidMutableSpan.size());
-
-    status = GetWiFiDriver()->RemoveNetwork(ssidSpan, debugText, networkIndex);
-
-    if (status != DeviceLayer::NetworkCommissioning::Status::kSuccess)
-    {
-        ChipLogError(DeviceLayer, "[Shell] Error: RemoveNetwork: %u", (uint8_t) status);
-    }
-
-    return CHIP_NO_ERROR;
-}
-
 static CHIP_ERROR WiFiScanHandler(int argc, char ** argv)
 {
     ByteSpan ssidSpan;
@@ -281,11 +199,9 @@ void RegisterWiFiCommands()
     static const shell_command_t sWiFiSubCommands[] = {
         { &WiFiHelpHandler, "help", "" },
         { &WiFiModeHandler, "mode", "Get/Set wifi mode. Usage: wifi mode [disable|ap|sta]" },
-        { &WiFiConnectHandler, "connect", "Connect to AP. Usage: wifi connect <ssid> <psk>. ssid and psk are optional." },
+        { &WiFiConnectHandler, "connect", "Connect to AP. Usage: wifi connect <ssid> <psk>" },
         { &WiFiDisconnectHandler, "disconnect", "Disconnect device from AP. Usage: wifi disconnect" },
-        { &WiFiAddNwkHandler, "add", "Add credentials for Wi-Fi network. Usage: wifi add <ssid> <psk>" },
-        { &WiFiRemoveNwkHandler, "remove", "Remove credentials for Wi-Fi network. Usage: wifi remove <ssid>" },
-        { &WiFiScanHandler, "scan", "Scan for Wi-Fi networks. Usage: wifi scan <ssid>. ssid is optional." },
+        { &WiFiScanHandler, "scan", "Scan for Wi-Fi networks. Usage: wifi scan <ssid>. ssid is optional" },
     };
     static const shell_command_t sWiFiCommand = { &WiFiDispatch, "wifi", "Usage: wifi <subcommand>" };