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

Handle router selection jitter timeout only once (#758)

Browse Source
This commit is contained in:
Robert Lubos
2016-10-06 09:04:46 -07:00
committed by Jonathan Hui
parent 00059947d3
commit 2c21e83d89
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle.cpp
+1 -1
View File
@@ -2165,7 +2165,7 @@ ThreadError Mle::HandleChildIdResponse(const Message &aMessage, const Ip6::Messa
(mDeviceMode & ModeTlv::kModeFFD) && (mDeviceMode & ModeTlv::kModeFFD) &&
(numRouters < mMleRouter.GetRouterUpgradeThreshold())) (numRouters < mMleRouter.GetRouterUpgradeThreshold()))
{ {
mRouterSelectionJitterTimeout = otPlatRandomGet() % mRouterSelectionJitter; mRouterSelectionJitterTimeout = (otPlatRandomGet() % mRouterSelectionJitter) + 1;
} }
} }
src/core/thread/mle_router.cpp
+10 -5
View File
@@ -1354,7 +1354,7 @@ ThreadError MleRouter::HandleAdvertisement(const Message &aMessage, const Ip6::M
(mDeviceMode & ModeTlv::kModeFFD) && (mDeviceMode & ModeTlv::kModeFFD) &&
(GetActiveRouterCount() < mRouterUpgradeThreshold)) (GetActiveRouterCount() < mRouterUpgradeThreshold))
{ {
mRouterSelectionJitterTimeout = otPlatRandomGet() % mRouterSelectionJitter; mRouterSelectionJitterTimeout = (otPlatRandomGet() % mRouterSelectionJitter) + 1;
ExitNow(); ExitNow();
} }
@@ -1680,6 +1680,8 @@ void MleRouter::HandleStateUpdateTimer(void *aContext)
void MleRouter::HandleStateUpdateTimer(void) void MleRouter::HandleStateUpdateTimer(void)
{ {
bool routerStateUpdate = false;
if (mChallengeTimeout > 0) if (mChallengeTimeout > 0)
{ {
mChallengeTimeout--; mChallengeTimeout--;
@@ -1688,6 +1690,11 @@ void MleRouter::HandleStateUpdateTimer(void)
if (mRouterSelectionJitterTimeout > 0) if (mRouterSelectionJitterTimeout > 0)
{ {
mRouterSelectionJitterTimeout--; mRouterSelectionJitterTimeout--;
if (mRouterSelectionJitterTimeout == 0)
{
routerStateUpdate = true;
}
} }
switch (GetDeviceState()) switch (GetDeviceState())
@@ -1702,8 +1709,7 @@ void MleRouter::HandleStateUpdateTimer(void)
ExitNow(); ExitNow();
case kDeviceStateChild: case kDeviceStateChild:
if (mRouterSelectionJitterTimeout == 0 && if (routerStateUpdate && GetActiveRouterCount() < mRouterUpgradeThreshold)
GetActiveRouterCount() < mRouterUpgradeThreshold)
{ {
// upgrade to Router // upgrade to Router
BecomeRouter(ThreadStatusTlv::kTooFewRouters); BecomeRouter(ThreadStatusTlv::kTooFewRouters);
@@ -1718,8 +1724,7 @@ void MleRouter::HandleStateUpdateTimer(void)
BecomeChild(kMleAttachSamePartition); BecomeChild(kMleAttachSamePartition);
} }
if (mRouterSelectionJitterTimeout == 0 && if (routerStateUpdate && GetActiveRouterCount() > mRouterDowngradeThreshold)
GetActiveRouterCount() > mRouterDowngradeThreshold)
{ {
// downgrade to REED // downgrade to REED
BecomeChild(kMleAttachSamePartition); BecomeChild(kMleAttachSamePartition);