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

[mle-router] fix HasOneNeighborWithComparableConnectivity() (#7617)

Browse Source 
The `routerCount` value was being reset to zero with each iteration
over the router table. As a result, the comparisons were only
happening on the first entry in the received Route64 TLV.
This commit is contained in:
Jonathan Hui
2022-04-22 10:13:35 -07:00
committed by GitHub
parent 9b6ac4b5ac
commit 7284b3f183
1 changed files with 37 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle_router.cpp
+37 -47
View File
@@ -4298,66 +4298,56 @@ bool MleRouter::HasMinDowngradeNeighborRouters(void)
bool MleRouter::HasOneNeighborWithComparableConnectivity(const RouteTlv &aRoute, uint8_t aRouterId)
{
bool rval = true;
uint8_t routerCount = 0;
bool rval = true;
// process local neighbor routers
for (Router &router : Get<RouterTable>().Iterate())
{
uint8_t localLinkQuality = 0;
uint8_t peerLinkQuality = 0;
uint8_t routerCount = 0;
uint8_t localLinkQuality;
uint8_t peerLinkQuality;
if (router.GetRouterId() == mRouterId)
if (!router.IsStateValid() || router.GetRouterId() == mRouterId || router.GetRouterId() == aRouterId)
{
routerCount++;
continue;
}
// check if neighbor is valid
if (router.IsStateValid())
localLinkQuality = router.GetLinkInfo().GetLinkQuality();
if (localLinkQuality > router.GetLinkQualityOut())
{
// if neighbor is just peer
if (router.GetRouterId() == aRouterId)
{
routerCount++;
continue;
}
localLinkQuality = router.GetLinkInfo().GetLinkQuality();
if (localLinkQuality > router.GetLinkQualityOut())
{
localLinkQuality = router.GetLinkQualityOut();
}
if (localLinkQuality >= 2)
{
// check if this neighbor router is in peer Route64 TLV
if (!aRoute.IsRouterIdSet(router.GetRouterId()))
{
ExitNow(rval = false);
}
// get the peer's two-way link quality to this router
peerLinkQuality = aRoute.GetLinkQualityIn(routerCount);
if (peerLinkQuality > aRoute.GetLinkQualityOut(routerCount))
{
peerLinkQuality = aRoute.GetLinkQualityOut(routerCount);
}
// compare local link quality to this router with peer's
if (peerLinkQuality >= localLinkQuality)
{
routerCount++;
continue;
}
ExitNow(rval = false);
}
localLinkQuality = router.GetLinkQualityOut();
}
routerCount++;
if (localLinkQuality < 2)
{
routerCount++;
continue;
}
// check if this neighbor router is in peer Route64 TLV
if (!aRoute.IsRouterIdSet(router.GetRouterId()))
{
ExitNow(rval = false);
}
// get the peer's two-way link quality to this router
peerLinkQuality = aRoute.GetLinkQualityIn(routerCount);
if (peerLinkQuality > aRoute.GetLinkQualityOut(routerCount))
{
peerLinkQuality = aRoute.GetLinkQualityOut(routerCount);
}
// compare local link quality to this router with peer's
if (peerLinkQuality >= localLinkQuality)
{
routerCount++;
continue;
}
ExitNow(rval = false);
}
exit: