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

Clean up Route TLV processing in Advertisement message. (#759)

Browse Source
This commit is contained in:
Jonathan Hui
2016-10-06 08:59:11 -07:00
committed by GitHub
parent 118ef08167
commit 00059947d3
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle_router.cpp
+8 -16
View File
@@ -1310,7 +1310,12 @@ ThreadError MleRouter::HandleAdvertisement(const Message &aMessage, const Ip6::M
ExitNow();
}
if (mDeviceMode & ModeTlv::kModeFFD)
VerifyOrExit(IsActiveRouter(sourceAddress.GetRloc16()), ;);
routerId = GetRouterId(sourceAddress.GetRloc16());
VerifyOrExit(IsRouterIdValid(routerId), error = kThreadError_Parse);
if ((mDeviceMode & ModeTlv::kModeFFD) &&
static_cast<int8_t>(route.GetRouterIdSequence() - mRouterIdSequence) > 0)
{
bool processRouteTlv = false;
@@ -1321,20 +1326,12 @@ ThreadError MleRouter::HandleAdvertisement(const Message &aMessage, const Ip6::M
break;
case kDeviceStateChild:
if (sourceAddress.GetRloc16() == mParent.mValid.mRloc16)
{
processRouteTlv = true;
}
processRouteTlv = (sourceAddress.GetRloc16() == mParent.mValid.mRloc16);
break;
case kDeviceStateRouter:
case kDeviceStateLeader:
if (static_cast<int8_t>(route.GetRouterIdSequence() - mRouterIdSequence) > 0)
{
processRouteTlv = true;
}
processRouteTlv = true;
break;
}
@@ -1344,11 +1341,6 @@ ThreadError MleRouter::HandleAdvertisement(const Message &aMessage, const Ip6::M
}
}
VerifyOrExit(IsActiveRouter(sourceAddress.GetRloc16()), ;);
routerId = GetRouterId(sourceAddress.GetRloc16());
VerifyOrExit(IsRouterIdValid(routerId), error = kThreadError_Parse);
router = NULL;
switch (GetDeviceState())