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

[dataset] fix dataset update issues (#2791)

Browse Source 
* pending dataset should not be restored from local when ClearNetwork

* update the condition for stop /c/as registration attempts during dataset transition
This commit is contained in:
rongli
2018-06-14 09:01:34 -07:00
committed by Jonathan Hui
parent a5e5eadfdf
commit d92b424bc9
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/meshcop/dataset_manager.cpp
+6 -2
View File
@@ -204,7 +204,7 @@ void DatasetManager::HandleTimer(void)
const ActiveTimestampTlv *tlv = static_cast<const ActiveTimestampTlv *>(dataset.Get(Tlv::kActiveTimestamp));
const Timestamp * pendingActiveTimestamp = static_cast<const Timestamp *>(tlv);
if (pendingActiveTimestamp != NULL && mLocal.Compare(pendingActiveTimestamp) >= 0)
if (pendingActiveTimestamp != NULL && mLocal.Compare(pendingActiveTimestamp) == 0)
{
// stop registration attempts during dataset transition
ExitNow();
@@ -450,7 +450,11 @@ void PendingDataset::Clear(void)
void PendingDataset::ClearNetwork(void)
{
Restore();
Dataset dataset(mLocal.GetType());
mTimestamp.Init();
mTimestampValid = false;
DatasetManager::Set(dataset);
}
otError PendingDataset::Set(const Timestamp &aTimestamp, const Message &aMessage, uint16_t aOffset, uint8_t aLength)