espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-06-06 05:24:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[mle] simplify handling of Link Accept variants (#10919)

Browse Source 
This commit renames and updates `HandleLinkAcceptVariant()` used to
handle an MLE "Link Accept" or "Link Accept And Request". The method
now takes the `MessageType` directly as an input parameter.
This commit is contained in:
Abtin Keshavarzian
2024-11-13 08:35:22 -08:00
committed by GitHub
parent 81f677b502
commit 659b4272b7
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle_router.cpp
+8 -14
View File
@@ -861,22 +861,17 @@ exit:
return error;
}
void MleRouter::HandleLinkAccept(RxInfo &aRxInfo)
{
Error error = HandleLinkAccept(aRxInfo, false);
LogProcessError(kTypeLinkAccept, error);
}
void MleRouter::HandleLinkAccept(RxInfo &aRxInfo) { HandleLinkAcceptVariant(aRxInfo, kTypeLinkAccept); }
void MleRouter::HandleLinkAcceptAndRequest(RxInfo &aRxInfo)
{
Error error = HandleLinkAccept(aRxInfo, true);
LogProcessError(kTypeLinkAcceptAndRequest, error);
HandleLinkAcceptVariant(aRxInfo, kTypeLinkAcceptAndRequest);
}
Error MleRouter::HandleLinkAccept(RxInfo &aRxInfo, bool aRequest)
void MleRouter::HandleLinkAcceptVariant(RxInfo &aRxInfo, MessageType aMessageType)
{
// Handles "Link Accept" or "Link Accept And Request".
Error error = kErrorNone;
Router *router;
Neighbor::State neighborState;
@@ -894,8 +889,7 @@ Error MleRouter::HandleLinkAccept(RxInfo &aRxInfo, bool aRequest)
SuccessOrExit(error = Tlv::Find<SourceAddressTlv>(aRxInfo.mMessage, sourceAddress));
Log(kMessageReceive, aRequest ? kTypeLinkAcceptAndRequest : kTypeLinkAccept, aRxInfo.mMessageInfo.GetPeerAddr(),
sourceAddress);
Log(kMessageReceive, aMessageType, aRxInfo.mMessageInfo.GetPeerAddr(), sourceAddress);
VerifyOrExit(IsRouterRloc16(sourceAddress), error = kErrorParse);
@@ -1056,7 +1050,7 @@ Error MleRouter::HandleLinkAccept(RxInfo &aRxInfo, bool aRequest)
aRxInfo.mClass = RxInfo::kAuthoritativeMessage;
ProcessKeySequence(aRxInfo);
if (aRequest)
if (aMessageType == kTypeLinkAcceptAndRequest)
{
LinkAcceptInfo info;
@@ -1078,7 +1072,7 @@ Error MleRouter::HandleLinkAccept(RxInfo &aRxInfo, bool aRequest)
}
exit:
return error;
LogProcessError(aMessageType, error);
}
Error MleRouter::ProcessRouteTlv(const RouteTlv &aRouteTlv, RxInfo &aRxInfo)
src/core/thread/mle_router.hpp
+1 -1
View File
@@ -585,8 +585,8 @@ private:
void HandleSecurityPolicyChanged(void);
void HandleLinkRequest(RxInfo &aRxInfo);
void HandleLinkAccept(RxInfo &aRxInfo);
Error HandleLinkAccept(RxInfo &aRxInfo, bool aRequest);
void HandleLinkAcceptAndRequest(RxInfo &aRxInfo);
void HandleLinkAcceptVariant(RxInfo &aRxInfo, MessageType aMessageType);
Error HandleAdvertisementOnFtd(RxInfo &aRxInfo, uint16_t aSourceAddress, const LeaderData &aLeaderData);
void HandleParentRequest(RxInfo &aRxInfo);
void HandleChildIdRequest(RxInfo &aRxInfo);