[meshcop] remove unnecessary `MeshCoP::` qualifier (#7628)
diff --git a/src/core/meshcop/border_agent.cpp b/src/core/meshcop/border_agent.cpp
index 8bde4b8..1e5883e 100644
--- a/src/core/meshcop/border_agent.cpp
+++ b/src/core/meshcop/border_agent.cpp
@@ -303,7 +303,7 @@
VerifyOrExit(aEvents.ContainsAny(kEventThreadRoleChanged | kEventCommissionerStateChanged));
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
- VerifyOrExit(Get<MeshCoP::Commissioner>().IsDisabled());
+ VerifyOrExit(Get<Commissioner>().IsDisabled());
#endif
if (Get<Mle::MleRouter>().IsAttached())
diff --git a/src/core/meshcop/commissioner.cpp b/src/core/meshcop/commissioner.cpp
index 500041b..a15d991 100644
--- a/src/core/meshcop/commissioner.cpp
+++ b/src/core/meshcop/commissioner.cpp
@@ -304,7 +304,7 @@
VerifyOrExit(mState == kStateDisabled, error = kErrorAlready);
#if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE
- Get<MeshCoP::BorderAgent>().Stop();
+ Get<BorderAgent>().Stop();
#endif
SuccessOrExit(error = Get<Coap::CoapSecure>().Start(SendRelayTransmit, this));
@@ -359,7 +359,7 @@
}
#if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE
- Get<MeshCoP::BorderAgent>().Start();
+ Get<BorderAgent>().Start();
#endif
exit:
@@ -687,7 +687,7 @@
Error error = kErrorNone;
Coap::Message * message;
Tmf::MessageInfo messageInfo(GetInstance());
- MeshCoP::Tlv tlv;
+ Tlv tlv;
VerifyOrExit((message = Get<Tmf::Agent>().NewPriorityMessage()) != nullptr, error = kErrorNoBufs);
@@ -700,7 +700,7 @@
if (aLength > 0)
{
- tlv.SetType(MeshCoP::Tlv::kGet);
+ tlv.SetType(Tlv::kGet);
tlv.SetLength(aLength);
SuccessOrExit(error = message->Append(tlv));
SuccessOrExit(error = message->AppendBytes(aTlvs, aLength));
@@ -752,12 +752,12 @@
if (aDataset.IsLocatorSet())
{
- SuccessOrExit(error = Tlv::Append<MeshCoP::BorderAgentLocatorTlv>(*message, aDataset.GetLocator()));
+ SuccessOrExit(error = Tlv::Append<BorderAgentLocatorTlv>(*message, aDataset.GetLocator()));
}
if (aDataset.IsSessionIdSet())
{
- SuccessOrExit(error = Tlv::Append<MeshCoP::CommissionerSessionIdTlv>(*message, aDataset.GetSessionId()));
+ SuccessOrExit(error = Tlv::Append<CommissionerSessionIdTlv>(*message, aDataset.GetSessionId()));
}
if (aDataset.IsSteeringDataSet())
diff --git a/src/core/meshcop/dataset.cpp b/src/core/meshcop/dataset.cpp
index ad6adec..74d9a09 100644
--- a/src/core/meshcop/dataset.cpp
+++ b/src/core/meshcop/dataset.cpp
@@ -555,12 +555,11 @@
break;
case Tlv::kExtendedPanId:
- aInstance.Get<MeshCoP::ExtendedPanIdManager>().SetExtPanId(As<ExtendedPanIdTlv>(cur)->GetExtendedPanId());
+ aInstance.Get<ExtendedPanIdManager>().SetExtPanId(As<ExtendedPanIdTlv>(cur)->GetExtendedPanId());
break;
case Tlv::kNetworkName:
- IgnoreError(
- aInstance.Get<MeshCoP::NetworkNameManager>().SetNetworkName(As<NetworkNameTlv>(cur)->GetNetworkName()));
+ IgnoreError(aInstance.Get<NetworkNameManager>().SetNetworkName(As<NetworkNameTlv>(cur)->GetNetworkName()));
break;
case Tlv::kNetworkKey:
diff --git a/src/core/meshcop/dataset.hpp b/src/core/meshcop/dataset.hpp
index 36b08fe..5990a48 100644
--- a/src/core/meshcop/dataset.hpp
+++ b/src/core/meshcop/dataset.hpp
@@ -339,7 +339,7 @@
* @returns The Extended PAN ID in the Dataset.
*
*/
- const MeshCoP::ExtendedPanId &GetExtendedPanId(void) const { return AsCoreType(&mExtendedPanId); }
+ const ExtendedPanId &GetExtendedPanId(void) const { return AsCoreType(&mExtendedPanId); }
/**
* This method sets the Extended PAN ID in the Dataset.
@@ -347,7 +347,7 @@
* @param[in] aExtendedPanId An Extended PAN ID.
*
*/
- void SetExtendedPanId(const MeshCoP::ExtendedPanId &aExtendedPanId)
+ void SetExtendedPanId(const ExtendedPanId &aExtendedPanId)
{
mExtendedPanId = aExtendedPanId;
mComponents.mIsExtendedPanIdPresent = true;
diff --git a/src/core/meshcop/dataset_manager.cpp b/src/core/meshcop/dataset_manager.cpp
index 1c00ea8..b0bf93c 100644
--- a/src/core/meshcop/dataset_manager.cpp
+++ b/src/core/meshcop/dataset_manager.cpp
@@ -227,10 +227,10 @@
Error DatasetManager::GetChannelMask(Mac::ChannelMask &aChannelMask) const
{
- Error error;
- const MeshCoP::ChannelMaskTlv *channelMaskTlv;
- uint32_t mask;
- Dataset dataset;
+ Error error;
+ const ChannelMaskTlv *channelMaskTlv;
+ uint32_t mask;
+ Dataset dataset;
SuccessOrExit(error = Read(dataset));
diff --git a/src/core/meshcop/dataset_manager_ftd.cpp b/src/core/meshcop/dataset_manager_ftd.cpp
index 7893bcc..da57c5f 100644
--- a/src/core/meshcop/dataset_manager_ftd.cpp
+++ b/src/core/meshcop/dataset_manager_ftd.cpp
@@ -334,7 +334,7 @@
if (dataset.GetTlv<ExtendedPanIdTlv>() == nullptr)
{
- IgnoreError(dataset.SetTlv(Tlv::kExtendedPanId, Get<MeshCoP::ExtendedPanIdManager>().GetExtPanId()));
+ IgnoreError(dataset.SetTlv(Tlv::kExtendedPanId, Get<ExtendedPanIdManager>().GetExtPanId()));
}
if (dataset.GetTlv<MeshLocalPrefixTlv>() == nullptr)
@@ -352,7 +352,7 @@
if (dataset.GetTlv<NetworkNameTlv>() == nullptr)
{
- MeshCoP::NameData nameData = Get<MeshCoP::NetworkNameManager>().GetNetworkName().GetAsData();
+ NameData nameData = Get<NetworkNameManager>().GetNetworkName().GetAsData();
IgnoreError(dataset.SetTlv(Tlv::kNetworkName, nameData.GetBuffer(), nameData.GetLength()));
}
diff --git a/src/core/meshcop/dataset_updater.cpp b/src/core/meshcop/dataset_updater.cpp
index c3c9766..c1ca78e 100644
--- a/src/core/meshcop/dataset_updater.cpp
+++ b/src/core/meshcop/dataset_updater.cpp
@@ -54,7 +54,7 @@
{
}
-Error DatasetUpdater::RequestUpdate(const MeshCoP::Dataset::Info &aDataset, Callback aCallback, void *aContext)
+Error DatasetUpdater::RequestUpdate(const Dataset::Info &aDataset, Callback aCallback, void *aContext)
{
Error error = kErrorNone;
Message *message = nullptr;
@@ -105,9 +105,9 @@
void DatasetUpdater::PreparePendingDataset(void)
{
- Dataset dataset;
- MeshCoP::Dataset::Info requestedDataset;
- Error error;
+ Dataset dataset;
+ Dataset::Info requestedDataset;
+ Error error;
VerifyOrExit(!Get<Mle::Mle>().IsDisabled(), error = kErrorInvalidState);
@@ -178,8 +178,8 @@
void DatasetUpdater::HandleNotifierEvents(Events aEvents)
{
- MeshCoP::Dataset::Info requestedDataset;
- MeshCoP::Dataset::Info dataset;
+ Dataset::Info requestedDataset;
+ Dataset::Info dataset;
VerifyOrExit(mDataset != nullptr);
@@ -187,7 +187,7 @@
IgnoreError(mDataset->Read(0, requestedDataset));
- if (aEvents.Contains(kEventActiveDatasetChanged) && Get<MeshCoP::ActiveDataset>().Read(dataset) == kErrorNone)
+ if (aEvents.Contains(kEventActiveDatasetChanged) && Get<ActiveDataset>().Read(dataset) == kErrorNone)
{
if (requestedDataset.IsSubsetOf(dataset))
{
@@ -199,7 +199,7 @@
}
}
- if (aEvents.Contains(kEventPendingDatasetChanged) && Get<MeshCoP::PendingDataset>().Read(dataset) == kErrorNone)
+ if (aEvents.Contains(kEventPendingDatasetChanged) && Get<PendingDataset>().Read(dataset) == kErrorNone)
{
if (!requestedDataset.IsSubsetOf(dataset))
{
diff --git a/src/core/meshcop/dataset_updater.hpp b/src/core/meshcop/dataset_updater.hpp
index cd7a806..b3b94c0 100644
--- a/src/core/meshcop/dataset_updater.hpp
+++ b/src/core/meshcop/dataset_updater.hpp
@@ -94,7 +94,7 @@
* @retval kErrorNoBufs Could not allocated buffer to save Dataset.
*
*/
- Error RequestUpdate(const MeshCoP::Dataset::Info &aDataset, Callback aCallback, void *aContext);
+ Error RequestUpdate(const Dataset::Info &aDataset, Callback aCallback, void *aContext);
/**
* This method cancels an ongoing (if any) Operational Dataset update request.
diff --git a/src/core/meshcop/dtls.cpp b/src/core/meshcop/dtls.cpp
index aa28345..7a558aa 100644
--- a/src/core/meshcop/dtls.cpp
+++ b/src/core/meshcop/dtls.cpp
@@ -176,10 +176,10 @@
{
switch (mState)
{
- case MeshCoP::Dtls::kStateClosed:
+ case Dtls::kStateClosed:
ExitNow();
- case MeshCoP::Dtls::kStateOpen:
+ case Dtls::kStateOpen:
IgnoreError(mSocket.Connect(Ip6::SockAddr(aMessageInfo.GetPeerAddr(), aMessageInfo.GetPeerPort())));
mMessageInfo.SetPeerAddr(aMessageInfo.GetPeerAddr());
@@ -204,7 +204,7 @@
}
#ifdef MBEDTLS_SSL_SRV_C
- if (mState == MeshCoP::Dtls::kStateConnecting)
+ if (mState == Dtls::kStateConnecting)
{
IgnoreError(SetClientId(mMessageInfo.GetPeerAddr().mFields.m8, sizeof(mMessageInfo.GetPeerAddr().mFields)));
}
diff --git a/src/core/meshcop/joiner.cpp b/src/core/meshcop/joiner.cpp
index 9d67941..33f7966 100644
--- a/src/core/meshcop/joiner.cpp
+++ b/src/core/meshcop/joiner.cpp
@@ -581,7 +581,7 @@
datasetInfo.SetChannel(Get<Mac::Mac>().GetPanChannel());
datasetInfo.SetPanId(Get<Mac::Mac>().GetPanId());
- IgnoreError(Get<MeshCoP::ActiveDataset>().Save(datasetInfo));
+ IgnoreError(Get<ActiveDataset>().Save(datasetInfo));
LogInfo("Joiner successful!");
diff --git a/src/core/meshcop/joiner_router.cpp b/src/core/meshcop/joiner_router.cpp
index 48995b4..dff1411 100644
--- a/src/core/meshcop/joiner_router.cpp
+++ b/src/core/meshcop/joiner_router.cpp
@@ -325,10 +325,10 @@
Get<KeyManager>().GetNetworkKey(networkKey);
SuccessOrExit(error = Tlv::Append<NetworkKeyTlv>(*message, networkKey));
SuccessOrExit(error = Tlv::Append<MeshLocalPrefixTlv>(*message, Get<Mle::MleRouter>().GetMeshLocalPrefix()));
- SuccessOrExit(error = Tlv::Append<ExtendedPanIdTlv>(*message, Get<MeshCoP::ExtendedPanIdManager>().GetExtPanId()));
+ SuccessOrExit(error = Tlv::Append<ExtendedPanIdTlv>(*message, Get<ExtendedPanIdManager>().GetExtPanId()));
networkName.Init();
- networkName.SetNetworkName(Get<MeshCoP::NetworkNameManager>().GetNetworkName().GetAsData());
+ networkName.SetNetworkName(Get<NetworkNameManager>().GetNetworkName().GetAsData());
SuccessOrExit(error = networkName.AppendTo(*message));
IgnoreError(Get<ActiveDataset>().Read(dataset));
diff --git a/src/core/meshcop/meshcop.cpp b/src/core/meshcop/meshcop.cpp
index cc53a3b..a61b0ae 100644
--- a/src/core/meshcop/meshcop.cpp
+++ b/src/core/meshcop/meshcop.cpp
@@ -316,10 +316,10 @@
}
#if OPENTHREAD_FTD
-Error GeneratePskc(const char * aPassPhrase,
- const MeshCoP::NetworkName & aNetworkName,
- const MeshCoP::ExtendedPanId &aExtPanId,
- Pskc & aPskc)
+Error GeneratePskc(const char * aPassPhrase,
+ const NetworkName & aNetworkName,
+ const ExtendedPanId &aExtPanId,
+ Pskc & aPskc)
{
Error error = kErrorNone;
const char saltPrefix[] = "Thread";
diff --git a/src/core/meshcop/meshcop.hpp b/src/core/meshcop/meshcop.hpp
index 96b8514..0de1047 100644
--- a/src/core/meshcop/meshcop.hpp
+++ b/src/core/meshcop/meshcop.hpp
@@ -420,10 +420,10 @@
* @retval kErrorInvalidArgs If the length of passphrase is out of range.
*
*/
-Error GeneratePskc(const char * aPassPhrase,
- const MeshCoP::NetworkName & aNetworkName,
- const MeshCoP::ExtendedPanId &aExtPanId,
- Pskc & aPskc);
+Error GeneratePskc(const char * aPassPhrase,
+ const NetworkName & aNetworkName,
+ const ExtendedPanId &aExtPanId,
+ Pskc & aPskc);
/**
* This function computes the Joiner ID from a factory-assigned IEEE EUI-64.
diff --git a/src/core/meshcop/meshcop_tlvs.cpp b/src/core/meshcop/meshcop_tlvs.cpp
index 7c2708a..c047ed9 100644
--- a/src/core/meshcop/meshcop_tlvs.cpp
+++ b/src/core/meshcop/meshcop_tlvs.cpp
@@ -280,9 +280,9 @@
entry->SetChannelPage(OT_RADIO_CHANNEL_PAGE_2);
entry->SetMask(aChannelMask & OT_RADIO_915MHZ_OQPSK_CHANNEL_MASK);
- length += sizeof(MeshCoP::ChannelMaskEntry);
+ length += sizeof(ChannelMaskEntry);
- entry = static_cast<MeshCoP::ChannelMaskEntry *>(entry->GetNext());
+ entry = static_cast<ChannelMaskEntry *>(entry->GetNext());
}
#endif
@@ -294,7 +294,7 @@
entry->SetChannelPage(OT_RADIO_CHANNEL_PAGE_0);
entry->SetMask(aChannelMask & OT_RADIO_2P4GHZ_OQPSK_CHANNEL_MASK);
- length += sizeof(MeshCoP::ChannelMaskEntry);
+ length += sizeof(ChannelMaskEntry);
}
#endif
@@ -306,7 +306,7 @@
entry->SetChannelPage(OPENTHREAD_CONFIG_PLATFORM_RADIO_PROPRIETARY_CHANNEL_PAGE);
entry->SetMask(aChannelMask & OPENTHREAD_CONFIG_PLATFORM_RADIO_PROPRIETARY_CHANNEL_MASK);
- length += sizeof(MeshCoP::ChannelMaskEntry);
+ length += sizeof(ChannelMaskEntry);
}
#endif
diff --git a/src/core/meshcop/meshcop_tlvs.hpp b/src/core/meshcop/meshcop_tlvs.hpp
index a7d264c..ffe14a4 100644
--- a/src/core/meshcop/meshcop_tlvs.hpp
+++ b/src/core/meshcop/meshcop_tlvs.hpp
@@ -447,7 +447,7 @@
*
*/
OT_TOOL_PACKED_BEGIN
-class ExtendedPanIdTlv : public Tlv, public SimpleTlvInfo<Tlv::kExtendedPanId, MeshCoP::ExtendedPanId>
+class ExtendedPanIdTlv : public Tlv, public SimpleTlvInfo<Tlv::kExtendedPanId, ExtendedPanId>
{
public:
/**
@@ -475,7 +475,7 @@
* @returns The Extended PAN ID value.
*
*/
- const MeshCoP::ExtendedPanId &GetExtendedPanId(void) const { return mExtendedPanId; }
+ const ExtendedPanId &GetExtendedPanId(void) const { return mExtendedPanId; }
/**
* This method sets the Extended PAN ID value.
@@ -483,10 +483,10 @@
* @param[in] aExtendedPanId An Extended PAN ID value.
*
*/
- void SetExtendedPanId(const MeshCoP::ExtendedPanId &aExtendedPanId) { mExtendedPanId = aExtendedPanId; }
+ void SetExtendedPanId(const ExtendedPanId &aExtendedPanId) { mExtendedPanId = aExtendedPanId; }
private:
- MeshCoP::ExtendedPanId mExtendedPanId;
+ ExtendedPanId mExtendedPanId;
} OT_TOOL_PACKED_END;
/**
