espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-13 20:50:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect link quality after router removal. (#1388)

Browse Source
This commit is contained in:
Robert Lubos
2017-02-24 09:27:45 -08:00
committed by Jonathan Hui
parent 487d5798dd
commit 64806de6fa
1 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle_router.cpp
+28 -23
View File
@@ -1830,29 +1830,7 @@ void MleRouter::HandleStateUpdateTimer(void)
{
if ((Timer::GetNow() - mRouters[i].mLastHeard) >= Timer::SecToMsec(kMaxNeighborAge))
{
mRouters[i].mState = Neighbor::kStateInvalid;
mRouters[i].mLinkInfo.Clear();
mRouters[i].mLinkQualityOut = 0;
mRouters[i].mLastHeard = Timer::GetNow();
for (uint8_t j = 0; j <= kMaxRouterId; j++)
{
if (mRouters[j].mNextHop == i)
{
mRouters[j].mNextHop = kInvalidRouterId;
mRouters[j].mCost = 0;
if (GetLinkCost(j) >= kMaxRouteCost)
{
ResetAdvertiseInterval();
}
}
}
if (mRouters[i].mNextHop == kInvalidRouterId)
{
ResetAdvertiseInterval();
}
RemoveNeighbor(mRouters[i]);
}
}
@@ -3000,10 +2978,37 @@ ThreadError MleRouter::RemoveNeighbor(Neighbor &aNeighbor)
mNetif.GetNetworkDataLeader().SendServerDataNotification(aNeighbor.mValid.mRloc16);
RemoveStoredChild(aNeighbor.mValid.mRloc16);
}
else if ((aNeighbor.mState == Neighbor::kStateValid) && IsActiveRouter(aNeighbor.mValid.mRloc16))
{
Router &routerToRemove = static_cast<Router &>(aNeighbor);
routerToRemove.mLinkQualityOut = 0;
routerToRemove.mLastHeard = Timer::GetNow();
for (uint8_t j = 0; j <= kMaxRouterId; j++)
{
if (mRouters[j].mNextHop == GetRouterId(routerToRemove.mValid.mRloc16))
{
mRouters[j].mNextHop = kInvalidRouterId;
mRouters[j].mCost = 0;
if (GetLinkCost(j) >= kMaxRouteCost)
{
ResetAdvertiseInterval();
}
}
}
if (routerToRemove.mNextHop == kInvalidRouterId)
{
ResetAdvertiseInterval();
}
}
break;
}
aNeighbor.mLinkInfo.Clear();
aNeighbor.mState = Neighbor::kStateInvalid;
return kThreadError_None;