From 524da6d2c46e480f2b98e9d6afb31851e5fc1c3a Mon Sep 17 00:00:00 2001 From: Abtin Keshavarzian Date: Fri, 23 Apr 2021 07:50:38 -0700 Subject: [PATCH] [tmf] rename TMF agent class to `Tmf::Agent` (#6502) This commit renames the TMF agent class from `Tmf::TmfAgent` to `Tmf::Agent` (to follow style used by other modules). --- src/core/api/message_api.cpp | 4 +-- src/core/backbone_router/bbr_manager.cpp | 18 +++++----- src/core/common/instance.hpp | 2 +- src/core/meshcop/announce_begin_client.cpp | 4 +-- src/core/meshcop/border_agent.cpp | 12 +++---- src/core/meshcop/commissioner.cpp | 38 ++++++++++----------- src/core/meshcop/dataset_manager.cpp | 22 ++++++------ src/core/meshcop/dataset_manager_ftd.cpp | 12 +++---- src/core/meshcop/energy_scan_client.cpp | 8 ++--- src/core/meshcop/joiner.cpp | 6 ++-- src/core/meshcop/joiner_router.cpp | 14 ++++---- src/core/meshcop/meshcop_leader.cpp | 16 ++++----- src/core/meshcop/panid_query_client.cpp | 8 ++--- src/core/thread/address_resolver.cpp | 22 ++++++------ src/core/thread/announce_begin_server.cpp | 4 +-- src/core/thread/dua_manager.cpp | 19 +++++------ src/core/thread/energy_scan_server.cpp | 8 ++--- src/core/thread/mle.cpp | 2 +- src/core/thread/mle_router.cpp | 26 +++++++------- src/core/thread/mlr_manager.cpp | 4 +-- src/core/thread/network_data.cpp | 4 +-- src/core/thread/network_data_leader_ftd.cpp | 22 ++++++------ src/core/thread/network_diagnostic.cpp | 30 ++++++++-------- src/core/thread/panid_query_server.cpp | 8 ++--- src/core/thread/thread_netif.cpp | 4 +-- src/core/thread/thread_netif.hpp | 2 +- src/core/thread/tmf.cpp | 8 ++--- src/core/thread/tmf.hpp | 4 +-- 28 files changed, 165 insertions(+), 166 deletions(-) diff --git a/src/core/api/message_api.cpp b/src/core/api/message_api.cpp index 777c3df5f..149fa907f 100644 --- a/src/core/api/message_api.cpp +++ b/src/core/api/message_api.cpp @@ -201,8 +201,8 @@ void otMessageGetBufferInfo(otInstance *aInstance, otBufferInfo *aBufferInfo) instance.Get().GetMessageQueue().GetInfo(aBufferInfo->mMleMessages, aBufferInfo->mMleBuffers); - instance.Get().GetRequestMessages().GetInfo(aBufferInfo->mCoapMessages, aBufferInfo->mCoapBuffers); - instance.Get().GetCachedResponses().GetInfo(messages, buffers); + instance.Get().GetRequestMessages().GetInfo(aBufferInfo->mCoapMessages, aBufferInfo->mCoapBuffers); + instance.Get().GetCachedResponses().GetInfo(messages, buffers); aBufferInfo->mCoapMessages += messages; aBufferInfo->mCoapBuffers += buffers; diff --git a/src/core/backbone_router/bbr_manager.cpp b/src/core/backbone_router/bbr_manager.cpp index 4247459b9..b3ca9d3eb 100644 --- a/src/core/backbone_router/bbr_manager.cpp +++ b/src/core/backbone_router/bbr_manager.cpp @@ -95,11 +95,11 @@ void Manager::HandleNotifierEvents(Events aEvents) if (Get().GetState() == OT_BACKBONE_ROUTER_STATE_DISABLED) { #if OPENTHREAD_CONFIG_BACKBONE_ROUTER_MULTICAST_ROUTING_ENABLE - Get().RemoveResource(mMulticastListenerRegistration); + Get().RemoveResource(mMulticastListenerRegistration); mMulticastListenersTable.Clear(); #endif #if OPENTHREAD_CONFIG_BACKBONE_ROUTER_DUA_NDPROXYING_ENABLE - Get().RemoveResource(mDuaRegistration); + Get().RemoveResource(mDuaRegistration); #endif mTimer.Stop(); @@ -117,10 +117,10 @@ void Manager::HandleNotifierEvents(Events aEvents) else { #if OPENTHREAD_CONFIG_BACKBONE_ROUTER_MULTICAST_ROUTING_ENABLE - Get().AddResource(mMulticastListenerRegistration); + Get().AddResource(mMulticastListenerRegistration); #endif #if OPENTHREAD_CONFIG_BACKBONE_ROUTER_DUA_NDPROXYING_ENABLE - Get().AddResource(mDuaRegistration); + Get().AddResource(mDuaRegistration); #endif if (!mTimer.IsRunning()) { @@ -301,7 +301,7 @@ void Manager::SendMulticastListenerRegistrationResponse(const Coap::Message & Error error = kErrorNone; Coap::Message *message = nullptr; - VerifyOrExit((message = Get().NewMessage()) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = Get().NewMessage()) != nullptr, error = kErrorNoBufs); SuccessOrExit(message->SetDefaultResponseHeader(aMessage)); SuccessOrExit(message->SetPayloadMarker()); @@ -322,7 +322,7 @@ void Manager::SendMulticastListenerRegistrationResponse(const Coap::Message & } } - SuccessOrExit(error = Get().SendMessage(*message, aMessageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, aMessageInfo)); exit: FreeMessageOnError(message, error); @@ -435,7 +435,7 @@ exit: #if OPENTHREAD_CONFIG_REFERENCE_DEVICE_ENABLE if (duaRespCoapCode != Coap::kCodeEmpty) { - IgnoreError(Get().SendEmptyAck(aMessage, aMessageInfo, duaRespCoapCode)); + IgnoreError(Get().SendEmptyAck(aMessage, aMessageInfo, duaRespCoapCode)); } else #endif @@ -453,7 +453,7 @@ void Manager::SendDuaRegistrationResponse(const Coap::Message & aMessage, Error error = kErrorNone; Coap::Message *message = nullptr; - VerifyOrExit((message = Get().NewMessage()) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = Get().NewMessage()) != nullptr, error = kErrorNoBufs); SuccessOrExit(message->SetDefaultResponseHeader(aMessage)); SuccessOrExit(message->SetPayloadMarker()); @@ -461,7 +461,7 @@ void Manager::SendDuaRegistrationResponse(const Coap::Message & aMessage, SuccessOrExit(Tlv::Append(*message, aStatus)); SuccessOrExit(Tlv::Append(*message, aTarget)); - SuccessOrExit(error = Get().SendMessage(*message, aMessageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, aMessageInfo)); exit: FreeMessageOnError(message, error); diff --git a/src/core/common/instance.hpp b/src/core/common/instance.hpp index 57621473e..cbffac0e5 100644 --- a/src/core/common/instance.hpp +++ b/src/core/common/instance.hpp @@ -660,7 +660,7 @@ template <> inline Ip6::Mpl &Instance::Get(void) return mIp6.mMpl; } -template <> inline Tmf::TmfAgent &Instance::Get(void) +template <> inline Tmf::Agent &Instance::Get(void) { return mThreadNetif.mTmfAgent; } diff --git a/src/core/meshcop/announce_begin_client.cpp b/src/core/meshcop/announce_begin_client.cpp index af11ee870..8b707d285 100644 --- a/src/core/meshcop/announce_begin_client.cpp +++ b/src/core/meshcop/announce_begin_client.cpp @@ -64,7 +64,7 @@ Error AnnounceBeginClient::SendRequest(uint32_t aChannelMask, Coap::Message * message = nullptr; VerifyOrExit(Get().IsActive(), error = kErrorInvalidState); - VerifyOrExit((message = MeshCoP::NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = MeshCoP::NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsPost(aAddress, UriPath::kAnnounceBegin)); SuccessOrExit(error = message->SetPayloadMarker()); @@ -83,7 +83,7 @@ Error AnnounceBeginClient::SendRequest(uint32_t aChannelMask, messageInfo.SetPeerAddr(aAddress); messageInfo.SetPeerPort(Tmf::kUdpPort); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); otLogInfoMeshCoP("sent announce begin query"); diff --git a/src/core/meshcop/border_agent.cpp b/src/core/meshcop/border_agent.cpp index c9561d8d5..c508db0a8 100644 --- a/src/core/meshcop/border_agent.cpp +++ b/src/core/meshcop/border_agent.cpp @@ -462,7 +462,7 @@ void BorderAgent::HandleRelayTransmit(const Coap::Message &aMessage) SuccessOrExit(error = Tlv::Find(aMessage, joinerRouterRloc)); - VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsNonConfirmablePost(UriPath::kRelayTx)); SuccessOrExit(error = message->SetPayloadMarker()); @@ -477,7 +477,7 @@ void BorderAgent::HandleRelayTransmit(const Coap::Message &aMessage) messageInfo.SetPeerAddr(Get().GetMeshLocal16()); messageInfo.GetPeerAddr().GetIid().SetLocator(joinerRouterRloc); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); otLogInfoMeshCoP("Sent to joiner router request on %s", UriPath::kRelayTx); @@ -498,7 +498,7 @@ Error BorderAgent::ForwardToLeader(const Coap::Message & aMessage, Coap::Message * message = nullptr; uint16_t offset = 0; - VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); if (aSeparate) { @@ -527,7 +527,7 @@ Error BorderAgent::ForwardToLeader(const Coap::Message & aMessage, messageInfo.SetSockAddr(Get().GetMeshLocal16()); messageInfo.SetSockPort(Tmf::kUdpPort); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo, HandleCoapResponse, forwardContext)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo, HandleCoapResponse, forwardContext)); // HandleCoapResponse is responsible to free this forward context. forwardContext = nullptr; @@ -601,7 +601,7 @@ Error BorderAgent::Start(void) coaps.AddResource(mProxyTransmit); coaps.AddResource(mRelayTransmit); - Get().AddResource(mRelayReceive); + Get().AddResource(mRelayReceive); mState = kStateStarted; mUdpProxyPort = 0; @@ -644,7 +644,7 @@ Error BorderAgent::Stop(void) coaps.RemoveResource(mProxyTransmit); coaps.RemoveResource(mRelayTransmit); - Get().RemoveResource(mRelayReceive); + Get().RemoveResource(mRelayReceive); coaps.Stop(); diff --git a/src/core/meshcop/commissioner.cpp b/src/core/meshcop/commissioner.cpp index 0b7a06aa1..4c1c9a062 100644 --- a/src/core/meshcop/commissioner.cpp +++ b/src/core/meshcop/commissioner.cpp @@ -137,15 +137,15 @@ exit: void Commissioner::AddCoapResources(void) { - Get().AddResource(mRelayReceive); - Get().AddResource(mDatasetChanged); + Get().AddResource(mRelayReceive); + Get().AddResource(mDatasetChanged); Get().AddResource(mJoinerFinalize); } void Commissioner::RemoveCoapResources(void) { - Get().RemoveResource(mRelayReceive); - Get().RemoveResource(mDatasetChanged); + Get().RemoveResource(mRelayReceive); + Get().RemoveResource(mDatasetChanged); Get().RemoveResource(mJoinerFinalize); } @@ -689,7 +689,7 @@ Error Commissioner::SendMgmtCommissionerGetRequest(const uint8_t *aTlvs, uint8_t Ip6::MessageInfo messageInfo; MeshCoP::Tlv tlv; - VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsConfirmablePost(UriPath::kCommissionerGet)); @@ -709,8 +709,8 @@ Error Commissioner::SendMgmtCommissionerGetRequest(const uint8_t *aTlvs, uint8_t messageInfo.SetSockAddr(Get().GetMeshLocal16()); SuccessOrExit(error = Get().GetLeaderAloc(messageInfo.GetPeerAddr())); messageInfo.SetPeerPort(Tmf::kUdpPort); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo, - Commissioner::HandleMgmtCommissionerGetResponse, this)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo, + Commissioner::HandleMgmtCommissionerGetResponse, this)); otLogInfoMeshCoP("sent MGMT_COMMISSIONER_GET.req to leader"); @@ -749,7 +749,7 @@ Error Commissioner::SendMgmtCommissionerSetRequest(const otCommissioningDataset Coap::Message * message; Ip6::MessageInfo messageInfo; - VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsConfirmablePost(UriPath::kCommissionerSet)); SuccessOrExit(error = message->SetPayloadMarker()); @@ -789,8 +789,8 @@ Error Commissioner::SendMgmtCommissionerSetRequest(const otCommissioningDataset messageInfo.SetSockAddr(Get().GetMeshLocal16()); SuccessOrExit(error = Get().GetLeaderAloc(messageInfo.GetPeerAddr())); messageInfo.SetPeerPort(Tmf::kUdpPort); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo, - Commissioner::HandleMgmtCommissionerSetResponse, this)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo, + Commissioner::HandleMgmtCommissionerSetResponse, this)); otLogInfoMeshCoP("sent MGMT_COMMISSIONER_SET.req to leader"); @@ -830,7 +830,7 @@ Error Commissioner::SendPetition(void) mTransmitAttempts++; - VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsConfirmablePost(UriPath::kLeaderPetition)); SuccessOrExit(error = message->SetPayloadMarker()); @@ -843,8 +843,8 @@ Error Commissioner::SendPetition(void) SuccessOrExit(error = Get().GetLeaderAloc(messageInfo.GetPeerAddr())); messageInfo.SetPeerPort(Tmf::kUdpPort); messageInfo.SetSockAddr(Get().GetMeshLocal16()); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo, - Commissioner::HandleLeaderPetitionResponse, this)); + SuccessOrExit( + error = Get().SendMessage(*message, messageInfo, Commissioner::HandleLeaderPetitionResponse, this)); otLogInfoMeshCoP("sent petition"); @@ -925,7 +925,7 @@ void Commissioner::SendKeepAlive(uint16_t aSessionId) Coap::Message * message = nullptr; Ip6::MessageInfo messageInfo; - VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsConfirmablePost(UriPath::kLeaderKeepAlive)); SuccessOrExit(error = message->SetPayloadMarker()); @@ -938,8 +938,8 @@ void Commissioner::SendKeepAlive(uint16_t aSessionId) messageInfo.SetSockAddr(Get().GetMeshLocal16()); SuccessOrExit(error = Get().GetLeaderAloc(messageInfo.GetPeerAddr())); messageInfo.SetPeerPort(Tmf::kUdpPort); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo, - Commissioner::HandleLeaderKeepAliveResponse, this)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo, + Commissioner::HandleLeaderKeepAliveResponse, this)); otLogInfoMeshCoP("sent keep alive"); @@ -1061,7 +1061,7 @@ void Commissioner::HandleDatasetChanged(Coap::Message &aMessage, const Ip6::Mess otLogInfoMeshCoP("received dataset changed"); - SuccessOrExit(Get().SendEmptyAck(aMessage, aMessageInfo)); + SuccessOrExit(Get().SendEmptyAck(aMessage, aMessageInfo)); otLogInfoMeshCoP("sent dataset changed acknowledgment"); @@ -1167,7 +1167,7 @@ Error Commissioner::SendRelayTransmit(Message &aMessage, const Ip6::MessageInfo uint16_t offset; Ip6::MessageInfo messageInfo; - VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); message->InitAsNonConfirmablePost(); SuccessOrExit(error = message->AppendUriPathOptions(UriPath::kRelayTx)); @@ -1194,7 +1194,7 @@ Error Commissioner::SendRelayTransmit(Message &aMessage, const Ip6::MessageInfo messageInfo.SetPeerPort(Tmf::kUdpPort); messageInfo.SetSockAddr(Get().GetMeshLocal16()); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); aMessage.Free(); diff --git a/src/core/meshcop/dataset_manager.cpp b/src/core/meshcop/dataset_manager.cpp index 7b1842b04..4b0ef40f8 100644 --- a/src/core/meshcop/dataset_manager.cpp +++ b/src/core/meshcop/dataset_manager.cpp @@ -297,7 +297,7 @@ void DatasetManager::SendSet(void) } } - VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsConfirmablePost(IsActiveDataset() ? UriPath::kActiveSet : UriPath::kPendingSet)); @@ -309,8 +309,8 @@ void DatasetManager::SendSet(void) messageInfo.SetSockAddr(Get().GetMeshLocal16()); IgnoreError(Get().GetLeaderAloc(messageInfo.GetPeerAddr())); messageInfo.SetPeerPort(Tmf::kUdpPort); - SuccessOrExit( - error = Get().SendMessage(*message, messageInfo, &DatasetManager::HandleCoapResponse, this)); + SuccessOrExit(error = + Get().SendMessage(*message, messageInfo, &DatasetManager::HandleCoapResponse, this)); otLogInfoMeshCoP("Sent %s set to leader", Dataset::TypeToString(GetType())); @@ -407,7 +407,7 @@ void DatasetManager::SendGetResponse(const Coap::Message & aRequest, IgnoreError(Read(dataset)); - VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->SetDefaultResponseHeader(aRequest)); SuccessOrExit(error = message->SetPayloadMarker()); @@ -448,7 +448,7 @@ void DatasetManager::SendGetResponse(const Coap::Message & aRequest, IgnoreError(message->SetLength(message->GetLength() - 1)); } - SuccessOrExit(error = Get().SendMessage(*message, aMessageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, aMessageInfo)); otLogInfoMeshCoP("sent %s dataset get response to %s", (GetType() == Dataset::kActive ? "active" : "pending"), aMessageInfo.GetPeerAddr().ToString().AsCString()); @@ -475,7 +475,7 @@ Error DatasetManager::SendSetRequest(const Dataset::Info &aDatasetInfo, const ui Coap::Message * message; Ip6::MessageInfo messageInfo; - VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsConfirmablePost(IsActiveDataset() ? UriPath::kActiveSet : UriPath::kPendingSet)); @@ -523,7 +523,7 @@ Error DatasetManager::SendSetRequest(const Dataset::Info &aDatasetInfo, const ui messageInfo.SetSockAddr(Get().GetMeshLocal16()); IgnoreError(Get().GetLeaderAloc(messageInfo.GetPeerAddr())); messageInfo.SetPeerPort(Tmf::kUdpPort); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); otLogInfoMeshCoP("sent dataset set request to leader"); @@ -606,7 +606,7 @@ Error DatasetManager::SendGetRequest(const Dataset::Components &aDatasetComponen datasetTlvs[length++] = Tlv::kChannelMask; } - VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsConfirmablePost(IsActiveDataset() ? UriPath::kActiveGet : UriPath::kPendingGet)); @@ -644,7 +644,7 @@ Error DatasetManager::SendGetRequest(const Dataset::Components &aDatasetComponen messageInfo.SetSockAddr(Get().GetMeshLocal16()); messageInfo.SetPeerPort(Tmf::kUdpPort); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); otLogInfoMeshCoP("sent dataset get request"); @@ -660,7 +660,7 @@ ActiveDataset::ActiveDataset(Instance &aInstance) , mResourceSet(UriPath::kActiveSet, &ActiveDataset::HandleSet, this) #endif { - Get().AddResource(mResourceGet); + Get().AddResource(mResourceGet); } bool ActiveDataset::IsPartiallyComplete(void) const @@ -719,7 +719,7 @@ PendingDataset::PendingDataset(Instance &aInstance) , mResourceSet(UriPath::kPendingSet, &PendingDataset::HandleSet, this) #endif { - Get().AddResource(mResourceGet); + Get().AddResource(mResourceGet); } void PendingDataset::Clear(void) diff --git a/src/core/meshcop/dataset_manager_ftd.cpp b/src/core/meshcop/dataset_manager_ftd.cpp index c53e3fcf2..9a5c341a3 100644 --- a/src/core/meshcop/dataset_manager_ftd.cpp +++ b/src/core/meshcop/dataset_manager_ftd.cpp @@ -278,14 +278,14 @@ void DatasetManager::SendSetResponse(const Coap::Message & aRequest, Error error = kErrorNone; Coap::Message *message; - VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->SetDefaultResponseHeader(aRequest)); SuccessOrExit(error = message->SetPayloadMarker()); SuccessOrExit(error = Tlv::Append(*message, aState)); - SuccessOrExit(error = Get().SendMessage(*message, aMessageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, aMessageInfo)); otLogInfoMeshCoP("sent dataset set response"); @@ -405,12 +405,12 @@ exit: void ActiveDataset::StartLeader(void) { IgnoreError(GenerateLocal()); - Get().AddResource(mResourceSet); + Get().AddResource(mResourceSet); } void ActiveDataset::StopLeader(void) { - Get().RemoveResource(mResourceSet); + Get().RemoveResource(mResourceSet); } void ActiveDataset::HandleSet(void *aContext, otMessage *aMessage, const otMessageInfo *aMessageInfo) @@ -431,12 +431,12 @@ exit: void PendingDataset::StartLeader(void) { StartDelayTimer(); - Get().AddResource(mResourceSet); + Get().AddResource(mResourceSet); } void PendingDataset::StopLeader(void) { - Get().RemoveResource(mResourceSet); + Get().RemoveResource(mResourceSet); } void PendingDataset::HandleSet(void *aContext, otMessage *aMessage, const otMessageInfo *aMessageInfo) diff --git a/src/core/meshcop/energy_scan_client.cpp b/src/core/meshcop/energy_scan_client.cpp index e55e7b3e2..7499c9d2d 100644 --- a/src/core/meshcop/energy_scan_client.cpp +++ b/src/core/meshcop/energy_scan_client.cpp @@ -55,7 +55,7 @@ EnergyScanClient::EnergyScanClient(Instance &aInstance) , mContext(nullptr) , mEnergyScan(UriPath::kEnergyReport, &EnergyScanClient::HandleReport, this) { - Get().AddResource(mEnergyScan); + Get().AddResource(mEnergyScan); } Error EnergyScanClient::SendQuery(uint32_t aChannelMask, @@ -72,7 +72,7 @@ Error EnergyScanClient::SendQuery(uint32_t aChannelMas Coap::Message * message = nullptr; VerifyOrExit(Get().IsActive(), error = kErrorInvalidState); - VerifyOrExit((message = MeshCoP::NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = MeshCoP::NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsPost(aAddress, UriPath::kEnergyScan)); SuccessOrExit(error = message->SetPayloadMarker()); @@ -91,7 +91,7 @@ Error EnergyScanClient::SendQuery(uint32_t aChannelMas messageInfo.SetSockAddr(Get().GetMeshLocal16()); messageInfo.SetPeerAddr(aAddress); messageInfo.SetPeerPort(Tmf::kUdpPort); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); otLogInfoMeshCoP("sent energy scan query"); @@ -134,7 +134,7 @@ void EnergyScanClient::HandleReport(Coap::Message &aMessage, const Ip6::MessageI mCallback(mask, energyList.list, energyList.tlv.GetLength(), mContext); } - SuccessOrExit(Get().SendEmptyAck(aMessage, aMessageInfo)); + SuccessOrExit(Get().SendEmptyAck(aMessage, aMessageInfo)); otLogInfoMeshCoP("sent energy scan report response"); diff --git a/src/core/meshcop/joiner.cpp b/src/core/meshcop/joiner.cpp index 917f77830..f9b05b12d 100644 --- a/src/core/meshcop/joiner.cpp +++ b/src/core/meshcop/joiner.cpp @@ -68,7 +68,7 @@ Joiner::Joiner(Instance &aInstance) SetIdFromIeeeEui64(); mDiscerner.Clear(); memset(mJoinerRouters, 0, sizeof(mJoinerRouters)); - Get().AddResource(mJoinerEntrust); + Get().AddResource(mJoinerEntrust); } void Joiner::SetIdFromIeeeEui64(void) @@ -595,12 +595,12 @@ void Joiner::SendJoinerEntrustResponse(const Coap::Message &aRequest, const Ip6: Coap::Message * message; Ip6::MessageInfo responseInfo(aRequestInfo); - VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->SetDefaultResponseHeader(aRequest)); message->SetSubType(Message::kSubTypeJoinerEntrust); responseInfo.GetSockAddr().Clear(); - SuccessOrExit(error = Get().SendMessage(*message, responseInfo)); + SuccessOrExit(error = Get().SendMessage(*message, responseInfo)); SetState(kStateJoined); diff --git a/src/core/meshcop/joiner_router.cpp b/src/core/meshcop/joiner_router.cpp index 8b1d5585d..77de5b51b 100644 --- a/src/core/meshcop/joiner_router.cpp +++ b/src/core/meshcop/joiner_router.cpp @@ -59,7 +59,7 @@ JoinerRouter::JoinerRouter(Instance &aInstance) , mJoinerUdpPort(0) , mIsJoinerPortConfigured(false) { - Get().AddResource(mRelayTransmit); + Get().AddResource(mRelayTransmit); } void JoinerRouter::HandleNotifierEvents(Events aEvents) @@ -141,7 +141,7 @@ void JoinerRouter::HandleUdpReceive(Message &aMessage, const Ip6::MessageInfo &a SuccessOrExit(error = GetBorderAgentRloc(Get(), borderAgentRloc)); - VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsNonConfirmablePost(UriPath::kRelayRx)); SuccessOrExit(error = message->SetPayloadMarker()); @@ -162,7 +162,7 @@ void JoinerRouter::HandleUdpReceive(Message &aMessage, const Ip6::MessageInfo &a messageInfo.GetPeerAddr().GetIid().SetLocator(borderAgentRloc); messageInfo.SetPeerPort(Tmf::kUdpPort); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); otLogInfoMeshCoP("Sent relay rx"); @@ -296,11 +296,11 @@ Error JoinerRouter::SendJoinerEntrust(const Ip6::MessageInfo &aMessageInfo) message = PrepareJoinerEntrustMessage(); VerifyOrExit(message != nullptr, error = kErrorNoBufs); - IgnoreError(Get().AbortTransaction(&JoinerRouter::HandleJoinerEntrustResponse, this)); + IgnoreError(Get().AbortTransaction(&JoinerRouter::HandleJoinerEntrustResponse, this)); otLogInfoMeshCoP("Sending JOIN_ENT.ntf"); - SuccessOrExit(error = Get().SendMessage(*message, aMessageInfo, - &JoinerRouter::HandleJoinerEntrustResponse, this)); + SuccessOrExit(error = Get().SendMessage(*message, aMessageInfo, + &JoinerRouter::HandleJoinerEntrustResponse, this)); otLogInfoMeshCoP("Sent joiner entrust length = %d", message->GetLength()); otLogCertMeshCoP("[THCI] direction=send | type=JOIN_ENT.ntf"); @@ -319,7 +319,7 @@ Coap::Message *JoinerRouter::PrepareJoinerEntrustMessage(void) NetworkNameTlv networkName; const Tlv * tlv; - VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); message->InitAsConfirmablePost(); SuccessOrExit(error = message->AppendUriPathOptions(UriPath::kJoinerEntrust)); diff --git a/src/core/meshcop/meshcop_leader.cpp b/src/core/meshcop/meshcop_leader.cpp index 02e5266ed..6be2ab125 100644 --- a/src/core/meshcop/meshcop_leader.cpp +++ b/src/core/meshcop/meshcop_leader.cpp @@ -60,8 +60,8 @@ Leader::Leader(Instance &aInstance) , mDelayTimerMinimal(DelayTimerTlv::kDelayTimerMinimal) , mSessionId(Random::NonCrypto::GetUint16()) { - Get().AddResource(mPetition); - Get().AddResource(mKeepAlive); + Get().AddResource(mPetition); + Get().AddResource(mKeepAlive); } void Leader::HandlePetition(void *aContext, otMessage *aMessage, const otMessageInfo *aMessageInfo) @@ -126,7 +126,7 @@ void Leader::SendPetitionResponse(const Coap::Message & aRequest, Error error = kErrorNone; Coap::Message *message; - VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->SetDefaultResponseHeader(aRequest)); SuccessOrExit(error = message->SetPayloadMarker()); @@ -143,7 +143,7 @@ void Leader::SendPetitionResponse(const Coap::Message & aRequest, SuccessOrExit(error = Tlv::Append(*message, mSessionId)); } - SuccessOrExit(error = Get().SendMessage(*message, aMessageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, aMessageInfo)); otLogInfoMeshCoP("sent petition response"); @@ -210,14 +210,14 @@ void Leader::SendKeepAliveResponse(const Coap::Message & aRequest, Error error = kErrorNone; Coap::Message *message; - VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->SetDefaultResponseHeader(aRequest)); SuccessOrExit(error = message->SetPayloadMarker()); SuccessOrExit(error = Tlv::Append(*message, aState)); - SuccessOrExit(error = Get().SendMessage(*message, aMessageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, aMessageInfo)); otLogInfoMeshCoP("sent keep alive response"); @@ -232,14 +232,14 @@ void Leader::SendDatasetChanged(const Ip6::Address &aAddress) Ip6::MessageInfo messageInfo; Coap::Message * message; - VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsConfirmablePost(UriPath::kDatasetChanged)); messageInfo.SetSockAddr(Get().GetMeshLocal16()); messageInfo.SetPeerAddr(aAddress); messageInfo.SetPeerPort(Tmf::kUdpPort); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); otLogInfoMeshCoP("sent dataset changed"); diff --git a/src/core/meshcop/panid_query_client.cpp b/src/core/meshcop/panid_query_client.cpp index bdfd66827..8bdef6acf 100644 --- a/src/core/meshcop/panid_query_client.cpp +++ b/src/core/meshcop/panid_query_client.cpp @@ -54,7 +54,7 @@ PanIdQueryClient::PanIdQueryClient(Instance &aInstance) , mContext(nullptr) , mPanIdQuery(UriPath::kPanIdConflict, &PanIdQueryClient::HandleConflict, this) { - Get().AddResource(mPanIdQuery); + Get().AddResource(mPanIdQuery); } Error PanIdQueryClient::SendQuery(uint16_t aPanId, @@ -69,7 +69,7 @@ Error PanIdQueryClient::SendQuery(uint16_t aPanId, Coap::Message * message = nullptr; VerifyOrExit(Get().IsActive(), error = kErrorInvalidState); - VerifyOrExit((message = MeshCoP::NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = MeshCoP::NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsPost(aAddress, UriPath::kPanIdQuery)); SuccessOrExit(error = message->SetPayloadMarker()); @@ -86,7 +86,7 @@ Error PanIdQueryClient::SendQuery(uint16_t aPanId, messageInfo.SetSockAddr(Get().GetMeshLocal16()); messageInfo.SetPeerAddr(aAddress); messageInfo.SetPeerPort(Tmf::kUdpPort); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); otLogInfoMeshCoP("sent panid query"); @@ -123,7 +123,7 @@ void PanIdQueryClient::HandleConflict(Coap::Message &aMessage, const Ip6::Messag mCallback(panId, mask, mContext); } - SuccessOrExit(Get().SendEmptyAck(aMessage, responseInfo)); + SuccessOrExit(Get().SendEmptyAck(aMessage, responseInfo)); otLogInfoMeshCoP("sent panid query conflict response"); diff --git a/src/core/thread/address_resolver.cpp b/src/core/thread/address_resolver.cpp index b96105025..2baa1c044 100644 --- a/src/core/thread/address_resolver.cpp +++ b/src/core/thread/address_resolver.cpp @@ -59,9 +59,9 @@ AddressResolver::AddressResolver(Instance &aInstance) , mCacheEntryPool(aInstance) , mIcmpHandler(&AddressResolver::HandleIcmpReceive, this) { - Get().AddResource(mAddressError); - Get().AddResource(mAddressQuery); - Get().AddResource(mAddressNotification); + Get().AddResource(mAddressError); + Get().AddResource(mAddressQuery); + Get().AddResource(mAddressNotification); IgnoreError(Get().RegisterHandler(mIcmpHandler)); } @@ -523,7 +523,7 @@ Error AddressResolver::SendAddressQuery(const Ip6::Address &aEid) Coap::Message * message; Ip6::MessageInfo messageInfo; - VerifyOrExit((message = Get().NewPriorityMessage()) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = Get().NewPriorityMessage()) != nullptr, error = kErrorNoBufs); message->InitAsNonConfirmablePost(); SuccessOrExit(error = message->AppendUriPathOptions(UriPath::kAddressQuery)); @@ -536,7 +536,7 @@ Error AddressResolver::SendAddressQuery(const Ip6::Address &aEid) messageInfo.SetSockAddr(Get().GetMeshLocal16()); messageInfo.SetPeerPort(Tmf::kUdpPort); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); otLogInfoArp("Sending address query for %s", aEid.ToString().AsCString()); @@ -622,7 +622,7 @@ void AddressResolver::HandleAddressNotification(Coap::Message &aMessage, const I LogCacheEntryChange(kEntryUpdated, kReasonReceivedNotification, *entry); - if (Get().SendEmptyAck(aMessage, aMessageInfo) == kErrorNone) + if (Get().SendEmptyAck(aMessage, aMessageInfo) == kErrorNone) { otLogInfoArp("Sending address notification acknowledgment"); } @@ -641,7 +641,7 @@ void AddressResolver::SendAddressError(const Ip6::Address & aTarget, Coap::Message * message; Ip6::MessageInfo messageInfo; - VerifyOrExit((message = Get().NewMessage()) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = Get().NewMessage()) != nullptr, error = kErrorNoBufs); message->Init(aDestination == nullptr ? Coap::kTypeNonConfirmable : Coap::kTypeConfirmable, Coap::kCodePost); SuccessOrExit(error = message->AppendUriPathOptions(UriPath::kAddressError)); @@ -662,7 +662,7 @@ void AddressResolver::SendAddressError(const Ip6::Address & aTarget, messageInfo.SetSockAddr(Get().GetMeshLocal16()); messageInfo.SetPeerPort(Tmf::kUdpPort); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); otLogInfoArp("Sending address error for target %s", aTarget.ToString().AsCString()); @@ -695,7 +695,7 @@ void AddressResolver::HandleAddressError(Coap::Message &aMessage, const Ip6::Mes if (aMessage.IsConfirmable() && !aMessageInfo.GetSockAddr().IsMulticast()) { - if (Get().SendEmptyAck(aMessage, aMessageInfo) == kErrorNone) + if (Get().SendEmptyAck(aMessage, aMessageInfo) == kErrorNone) { otLogInfoArp("Sent address error notification acknowledgment"); } @@ -820,7 +820,7 @@ void AddressResolver::SendAddressQueryResponse(const Ip6::Address & a Coap::Message * message; Ip6::MessageInfo messageInfo; - VerifyOrExit((message = Get().NewPriorityMessage()) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = Get().NewPriorityMessage()) != nullptr, error = kErrorNoBufs); message->InitAsConfirmablePost(); SuccessOrExit(error = message->AppendUriPathOptions(UriPath::kAddressNotify)); @@ -839,7 +839,7 @@ void AddressResolver::SendAddressQueryResponse(const Ip6::Address & a messageInfo.SetSockAddr(Get().GetMeshLocal16()); messageInfo.SetPeerPort(Tmf::kUdpPort); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); otLogInfoArp("Sending address notification for target %s", aTarget.ToString().AsCString()); diff --git a/src/core/thread/announce_begin_server.cpp b/src/core/thread/announce_begin_server.cpp index abf3fa593..42d48fc38 100644 --- a/src/core/thread/announce_begin_server.cpp +++ b/src/core/thread/announce_begin_server.cpp @@ -51,7 +51,7 @@ AnnounceBeginServer::AnnounceBeginServer(Instance &aInstance) : AnnounceSenderBase(aInstance, AnnounceBeginServer::HandleTimer) , mAnnounceBegin(UriPath::kAnnounceBegin, &AnnounceBeginServer::HandleRequest, this) { - Get().AddResource(mAnnounceBegin); + Get().AddResource(mAnnounceBegin); } void AnnounceBeginServer::SendAnnounce(uint32_t aChannelMask, uint8_t aCount, uint16_t aPeriod) @@ -82,7 +82,7 @@ void AnnounceBeginServer::HandleRequest(Coap::Message &aMessage, const Ip6::Mess if (aMessage.IsConfirmable() && !aMessageInfo.GetSockAddr().IsMulticast()) { - SuccessOrExit(Get().SendEmptyAck(aMessage, responseInfo)); + SuccessOrExit(Get().SendEmptyAck(aMessage, responseInfo)); otLogInfoMeshCoP("sent announce begin response"); } diff --git a/src/core/thread/dua_manager.cpp b/src/core/thread/dua_manager.cpp index 724728ff4..99ebee1b9 100644 --- a/src/core/thread/dua_manager.cpp +++ b/src/core/thread/dua_manager.cpp @@ -76,7 +76,7 @@ DuaManager::DuaManager(Instance &aInstance) mChildDuaRegisteredMask.Clear(); #endif - Get().AddResource(mDuaNotification); + Get().AddResource(mDuaNotification); } void DuaManager::HandleDomainPrefixUpdate(BackboneRouter::Leader::DomainPrefixState aState) @@ -86,7 +86,7 @@ void DuaManager::HandleDomainPrefixUpdate(BackboneRouter::Leader::DomainPrefixSt { if (mIsDuaPending) { - IgnoreError(Get().AbortTransaction(&DuaManager::HandleDuaResponse, this)); + IgnoreError(Get().AbortTransaction(&DuaManager::HandleDuaResponse, this)); } #if OPENTHREAD_CONFIG_DUA_ENABLE @@ -241,7 +241,7 @@ void DuaManager::RemoveDomainUnicastAddress(void) { if (mDuaState == kRegistering && mIsDuaPending) { - IgnoreError(Get().AbortTransaction(&DuaManager::HandleDuaResponse, this)); + IgnoreError(Get().AbortTransaction(&DuaManager::HandleDuaResponse, this)); } mDuaState = kNotExist; @@ -449,7 +449,7 @@ void DuaManager::PerformNextRegistration(void) } // Prepare DUA.req - VerifyOrExit((message = Get().NewPriorityMessage()) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = Get().NewPriorityMessage()) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsConfirmablePost(UriPath::kDuaRegistrationRequest)); SuccessOrExit(error = message->SetPayloadMarker()); @@ -515,8 +515,7 @@ void DuaManager::PerformNextRegistration(void) messageInfo.SetPeerPort(Tmf::kUdpPort); messageInfo.SetSockAddr(Get().GetMeshLocal16()); - SuccessOrExit(error = - Get().SendMessage(*message, messageInfo, &DuaManager::HandleDuaResponse, this)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo, &DuaManager::HandleDuaResponse, this)); mIsDuaPending = true; mRegisteringDua = dua; @@ -575,7 +574,7 @@ void DuaManager::HandleDuaNotification(Coap::Message &aMessage, const Ip6::Messa VerifyOrExit(aMessage.IsPostRequest(), error = kErrorParse); - if (aMessage.IsConfirmable() && Get().SendEmptyAck(aMessage, aMessageInfo) == kErrorNone) + if (aMessage.IsConfirmable() && Get().SendEmptyAck(aMessage, aMessageInfo) == kErrorNone) { otLogInfoDua("Sent DUA.ntf acknowledgment"); } @@ -682,7 +681,7 @@ void DuaManager::SendAddressNotification(Ip6::Address & aAddress, Ip6::MessageInfo messageInfo; Error error; - VerifyOrExit((message = Get().NewPriorityMessage()) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = Get().NewPriorityMessage()) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsConfirmablePost(UriPath::kDuaRegistrationNotify)); SuccessOrExit(error = message->SetPayloadMarker()); @@ -694,7 +693,7 @@ void DuaManager::SendAddressNotification(Ip6::Address & aAddress, messageInfo.SetPeerPort(Tmf::kUdpPort); messageInfo.SetSockAddr(Get().GetMeshLocal16()); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); otLogInfoDua("Sent ADDR_NTF for child %04x DUA %s", aChild.GetRloc16(), aAddress.ToString().AsCString()); @@ -724,7 +723,7 @@ void DuaManager::UpdateChildDomainUnicastAddress(const Child &aChild, Mle::Child if (mIsDuaPending && mChildIndexDuaRegistering == childIndex) #endif { - IgnoreError(Get().AbortTransaction(&DuaManager::HandleDuaResponse, this)); + IgnoreError(Get().AbortTransaction(&DuaManager::HandleDuaResponse, this)); // Reset mRegisterCurrentChildIndex properly mRegisterCurrentChildIndex = mRegisterCurrentChildIndex && (aState == Mle::ChildDuaState::kRemoved); diff --git a/src/core/thread/energy_scan_server.cpp b/src/core/thread/energy_scan_server.cpp index b83bfb661..e989a6183 100644 --- a/src/core/thread/energy_scan_server.cpp +++ b/src/core/thread/energy_scan_server.cpp @@ -58,7 +58,7 @@ EnergyScanServer::EnergyScanServer(Instance &aInstance) , mTimer(aInstance, EnergyScanServer::HandleTimer) , mEnergyScan(UriPath::kEnergyScan, &EnergyScanServer::HandleRequest, this) { - Get().AddResource(mEnergyScan); + Get().AddResource(mEnergyScan); } void EnergyScanServer::HandleRequest(void *aContext, otMessage *aMessage, const otMessageInfo *aMessageInfo) @@ -96,7 +96,7 @@ void EnergyScanServer::HandleRequest(Coap::Message &aMessage, const Ip6::Message if (aMessage.IsConfirmable() && !aMessageInfo.GetSockAddr().IsMulticast()) { - SuccessOrExit(Get().SendEmptyAck(aMessage, responseInfo)); + SuccessOrExit(Get().SendEmptyAck(aMessage, responseInfo)); otLogInfoMeshCoP("sent energy scan query response"); } @@ -175,7 +175,7 @@ void EnergyScanServer::SendReport(void) Ip6::MessageInfo messageInfo; Coap::Message * message; - VerifyOrExit((message = MeshCoP::NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = MeshCoP::NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsConfirmablePost(UriPath::kEnergyReport)); SuccessOrExit(error = message->SetPayloadMarker()); @@ -192,7 +192,7 @@ void EnergyScanServer::SendReport(void) messageInfo.SetSockAddr(Get().GetMeshLocal16()); messageInfo.SetPeerAddr(mCommissioner); messageInfo.SetPeerPort(Tmf::kUdpPort); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); otLogInfoMeshCoP("sent scan results"); diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp index 9acd1d262..fa3f85223 100644 --- a/src/core/thread/mle.cpp +++ b/src/core/thread/mle.cpp @@ -901,7 +901,7 @@ void Mle::SetRloc16(uint16_t aRloc16) // Clear cached CoAP with old RLOC source if (oldRloc16 != Mac::kShortAddrInvalid) { - Get().ClearRequests(mMeshLocal16.GetAddress()); + Get().ClearRequests(mMeshLocal16.GetAddress()); } } diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp index feefdccc4..7e2851016 100644 --- a/src/core/thread/mle_router.cpp +++ b/src/core/thread/mle_router.cpp @@ -105,7 +105,7 @@ void MleRouter::HandlePartitionChange(void) mPreviousPartitionIdTimeout = GetNetworkIdTimeout(); Get().Clear(); - IgnoreError(Get().AbortTransaction(&MleRouter::HandleAddressSolicitResponse, this)); + IgnoreError(Get().AbortTransaction(&MleRouter::HandleAddressSolicitResponse, this)); mRouterTable.Clear(); } @@ -221,8 +221,8 @@ exit: void MleRouter::StopLeader(void) { - Get().RemoveResource(mAddressSolicit); - Get().RemoveResource(mAddressRelease); + Get().RemoveResource(mAddressSolicit); + Get().RemoveResource(mAddressRelease); Get().StopLeader(); Get().StopLeader(); StopAdvertiseTrickleTimer(); @@ -367,8 +367,8 @@ void MleRouter::SetStateLeader(uint16_t aRloc16) Get().Start(); Get().StartLeader(); Get().StartLeader(); - Get().AddResource(mAddressSolicit); - Get().AddResource(mAddressRelease); + Get().AddResource(mAddressSolicit); + Get().AddResource(mAddressRelease); Get().SetForwardingEnabled(true); Get().SetTimerExpirations(kMplRouterDataMessageTimerExpirations); Get().SetBeaconEnabled(true); @@ -3531,7 +3531,7 @@ Error MleRouter::SendAddressSolicit(ThreadStatusTlv::Status aStatus) VerifyOrExit(!mAddressSolicitPending); - VerifyOrExit((message = Get().NewPriorityMessage()) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = Get().NewPriorityMessage()) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsConfirmablePost(UriPath::kAddressSolicit)); SuccessOrExit(error = message->SetPayloadMarker()); @@ -3553,8 +3553,8 @@ Error MleRouter::SendAddressSolicit(ThreadStatusTlv::Status aStatus) messageInfo.SetSockAddr(GetMeshLocal16()); messageInfo.SetPeerPort(Tmf::kUdpPort); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo, - &MleRouter::HandleAddressSolicitResponse, this)); + SuccessOrExit( + error = Get().SendMessage(*message, messageInfo, &MleRouter::HandleAddressSolicitResponse, this)); mAddressSolicitPending = true; Log(kMessageSend, kTypeAddressSolicit, messageInfo.GetPeerAddr()); @@ -3570,7 +3570,7 @@ void MleRouter::SendAddressRelease(void) Ip6::MessageInfo messageInfo; Coap::Message * message; - VerifyOrExit((message = Get().NewMessage()) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = Get().NewMessage()) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsConfirmablePost(UriPath::kAddressRelease)); SuccessOrExit(error = message->SetPayloadMarker()); @@ -3582,7 +3582,7 @@ void MleRouter::SendAddressRelease(void) messageInfo.SetSockAddr(GetMeshLocal16()); SuccessOrExit(error = GetLeaderAddress(messageInfo.GetPeerAddr())); messageInfo.SetPeerPort(Tmf::kUdpPort); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); Log(kMessageSend, kTypeAddressRelease, messageInfo.GetPeerAddr()); @@ -3799,7 +3799,7 @@ void MleRouter::SendAddressSolicitResponse(const Coap::Message & aRequest, ThreadRouterMaskTlv routerMaskTlv; Coap::Message * message; - VerifyOrExit((message = Get().NewPriorityMessage()) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = Get().NewPriorityMessage()) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->SetDefaultResponseHeader(aRequest)); SuccessOrExit(error = message->SetPayloadMarker()); @@ -3818,7 +3818,7 @@ void MleRouter::SendAddressSolicitResponse(const Coap::Message & aRequest, SuccessOrExit(error = routerMaskTlv.AppendTo(*message)); } - SuccessOrExit(error = Get().SendMessage(*message, aMessageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, aMessageInfo)); Log(kMessageSend, kTypeAddressReply, aMessageInfo.GetPeerAddr()); @@ -3853,7 +3853,7 @@ void MleRouter::HandleAddressRelease(Coap::Message &aMessage, const Ip6::Message IgnoreError(mRouterTable.Release(routerId)); - SuccessOrExit(Get().SendEmptyAck(aMessage, aMessageInfo)); + SuccessOrExit(Get().SendEmptyAck(aMessage, aMessageInfo)); Log(kMessageSend, kTypeAddressReleaseReply, aMessageInfo.GetPeerAddr()); diff --git a/src/core/thread/mlr_manager.cpp b/src/core/thread/mlr_manager.cpp index 7643c3f70..7944ed696 100644 --- a/src/core/thread/mlr_manager.cpp +++ b/src/core/thread/mlr_manager.cpp @@ -401,7 +401,7 @@ Error MlrManager::SendMulticastListenerRegistrationMessage(const otIp6Address * VerifyOrExit(Get().HasPrimary(), error = kErrorInvalidState); - VerifyOrExit((message = Get().NewMessage()) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = Get().NewMessage()) != nullptr, error = kErrorNoBufs); message->InitAsConfirmablePost(); SuccessOrExit(message->GenerateRandomToken(Coap::Message::kDefaultTokenLength)); @@ -444,7 +444,7 @@ Error MlrManager::SendMulticastListenerRegistrationMessage(const otIp6Address * messageInfo.SetPeerPort(Tmf::kUdpPort); messageInfo.SetSockAddr(mle.GetMeshLocal16()); - error = Get().SendMessage(*message, messageInfo, aResponseHandler, aResponseContext); + error = Get().SendMessage(*message, messageInfo, aResponseHandler, aResponseContext); exit: otLogInfoMlr("Send MLR.req: %s, addressNum=%d", ErrorToString(error), aAddressNum); diff --git a/src/core/thread/network_data.cpp b/src/core/thread/network_data.cpp index a0dc369e5..6fcca99dd 100644 --- a/src/core/thread/network_data.cpp +++ b/src/core/thread/network_data.cpp @@ -841,7 +841,7 @@ Error NetworkData::SendServerDataNotification(uint16_t aRloc16, Coap::ResponseHa Coap::Message * message = nullptr; Ip6::MessageInfo messageInfo; - VerifyOrExit((message = Get().NewMessage()) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = Get().NewMessage()) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsConfirmablePost(UriPath::kServerData)); SuccessOrExit(error = message->SetPayloadMarker()); @@ -863,7 +863,7 @@ Error NetworkData::SendServerDataNotification(uint16_t aRloc16, Coap::ResponseHa IgnoreError(Get().GetLeaderAloc(messageInfo.GetPeerAddr())); messageInfo.SetSockAddr(Get().GetMeshLocal16()); messageInfo.SetPeerPort(Tmf::kUdpPort); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo, aHandler, aContext)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo, aHandler, aContext)); otLogInfoNetData("Sent server data notification"); diff --git a/src/core/thread/network_data_leader_ftd.cpp b/src/core/thread/network_data_leader_ftd.cpp index 6f7eb9549..8e5d82f29 100644 --- a/src/core/thread/network_data_leader_ftd.cpp +++ b/src/core/thread/network_data_leader_ftd.cpp @@ -76,16 +76,16 @@ void Leader::Reset(void) void Leader::Start(void) { - Get().AddResource(mServerData); - Get().AddResource(mCommissioningDataGet); - Get().AddResource(mCommissioningDataSet); + Get().AddResource(mServerData); + Get().AddResource(mCommissioningDataGet); + Get().AddResource(mCommissioningDataSet); } void Leader::Stop(void) { - Get().RemoveResource(mServerData); - Get().RemoveResource(mCommissioningDataGet); - Get().RemoveResource(mCommissioningDataSet); + Get().RemoveResource(mServerData); + Get().RemoveResource(mCommissioningDataGet); + Get().RemoveResource(mCommissioningDataSet); } void Leader::IncrementVersion(void) @@ -164,7 +164,7 @@ void Leader::HandleServerData(Coap::Message &aMessage, const Ip6::MessageInfo &a networkData.GetLength()); } - SuccessOrExit(Get().SendEmptyAck(aMessage, aMessageInfo)); + SuccessOrExit(Get().SendEmptyAck(aMessage, aMessageInfo)); otLogInfoNetData("Sent network data registration acknowledgment"); @@ -304,7 +304,7 @@ void Leader::SendCommissioningGetResponse(const Coap::Message & aRequest, uint8_t * data = nullptr; uint8_t length = 0; - VerifyOrExit((message = MeshCoP::NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = MeshCoP::NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->SetDefaultResponseHeader(aRequest)); SuccessOrExit(error = message->SetPayloadMarker()); @@ -349,7 +349,7 @@ void Leader::SendCommissioningGetResponse(const Coap::Message & aRequest, IgnoreError(message->SetLength(message->GetLength() - 1)); } - SuccessOrExit(error = Get().SendMessage(*message, aMessageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, aMessageInfo)); otLogInfoMeshCoP("sent commissioning dataset get response"); @@ -364,14 +364,14 @@ void Leader::SendCommissioningSetResponse(const Coap::Message & aRequest, Error error = kErrorNone; Coap::Message *message; - VerifyOrExit((message = MeshCoP::NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = MeshCoP::NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->SetDefaultResponseHeader(aRequest)); SuccessOrExit(error = message->SetPayloadMarker()); SuccessOrExit(error = Tlv::Append(*message, aState)); - SuccessOrExit(error = Get().SendMessage(*message, aMessageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, aMessageInfo)); otLogInfoMeshCoP("sent commissioning dataset set response"); diff --git a/src/core/thread/network_diagnostic.cpp b/src/core/thread/network_diagnostic.cpp index 5fbf71313..df98a378a 100644 --- a/src/core/thread/network_diagnostic.cpp +++ b/src/core/thread/network_diagnostic.cpp @@ -63,10 +63,10 @@ NetworkDiagnostic::NetworkDiagnostic(Instance &aInstance) , mReceiveDiagnosticGetCallback(nullptr) , mReceiveDiagnosticGetCallbackContext(nullptr) { - Get().AddResource(mDiagnosticGetRequest); - Get().AddResource(mDiagnosticGetQuery); - Get().AddResource(mDiagnosticGetAnswer); - Get().AddResource(mDiagnosticReset); + Get().AddResource(mDiagnosticGetRequest); + Get().AddResource(mDiagnosticGetQuery); + Get().AddResource(mDiagnosticGetAnswer); + Get().AddResource(mDiagnosticReset); } Error NetworkDiagnostic::SendDiagnosticGet(const Ip6::Address & aDestination, @@ -80,7 +80,7 @@ Error NetworkDiagnostic::SendDiagnosticGet(const Ip6::Address & aDesti Ip6::MessageInfo messageInfo; otCoapResponseHandler handler = nullptr; - VerifyOrExit((message = Get().NewMessage()) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = Get().NewMessage()) != nullptr, error = kErrorNoBufs); if (aDestination.IsMulticast()) { @@ -115,7 +115,7 @@ Error NetworkDiagnostic::SendDiagnosticGet(const Ip6::Address & aDesti messageInfo.SetPeerAddr(aDestination); messageInfo.SetPeerPort(Tmf::kUdpPort); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo, handler, this)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo, handler, this)); mReceiveDiagnosticGetCallback = aCallback; mReceiveDiagnosticGetCallbackContext = aCallbackContext; @@ -174,7 +174,7 @@ void NetworkDiagnostic::HandleDiagnosticGetAnswer(Coap::Message &aMessage, const mReceiveDiagnosticGetCallback(kErrorNone, &aMessage, &aMessageInfo, mReceiveDiagnosticGetCallbackContext); } - SuccessOrExit(Get().SendEmptyAck(aMessage, aMessageInfo)); + SuccessOrExit(Get().SendEmptyAck(aMessage, aMessageInfo)); otLogInfoNetDiag("Sent diagnostic answer acknowledgment"); @@ -477,13 +477,13 @@ void NetworkDiagnostic::HandleDiagnosticGetQuery(Coap::Message &aMessage, const // DIAG_GET.qry may be sent as a confirmable message. if (aMessage.IsConfirmable()) { - if (Get().SendEmptyAck(aMessage, aMessageInfo) == kErrorNone) + if (Get().SendEmptyAck(aMessage, aMessageInfo) == kErrorNone) { otLogInfoNetDiag("Sent diagnostic get query acknowledgment"); } } - VerifyOrExit((message = Get().NewMessage()) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = Get().NewMessage()) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsConfirmablePost(UriPath::kDiagnosticGetAnswer)); @@ -512,7 +512,7 @@ void NetworkDiagnostic::HandleDiagnosticGetQuery(Coap::Message &aMessage, const IgnoreError(message->SetLength(message->GetLength() - 1)); } - SuccessOrExit(error = Get().SendMessage(*message, messageInfo, nullptr, this)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo, nullptr, this)); otLogInfoNetDiag("Sent diagnostic get answer"); @@ -543,7 +543,7 @@ void NetworkDiagnostic::HandleDiagnosticGetRequest(Coap::Message &aMessage, cons VerifyOrExit(networkDiagnosticTlv.GetType() == NetworkDiagnosticTlv::kTypeList, error = kErrorParse); - VerifyOrExit((message = Get().NewMessage()) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = Get().NewMessage()) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->SetDefaultResponseHeader(aMessage)); SuccessOrExit(error = message->SetPayloadMarker()); @@ -556,7 +556,7 @@ void NetworkDiagnostic::HandleDiagnosticGetRequest(Coap::Message &aMessage, cons IgnoreError(message->SetLength(message->GetOffset() - 1)); } - SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); otLogInfoNetDiag("Sent diagnostic get response"); @@ -572,7 +572,7 @@ Error NetworkDiagnostic::SendDiagnosticReset(const Ip6::Address &aDestination, Coap::Message * message = nullptr; Ip6::MessageInfo messageInfo; - VerifyOrExit((message = Get().NewMessage()) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = Get().NewMessage()) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsConfirmablePost(UriPath::kDiagnosticReset)); @@ -598,7 +598,7 @@ Error NetworkDiagnostic::SendDiagnosticReset(const Ip6::Address &aDestination, messageInfo.SetPeerAddr(aDestination); messageInfo.SetPeerPort(Tmf::kUdpPort); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); otLogInfoNetDiag("Sent network diagnostic reset"); @@ -646,7 +646,7 @@ void NetworkDiagnostic::HandleDiagnosticReset(Coap::Message &aMessage, const Ip6 } } - SuccessOrExit(Get().SendEmptyAck(aMessage, aMessageInfo)); + SuccessOrExit(Get().SendEmptyAck(aMessage, aMessageInfo)); otLogInfoNetDiag("Sent diagnostic reset acknowledgment"); diff --git a/src/core/thread/panid_query_server.cpp b/src/core/thread/panid_query_server.cpp index 918c9cbaa..54b899be7 100644 --- a/src/core/thread/panid_query_server.cpp +++ b/src/core/thread/panid_query_server.cpp @@ -53,7 +53,7 @@ PanIdQueryServer::PanIdQueryServer(Instance &aInstance) , mTimer(aInstance, PanIdQueryServer::HandleTimer) , mPanIdQuery(UriPath::kPanIdQuery, &PanIdQueryServer::HandleQuery, this) { - Get().AddResource(mPanIdQuery); + Get().AddResource(mPanIdQuery); } void PanIdQueryServer::HandleQuery(void *aContext, otMessage *aMessage, const otMessageInfo *aMessageInfo) @@ -80,7 +80,7 @@ void PanIdQueryServer::HandleQuery(Coap::Message &aMessage, const Ip6::MessageIn if (aMessage.IsConfirmable() && !aMessageInfo.GetSockAddr().IsMulticast()) { - SuccessOrExit(Get().SendEmptyAck(aMessage, responseInfo)); + SuccessOrExit(Get().SendEmptyAck(aMessage, responseInfo)); otLogInfoMeshCoP("sent panid query response"); } @@ -115,7 +115,7 @@ void PanIdQueryServer::SendConflict(void) Ip6::MessageInfo messageInfo; Coap::Message * message; - VerifyOrExit((message = MeshCoP::NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); + VerifyOrExit((message = MeshCoP::NewMeshCoPMessage(Get())) != nullptr, error = kErrorNoBufs); SuccessOrExit(error = message->InitAsConfirmablePost(UriPath::kPanIdConflict)); SuccessOrExit(error = message->SetPayloadMarker()); @@ -129,7 +129,7 @@ void PanIdQueryServer::SendConflict(void) messageInfo.SetSockAddr(Get().GetMeshLocal16()); messageInfo.SetPeerAddr(mCommissioner); messageInfo.SetPeerPort(Tmf::kUdpPort); - SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo)); otLogInfoMeshCoP("sent panid conflict"); diff --git a/src/core/thread/thread_netif.cpp b/src/core/thread/thread_netif.cpp index 6ebfcfc7b..c20ce9595 100644 --- a/src/core/thread/thread_netif.cpp +++ b/src/core/thread/thread_netif.cpp @@ -167,7 +167,7 @@ void ThreadNetif::Up(void) SubscribeAllNodesMulticast(); IgnoreError(Get().Enable()); - IgnoreError(Get().Start()); + IgnoreError(Get().Start()); #if OPENTHREAD_CONFIG_DNSSD_SERVER_ENABLE IgnoreError(Get().Start()); #endif @@ -199,7 +199,7 @@ void ThreadNetif::Down(void) #if OPENTHREAD_CONFIG_DTLS_ENABLE Get().Stop(); #endif - IgnoreError(Get().Stop()); + IgnoreError(Get().Stop()); IgnoreError(Get().Disable()); RemoveAllExternalUnicastAddresses(); UnsubscribeAllExternalMulticastAddresses(); diff --git a/src/core/thread/thread_netif.hpp b/src/core/thread/thread_netif.hpp index 59ce9cd5e..694280283 100644 --- a/src/core/thread/thread_netif.hpp +++ b/src/core/thread/thread_netif.hpp @@ -193,7 +193,7 @@ public: bool IsOnMesh(const Ip6::Address &aAddress) const; private: - Tmf::TmfAgent mTmfAgent; + Tmf::Agent mTmfAgent; #if OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE Dhcp6::Client mDhcp6Client; #endif diff --git a/src/core/thread/tmf.cpp b/src/core/thread/tmf.cpp index 687182904..7dc5ea406 100644 --- a/src/core/thread/tmf.cpp +++ b/src/core/thread/tmf.cpp @@ -38,19 +38,19 @@ namespace ot { namespace Tmf { -Error TmfAgent::Start(void) +Error Agent::Start(void) { return Coap::Start(kUdpPort, OT_NETIF_THREAD); } -Error TmfAgent::Filter(const ot::Coap::Message &aMessage, const Ip6::MessageInfo &aMessageInfo, void *aContext) +Error Agent::Filter(const ot::Coap::Message &aMessage, const Ip6::MessageInfo &aMessageInfo, void *aContext) { OT_UNUSED_VARIABLE(aMessage); - return static_cast(aContext)->IsTmfMessage(aMessageInfo) ? kErrorNone : kErrorNotTmf; + return static_cast(aContext)->IsTmfMessage(aMessageInfo) ? kErrorNone : kErrorNotTmf; } -bool TmfAgent::IsTmfMessage(const Ip6::MessageInfo &aMessageInfo) const +bool Agent::IsTmfMessage(const Ip6::MessageInfo &aMessageInfo) const { bool rval = true; diff --git a/src/core/thread/tmf.hpp b/src/core/thread/tmf.hpp index 6de017339..c79fd1e71 100644 --- a/src/core/thread/tmf.hpp +++ b/src/core/thread/tmf.hpp @@ -48,7 +48,7 @@ enum * This class implements functionality of the Thread TMF agent. * */ -class TmfAgent : public Coap::Coap +class Agent : public Coap::Coap { public: /** @@ -57,7 +57,7 @@ public: * @param[in] aInstance A reference to the OpenThread instance. * */ - explicit TmfAgent(Instance &aInstance) + explicit Agent(Instance &aInstance) : Coap::Coap(aInstance) { SetInterceptor(&Filter, this);