diff --git a/src/core/meshcop/dataset.cpp b/src/core/meshcop/dataset.cpp index 9ee0bb4c2..5d9a02877 100644 --- a/src/core/meshcop/dataset.cpp +++ b/src/core/meshcop/dataset.cpp @@ -83,7 +83,7 @@ Error Dataset::Info::GenerateRandom(Instance &aInstance) SuccessOrExit(error = Random::Crypto::FillBuffer(mExtendedPanId.m8, sizeof(mExtendedPanId.m8))); SuccessOrExit(error = AsCoreType(&mMeshLocalPrefix).GenerateRandomUla()); - snprintf(mNetworkName.m8, sizeof(mNetworkName), "OpenThread-%04x", mPanId); + snprintf(mNetworkName.m8, sizeof(mNetworkName), "%s-%04x", NetworkName::kNetworkNameInit, mPanId); mComponents.mIsActiveTimestampPresent = true; mComponents.mIsNetworkKeyPresent = true; diff --git a/src/core/meshcop/network_name.cpp b/src/core/meshcop/network_name.cpp index 4e0fe4895..431663123 100644 --- a/src/core/meshcop/network_name.cpp +++ b/src/core/meshcop/network_name.cpp @@ -40,12 +40,6 @@ namespace ot { namespace MeshCoP { -const char NetworkNameManager::sNetworkNameInit[] = "OpenThread"; - -#if (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2) -const char NetworkNameManager::sDomainNameInit[] = "DefaultDomain"; -#endif - uint8_t NameData::CopyTo(char *aBuffer, uint8_t aMaxSize) const { MutableData destData; @@ -114,10 +108,10 @@ bool NetworkName::operator==(const NetworkName &aOther) const { return GetAsData NetworkNameManager::NetworkNameManager(Instance &aInstance) : InstanceLocator(aInstance) { - IgnoreError(SetNetworkName(sNetworkNameInit)); + IgnoreError(SetNetworkName(NetworkName::kNetworkNameInit)); #if (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2) - IgnoreError(SetDomainName(sDomainNameInit)); + IgnoreError(SetDomainName(NetworkName::kDomainNameInit)); #endif } diff --git a/src/core/meshcop/network_name.hpp b/src/core/meshcop/network_name.hpp index 1f6d84786..d376fc5cd 100644 --- a/src/core/meshcop/network_name.hpp +++ b/src/core/meshcop/network_name.hpp @@ -107,6 +107,9 @@ public: class NetworkName : public otNetworkName, public Unequatable { public: + static constexpr const char *kNetworkNameInit = "OpenThread"; + static constexpr const char *kDomainNameInit = "DefaultDomain"; + /** * This constant specified the maximum number of chars in Network Name (excludes null char). * @@ -262,9 +265,6 @@ public: private: Error SignalNetworkNameChange(Error aError); - static const char sNetworkNameInit[]; - static const char sDomainNameInit[]; - NetworkName mNetworkName; #if (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2)