espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-07-28 14:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[tmf] introduce specialized SendMessageTo() methods in Tmf::Agent (#12548)

Browse Source 
This commit introduces new helper methods in the `Tmf::Agent` class
(`SendMessageTo()`, `SendMessageToRloc()`, `SendMessageToLeaderAloc()`,
and `SendMessageAllowMulticastLoop()`) to simplify the transmission of
TMF messages.

Previously, callers of `Tmf::Agent::SendMessage()` were required to
manually configure a `Tmf::MessageInfo` object with the appropriate
socket and peer address information before sending a message. This led
to repetitive code across the various modules utilizing TMF.

By incorporating these address resolution and message info preparation
steps directly into `Tmf::Agent`, this change significantly reduces
boilerplate code. All existing calls to `SendMessage()` have been
updated to use the new flavors.
This commit is contained in:
Abtin Keshavarzian
2026-02-26 15:26:45 -06:00
committed by GitHub
parent 3ea2dbe146
commit f03cecdff6
36 changed files with 336 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/api/dataset_api.cpp
+4 -4
View File
@@ -100,8 +100,8 @@ otError otDatasetSendMgmtActiveGet(otInstance *aInstan
uint8_t aLength,
const otIp6Address *aAddress)
{
return AsCoreType(aInstance).Get<MeshCoP::ActiveDatasetManager>().SendGetRequest(AsCoreType(aDatasetComponents),
aTlvTypes, aLength, aAddress);
return AsCoreType(aInstance).Get<MeshCoP::ActiveDatasetManager>().SendGetRequest(
AsCoreType(aDatasetComponents), aTlvTypes, aLength, AsCoreTypePtr(aAddress));
}
otError otDatasetSendMgmtActiveSet(otInstance *aInstance,
@@ -121,8 +121,8 @@ otError otDatasetSendMgmtPendingGet(otInstance *aInsta
uint8_t aLength,
const otIp6Address *aAddress)
{
return AsCoreType(aInstance).Get<MeshCoP::PendingDatasetManager>().SendGetRequest(AsCoreType(aDatasetComponents),
aTlvTypes, aLength, aAddress);
return AsCoreType(aInstance).Get<MeshCoP::PendingDatasetManager>().SendGetRequest(
AsCoreType(aDatasetComponents), aTlvTypes, aLength, AsCoreTypePtr(aAddress));
}
otError otDatasetSendMgmtPendingSet(otInstance *aInstance,
src/core/meshcop/announce_begin_client.cpp
+3 -6
View File
@@ -51,9 +51,8 @@ Error AnnounceBeginClient::SendRequest(uint32_t aChannelMask,
uint16_t aPeriod,
const Ip6::Address &aAddress)
{
Error error = kErrorNone;
Tmf::MessageInfo messageInfo(GetInstance());
Coap::Message *message = nullptr;
Error error = kErrorNone;
Coap::Message *message = nullptr;
VerifyOrExit(Get<MeshCoP::Commissioner>().IsActive(), error = kErrorInvalidState);
VerifyOrExit((message = Get<Tmf::Agent>().NewPriorityMessage()) != nullptr, error = kErrorNoBufs);
@@ -69,9 +68,7 @@ Error AnnounceBeginClient::SendRequest(uint32_t aChannelMask,
SuccessOrExit(error = Tlv::Append<MeshCoP::CountTlv>(*message, aCount));
SuccessOrExit(error = Tlv::Append<MeshCoP::PeriodTlv>(*message, aPeriod));
messageInfo.SetSockAddrToRlocPeerAddrTo(aAddress);
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*message, messageInfo));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageTo(*message, aAddress));
LogInfo("Sent %s", UriToString<kUriAnnounceBegin>());
src/core/meshcop/border_agent.cpp
+7 -13
View File
@@ -507,7 +507,6 @@ Error Manager::EvictActiveCommissioner(void)
Error error = kErrorNone;
uint16_t sessionId;
uint16_t baRloc16;
Tmf::MessageInfo messageInfo(GetInstance());
OwnedPtr<Coap::Message> message;
SuccessOrExit(error = Get<NetworkData::Leader>().FindBorderAgentRloc(baRloc16));
@@ -519,9 +518,8 @@ Error Manager::EvictActiveCommissioner(void)
SuccessOrExit(error = Tlv::Append<StateTlv>(*message, StateTlv::kReject));
SuccessOrExit(error = Tlv::Append<CommissionerSessionIdTlv>(*message, sessionId));
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
error = Get<Tmf::Agent>().SendMessage(message.PassOwnership(), messageInfo);
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageToLeaderAloc(*message));
message.Release();
exit:
return error;
@@ -695,7 +693,6 @@ Error Manager::CoapDtlsSession::ForwardToLeader(const Coap::Msg &aMsg, Uri aUri)
{
Error error = kErrorNone;
OwnedPtr<ForwardContext> forwardContext;
Tmf::MessageInfo messageInfo(GetInstance());
OwnedPtr<Coap::Message> message;
OffsetRange offsetRange;
Coap::Token token;
@@ -720,10 +717,9 @@ Error Manager::CoapDtlsSession::ForwardToLeader(const Coap::Msg &aMsg, Uri aUri)
offsetRange.InitFromMessageOffsetToEnd(aMsg.mMessage);
SuccessOrExit(error = message->AppendBytesFromMessage(aMsg.mMessage, offsetRange));
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(message.PassOwnership(), messageInfo,
HandleLeaderResponseToFwdTmf, forwardContext.Get()));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageToLeaderAloc(*message, HandleLeaderResponseToFwdTmf,
forwardContext.Get()));
message.Release();
// Release the ownership of `forwardContext` since `SendMessage()`
// will own it. We take back ownership when the callback
@@ -1010,7 +1006,6 @@ void Manager::CoapDtlsSession::HandleTmfRelayTx(Coap::Msg &aMsg)
Error error = kErrorNone;
uint16_t joinerRouterRloc;
OwnedPtr<Coap::Message> message;
Tmf::MessageInfo messageInfo(GetInstance());
OffsetRange offsetRange;
VerifyOrExit(aMsg.IsNonConfirmablePostRequest());
@@ -1036,9 +1031,8 @@ void Manager::CoapDtlsSession::HandleTmfRelayTx(Coap::Msg &aMsg)
offsetRange.InitFromMessageOffsetToEnd(aMsg.mMessage);
SuccessOrExit(error = message->AppendBytesFromMessage(aMsg.mMessage, offsetRange));
messageInfo.SetSockAddrToRlocPeerAddrTo(joinerRouterRloc);
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(message.PassOwnership(), messageInfo));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageToRloc(*message, joinerRouterRloc));
message.Release();
LogInfo("Forward %s to joiner router 0x%04x", UriToString<kUriRelayTx>(), joinerRouterRloc);
src/core/meshcop/border_agent_admitter.cpp
+3 -6
View File
@@ -894,15 +894,12 @@ exit:
Error Admitter::CommissionerPetitioner::SendToLeader(OwnedPtr<Coap::Message> aMessage, Coap::ResponseHandler aHandler)
{
Error error;
Tmf::MessageInfo messageInfo(GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
Error error;
// On success the message ownership is transferred.
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*aMessage, messageInfo, aHandler,
(aHandler != nullptr) ? this : nullptr));
SuccessOrExit(
error = Get<Tmf::Agent>().SendMessageToLeaderAloc(*aMessage, aHandler, (aHandler != nullptr) ? this : nullptr));
aMessage.Release();
exit:
src/core/meshcop/commissioner.cpp
+10 -20
View File
@@ -605,7 +605,6 @@ Error Commissioner::SendMgmtCommissionerGetRequest(const uint8_t *aTlvs, uint8_t
{
Error error = kErrorNone;
OwnedPtr<Coap::Message> message;
Tmf::MessageInfo messageInfo(GetInstance());
message.Reset(Get<Tmf::Agent>().NewPriorityConfirmablePostMessage(kUriCommissionerGet));
VerifyOrExit(message != nullptr, error = kErrorNoBufs);
@@ -615,9 +614,8 @@ Error Commissioner::SendMgmtCommissionerGetRequest(const uint8_t *aTlvs, uint8_t
SuccessOrExit(error = Tlv::AppendTlv(*message, Tlv::kGet, aTlvs, aLength));
}
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(message.PassOwnership(), messageInfo,
HandleMgmtCommissionerGetResponse, this));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageToLeaderAloc(*message, HandleMgmtCommissionerGetResponse, this));
message.Release();
LogInfo("Sent %s to leader", UriToString<kUriCommissionerGet>());
@@ -640,7 +638,6 @@ Error Commissioner::SendMgmtCommissionerSetRequest(const CommissioningDataset &a
{
Error error = kErrorNone;
OwnedPtr<Coap::Message> message;
Tmf::MessageInfo messageInfo(GetInstance());
message.Reset(Get<Tmf::Agent>().NewPriorityConfirmablePostMessage(kUriCommissionerSet));
VerifyOrExit(message != nullptr, error = kErrorNoBufs);
@@ -672,9 +669,8 @@ Error Commissioner::SendMgmtCommissionerSetRequest(const CommissioningDataset &a
SuccessOrExit(error = message->AppendBytes(aTlvs, aLength));
}
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(message.PassOwnership(), messageInfo,
HandleMgmtCommissionerSetResponse, this));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageToLeaderAloc(*message, HandleMgmtCommissionerSetResponse, this));
message.Release();
LogInfo("Sent %s to leader", UriToString<kUriCommissionerSet>());
@@ -702,7 +698,6 @@ Error Commissioner::SendPetition(void)
{
Error error = kErrorNone;
OwnedPtr<Coap::Message> message;
Tmf::MessageInfo messageInfo(GetInstance());
mTransmitAttempts++;
@@ -711,9 +706,8 @@ Error Commissioner::SendPetition(void)
SuccessOrExit(error = Tlv::Append<CommissionerIdTlv>(*message, mCommissionerId));
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(message.PassOwnership(), messageInfo,
HandleLeaderPetitionResponse, this));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageToLeaderAloc(*message, HandleLeaderPetitionResponse, this));
message.Release();
LogInfo("Sent %s", UriToString<kUriLeaderPetition>());
@@ -774,7 +768,6 @@ void Commissioner::SendKeepAlive(uint16_t aSessionId)
{
Error error = kErrorNone;
OwnedPtr<Coap::Message> message;
Tmf::MessageInfo messageInfo(GetInstance());
message.Reset(Get<Tmf::Agent>().NewPriorityConfirmablePostMessage(kUriLeaderKeepAlive));
VerifyOrExit(message != nullptr, error = kErrorNoBufs);
@@ -784,9 +777,8 @@ void Commissioner::SendKeepAlive(uint16_t aSessionId)
SuccessOrExit(error = Tlv::Append<CommissionerSessionIdTlv>(*message, aSessionId));
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(message.PassOwnership(), messageInfo,
HandleLeaderKeepAliveResponse, this));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageToLeaderAloc(*message, HandleLeaderKeepAliveResponse, this));
message.Release();
LogInfo("Sent %s", UriToString<kUriLeaderKeepAlive>());
@@ -985,7 +977,6 @@ Error Commissioner::SendRelayTransmit(Message &aMessage, const Ip6::MessageInfo
Error error = kErrorNone;
ExtendedTlv tlv;
OwnedPtr<Coap::Message> message;
Tmf::MessageInfo messageInfo(GetInstance());
Kek kek;
Get<KeyManager>().ExtractKek(kek);
@@ -1007,9 +998,8 @@ Error Commissioner::SendRelayTransmit(Message &aMessage, const Ip6::MessageInfo
SuccessOrExit(error = message->Append(tlv));
SuccessOrExit(error = message->AppendBytesFromMessage(aMessage, 0, aMessage.GetLength()));
messageInfo.SetSockAddrToRlocPeerAddrTo(mJoinerRloc);
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(message.PassOwnership(), messageInfo));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageToRloc(*message, mJoinerRloc));
message.Release();
aMessage.Free();
src/core/meshcop/dataset_manager.cpp
+13 -15
View File
@@ -465,9 +465,8 @@ exit:
Error DatasetManager::SendSetRequest(const Dataset &aDataset)
{
Error error = kErrorNone;
Coap::Message *message = nullptr;
Tmf::MessageInfo messageInfo(GetInstance());
Error error = kErrorNone;
Coap::Message *message = nullptr;
VerifyOrExit(!mMgmtPending, error = kErrorAlready);
@@ -475,9 +474,8 @@ Error DatasetManager::SendSetRequest(const Dataset &aDataset)
VerifyOrExit(message != nullptr, error = kErrorNoBufs);
SuccessOrExit(error = message->AppendBytes(aDataset.GetBytes(), aDataset.GetLength()));
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*message, messageInfo, HandleMgmtSetResponse, this));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageToLeaderAloc(*message, HandleMgmtSetResponse, this));
mMgmtPending = true;
LogInfo("Sent dataset set request to leader");
@@ -621,12 +619,11 @@ exit:
Error DatasetManager::SendGetRequest(const Dataset::Components &aDatasetComponents,
const uint8_t *aTlvTypes,
uint8_t aLength,
const otIp6Address *aAddress) const
const Ip6::Address *aAddress) const
{
Error error = kErrorNone;
Coap::Message *message;
Tmf::MessageInfo messageInfo(GetInstance());
TlvList tlvList;
Error error = kErrorNone;
Coap::Message *message;
TlvList tlvList;
if (aDatasetComponents.IsPresent<Dataset::kActiveTimestamp>())
{
@@ -706,15 +703,16 @@ Error DatasetManager::SendGetRequest(const Dataset::Components &aDatasetComponen
SuccessOrExit(error = Tlv::AppendTlv(*message, Tlv::kGet, tlvList.GetArrayBuffer(), tlvList.GetLength()));
}
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
if (aAddress != nullptr)
{
// Use leader ALOC if `aAddress` is `nullptr`.
messageInfo.SetPeerAddr(AsCoreType(aAddress));
error = Get<Tmf::Agent>().SendMessageTo(*message, *aAddress);
}
else
{
error = Get<Tmf::Agent>().SendMessageToLeaderAloc(*message);
}
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*message, messageInfo));
SuccessOrExit(error);
LogInfo("sent dataset get request");
src/core/meshcop/dataset_manager.hpp
+1 -1
View File
@@ -212,7 +212,7 @@ public:
Error SendGetRequest(const Dataset::Components &aDatasetComponents,
const uint8_t *aTlvTypes,
uint8_t aLength,
const otIp6Address *aAddress) const;
const Ip6::Address *aAddress) const;
/**
* Processes a MGMT_GET request message and prepares the response.
src/core/meshcop/energy_scan_client.cpp
+3 -5
View File
@@ -54,9 +54,8 @@ Error EnergyScanClient::SendQuery(uint32_t aChannelMas
otCommissionerEnergyReportCallback aCallback,
void *aContext)
{
Error error = kErrorNone;
Tmf::MessageInfo messageInfo(GetInstance());
Coap::Message *message = nullptr;
Error error = kErrorNone;
Coap::Message *message = nullptr;
VerifyOrExit(Get<MeshCoP::Commissioner>().IsActive(), error = kErrorInvalidState);
VerifyOrExit((message = Get<Tmf::Agent>().NewPriorityMessage()) != nullptr, error = kErrorNoBufs);
@@ -73,8 +72,7 @@ Error EnergyScanClient::SendQuery(uint32_t aChannelMas
SuccessOrExit(error = Tlv::Append<MeshCoP::PeriodTlv>(*message, aPeriod));
SuccessOrExit(error = Tlv::Append<MeshCoP::ScanDurationTlv>(*message, aScanDuration));
messageInfo.SetSockAddrToRlocPeerAddrTo(aAddress);
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*message, messageInfo));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageTo(*message, aAddress));
LogInfo("Sent %s", UriToString<kUriEnergyScan>());
src/core/meshcop/joiner_router.cpp
+6 -9
View File
@@ -116,12 +116,11 @@ void JoinerRouter::SetJoinerUdpPort(uint16_t aJoinerUdpPort)
void JoinerRouter::HandleUdpReceive(Message &aMessage, const Ip6::MessageInfo &aMessageInfo)
{
Error error;
Coap::Message *message = nullptr;
Tmf::MessageInfo messageInfo(GetInstance());
ExtendedTlv tlv;
uint16_t borderAgentRloc;
OffsetRange offsetRange;
Error error;
Coap::Message *message = nullptr;
ExtendedTlv tlv;
uint16_t borderAgentRloc;
OffsetRange offsetRange;
LogInfo("JoinerRouter::HandleUdpReceive");
@@ -141,9 +140,7 @@ void JoinerRouter::HandleUdpReceive(Message &aMessage, const Ip6::MessageInfo &a
SuccessOrExit(error = message->Append(tlv));
SuccessOrExit(error = message->AppendBytesFromMessage(aMessage, offsetRange));
messageInfo.SetSockAddrToRlocPeerAddrTo(borderAgentRloc);
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*message, messageInfo));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageToRloc(*message, borderAgentRloc));
LogInfo("Sent %s", UriToString<kUriRelayRx>());
src/core/meshcop/meshcop_leader.cpp
+3 -5
View File
@@ -177,15 +177,13 @@ exit:
void Leader::SendDatasetChanged(const Ip6::Address &aAddress)
{
Error error = kErrorNone;
Tmf::MessageInfo messageInfo(GetInstance());
Coap::Message *message;
Error error = kErrorNone;
Coap::Message *message;
message = Get<Tmf::Agent>().NewPriorityConfirmablePostMessage(kUriDatasetChanged);
VerifyOrExit(message != nullptr, error = kErrorNoBufs);
messageInfo.SetSockAddrToRlocPeerAddrTo(aAddress);
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*message, messageInfo));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageTo(*message, aAddress));
LogInfo("Sent %s", UriToString<kUriDatasetChanged>());
src/core/meshcop/panid_query_client.cpp
+3 -5
View File
@@ -52,9 +52,8 @@ Error PanIdQueryClient::SendQuery(uint16_t aPanId,
otCommissionerPanIdConflictCallback aCallback,
void *aContext)
{
Error error = kErrorNone;
Tmf::MessageInfo messageInfo(GetInstance());
Coap::Message *message = nullptr;
Error error = kErrorNone;
Coap::Message *message = nullptr;
VerifyOrExit(Get<MeshCoP::Commissioner>().IsActive(), error = kErrorInvalidState);
VerifyOrExit((message = Get<Tmf::Agent>().NewPriorityMessage()) != nullptr, error = kErrorNoBufs);
@@ -69,8 +68,7 @@ Error PanIdQueryClient::SendQuery(uint16_t aPanId,
SuccessOrExit(error = Tlv::Append<MeshCoP::PanIdTlv>(*message, aPanId));
messageInfo.SetSockAddrToRlocPeerAddrTo(aAddress);
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*message, messageInfo));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageTo(*message, aAddress));
LogInfo("Sent %s", UriToString<kUriPanIdQuery>());
src/core/thread/address_resolver.cpp
+9 -18
View File
@@ -611,18 +611,15 @@ exit:
Error AddressResolver::SendAddressQuery(const Ip6::Address &aEid)
{
Error error;
Coap::Message *message;
Tmf::MessageInfo messageInfo(GetInstance());
Error error;
Coap::Message *message;
message = Get<Tmf::Agent>().NewPriorityNonConfirmablePostMessage(kUriAddressQuery);
VerifyOrExit(message != nullptr, error = kErrorNoBufs);
SuccessOrExit(error = Tlv::Append<ThreadTargetTlv>(*message, aEid));
messageInfo.SetSockAddrToRlocPeerAddrToRealmLocalAllRoutersMulticast();
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*message, messageInfo));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageTo(*message, Ip6::Address::GetRealmLocalAllRoutersMulticast()));
LogInfo("Sent %s for %s", UriToString<kUriAddressQuery>(), aEid.ToString().AsCString());
@@ -720,9 +717,8 @@ void AddressResolver::SendAddressError(const Ip6::Address &aTarget,
const Ip6::InterfaceIdentifier &aMeshLocalIid,
const Ip6::Address &aDestination)
{
Error error;
Coap::Message *message;
Tmf::MessageInfo messageInfo(GetInstance());
Error error;
Coap::Message *message;
VerifyOrExit((message = Get<Tmf::Agent>().NewMessage()) != nullptr, error = kErrorNoBufs);
@@ -732,9 +728,7 @@ void AddressResolver::SendAddressError(const Ip6::Address &aTarget,
SuccessOrExit(error = Tlv::Append<ThreadTargetTlv>(*message, aTarget));
SuccessOrExit(error = Tlv::Append<ThreadMeshLocalEidTlv>(*message, aMeshLocalIid));
messageInfo.SetSockAddrToRlocPeerAddrTo(aDestination);
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*message, messageInfo));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageTo(*message, aDestination));
LogInfo("Sent %s for target %s", UriToString<kUriAddressError>(), aTarget.ToString().AsCString());
@@ -877,9 +871,8 @@ void AddressResolver::SendAddressQueryResponse(const Ip6::Address &a
const uint32_t *aLastTransactionTime,
const Ip6::Address &aDestination)
{
Error error;
Coap::Message *message;
Tmf::MessageInfo messageInfo(GetInstance());
Error error;
Coap::Message *message;
message = Get<Tmf::Agent>().NewPriorityConfirmablePostMessage(kUriAddressNotify);
VerifyOrExit(message != nullptr, error = kErrorNoBufs);
@@ -893,9 +886,7 @@ void AddressResolver::SendAddressQueryResponse(const Ip6::Address &a
SuccessOrExit(error = Tlv::Append<ThreadLastTransactionTimeTlv>(*message, *aLastTransactionTime));
}
messageInfo.SetSockAddrToRlocPeerAddrTo(aDestination);
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*message, messageInfo));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageTo(*message, aDestination));
LogInfo("Sent %s for target %s", UriToString<kUriAddressNotify>(), aTarget.ToString().AsCString());
src/core/thread/anycast_locator.cpp
+3 -6
View File
@@ -47,9 +47,8 @@ AnycastLocator::AnycastLocator(Instance &aInstance)
Error AnycastLocator::Locate(const Ip6::Address &aAnycastAddress, LocatorCallback aCallback, void *aContext)
{
Error error = kErrorNone;
Coap::Message *message = nullptr;
Tmf::MessageInfo messageInfo(GetInstance());
Error error = kErrorNone;
Coap::Message *message = nullptr;
VerifyOrExit((aCallback != nullptr) && Get<Mle::Mle>().IsAnycastLocator(aAnycastAddress),
error = kErrorInvalidArgs);
@@ -62,9 +61,7 @@ Error AnycastLocator::Locate(const Ip6::Address &aAnycastAddress, LocatorCallbac
IgnoreError(Get<Tmf::Agent>().AbortTransaction(HandleResponse, this));
}
messageInfo.SetSockAddrToRlocPeerAddrTo(aAnycastAddress);
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*message, messageInfo, HandleResponse, this));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageTo(*message, aAnycastAddress, HandleResponse, this));
mCallback.Set(aCallback, aContext);
src/core/thread/dua_manager.cpp
+10 -16
View File
@@ -418,10 +418,10 @@ void DuaManager::UpdateTimeTickerRegistration(void)
void DuaManager::PerformNextRegistration(void)
{
Error error = kErrorNone;
Coap::Message *message = nullptr;
Tmf::MessageInfo messageInfo(GetInstance());
Ip6::Address dua;
Error error = kErrorNone;
Coap::Message *message = nullptr;
Ip6::Address dua;
Ip6::Address destAddr;
VerifyOrExit(Get<Mle::Mle>().IsAttached());
VerifyOrExit(Get<BackboneRouter::Leader>().HasPrimary());
@@ -503,17 +503,14 @@ void DuaManager::PerformNextRegistration(void)
uint8_t pbbrServiceId;
SuccessOrExit(error = Get<BackboneRouter::Leader>().GetServiceId(pbbrServiceId));
Get<Mle::Mle>().GetServiceAloc(pbbrServiceId, messageInfo.GetPeerAddr());
Get<Mle::Mle>().GetServiceAloc(pbbrServiceId, destAddr);
}
else
{
messageInfo.GetPeerAddr().SetToRoutingLocator(Get<Mle::Mle>().GetMeshLocalPrefix(),
Get<BackboneRouter::Leader>().GetServer16());
destAddr.SetToRoutingLocator(Get<Mle::Mle>().GetMeshLocalPrefix(), Get<BackboneRouter::Leader>().GetServer16());
}
messageInfo.SetSockAddrToRloc();
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*message, messageInfo, HandleDuaResponse, this));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageTo(*message, destAddr, HandleDuaResponse, this));
mIsDuaPending = true;
mRegisteringDua = dua;
@@ -700,9 +697,8 @@ exit:
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE
void DuaManager::SendAddressNotification(Ip6::Address &aAddress, DuaStatus aStatus, const Child &aChild)
{
Coap::Message *message = nullptr;
Tmf::MessageInfo messageInfo(GetInstance());
Error error;
Coap::Message *message = nullptr;
Error error;
message = Get<Tmf::Agent>().NewPriorityConfirmablePostMessage(kUriDuaRegistrationNotify);
VerifyOrExit(message != nullptr, error = kErrorNoBufs);
@@ -710,9 +706,7 @@ void DuaManager::SendAddressNotification(Ip6::Address &aAddress, DuaStatus aStat
SuccessOrExit(error = Tlv::Append<ThreadStatusTlv>(*message, aStatus));
SuccessOrExit(error = Tlv::Append<ThreadTargetTlv>(*message, aAddress));
messageInfo.SetSockAddrToRlocPeerAddrTo(aChild.GetRloc16());
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*message, messageInfo));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageToRloc(*message, aChild.GetRloc16()));
LogInfo("Sent %s for child %04x DUA %s", UriToString<kUriDuaRegistrationNotify>(), aChild.GetRloc16(),
aAddress.ToString().AsCString());
src/core/thread/energy_scan_server.cpp
+3 -6
View File
@@ -172,17 +172,14 @@ exit:
void EnergyScanServer::SendReport(void)
{
Error error = kErrorNone;
Tmf::MessageInfo messageInfo(GetInstance());
uint16_t offset;
Error error = kErrorNone;
uint16_t offset;
// Update the Energy List TLV length in Report message
offset = mReportMessage->GetLength() - mNumScanResults - sizeof(uint8_t);
mReportMessage->Write(offset, mNumScanResults);
messageInfo.SetSockAddrToRlocPeerAddrTo(mCommissioner);
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*mReportMessage, messageInfo));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageTo(*mReportMessage, mCommissioner));
mReportMessage.Release();
LogInfo("Sent %s", UriToString<kUriEnergyReport>());
src/core/thread/mle_ftd.cpp
+12 -12
View File
@@ -3258,9 +3258,9 @@ void Mle::SetRouterId(uint8_t aRouterId)
Error Mle::SendAddressSolicit(RouterUpgradeReason aReason)
{
Error error = kErrorNone;
Tmf::MessageInfo messageInfo(GetInstance());
Coap::Message *message = nullptr;
Error error = kErrorNone;
Coap::Message *message = nullptr;
Ip6::Address leaderRloc;
VerifyOrExit(!mAddressSolicitPending);
@@ -3280,12 +3280,12 @@ Error Mle::SendAddressSolicit(RouterUpgradeReason aReason)
SuccessOrExit(error = Tlv::Append<XtalAccuracyTlv>(*message, otPlatTimeGetXtalAccuracy()));
#endif
messageInfo.SetSockAddrToRlocPeerAddrToLeaderRloc();
GetLeaderRloc(leaderRloc);
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*message, messageInfo, HandleAddressSolicitResponse, this));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageTo(*message, leaderRloc, HandleAddressSolicitResponse, this));
mAddressSolicitPending = true;
Log(kMessageSend, kTypeAddressSolicit, messageInfo.GetPeerAddr());
Log(kMessageSend, kTypeAddressSolicit, leaderRloc);
exit:
FreeMessageOnError(message, error);
@@ -3294,9 +3294,9 @@ exit:
void Mle::SendAddressRelease(void)
{
Error error = kErrorNone;
Tmf::MessageInfo messageInfo(GetInstance());
Coap::Message *message;
Error error = kErrorNone;
Coap::Message *message;
Ip6::Address leaderRloc;
message = Get<Tmf::Agent>().NewPriorityConfirmablePostMessage(kUriAddressRelease);
VerifyOrExit(message != nullptr, error = kErrorNoBufs);
@@ -3304,11 +3304,11 @@ void Mle::SendAddressRelease(void)
SuccessOrExit(error = Tlv::Append<ThreadRloc16Tlv>(*message, Rloc16FromRouterId(mRouterId)));
SuccessOrExit(error = Tlv::Append<ThreadExtMacAddressTlv>(*message, Get<Mac::Mac>().GetExtAddress()));
messageInfo.SetSockAddrToRlocPeerAddrToLeaderRloc();
GetLeaderRloc(leaderRloc);
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*message, messageInfo));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageTo(*message, leaderRloc));
Log(kMessageSend, kTypeAddressRelease, messageInfo.GetPeerAddr());
Log(kMessageSend, kTypeAddressRelease, leaderRloc);
exit:
FreeMessageOnError(message, error);
src/core/thread/mlr_manager.cpp
+7 -10
View File
@@ -358,10 +358,10 @@ Error MlrManager::SendMlrMessage(const Ip6::Address *aAddresses,
{
OT_UNUSED_VARIABLE(aTimeout);
Error error = kErrorNone;
Coap::Message *message = nullptr;
Tmf::MessageInfo messageInfo(GetInstance());
Ip6AddressesTlv addressesTlv;
Error error = kErrorNone;
Coap::Message *message = nullptr;
Ip6::Address destAddr;
Ip6AddressesTlv addressesTlv;
VerifyOrExit(Get<BackboneRouter::Leader>().HasPrimary(), error = kErrorInvalidState);
@@ -393,17 +393,14 @@ Error MlrManager::SendMlrMessage(const Ip6::Address *aAddresses,
uint8_t pbbrServiceId;
SuccessOrExit(error = Get<BackboneRouter::Leader>().GetServiceId(pbbrServiceId));
Get<Mle::Mle>().GetServiceAloc(pbbrServiceId, messageInfo.GetPeerAddr());
Get<Mle::Mle>().GetServiceAloc(pbbrServiceId, destAddr);
}
else
{
messageInfo.GetPeerAddr().SetToRoutingLocator(Get<Mle::Mle>().GetMeshLocalPrefix(),
Get<BackboneRouter::Leader>().GetServer16());
destAddr.SetToRoutingLocator(Get<Mle::Mle>().GetMeshLocalPrefix(), Get<BackboneRouter::Leader>().GetServer16());
}
messageInfo.SetSockAddrToRloc();
error = Get<Tmf::Agent>().SendMessage(*message, messageInfo, aResponseHandler, aContext);
error = Get<Tmf::Agent>().SendMessageTo(*message, destAddr, aResponseHandler, aContext);
LogInfo("Sent MLR.req: addressNum=%d", aAddressNum);
src/core/thread/network_data_notifier.cpp
+3 -5
View File
@@ -183,9 +183,8 @@ exit:
Error Notifier::SendServerDataNotification(uint16_t aOldRloc16, const NetworkData *aNetworkData)
{
Error error = kErrorNone;
Coap::Message *message;
Tmf::MessageInfo messageInfo(GetInstance());
Error error = kErrorNone;
Coap::Message *message;
message = Get<Tmf::Agent>().NewPriorityConfirmablePostMessage(kUriServerData);
VerifyOrExit(message != nullptr, error = kErrorNoBufs);
@@ -205,8 +204,7 @@ Error Notifier::SendServerDataNotification(uint16_t aOldRloc16, const NetworkDat
SuccessOrExit(error = Tlv::Append<ThreadRloc16Tlv>(*message, aOldRloc16));
}
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*message, messageInfo, HandleCoapResponse, this));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageToLeaderAloc(*message, HandleCoapResponse, this));
LogInfo("Sent %s", UriToString<kUriServerData>());
src/core/thread/network_diagnostic.cpp
+11 -39
View File
@@ -50,25 +50,6 @@ Server::Server(Instance &aInstance)
{
}
void Server::PrepareMessageInfoForDest(const Ip6::Address &aDestination, Tmf::MessageInfo &aMessageInfo) const
{
if (aDestination.IsMulticast())
{
aMessageInfo.SetMulticastLoop(true);
}
if (aDestination.IsLinkLocalUnicastOrMulticast())
{
aMessageInfo.SetSockAddr(Get<Mle::Mle>().GetLinkLocalAddress());
}
else
{
aMessageInfo.SetSockAddrToRloc();
}
aMessageInfo.SetPeerAddr(aDestination);
}
Error Server::AppendIp6AddressList(Message &aMessage)
{
Error error;
@@ -599,11 +580,10 @@ exit:
void Server::SendAnswer(const Ip6::Address &aDestination, const Message &aRequest)
{
Error error = kErrorNone;
Coap::Message *answer = nullptr;
Tmf::MessageInfo messageInfo(GetInstance());
AnswerTlv answerTlv;
uint16_t queryId;
Error error = kErrorNone;
Coap::Message *answer = nullptr;
AnswerTlv answerTlv;
uint16_t queryId;
answer = Get<Tmf::Agent>().NewConfirmablePostMessage(kUriDiagnosticGetAnswer);
VerifyOrExit(answer != nullptr, error = kErrorNoBufs);
@@ -620,9 +600,7 @@ void Server::SendAnswer(const Ip6::Address &aDestination, const Message &aReques
answerTlv.Init(0, AnswerTlv::kIsLast);
SuccessOrExit(answer->Append(answerTlv));
PrepareMessageInfoForDest(aDestination, messageInfo);
error = Get<Tmf::Agent>().SendMessage(*answer, messageInfo);
error = Get<Tmf::Agent>().SendMessageAllowMulticastLoop(*answer, aDestination);
exit:
FreeMessageOnError(answer, error);
@@ -778,18 +756,15 @@ void Server::SendNextAnswer(Coap::Message &aAnswer, const Ip6::Address &aDestina
// This method send the given next `aAnswer` associated with
// a query to the `aDestination`.
Error error = kErrorNone;
Coap::Message *nextAnswer = IsLastAnswer(aAnswer) ? nullptr : aAnswer.GetNextCoapMessage();
Tmf::MessageInfo messageInfo(GetInstance());
Error error = kErrorNone;
Coap::Message *nextAnswer = IsLastAnswer(aAnswer) ? nullptr : aAnswer.GetNextCoapMessage();
mAnswerQueue.Dequeue(aAnswer);
PrepareMessageInfoForDest(aDestination, messageInfo);
// When sending the message, we pass `nextAnswer` as `aContext`
// to be used when invoking callback `HandleAnswerResponse()`.
error = Get<Tmf::Agent>().SendMessage(aAnswer, messageInfo, HandleAnswerResponse, nextAnswer);
error = Get<Tmf::Agent>().SendMessageAllowMulticastLoop(aAnswer, aDestination, HandleAnswerResponse, nextAnswer);
if (error != kErrorNone)
{
@@ -1052,9 +1027,8 @@ Error Client::SendCommand(Uri aUri,
Coap::ResponseHandler aHandler,
void *aContext)
{
Error error;
Coap::Message *message = nullptr;
Tmf::MessageInfo messageInfo(GetInstance());
Error error;
Coap::Message *message = nullptr;
switch (aUri)
{
@@ -1084,9 +1058,7 @@ Error Client::SendCommand(Uri aUri,
SuccessOrExit(error = Tlv::Append<QueryIdTlv>(*message, ++mQueryId));
}
Get<Server>().PrepareMessageInfoForDest(aDestination, messageInfo);
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*message, messageInfo, aHandler, aContext));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageAllowMulticastLoop(*message, aDestination, aHandler, aContext));
LogInfo("Sent %s to %s", UriToString(aUri), aDestination.ToString().AsCString());
src/core/thread/network_diagnostic.hpp
-1
View File
@@ -147,7 +147,6 @@ private:
Error AppendIp6AddressList(Message &aMessage);
Error AppendMacCounters(Message &aMessage);
Error AppendRequestedTlvs(const Message &aRequest, Message &aResponse);
void PrepareMessageInfoForDest(const Ip6::Address &aDestination, Tmf::MessageInfo &aMessageInfo) const;
#if OPENTHREAD_CONFIG_BLE_TCAT_ENABLE
Error AppendRequestedTlvsForTcat(const Message &aRequest, Message &aResponse, OffsetRange &aOffsetRange);
src/core/thread/panid_query_server.cpp
+3 -6
View File
@@ -89,9 +89,8 @@ void PanIdQueryServer::HandleScanResult(const ScanResult *aScanResult)
void PanIdQueryServer::SendConflict(void)
{
Error error = kErrorNone;
Tmf::MessageInfo messageInfo(GetInstance());
Coap::Message *message;
Error error = kErrorNone;
Coap::Message *message;
message = Get<Tmf::Agent>().NewPriorityConfirmablePostMessage(kUriPanIdConflict);
VerifyOrExit(message != nullptr, error = kErrorNoBufs);
@@ -100,9 +99,7 @@ void PanIdQueryServer::SendConflict(void)
SuccessOrExit(error = Tlv::Append<MeshCoP::PanIdTlv>(*message, mPanId));
messageInfo.SetSockAddrToRlocPeerAddrTo(mCommissioner);
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*message, messageInfo));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageTo(*message, mCommissioner));
LogInfo("Sent %s", UriToString<kUriPanIdConflict>());
src/core/thread/tmf.cpp
+75 -35
View File
@@ -38,41 +38,6 @@
namespace ot {
namespace Tmf {
//----------------------------------------------------------------------------------------------------------------------
// MessageInfo
void MessageInfo::SetSockAddrToRloc(void) { SetSockAddr(Get<Mle::Mle>().GetMeshLocalRloc()); }
void MessageInfo::SetSockAddrToRlocPeerAddrToLeaderAloc(void)
{
SetSockAddrToRloc();
Get<Mle::Mle>().GetLeaderAloc(GetPeerAddr());
}
void MessageInfo::SetSockAddrToRlocPeerAddrToLeaderRloc(void)
{
SetSockAddrToRloc();
Get<Mle::Mle>().GetLeaderRloc(GetPeerAddr());
}
void MessageInfo::SetSockAddrToRlocPeerAddrToRealmLocalAllRoutersMulticast(void)
{
SetSockAddrToRloc();
SetPeerAddr(Ip6::Address::GetRealmLocalAllRoutersMulticast());
}
void MessageInfo::SetSockAddrToRlocPeerAddrTo(uint16_t aRloc16)
{
SetSockAddrToRloc();
GetPeerAddr().SetToRoutingLocator(Get<Mle::Mle>().GetMeshLocalPrefix(), aRloc16);
}
void MessageInfo::SetSockAddrToRlocPeerAddrTo(const Ip6::Address &aPeerAddress)
{
SetSockAddrToRloc();
SetPeerAddr(aPeerAddress);
}
//----------------------------------------------------------------------------------------------------------------------
// Agent
@@ -229,6 +194,81 @@ exit:
return isTmf;
}
Error Agent::SendMessageTo(Message &aMessage, const Ip6::Address &aDest)
{
return SendMessageTo(aMessage, aDest, nullptr, nullptr);
}
Error Agent::SendMessageTo(Message &aMessage, const Ip6::Address &aDest, ResponseHandler aHandler, void *aContext)
{
return Send(aMessage, aDest, /* aAllowMulticastLoop */ false, aHandler, aContext);
}
Error Agent::SendMessageAllowMulticastLoop(Message &aMessage, const Ip6::Address &aDest)
{
return SendMessageAllowMulticastLoop(aMessage, aDest, nullptr, nullptr);
}
Error Agent::SendMessageAllowMulticastLoop(Message &aMessage,
const Ip6::Address &aDest,
ResponseHandler aHandler,
void *aContext)
{
return Send(aMessage, aDest, /* aAllowMulticastLoop */ true, aHandler, aContext);
}
Error Agent::Send(Message &aMessage,
const Ip6::Address &aDest,
bool aAllowMulticastLoop,
ResponseHandler aHandler,
void *aContext)
{
Ip6::MessageInfo messageInfo;
messageInfo.SetPeerAddr(aDest);
PrepareMessageInfo(messageInfo);
messageInfo.SetMulticastLoop(aAllowMulticastLoop);
return SendMessage(aMessage, messageInfo, aHandler, aContext);
}
Error Agent::SendMessageToRloc(Message &aMessage, uint16_t aRloc16)
{
return SendMessageToRloc(aMessage, aRloc16, nullptr, nullptr);
}
Error Agent::SendMessageToRloc(Message &aMessage, uint16_t aRloc16, ResponseHandler aHandler, void *aContext)
{
Ip6::MessageInfo messageInfo;
messageInfo.GetPeerAddr().SetToRoutingLocator(Get<Mle::Mle>().GetMeshLocalPrefix(), aRloc16);
PrepareMessageInfo(messageInfo);
return SendMessage(aMessage, messageInfo, aHandler, aContext);
}
Error Agent::SendMessageToLeaderAloc(Message &aMessage) { return SendMessageToLeaderAloc(aMessage, nullptr, nullptr); }
Error Agent::SendMessageToLeaderAloc(Message &aMessage, ResponseHandler aHandler, void *aContext)
{
Ip6::MessageInfo messageInfo;
Get<Mle::Mle>().GetLeaderAloc(messageInfo.GetPeerAddr());
PrepareMessageInfo(messageInfo);
return SendMessage(aMessage, messageInfo, aHandler, aContext);
}
void Agent::PrepareMessageInfo(Ip6::MessageInfo &aMessageInfo) const
{
// `GetPeerAddr()` must be already set.
aMessageInfo.SetPeerPort(kUdpPort);
aMessageInfo.SetSockAddr(aMessageInfo.GetPeerAddr().IsLinkLocalUnicastOrMulticast()
? Get<Mle::Mle>().GetLinkLocalAddress()
: Get<Mle::Mle>().GetMeshLocalRloc());
}
uint8_t Agent::PriorityToDscp(Message::Priority aPriority)
{
uint8_t dscp = Ip6::kDscpTmfNormalPriority;
src/core/thread/tmf.hpp
+106 -60
View File
@@ -83,66 +83,9 @@ namespace Tmf {
constexpr uint16_t kUdpPort = 61631; ///< TMF UDP Port
typedef Coap::Message Message; ///< A TMF message.
typedef Coap::Msg Msg; ///< A TMF message along with its `Ip6::MessageInfo`.
/**
* Represents message information for a TMF message.
*
* This is sub-class of `Ip6::MessageInfo` intended for use when sending TMF messages.
*/
class MessageInfo : public InstanceLocator, public Ip6::MessageInfo
{
public:
/**
* Initializes the `MessageInfo`.
*
* The peer port is set to `Tmf::kUdpPort` and all other properties are cleared (set to zero).
*
* @param[in] aInstance The OpenThread instance.
*/
explicit MessageInfo(Instance &aInstance)
: InstanceLocator(aInstance)
{
SetPeerPort(kUdpPort);
}
/**
* Sets the local socket address to mesh-local RLOC address.
*/
void SetSockAddrToRloc(void);
/**
* Sets the local socket address to RLOC address and the peer socket address to leader ALOC.
*/
void SetSockAddrToRlocPeerAddrToLeaderAloc(void);
/**
* Sets the local socket address to RLOC address and the peer socket address to leader RLOC.
*/
void SetSockAddrToRlocPeerAddrToLeaderRloc(void);
/**
* Sets the local socket address to RLOC address and the peer socket address to realm-local all
* routers multicast address.
*/
void SetSockAddrToRlocPeerAddrToRealmLocalAllRoutersMulticast(void);
/**
* Sets the local socket address to RLOC address and the peer socket address to a router RLOC based on
* a given RLOC16.
*
* @param[in] aRloc16 The RLOC16 to use for peer address.
*/
void SetSockAddrToRlocPeerAddrTo(uint16_t aRloc16);
/**
* Sets the local socket address to RLOC address and the peer socket address to a given address.
*
* @param[in] aPeerAddress The peer address.
*/
void SetSockAddrToRlocPeerAddrTo(const Ip6::Address &aPeerAddress);
};
typedef Coap::Message Message; ///< A TMF message.
typedef Coap::Msg Msg; ///< A TMF message along with its `Ip6::MessageInfo`.
typedef Coap::ResponseHandler ResponseHandler; ///< A TMF message response handler function pointer.
/**
* Implements functionality of the Thread TMF agent.
@@ -183,6 +126,103 @@ public:
*/
bool IsTmfMessage(const Ip6::Address &aSourceAddress, const Ip6::Address &aDestAddress, uint16_t aDestPort) const;
/**
* Sends a TMF message to a given destination address.
*
* @param[in] aMessage The message to send.
* @param[in] aDest The destination IPv6 address.
*
* @retval kErrorNone Successfully sent the message.
* @retval kErrorNoBufs Insufficient buffers available to send the message.
*/
Error SendMessageTo(Message &aMessage, const Ip6::Address &aDest);
/**
* Sends a TMF message to a given destination address.
*
* @param[in] aMessage The message to send.
* @param[in] aDest The destination IPv6 address.
* @param[in] aHandler The `ResponseHandler` callback function.
* @param[in] aContext A pointer to arbitrary context information used with @p aHandler.
*
* @retval kErrorNone Successfully sent the message.
* @retval kErrorNoBufs Insufficient buffers available to send the message.
*/
Error SendMessageTo(Message &aMessage, const Ip6::Address &aDest, ResponseHandler aHandler, void *aContext);
/**
* Sends a TMF message to a given destination address and allows multicast loop.
*
* @param[in] aMessage The message to send.
* @param[in] aDest The destination IPv6 address.
*
* @retval kErrorNone Successfully sent the message.
* @retval kErrorNoBufs Insufficient buffers available to send the message.
*/
Error SendMessageAllowMulticastLoop(Message &aMessage, const Ip6::Address &aDest);
/**
* Sends a TMF message to a given destination address and allows multicast loop.
*
* @param[in] aMessage The message to send.
* @param[in] aDest The destination IPv6 address.
* @param[in] aHandler The `ResponseHandler` callback function.
* @param[in] aContext A pointer to arbitrary context information used with @p aHandler.
*
* @retval kErrorNone Successfully sent the message.
* @retval kErrorNoBufs Insufficient buffers available to send the message.
*/
Error SendMessageAllowMulticastLoop(Message &aMessage,
const Ip6::Address &aDest,
ResponseHandler aHandler,
void *aContext);
/**
* Sends a TMF message to a router RLOC based on a given RLOC16.
*
* @param[in] aMessage The message to send.
* @param[in] aRloc16 The RLOC16 to use for peer address.
*
* @retval kErrorNone Successfully sent the message.
* @retval kErrorNoBufs Insufficient buffers available to send the message.
*/
Error SendMessageToRloc(Message &aMessage, uint16_t aRloc16);
/**
* Sends a TMF message to a router RLOC based on a given RLOC16.
*
* @param[in] aMessage The message to send.
* @param[in] aRloc16 The RLOC16 to use for peer address.
* @param[in] aHandler The `ResponseHandler` callback function.
* @param[in] aContext A pointer to arbitrary context information used with @p aHandler.
*
* @retval kErrorNone Successfully sent the message.
* @retval kErrorNoBufs Insufficient buffers available to send the message.
*/
Error SendMessageToRloc(Message &aMessage, uint16_t aRloc16, ResponseHandler aHandler, void *aContext);
/**
* Sends a TMF message to the Leader ALOC.
*
* @param[in] aMessage The message to send.
*
* @retval kErrorNone Successfully sent the message.
* @retval kErrorNoBufs Insufficient buffers available to send the message.
*/
Error SendMessageToLeaderAloc(Message &aMessage);
/**
* Sends a TMF message to the Leader ALOC.
*
* @param[in] aMessage The message to send.
* @param[in] aHandler The `ResponseHandler` callback function.
* @param[in] aContext A pointer to arbitrary context information used with @p aHandler.
*
* @retval kErrorNone Successfully sent the message.
* @retval kErrorNoBufs Insufficient buffers available to send the message.
*/
Error SendMessageToLeaderAloc(Message &aMessage, ResponseHandler aHandler, void *aContext);
/**
* Converts a TMF message priority to IPv6 header DSCP value.
*
@@ -204,6 +244,12 @@ public:
private:
template <Uri kUri> void HandleTmf(Msg &aMsg);
void PrepareMessageInfo(Ip6::MessageInfo &aMessageInfo) const;
Error Send(Message &aMessage,
const Ip6::Address &aDest,
bool aAllowMulticastLoop,
ResponseHandler aHandler,
void *aContext);
static bool HandleResource(CoapBase &aCoapBase, const char *aUriPath, Msg &aMsg);
bool HandleResource(const char *aUriPath, Msg &aMsg);
static Error Filter(void *aContext, const Msg &aRxMsg);
src/core/utils/history_tracker_client.cpp
+1 -5
View File
@@ -79,7 +79,6 @@ Error Client::SendQuery(Tlv::Type aTlvType, uint16_t aMaxEntries, uint32_t aMaxE
{
Error error = kErrorNone;
OwnedPtr<Coap::Message> message;
Tmf::MessageInfo messageInfo(GetInstance());
RequestTlv requestTlv;
VerifyOrExit(Get<Mle::Mle>().IsAttached(), error = kErrorInvalidState);
@@ -94,10 +93,7 @@ Error Client::SendQuery(Tlv::Type aTlvType, uint16_t aMaxEntries, uint32_t aMaxE
requestTlv.Init(aTlvType, aMaxEntries, aMaxEntryAge);
SuccessOrExit(error = message->Append(requestTlv));
messageInfo.SetSockAddrToRloc();
messageInfo.GetPeerAddr().SetToRoutingLocator(Get<Mle::Mle>().GetMeshLocalPrefix(), aRloc16);
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*message, messageInfo));
SuccessOrExit(error = Get<Tmf::Agent>().SendMessageToRloc(*message, aRloc16));
message.Release();
LogInfo("Sent %s for TLV %u to 0x%04x", UriToString<kUriHistoryQuery>(), aTlvType, aRloc16);
src/core/utils/history_tracker_server.cpp
+3 -25
View File
@@ -211,18 +211,15 @@ exit:
void Server::SendNextAnswer(Coap::Message &aAnswer, const Ip6::Address &aDestination)
{
Error error = kErrorNone;
Coap::Message *nextAnswer = IsLastAnswer(aAnswer) ? nullptr : aAnswer.GetNextCoapMessage();
Tmf::MessageInfo messageInfo(GetInstance());
Error error = kErrorNone;
Coap::Message *nextAnswer = IsLastAnswer(aAnswer) ? nullptr : aAnswer.GetNextCoapMessage();
mAnswerQueue.Dequeue(aAnswer);
PrepareMessageInfoForDest(aDestination, messageInfo);
// When sending the message, we pass `nextAnswer` as `aContext`
// to be used when invoking callback `HandleAnswerResponse()`.
error = Get<Tmf::Agent>().SendMessage(aAnswer, messageInfo, HandleAnswerResponse, nextAnswer);
error = Get<Tmf::Agent>().SendMessageAllowMulticastLoop(aAnswer, aDestination, HandleAnswerResponse, nextAnswer);
if (error != kErrorNone)
{
@@ -238,25 +235,6 @@ void Server::SendNextAnswer(Coap::Message &aAnswer, const Ip6::Address &aDestina
}
}
void Server::PrepareMessageInfoForDest(const Ip6::Address &aDestination, Tmf::MessageInfo &aMessageInfo) const
{
if (aDestination.IsMulticast())
{
aMessageInfo.SetMulticastLoop(true);
}
if (aDestination.IsLinkLocalUnicastOrMulticast())
{
aMessageInfo.SetSockAddr(Get<Mle::Mle>().GetLinkLocalAddress());
}
else
{
aMessageInfo.SetSockAddrToRloc();
}
aMessageInfo.SetPeerAddr(aDestination);
}
void Server::HandleAnswerResponse(void *aContext, Coap::Msg *aMsg, Error aResult)
{
Coap::Message *nextAnswer = static_cast<Coap::Message *>(aContext);
src/core/utils/history_tracker_server.hpp
-1
View File
@@ -88,7 +88,6 @@ private:
void PrepareAndSendAnswers(const Ip6::Address &aDestination, const Message &aRequest);
Error CheckAnswerLength(Coap::Message *&aAnswer, AnswerInfo &aInfo);
void SendNextAnswer(Coap::Message &aAnswer, const Ip6::Address &aDestination);
void PrepareMessageInfoForDest(const Ip6::Address &aDestination, Tmf::MessageInfo &aMessageInfo) const;
Error AppendNetworkInfo(Coap::Message *&aAnswer, AnswerInfo &aInfo, const RequestTlv &aRequestTlv);
static void HandleAnswerResponse(void *aContext, Coap::Msg *aMsg, Error aResult);
tests/nexus/test_9_2_10.cpp
+1 -3
View File
@@ -276,9 +276,7 @@ void Test9_2_10(void)
SuccessOrQuit(Tlv::Append<MeshCoP::ChannelTlv>(*message, MeshCoP::ChannelTlvValue(0, kSecondaryChannel)));
SuccessOrQuit(Tlv::Append<MeshCoP::PanIdTlv>(*message, kSecondaryPanId));
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
Log("---------------------------------------------------------------------------------------");
tests/nexus/test_9_2_12.cpp
+1 -4
View File
@@ -235,10 +235,7 @@ void Test9_2_12(void)
SuccessOrQuit(MeshCoP::Tlv::Append<MeshCoP::CountTlv>(*message, kAnnounceCount));
SuccessOrQuit(MeshCoP::Tlv::Append<MeshCoP::PeriodTlv>(*message, kAnnouncePeriod));
Tmf::MessageInfo messageInfo(leader1.GetInstance());
messageInfo.SetPeerAddr(router1.Get<Mle::Mle>().GetMeshLocalRloc());
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageTo(*message, router1.Get<Mle::Mle>().GetMeshLocalRloc()));
}
nexus.AdvanceTime(kResponseTime);
tests/nexus/test_9_2_13.cpp
+1 -3
View File
@@ -112,9 +112,7 @@ static void SendMgmtEnergyScanQuery(Node &aCommissioner, const Ip6::Address &aDe
SuccessOrQuit(Tlv::Append<MeshCoP::PeriodTlv>(*message, kScanPeriod));
SuccessOrQuit(Tlv::Append<MeshCoP::ScanDurationTlv>(*message, kScanDuration));
Tmf::MessageInfo messageInfo(aCommissioner.GetInstance());
messageInfo.SetPeerAddr(aDestAddr);
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageTo(*message, aDestAddr));
}
void Test9_2_13(void)
tests/nexus/test_9_2_15.cpp
+2 -6
View File
@@ -166,9 +166,7 @@ void SendPendingSet(Node &aCommissioner,
SuccessOrQuit(Tlv::Append<MeshCoP::PanIdTlv>(*message, *aPanId));
}
Tmf::MessageInfo messageInfo(aCommissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
void Test9_2_15(void)
@@ -531,9 +529,7 @@ void Test9_2_15(void)
Coap::Message *message = agent.NewPriorityConfirmablePostMessage(kUriActiveGet);
VerifyOrQuit(message != nullptr);
Tmf::MessageInfo messageInfo(leader.GetInstance());
messageInfo.SetPeerAddr(dut.Get<Mle::Mle>().GetMeshLocalEid());
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageTo(*message, dut.Get<Mle::Mle>().GetMeshLocalEid()));
}
Log("---------------------------------------------------------------------------------------");
tests/nexus/test_9_2_16.cpp
+4 -12
View File
@@ -282,9 +282,7 @@ void Test9_2_16(void)
}
SuccessOrQuit(Tlv::Append<MeshCoP::DelayTimerTlv>(*message, kDelayTimerStep3));
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
Log("---------------------------------------------------------------------------------------");
@@ -439,9 +437,7 @@ void Test9_2_16(void)
SuccessOrQuit(Tlv::Append<MeshCoP::PanIdTlv>(*message, kPanIdStep11));
SuccessOrQuit(Tlv::Append<MeshCoP::DelayTimerTlv>(*message, kDelayTimerStep11));
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
Log("---------------------------------------------------------------------------------------");
@@ -493,9 +489,7 @@ void Test9_2_16(void)
SuccessOrQuit(Tlv::Append<MeshCoP::PskcTlv>(*message, pskc));
}
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
Log("---------------------------------------------------------------------------------------");
@@ -622,9 +616,7 @@ void Test9_2_16(void)
Coap::Message *message = agent.NewPriorityConfirmablePostMessage(kUriActiveGet);
VerifyOrQuit(message != nullptr);
Tmf::MessageInfo messageInfo(leader.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrTo(router2.Get<Mle::Mle>().GetRloc16());
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToRloc(*message, router2.Get<Mle::Mle>().GetRloc16()));
}
Log("---------------------------------------------------------------------------------------");
tests/nexus/test_9_2_18.cpp
+3 -9
View File
@@ -264,9 +264,7 @@ void Test9_2_18(void)
dataset.SetFrom(activeDatasetInfo);
SuccessOrQuit(message->AppendBytes(dataset.GetBytes(), dataset.GetLength()));
}
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
nexus.AdvanceTime(kStabilizationTime);
@@ -321,9 +319,7 @@ void Test9_2_18(void)
dataset.SetFrom(pendingDatasetInfo1);
SuccessOrQuit(message->AppendBytes(dataset.GetBytes(), dataset.GetLength()));
}
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
nexus.AdvanceTime(kStabilizationTime);
@@ -383,9 +379,7 @@ void Test9_2_18(void)
dataset.SetFrom(pendingDatasetInfo2);
SuccessOrQuit(message->AppendBytes(dataset.GetBytes(), dataset.GetLength()));
}
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
nexus.AdvanceTime(kStabilizationTime);
tests/nexus/test_9_2_2.cpp
+6 -18
View File
@@ -143,9 +143,7 @@ void Test9_2_2(void)
AppendSteeringDataTlv(*message);
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
/**
@@ -190,9 +188,7 @@ void Test9_2_2(void)
AppendSteeringDataTlv(*message);
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
/**
@@ -236,9 +232,7 @@ void Test9_2_2(void)
SuccessOrQuit(Tlv::Append<MeshCoP::CommissionerSessionIdTlv>(*message, sessionId));
SuccessOrQuit(Tlv::Append<MeshCoP::BorderAgentLocatorTlv>(*message, kBorderAgentRloc));
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
/**
@@ -274,9 +268,7 @@ void Test9_2_2(void)
SuccessOrQuit(Tlv::Append<MeshCoP::BorderAgentLocatorTlv>(*message, kBorderAgentRloc));
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
/**
@@ -309,9 +301,7 @@ void Test9_2_2(void)
AppendSteeringDataTlv(*message);
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
/**
@@ -346,9 +336,7 @@ void Test9_2_2(void)
SuccessOrQuit(Tlv::Append<MeshCoP::ChannelTlv>(*message, Mle::ChannelTlvValue(11)));
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
/**
tests/nexus/test_9_2_4.cpp
+10 -30
View File
@@ -363,9 +363,7 @@ void RunTest9_2_4(Topology aTopology, const char *aJsonFile)
SuccessOrQuit(
Tlv::AppendTlv(*message, MeshCoP::Tlv::kSecurityPolicy, kSecurityPolicy, sizeof(kSecurityPolicy)));
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
Log("---------------------------------------------------------------------------------------");
@@ -400,9 +398,7 @@ void RunTest9_2_4(Topology aTopology, const char *aJsonFile)
Coap::Message *message = agent.NewPriorityConfirmablePostMessage(kUriActiveGet);
VerifyOrQuit(message != nullptr);
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
Log("---------------------------------------------------------------------------------------");
@@ -470,9 +466,7 @@ void RunTest9_2_4(Topology aTopology, const char *aJsonFile)
SuccessOrQuit(
Tlv::AppendTlv(*message, MeshCoP::Tlv::kSecurityPolicy, kSecurityPolicy, sizeof(kSecurityPolicy)));
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
Log("---------------------------------------------------------------------------------------");
@@ -541,9 +535,7 @@ void RunTest9_2_4(Topology aTopology, const char *aJsonFile)
SuccessOrQuit(
Tlv::AppendTlv(*message, MeshCoP::Tlv::kSecurityPolicy, kSecurityPolicy, sizeof(kSecurityPolicy)));
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
Log("---------------------------------------------------------------------------------------");
@@ -611,9 +603,7 @@ void RunTest9_2_4(Topology aTopology, const char *aJsonFile)
SuccessOrQuit(Tlv::AppendTlv(*message, MeshCoP::Tlv::kSecurityPolicy, kSecurityPolicyStep10,
sizeof(kSecurityPolicyStep10)));
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
Log("---------------------------------------------------------------------------------------");
@@ -675,9 +665,7 @@ void RunTest9_2_4(Topology aTopology, const char *aJsonFile)
SuccessOrQuit(Tlv::AppendTlv(*message, MeshCoP::Tlv::kSecurityPolicy, kSecurityPolicyStep10,
sizeof(kSecurityPolicyStep10)));
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
Log("---------------------------------------------------------------------------------------");
@@ -738,9 +726,7 @@ void RunTest9_2_4(Topology aTopology, const char *aJsonFile)
SuccessOrQuit(Tlv::AppendTlv(*message, MeshCoP::Tlv::kSecurityPolicy, kSecurityPolicyStep10,
sizeof(kSecurityPolicyStep10)));
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
Log("---------------------------------------------------------------------------------------");
@@ -801,9 +787,7 @@ void RunTest9_2_4(Topology aTopology, const char *aJsonFile)
SuccessOrQuit(Tlv::AppendTlv(*message, MeshCoP::Tlv::kSecurityPolicy, kSecurityPolicyStep10,
sizeof(kSecurityPolicyStep10)));
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
Log("---------------------------------------------------------------------------------------");
@@ -867,9 +851,7 @@ void RunTest9_2_4(Topology aTopology, const char *aJsonFile)
SuccessOrQuit(
Tlv::AppendTlv(*message, MeshCoP::Tlv::kSteeringData, kSteeringDataStep18, sizeof(kSteeringDataStep18)));
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
Log("---------------------------------------------------------------------------------------");
@@ -932,9 +914,7 @@ void RunTest9_2_4(Topology aTopology, const char *aJsonFile)
sizeof(kSecurityPolicyStep10)));
SuccessOrQuit(Tlv::AppendTlv(*message, kFutureTlvType, kFutureTlvValue, sizeof(kFutureTlvValue)));
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
Log("---------------------------------------------------------------------------------------");
tests/nexus/test_9_2_6.cpp
+3 -9
View File
@@ -220,9 +220,7 @@ void Test9_2_6(void)
Tlv::Append<MeshCoP::SteeringDataTlv>(*message, steeringData.GetData(), steeringData.GetLength()));
}
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
nexus.AdvanceTime(kResponseTime);
@@ -308,9 +306,7 @@ void Test9_2_6(void)
SuccessOrQuit(Tlv::Append<MeshCoP::NetworkNameTlv>(*message, kNetworkName));
SuccessOrQuit(Tlv::Append<MeshCoP::PskcTlv>(*message, AsCoreType(reinterpret_cast<const otPskc *>(kPskc))));
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
nexus.AdvanceTime(kResponseTime);
@@ -516,9 +512,7 @@ void Test9_2_6(void)
SuccessOrQuit(Tlv::Append<MeshCoP::DelayTimerTlv>(*message, kDelayTimerTime));
SuccessOrQuit(Tlv::Append<MeshCoP::ChannelTlv>(*message, Mle::ChannelTlvValue(kSecondaryChannel)));
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
nexus.AdvanceTime(kResponseTime);
tests/nexus/test_9_2_7.cpp
+3 -9
View File
@@ -291,9 +291,7 @@ void Test9_2_7(void)
SuccessOrQuit(updatedDataset.WriteTlvsFrom(datasetInfo));
SuccessOrQuit(message->AppendBytes(updatedDataset.GetBytes(), updatedDataset.GetLength()));
Tmf::MessageInfo messageInfo(router.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
nexus.AdvanceTime(kResponseTime);
@@ -417,9 +415,7 @@ void Test9_2_7(void)
SuccessOrQuit(message->AppendBytes(dataset.GetBytes(), dataset.GetLength()));
Tmf::MessageInfo messageInfo(router.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
// Wait for acceptance and retransmissions if needed
@@ -550,9 +546,7 @@ void Test9_2_7(void)
SuccessOrQuit(Tlv::Append<MeshCoP::ChannelTlv>(*message, MeshCoP::ChannelTlvValue(0, kSecondaryChannel)));
SuccessOrQuit(Tlv::Append<MeshCoP::PanIdTlv>(*message, kPanIdStep17));
Tmf::MessageInfo messageInfo(commissioner.GetInstance());
messageInfo.SetSockAddrToRlocPeerAddrToLeaderAloc();
SuccessOrQuit(agent.SendMessage(*message, messageInfo));
SuccessOrQuit(agent.SendMessageToLeaderAloc(*message));
}
Log("---------------------------------------------------------------------------------------");