[shell] Clean up shutdown handling.

project-chip · Jan 7, 2022 · b496878 · b496878
1 parent 2f82dec
commit b496878
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/config/standalone/CHIPProjectConfig.h b/config/standalone/CHIPProjectConfig.h
@@ -53,7 +53,7 @@
 //
 //    To build with this flag, pass 'treat_warnings_as_errors=false' to gn/ninja.
 //
-#define CHIP_CONFIG_SECURITY_TEST_MODE 0
+#define CHIP_CONFIG_SECURITY_TEST_MODE 1
 #define CHIP_CONFIG_REQUIRE_AUTH 1
 
 // Increase session idle timeout in stand-alone builds for the convenience of developers.

diff --git a/examples/shell/shell_common/cmd_server.cpp b/examples/shell/shell_common/cmd_server.cpp
@@ -42,6 +42,7 @@ bool lowPowerClusterSleep()
 static chip::Shell::Engine sShellServerSubcommands;
 static uint16_t sServerPortOperational   = CHIP_PORT;
 static uint16_t sServerPortCommissioning = CHIP_UDC_PORT;
+static bool sServerEnabled = false;
 
 static CHIP_ERROR CmdAppServerHelp(int argc, char ** argv)
 {
@@ -57,12 +58,16 @@ static CHIP_ERROR CmdAppServerStart(int argc, char ** argv)
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
 
+    sServerEnabled = true;
+
     return CHIP_NO_ERROR;
 }
 
 static CHIP_ERROR CmdAppServerStop(int argc, char ** argv)
 {
+    if (sServerEnabled == false) return CHIP_NO_ERROR;
     chip::Server::GetInstance().Shutdown();
+    sServerEnabled = false;
     return CHIP_NO_ERROR;
 }