espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-30 04:47:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[meshcop] remove unnecessary MeshCoP:: qualifier (#7628)

Browse Source
This commit is contained in:
Jonathan Hui
2022-04-25 06:19:38 -07:00
committed by GitHub
parent 8069b958d9
commit 79757a69f6
15 changed files with 48 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/meshcop/border_agent.cpp
+1 -1
View File
@@ -303,7 +303,7 @@ void BorderAgent::HandleNotifierEvents(Events aEvents)
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())
src/core/meshcop/commissioner.cpp
+6 -6
View File
@@ -304,7 +304,7 @@ Error Commissioner::Start(StateCallback aStateCallback, JoinerCallback aJoinerCa
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 @@ Error Commissioner::Stop(ResignMode aResignMode)
}
#if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE
Get<MeshCoP::BorderAgent>().Start();
Get<BorderAgent>().Start();
#endif
exit:
@@ -687,7 +687,7 @@ Error Commissioner::SendMgmtCommissionerGetRequest(const uint8_t *aTlvs, uint8_t
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 @@ Error Commissioner::SendMgmtCommissionerGetRequest(const uint8_t *aTlvs, uint8_t
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 @@ Error Commissioner::SendMgmtCommissionerSetRequest(const Dataset &aDataset, cons
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())
src/core/meshcop/dataset.cpp
+2 -3
View File
@@ -555,12 +555,11 @@ Error Dataset::ApplyConfiguration(Instance &aInstance, bool *aIsNetworkKeyUpdate
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:
src/core/meshcop/dataset.hpp
+2 -2
View File
@@ -339,7 +339,7 @@ public:
* @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 @@ public:
* @param[in] aExtendedPanId An Extended PAN ID.
*
*/
void SetExtendedPanId(const MeshCoP::ExtendedPanId &aExtendedPanId)
void SetExtendedPanId(const ExtendedPanId &aExtendedPanId)
{
mExtendedPanId = aExtendedPanId;
mComponents.mIsExtendedPanIdPresent = true;
src/core/meshcop/dataset_manager.cpp
+4 -4
View File
@@ -227,10 +227,10 @@ void DatasetManager::SignalDatasetChange(void) const
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));
src/core/meshcop/dataset_manager_ftd.cpp
+2 -2
View File
@@ -334,7 +334,7 @@ Error ActiveDataset::GenerateLocal(void)
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 @@ Error ActiveDataset::GenerateLocal(void)
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()));
}
src/core/meshcop/dataset_updater.cpp
+8 -8
View File
@@ -54,7 +54,7 @@ DatasetUpdater::DatasetUpdater(Instance &aInstance)
{
}
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::HandleTimer(void)
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::Finish(Error aError)
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 @@ void DatasetUpdater::HandleNotifierEvents(Events aEvents)
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 @@ void DatasetUpdater::HandleNotifierEvents(Events aEvents)
}
}
if (aEvents.Contains(kEventPendingDatasetChanged) && Get<MeshCoP::PendingDataset>().Read(dataset) == kErrorNone)
if (aEvents.Contains(kEventPendingDatasetChanged) && Get<PendingDataset>().Read(dataset) == kErrorNone)
{
if (!requestedDataset.IsSubsetOf(dataset))
{
src/core/meshcop/dataset_updater.hpp
+1 -1
View File
@@ -94,7 +94,7 @@ public:
* @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.
src/core/meshcop/dtls.cpp
+3 -3
View File
@@ -176,10 +176,10 @@ void Dtls::HandleUdpReceive(Message &aMessage, const Ip6::MessageInfo &aMessageI
{
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 @@ void Dtls::HandleUdpReceive(Message &aMessage, const Ip6::MessageInfo &aMessageI
}
#ifdef MBEDTLS_SSL_SRV_C
if (mState == MeshCoP::Dtls::kStateConnecting)
if (mState == Dtls::kStateConnecting)
{
IgnoreError(SetClientId(mMessageInfo.GetPeerAddr().mFields.m8, sizeof(mMessageInfo.GetPeerAddr().mFields)));
}
src/core/meshcop/joiner.cpp
+1 -1
View File
@@ -581,7 +581,7 @@ void Joiner::HandleJoinerEntrust(Coap::Message &aMessage, const Ip6::MessageInfo
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!");
src/core/meshcop/joiner_router.cpp
+2 -2
View File
@@ -325,10 +325,10 @@ Coap::Message *JoinerRouter::PrepareJoinerEntrustMessage(void)
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));
src/core/meshcop/meshcop.cpp
+4 -4
View File
@@ -316,10 +316,10 @@ exit:
}
#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";
src/core/meshcop/meshcop.hpp
+4 -4
View File
@@ -420,10 +420,10 @@ private:
* @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.
src/core/meshcop/meshcop_tlvs.cpp
+4 -4
View File
@@ -280,9 +280,9 @@ void ChannelMaskTlv::SetChannelMask(uint32_t aChannelMask)
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 @@ void ChannelMaskTlv::SetChannelMask(uint32_t aChannelMask)
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 @@ void ChannelMaskTlv::SetChannelMask(uint32_t aChannelMask)
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
src/core/meshcop/meshcop_tlvs.hpp
+4 -4
View File
@@ -447,7 +447,7 @@ private:
*
*/
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 @@ public:
* @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 @@ public:
* @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;
/**