espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-13 22:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[border-agent] simplify HandleUdpReceive() (#11075)

Browse Source 
This commit simplifies the `BorderAgent::HandleUdpReceive()` method:

- All local variables are defined at the top of the method.
- Tracks whether the UDP message was handled in the new local
  `didHandle` variable (avoiding the reuse of a specific error code
  to track this).
- Simplifies log messages.
This commit is contained in:
Abtin Keshavarzian
2024-12-23 18:15:36 -08:00
committed by GitHub
parent 143ebbfb7c
commit e9f45cb997
1 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/meshcop/border_agent.cpp
+21 -29
View File
@@ -462,53 +462,45 @@ bool BorderAgent::HandleUdpReceive(void *aContext, const otMessage *aMessage, co
bool BorderAgent::HandleUdpReceive(const Message &aMessage, const Ip6::MessageInfo &aMessageInfo)
{
Error error;
Coap::Message *message = nullptr;
Error error = kErrorNone;
Coap::Message *message = nullptr;
bool didHandle = false;
ExtendedTlv extTlv;
UdpEncapsulationTlvHeader udpEncapHeader;
OffsetRange offsetRange;
if (aMessageInfo.GetSockAddr() != mCommissionerAloc.GetAddress())
{
LogDebg("Filtered out message for commissioner: dest %s != %s (ALOC)",
aMessageInfo.GetSockAddr().ToString().AsCString(),
mCommissionerAloc.GetAddress().ToString().AsCString());
ExitNow(error = kErrorDestinationAddressFiltered);
}
VerifyOrExit(aMessageInfo.GetSockAddr() == mCommissionerAloc.GetAddress());
VerifyOrExit(aMessage.GetLength() > 0, error = kErrorNone);
didHandle = true;
VerifyOrExit(aMessage.GetLength() > 0);
message = Get<Tmf::SecureAgent>().NewPriorityNonConfirmablePostMessage(kUriProxyRx);
VerifyOrExit(message != nullptr, error = kErrorNoBufs);
{
ExtendedTlv extTlv;
UdpEncapsulationTlvHeader udpEncapHeader;
OffsetRange offsetRange;
offsetRange.InitFromMessageOffsetToEnd(aMessage);
offsetRange.InitFromMessageOffsetToEnd(aMessage);
extTlv.SetType(Tlv::kUdpEncapsulation);
extTlv.SetLength(sizeof(UdpEncapsulationTlvHeader) + offsetRange.GetLength());
extTlv.SetType(Tlv::kUdpEncapsulation);
extTlv.SetLength(sizeof(UdpEncapsulationTlvHeader) + offsetRange.GetLength());
SuccessOrExit(error = message->Append(extTlv));
udpEncapHeader.SetSourcePort(aMessageInfo.GetPeerPort());
udpEncapHeader.SetDestinationPort(aMessageInfo.GetSockPort());
udpEncapHeader.SetSourcePort(aMessageInfo.GetPeerPort());
udpEncapHeader.SetDestinationPort(aMessageInfo.GetSockPort());
SuccessOrExit(error = message->Append(udpEncapHeader));
SuccessOrExit(error = message->AppendBytesFromMessage(aMessage, offsetRange));
}
SuccessOrExit(error = message->Append(extTlv));
SuccessOrExit(error = message->Append(udpEncapHeader));
SuccessOrExit(error = message->AppendBytesFromMessage(aMessage, offsetRange));
SuccessOrExit(error = Tlv::Append<Ip6AddressTlv>(*message, aMessageInfo.GetPeerAddr()));
SuccessOrExit(error = SendMessage(*message));
LogInfo("Sent to commissioner on ProxyRx (c/ur)");
LogInfo("Sent ProxyRx (c/ur) to commissioner");
exit:
FreeMessageOnError(message, error);
if (error != kErrorDestinationAddressFiltered)
{
LogWarnOnError(error, "notify commissioner on ProxyRx (c/ur)");
}
LogWarnOnError(error, "send ProxyRx (c/ur)");
return error != kErrorDestinationAddressFiltered;
return didHandle;
}
Error BorderAgent::ForwardToCommissioner(Coap::Message &aForwardMessage, const Message &aMessage)