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

[mle] move attach fail logic to include child id response (#2301)

Browse Source 
The MLE attach logic would only execute if no MLE Parent Response messages
were received and assumed that a Child ID Request/Response exchange would
eventually succeed if an MLE Parent Response message was received.

This commit moves that logic to when an MLE Parent Response is received but
a Child ID Request/Response exchange fails.
This commit is contained in:
Jonathan Hui
2017-10-27 09:07:58 -07:00
committed by GitHub
parent f9cc6e0426
commit 3c6f7d811e
1 changed files with 58 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle.cpp
+58 -81
View File
@@ -1451,99 +1451,76 @@ void Mle::HandleParentRequestTimer(void)
SendChildIdRequest();
mParentRequestState = kChildIdRequest;
mParentRequestTimer.Start(kParentRequestChildTimeout);
}
else
{
ResetParentCandidate();
if (mReattachState == kReattachActive)
{
if (netif.GetPendingDataset().Restore() == OT_ERROR_NONE)
{
netif.GetPendingDataset().ApplyConfiguration();
mReattachState = kReattachPending;
mParentRequestState = kParentRequestStart;
mParentRequestTimer.Start(kParentRequestRouterTimeout);
}
else
{
mReattachState = kReattachStop;
}
}
else if (mReattachState == kReattachPending)
{
mReattachState = kReattachStop;
netif.GetActiveDataset().Restore();
}
if (mReattachState == kReattachStop)
{
switch (mParentRequestMode)
{
case kAttachAny:
if (mPreviousPanId != Mac::kPanIdBroadcast)
{
netif.GetMac().SetChannel(mPreviousChannel);
netif.GetMac().SetPanId(mPreviousPanId);
mPreviousPanId = Mac::kPanIdBroadcast;
BecomeDetached();
}
else if ((mDeviceMode & ModeTlv::kModeFFD) == 0)
{
SendOrphanAnnounce();
BecomeDetached();
}
else if (netif.GetMle().BecomeLeader() != OT_ERROR_NONE)
{
mParentRequestState = kParentIdle;
BecomeDetached();
}
break;
case kAttachSame1:
mParentRequestState = kParentIdle;
BecomeChild(kAttachSame2);
break;
case kAttachSame2:
mParentRequestState = kParentIdle;
BecomeChild(kAttachAny);
break;
case kAttachBetter:
mParentRequestState = kParentIdle;
if (mRole == OT_DEVICE_ROLE_CHILD)
{
// Restart keep-alive timer as it was disturbed by attachment procedure.
mParentRequestTimer.Start(0);
}
break;
}
}
break;
}
break;
// fall through
case kChildIdRequest:
mParentRequestState = kParentIdle;
ResetParentCandidate();
if ((mParentRequestMode == kAttachBetter) ||
(mRole == OT_DEVICE_ROLE_ROUTER) ||
(mRole == OT_DEVICE_ROLE_LEADER))
if (mReattachState == kReattachActive)
{
if (mRole == OT_DEVICE_ROLE_CHILD)
if (netif.GetPendingDataset().Restore() == OT_ERROR_NONE)
{
// Restart keep-alive timer as it was disturbed by attachment procedure.
mParentRequestTimer.Start(0);
netif.GetPendingDataset().ApplyConfiguration();
mReattachState = kReattachPending;
mParentRequestState = kParentRequestStart;
mParentRequestTimer.Start(kParentRequestRouterTimeout);
}
else
{
mReattachState = kReattachStop;
}
}
else
else if (mReattachState == kReattachPending)
{
BecomeDetached();
mReattachState = kReattachStop;
netif.GetActiveDataset().Restore();
}
if (mReattachState == kReattachStop)
{
switch (mParentRequestMode)
{
case kAttachAny:
if (mPreviousPanId != Mac::kPanIdBroadcast)
{
netif.GetMac().SetChannel(mPreviousChannel);
netif.GetMac().SetPanId(mPreviousPanId);
mPreviousPanId = Mac::kPanIdBroadcast;
BecomeDetached();
}
else if ((mDeviceMode & ModeTlv::kModeFFD) == 0)
{
SendOrphanAnnounce();
BecomeDetached();
}
else if (netif.GetMle().BecomeLeader() != OT_ERROR_NONE)
{
BecomeDetached();
}
break;
case kAttachSame1:
BecomeChild(kAttachSame2);
break;
case kAttachSame2:
BecomeChild(kAttachAny);
break;
case kAttachBetter:
if (mRole == OT_DEVICE_ROLE_CHILD)
{
// Restart keep-alive timer as it was disturbed by attachment procedure.
mParentRequestTimer.Start(0);
}
break;
}
}
break;