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

Ensure thread device has synced with latest Dataset before sending MLE Announce. (#845)

Browse Source
This commit is contained in:
Xiao Ma
2016-10-20 10:40:10 -07:00
committed by Jonathan Hui
parent 7a19067515
commit 27327a63a1
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle.cpp
+12 -3
View File
@@ -418,7 +418,7 @@ ThreadError Mle::SetStateChild(uint16_t aRloc16)
mNetif.GetNetworkDataLocal().ClearResubmitDelayTimer();
mNetif.GetIp6().SetForwardingEnabled(false);
if (mPreviousPanId != Mac::kPanIdBroadcast)
if (mPreviousPanId != Mac::kPanIdBroadcast && (mDeviceMode & ModeTlv::kModeFFD))
{
mPreviousPanId = Mac::kPanIdBroadcast;
mNetif.GetAnnounceBeginServer().SendAnnounce(1 << mPreviousChannel);
@@ -1507,8 +1507,6 @@ exit:
return;
}
ThreadError Mle::SendMessage(Message &aMessage, const Ip6::Address &aDestination)
{
ThreadError error = kThreadError_None;
@@ -2007,6 +2005,12 @@ ThreadError Mle::HandleDataResponse(const Message &aMessage, const Ip6::MessageI
mNetif.GetPendingDataset().Clear();
}
if (mPreviousPanId != Mac::kPanIdBroadcast && ((mDeviceMode & ModeTlv::kModeFFD) == 0))
{
mPreviousPanId = Mac::kPanIdBroadcast;
mNetif.GetAnnounceBeginServer().SendAnnounce(1 << mPreviousChannel);
}
mRetrieveNewNetworkData = false;
exit:
@@ -2462,6 +2466,11 @@ ThreadError Mle::HandleAnnounce(const Message &aMessage, const Ip6::MessageInfo
if (localTimestamp == NULL || localTimestamp->Compare(timestamp) > 0)
{
if ((mDeviceMode & ModeTlv::kModeFFD) == 0)
{
mRetrieveNewNetworkData = true;
}
Stop();
mPreviousChannel = mMac.GetChannel();
mPreviousPanId = mMac.GetPanId();