Remove shell cmd_ping/cmd_send that were obsolete

- Both cmd_send and cmd_ping used pre-spec internal test-level APIs which have grown stale and no longer function. They showed API usage that was both incorrect and dangerous. They are were also no longer used. Fixes #19889 Fixes #6293 This PR removes these stale commands, which already had become empty in a prior PR since the way they used FabricTable was also incorrect (and this had been corrected at the time). Testing done: - Unit tests still pass - Integration tests still pass
project-chip · Jun 26, 2022 · 23f4fdb · 23f4fdb
1 parent 98f5271
commit 23f4fdb
Show file tree

Hide file tree

Showing 17 changed files with 2 additions and 88 deletions.
diff --git a/examples/all-clusters-app/nxp/mw320/main.cpp b/examples/all-clusters-app/nxp/mw320/main.cpp
@@ -1103,8 +1103,6 @@ void ShellCLIMain(void * pvParameter)
 
     cmd_misc_init();
     // cmd_otcli_init();
-    // cmd_ping_init();
-    // cmd_send_init();
 
     ChipLogDetail(Shell, "Run CHIP shell Task: %d", rc);
     PRINTF("call mcuInitPower() \r\n");

diff --git a/examples/chef/esp32/main/main.cpp b/examples/chef/esp32/main/main.cpp
@@ -67,8 +67,6 @@ static void chip_shell_task(void * args)
 {
 
     cmd_misc_init();
-    cmd_ping_init();
-    cmd_send_init();
 
     Engine::Root().RunMainLoop();
 }

diff --git a/examples/chef/linux/main.cpp b/examples/chef/linux/main.cpp
@@ -47,8 +47,6 @@ int main(int argc, char * argv[])
 
     cmd_misc_init();
     cmd_otcli_init();
-    cmd_ping_init();
-    cmd_send_init();
 #if CHIP_SHELL_ENABLE_CMD_SERVER
     cmd_app_server_init();
 #endif

diff --git a/examples/chef/nrfconnect/CMakeLists.txt b/examples/chef/nrfconnect/CMakeLists.txt
@@ -72,8 +72,6 @@ if (CONFIG_ENABLE_CHIP_SHELL)
     ${CHEF}/shell_common/globals.cpp
     ${CHEF}/shell_common/cmd_misc.cpp
     ${CHEF}/shell_common/cmd_otcli.cpp
-    ${CHEF}/shell_common/cmd_ping.cpp
-    ${CHEF}/shell_common/cmd_send.cpp
   )
 
   target_include_directories(app PRIVATE

diff --git a/examples/chef/nrfconnect/main.cpp b/examples/chef/nrfconnect/main.cpp
@@ -141,8 +141,6 @@ CHIP_ERROR main()
 
     cmd_misc_init();
     cmd_otcli_init();
-    cmd_ping_init();
-    cmd_send_init();
 #endif
 
 #if CHIP_SHELL_ENABLE_CMD_SERVER

diff --git a/examples/platform/efr32/matter_shell.cpp b/examples/platform/efr32/matter_shell.cpp
@@ -78,8 +78,6 @@ void startShellTask()
     // TODO move at least OTCLI to default commands in lib/shell/commands
     cmd_misc_init();
     cmd_otcli_init();
-    cmd_ping_init();
-    cmd_send_init();
 
     shellTaskHandle = xTaskCreateStatic(MatterShellTask, "matter_cli", ArraySize(shellStack), NULL, SHELL_TASK_PRIORITY, shellStack,
                                         &shellTaskStruct);

diff --git a/examples/platform/qpg/shell_common/shell.cpp b/examples/platform/qpg/shell_common/shell.cpp
@@ -38,14 +38,6 @@ StaticTask_t shellTaskStruct;
 
 ShellTask ShellTask::sShellTask;
 
-/* required by cmd_send.cpp:ProcessCommand */
-extern "C" unsigned int sleep(unsigned int seconds)
-{
-    const TickType_t xDelay = 1000 * seconds / portTICK_PERIOD_MS;
-    vTaskDelay(xDelay);
-    return 0;
-}
-
 // using namespace ::chip;
 
 int ShellTask::Init(void)
@@ -60,8 +52,6 @@ int ShellTask::Init(void)
 
     cmd_misc_init();
     cmd_otcli_init();
-    cmd_ping_init();
-    cmd_send_init();
 #if CHIP_SHELL_ENABLE_CMD_SERVER
     cmd_app_server_init();
 #endif // CHIP_SHELL_ENABLE_CMD_SERVER

diff --git a/examples/shell/esp32/main/CMakeLists.txt b/examples/shell/esp32/main/CMakeLists.txt
@@ -21,8 +21,6 @@ set(CHIP_SHELL_DIR "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/she
 
 idf_component_register(SRCS main.cpp
                       "${CHIP_SHELL_DIR}/shell_common/globals.cpp"
-                      "${CHIP_SHELL_DIR}/shell_common/cmd_ping.cpp"
-                      "${CHIP_SHELL_DIR}/shell_common/cmd_send.cpp"                      
                       PRIV_INCLUDE_DIRS
                       "${CHIP_SHELL_DIR}/shell_common/include"
                       PRIV_REQUIRES chip nvs_flash bt console esp32_mbedtls)
diff --git a/examples/shell/mbed/CMakeLists.txt b/examples/shell/mbed/CMakeLists.txt
@@ -28,7 +28,7 @@ if(APP_TYPE STREQUAL "boot" OR APP_TYPE STREQUAL "upgrade")
 endif()
 
 include(${MBED_PATH}/tools/cmake/app.cmake)
-if(MBED_TARGET STREQUAL "CY8CPROTO_062_4343W" AND BOOT_ENABLED)   
+if(MBED_TARGET STREQUAL "CY8CPROTO_062_4343W" AND BOOT_ENABLED)
     list(REMOVE_ITEM MBED_TARGET_LABELS CM0P_SLEEP)
     list(REMOVE_ITEM MBED_TARGET_DEFINITIONS COMPONENT_CM0P_SLEEP=1)
 endif()
@@ -57,8 +57,6 @@ target_sources(${APP_TARGET} PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/main/main.cpp
                ${SHELL_COMMON}/cmd_misc.cpp
                ${SHELL_COMMON}/cmd_otcli.cpp
-               ${SHELL_COMMON}/cmd_ping.cpp
-               ${SHELL_COMMON}/cmd_send.cpp
                ${SHELL_COMMON}/cmd_server.cpp
                ${SHELL_COMMON}/globals.cpp
                ${MBED_COMMON}/util/DFUManager.cpp

diff --git a/examples/shell/mbed/main/main.cpp b/examples/shell/mbed/main/main.cpp
@@ -98,8 +98,6 @@ int main()
 
     cmd_misc_init();
     cmd_otcli_init();
-    cmd_ping_init();
-    cmd_send_init();
     cmd_app_server_init();
 
     ChipLogProgress(NotSpecified, "Mbed shell example application run");

diff --git a/examples/shell/nrfconnect/CMakeLists.txt b/examples/shell/nrfconnect/CMakeLists.txt
@@ -42,15 +42,13 @@ target_compile_options(app PRIVATE -Werror -Wno-error=maybe-uninitialized)
 
 target_include_directories(app PRIVATE
                            ${CMAKE_CURRENT_SOURCE_DIR}
-                           ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/app-common                           
+                           ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/app-common
                            ${APP_ROOT}/shell_common/include)
 
 target_sources(app PRIVATE
     ${APP_ROOT}/shell_common/globals.cpp
     ${APP_ROOT}/shell_common/cmd_misc.cpp
     ${APP_ROOT}/shell_common/cmd_otcli.cpp
-    ${APP_ROOT}/shell_common/cmd_ping.cpp
-    ${APP_ROOT}/shell_common/cmd_send.cpp     
     ${APP_ROOT}/standalone/main.cpp
 )
 

diff --git a/examples/shell/nxp/k32w/k32w0/main/main.cpp b/examples/shell/nxp/k32w/k32w0/main/main.cpp
@@ -131,8 +131,6 @@ extern "C" void main_task(void const * argument)
     }
 
     // cmd_otcli_init();
-    cmd_ping_init();
-    cmd_send_init();
 
     shellTaskHandle = xTaskCreate(shell_task, "shell_task", shell_task_size / sizeof(StackType_t), NULL, shell_task_priority, NULL);
     if (!shellTaskHandle)

diff --git a/examples/shell/shell_common/BUILD.gn b/examples/shell/shell_common/BUILD.gn
@@ -40,8 +40,6 @@ static_library("shell_common") {
   sources = [
     "cmd_misc.cpp",
     "cmd_otcli.cpp",
-    "cmd_ping.cpp",
-    "cmd_send.cpp",
     "globals.cpp",
   ]
 

diff --git a/examples/shell/shell_common/cmd_ping.cpp b/examples/shell/shell_common/cmd_ping.cpp
diff --git a/examples/shell/shell_common/cmd_send.cpp b/examples/shell/shell_common/cmd_send.cpp
diff --git a/examples/shell/shell_common/include/ChipShellCollection.h b/examples/shell/shell_common/include/ChipShellCollection.h
@@ -20,6 +20,4 @@
 // A list of shell commands provided by ChipShell
 void cmd_misc_init(void);
 void cmd_otcli_init(void);
-void cmd_ping_init(void);
-void cmd_send_init(void);
 void cmd_app_server_init(void);
diff --git a/examples/shell/standalone/main.cpp b/examples/shell/standalone/main.cpp
@@ -49,8 +49,6 @@ int main()
 
     cmd_misc_init();
     cmd_otcli_init();
-    cmd_ping_init();
-    cmd_send_init();
 #if CHIP_SHELL_ENABLE_CMD_SERVER
     cmd_app_server_init();
 #endif