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

[sub-mac] fix elapsed time in GetCslWindowEdges() (#7299)

Browse Source 
Do all the calculations on uint32_t to prevent bad wraparound check
due to mixing uint32_t with uint64_t.

Signed-off-by: George Stefan <[email protected]>
This commit is contained in:
George Stefan
2022-01-10 13:18:49 -08:00
committed by GitHub
parent 1c3a90f9f7
commit 91d444c2c5
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/mac/sub_mac.cpp
+4 -11
View File
@@ -1131,20 +1131,13 @@ void SubMac::HandleCslTimer(void)
void SubMac::GetCslWindowEdges(uint32_t &ahead, uint32_t &after) void SubMac::GetCslWindowEdges(uint32_t &ahead, uint32_t &after)
{ {
uint32_t semiPeriod = mCslPeriod * kUsPerTenSymbols / 2; uint32_t semiPeriod = mCslPeriod * kUsPerTenSymbols / 2;
uint64_t curTime = otPlatRadioGetNow(&GetInstance()); uint32_t curTime = static_cast<uint32_t>(otPlatRadioGetNow(&GetInstance()));
uint64_t elapsed; uint32_t elapsed;
uint32_t semiWindow; uint32_t semiWindow;
if (mCslLastSync.GetValue() > curTime) elapsed = curTime - mCslLastSync.GetValue();
{
elapsed = UINT64_MAX - mCslLastSync.GetValue() + curTime;
}
else
{
elapsed = curTime - mCslLastSync.GetValue();
}
semiWindow = static_cast<uint32_t>(elapsed * (Get<Radio>().GetCslAccuracy() + mCslParentAccuracy) / 1000000); semiWindow = elapsed * (Get<Radio>().GetCslAccuracy() + mCslParentAccuracy) / 1000000;
semiWindow += mCslParentUncert * kUsPerUncertUnit; semiWindow += mCslParentUncert * kUsPerUncertUnit;
ahead = (semiWindow + kCslReceiveTimeAhead > semiPeriod) ? semiPeriod : semiWindow + kCslReceiveTimeAhead; ahead = (semiWindow + kCslReceiveTimeAhead > semiPeriod) ? semiPeriod : semiWindow + kCslReceiveTimeAhead;