espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-03 17:37:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[pending-dataset] fix handling of large Delay Timer values (#2158)

Browse Source 
The Delay Timer value has a 32-bit range.  However, the current Timer
implementation does not support the full 32-bit range.

This commit fixes the handling of large Delay Timer values by splitting
the delay across multiple timer triggers.

Credit to OSS-Fuzz.
This commit is contained in:
Jonathan Hui
2017-09-06 12:04:59 -07:00
committed by GitHub
parent 39a492bb09
commit 768f6af148
1 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/meshcop/dataset_manager.cpp
+28 -1
View File
@@ -1112,7 +1112,15 @@ void PendingDatasetBase::StartDelayTimer(void)
if ((delayTimer = static_cast<DelayTimerTlv *>(mNetwork.Get(Tlv::kDelayTimer))) != NULL)
{
mDelayTimer.StartAt(mNetwork.GetUpdateTime(), delayTimer->GetDelayTimer());
uint32_t delay = delayTimer->GetDelayTimer();
// the Timer implementation does not support the full 32 bit range
if (delay > Timer::kMaxDt)
{
delay = Timer::kMaxDt;
}
mDelayTimer.StartAt(mNetwork.GetUpdateTime(), delay);
otLogInfoMeshCoP(GetInstance(), "delay timer started");
}
}
@@ -1124,11 +1132,30 @@ void PendingDatasetBase::HandleDelayTimer(Timer &aTimer)
void PendingDatasetBase::HandleDelayTimer(void)
{
DelayTimerTlv *delayTimer;
// if the Delay Timer value is larger than what our Timer implementation can handle, we have to compute
// the remainder and wait some more.
if ((delayTimer = static_cast<DelayTimerTlv *>(mNetwork.Get(Tlv::kDelayTimer))) != NULL)
{
uint32_t elapsed = mDelayTimer.GetFireTime() - mNetwork.GetUpdateTime();
uint32_t delay = delayTimer->GetDelayTimer();
if (elapsed < delay)
{
mDelayTimer.StartAt(mDelayTimer.GetFireTime(), delay - elapsed);
ExitNow();
}
}
otLogInfoMeshCoP(GetInstance(), "pending delay timer expired");
GetNetif().GetActiveDataset().Set(mNetwork);
Clear();
exit:
return;
}
void PendingDatasetBase::HandleGet(void *aContext, otCoapHeader *aHeader, otMessage *aMessage,