Update local dataset copy when rolling back the old Active Timestamp. (#898)

This commit is contained in:
Xiao Ma
2016-10-30 15:06:57 -07:00
committed by Jonathan Hui
parent fca7e86310
commit f13a4f8c24
2 changed files with 6 additions and 5 deletions
+5 -4
View File
@@ -112,10 +112,11 @@ ThreadError DatasetManager::Clear(uint8_t &aFlags)
return kThreadError_None;
}
ThreadError DatasetManager::Set(const Dataset &aDataset, uint8_t &aFlags)
ThreadError DatasetManager::Set(const Dataset &aDataset)
{
mNetwork.Set(aDataset);
HandleNetworkUpdate(aFlags);
mLocal.Set(aDataset);
mLocal.Store();
return kThreadError_None;
}
@@ -496,6 +497,7 @@ ThreadError DatasetManager::SendSetRequest(const otOperationalDataset &aDataset,
{
ChannelTlv channel;
channel.Init();
channel.SetChannelPage(0);
channel.SetChannel(aDataset.mChannel);
SuccessOrExit(error = message->Append(&channel, sizeof(channel)));
}
@@ -739,9 +741,8 @@ exit:
ThreadError ActiveDataset::Set(const Dataset &aDataset)
{
ThreadError error = kThreadError_None;
uint8_t flags;
SuccessOrExit(error = DatasetManager::Set(aDataset, flags));
SuccessOrExit(error = DatasetManager::Set(aDataset));
ApplyConfiguration();
exit:
+1 -1
View File
@@ -72,7 +72,7 @@ protected:
ThreadError Set(const otOperationalDataset &aDataset, uint8_t &aFlags);
ThreadError Set(const Dataset &aDataset, uint8_t &aFlags);
ThreadError Set(const Dataset &aDataset);
ThreadError Set(const Timestamp &aTimestamp, const Message &aMessage, uint16_t aOffset, uint8_t aLength,
uint8_t &aFlags);