espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-10-01 21:37:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove assert from ReleaseRouterId(). (#1045)

Browse Source
This commit is contained in:
Jonathan Hui
2016-12-06 13:29:45 -08:00
committed by GitHub
parent b3f91ee85f
commit 2d712c28c2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle_router.cpp
+6 -2
View File
@@ -172,9 +172,11 @@ exit:
ThreadError MleRouter::ReleaseRouterId(uint8_t aRouterId) ThreadError MleRouter::ReleaseRouterId(uint8_t aRouterId)
{ {
ThreadError error = kThreadError_None;
Router *router = GetRouter(aRouterId); Router *router = GetRouter(aRouterId);
assert(router != NULL); VerifyOrExit(router != NULL, error = kThreadError_InvalidArgs);
VerifyOrExit(mDeviceState == kDeviceStateLeader, error = kThreadError_InvalidState);
otLogInfoMle("delete router id %d", aRouterId); otLogInfoMle("delete router id %d", aRouterId);
router->mAllocated = false; router->mAllocated = false;
@@ -196,7 +198,9 @@ ThreadError MleRouter::ReleaseRouterId(uint8_t aRouterId)
mAddressResolver.Remove(aRouterId); mAddressResolver.Remove(aRouterId);
mNetworkData.RemoveBorderRouter(GetRloc16(aRouterId)); mNetworkData.RemoveBorderRouter(GetRloc16(aRouterId));
ResetAdvertiseInterval(); ResetAdvertiseInterval();
return kThreadError_None;
exit:
return error;
} }
uint32_t MleRouter::GetLeaderAge(void) const uint32_t MleRouter::GetLeaderAge(void) const