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

[mle] simplify HandleTimeTick() code related to aging routers (#9955)

Browse Source 
This commit contains smaller enhancements in the code related to
aging/updating router entries:

- Consolidate nested `if` blocks for readability.
- Add router's RLOC16 to logs for improved router tracking.
- Refactor duplicate code in `SEND_LINK_REQUEST_ON_ADV_TIMEOUT`.
This commit is contained in:
Abtin Keshavarzian
2024-03-25 11:02:47 -07:00
committed by GitHub
parent 90adc86d34
commit 32bef9bef0
1 changed files with 18 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle_router.cpp
+18 -36
View File
@@ -1635,53 +1635,35 @@ void MleRouter::HandleTimeTick(void)
age = TimerMilli::GetNow() - router.GetLastHeard();
if (router.IsStateValid())
if (router.IsStateValid() && (age >= kMaxNeighborAge))
{
#if OPENTHREAD_CONFIG_MLE_SEND_LINK_REQUEST_ON_ADV_TIMEOUT == 0
if (age >= kMaxNeighborAge)
#if OPENTHREAD_CONFIG_MLE_SEND_LINK_REQUEST_ON_ADV_TIMEOUT
if (age < kMaxNeighborAge + kMaxTxCount * kUnicastRetxDelay)
{
LogInfo("Router timeout expired");
RemoveNeighbor(router);
continue;
LogInfo("No Adv from router 0x%04x - sending Link Request", router.GetRloc16());
IgnoreError(SendLinkRequest(&router));
}
#else
if (age >= kMaxNeighborAge)
{
if (age < kMaxNeighborAge + kMaxTxCount * kUnicastRetxDelay)
{
LogInfo("Router timeout expired");
IgnoreError(SendLinkRequest(&router));
}
else
{
RemoveNeighbor(router);
continue;
}
}
else
#endif
}
else if (router.IsStateLinkRequest())
{
if (age >= kLinkRequestTimeout)
{
LogInfo("Link Request timeout expired");
LogInfo("Router 0x%04x timeout expired", router.GetRloc16());
RemoveNeighbor(router);
continue;
}
}
if (IsLeader())
if (router.IsStateLinkRequest() && (age >= kLinkRequestTimeout))
{
if (mRouterTable.FindNextHopOf(router) == nullptr && mRouterTable.GetLinkCost(router) >= kMaxRouteCost &&
age >= kMaxLeaderToRouterTimeout)
{
LogInfo("Router ID timeout expired (no route)");
IgnoreError(mRouterTable.Release(router.GetRouterId()));
}
LogInfo("Router 0x%04x - Link Request timeout expired", router.GetRloc16());
RemoveNeighbor(router);
continue;
}
if (IsLeader() && (mRouterTable.FindNextHopOf(router) == nullptr) &&
(mRouterTable.GetLinkCost(router) >= kMaxRouteCost) && (age >= kMaxLeaderToRouterTimeout))
{
LogInfo("Router 0x%04x ID timeout expired (no route)", router.GetRloc16());
IgnoreError(mRouterTable.Release(router.GetRouterId()));
}
}