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

[mle] unify the way of child removing

Browse Source 
Signed-off-by: Duda, Lukasz <[email protected]>
This commit is contained in:
Duda, Lukasz
2018-01-05 17:16:07 +00:00
committed by Jonathan Hui
parent 41e4b3202b
commit 9c9fdf074b
1 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle_router.cpp
+13 -27
View File
@@ -2227,12 +2227,7 @@ otError MleRouter::HandleChildIdRequest(const Message &aMessage, const Ip6::Mess
}
else
{
RemoveStoredChild(child->GetRloc16());
if (!child->IsRxOnWhenIdle())
{
netif.GetMeshForwarder().ClearChildIndirectMessages(*child);
}
RemoveNeighbor(*child);
}
child->SetLastHeard(TimerMilli::GetNow());
@@ -2465,8 +2460,7 @@ otError MleRouter::HandleChildUpdateResponse(const Message &aMessage, const Ip6:
if (status.GetStatus() == StatusTlv::kError)
{
RemoveStoredChild(child->GetRloc16());
child->SetState(Neighbor::kStateInvalid);
RemoveNeighbor(*child);
ExitNow();
}
}
@@ -3238,11 +3232,16 @@ otError MleRouter::RemoveNeighbor(Neighbor &aNeighbor)
case OT_DEVICE_ROLE_ROUTER:
case OT_DEVICE_ROLE_LEADER:
if (aNeighbor.IsStateValidOrRestoring() && !IsActiveRouter(aNeighbor.GetRloc16()))
if (!IsActiveRouter(aNeighbor.GetRloc16()))
{
SignalChildUpdated(OT_THREAD_CHILD_TABLE_EVENT_CHILD_REMOVED, static_cast<Child &>(aNeighbor));
if (aNeighbor.IsStateValidOrRestoring())
{
SignalChildUpdated(OT_THREAD_CHILD_TABLE_EVENT_CHILD_REMOVED, static_cast<Child &>(aNeighbor));
}
aNeighbor.SetState(Neighbor::kStateInvalid);
netif.GetMeshForwarder().UpdateIndirectMessages();
netif.GetMeshForwarder().ClearChildIndirectMessages(static_cast<Child &>(aNeighbor));
netif.GetNetworkDataLeader().SendServerDataNotification(aNeighbor.GetRloc16());
if (aNeighbor.GetDeviceMode() & ModeTlv::kModeFFD)
@@ -3253,7 +3252,7 @@ otError MleRouter::RemoveNeighbor(Neighbor &aNeighbor)
RemoveStoredChild(aNeighbor.GetRloc16());
}
else if ((aNeighbor.GetState() == Neighbor::kStateValid) && IsActiveRouter(aNeighbor.GetRloc16()))
else if (aNeighbor.GetState() == Neighbor::kStateValid)
{
Router &routerToRemove = static_cast<Router &>(aNeighbor);
@@ -4821,23 +4820,10 @@ void MleRouter::RemoveChildren(void)
{
for (uint8_t i = 0; i < mMaxChildrenAllowed; i++)
{
switch (mChildren[i].GetState())
if (mChildren[i].IsStateValidOrRestoring())
{
case Neighbor::kStateValid:
SignalChildUpdated(OT_THREAD_CHILD_TABLE_EVENT_CHILD_REMOVED, mChildren[i]);
// fall-through
case Neighbor::kStateChildUpdateRequest:
case Neighbor::kStateRestored:
RemoveStoredChild(mChildren[i].GetRloc16());
break;
default:
break;
RemoveNeighbor(mChildren[i]);
}
mChildren[i].SetState(Neighbor::kStateInvalid);
}
}