diff --git a/src/cli/cli_tcat.cpp b/src/cli/cli_tcat.cpp index 491aaf6c0..7845be89b 100644 --- a/src/cli/cli_tcat.cpp +++ b/src/cli/cli_tcat.cpp @@ -79,9 +79,8 @@ namespace ot { namespace Cli { -otTcatVendorInfo sVendorInfo; -const char kPskdVendor[] = "J01NM3"; -const char kUrl[] = "dummy_url"; +const char kPskdVendor[] = "J01NM3"; +const char kUrl[] = "dummy_url"; static void HandleBleSecureReceive(otInstance *aInstance, const otMessage *aMessage, @@ -116,8 +115,9 @@ template <> otError Tcat::Process(Arg aArgs[]) otError error = OT_ERROR_NONE; - sVendorInfo.mPskdString = kPskdVendor; - sVendorInfo.mProvisioningUrl = kUrl; + ClearAllBytes(mVendorInfo); + mVendorInfo.mPskdString = kPskdVendor; + mVendorInfo.mProvisioningUrl = kUrl; otBleSecureSetCertificate(GetInstancePtr(), reinterpret_cast(OT_CLI_TCAT_X509_CERT), sizeof(OT_CLI_TCAT_X509_CERT), reinterpret_cast(OT_CLI_TCAT_PRIV_KEY), @@ -130,7 +130,7 @@ template <> otError Tcat::Process(Arg aArgs[]) otBleSecureSetSslAuthMode(GetInstancePtr(), true); SuccessOrExit(error = otBleSecureStart(GetInstancePtr(), nullptr, HandleBleSecureReceive, true, nullptr)); - SuccessOrExit(error = otBleSecureTcatStart(GetInstancePtr(), &sVendorInfo, nullptr)); + SuccessOrExit(error = otBleSecureTcatStart(GetInstancePtr(), &mVendorInfo, nullptr)); exit: return error; diff --git a/src/cli/cli_tcat.hpp b/src/cli/cli_tcat.hpp index 3f1d0be6e..91b36cc4b 100644 --- a/src/cli/cli_tcat.hpp +++ b/src/cli/cli_tcat.hpp @@ -31,6 +31,8 @@ #include "openthread-core-config.h" +#include + #include "cli/cli_output.hpp" #if OPENTHREAD_CONFIG_BLE_TCAT_ENABLE && OPENTHREAD_CONFIG_CLI_BLE_SECURE_ENABLE @@ -78,6 +80,8 @@ private: using Command = CommandEntry; template otError Process(Arg aArgs[]); + + otTcatVendorInfo mVendorInfo; }; } // namespace Cli