espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-30 12:57:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[trickle-timer] change Start() to return void (#4941)

Browse Source
This commit is contained in:
Jonathan Hui
2020-05-11 12:44:54 -07:00
parent 8a27e6da83
commit 8172e31a47
4 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/common/trickle_timer.cpp
+3 -8
View File
@@ -64,12 +64,10 @@ TrickleTimer::TrickleTimer(Instance &aInstance,
OT_ASSERT(aTransmitHandler != NULL);
}
otError TrickleTimer::Start(uint32_t aIntervalMin, uint32_t aIntervalMax, Mode aMode)
void TrickleTimer::Start(uint32_t aIntervalMin, uint32_t aIntervalMax, Mode aMode)
{
otError error = OT_ERROR_NONE;
VerifyOrExit(aIntervalMax >= aIntervalMin, error = OT_ERROR_INVALID_ARGS);
VerifyOrExit(aIntervalMin != 0 || aIntervalMax != 0, error = OT_ERROR_INVALID_ARGS);
OT_ASSERT(aIntervalMax >= aIntervalMin);
OT_ASSERT(aIntervalMin != 0 || aIntervalMax != 0);
mIntervalMin = aIntervalMin;
mIntervalMax = aIntervalMax;
@@ -80,9 +78,6 @@ otError TrickleTimer::Start(uint32_t aIntervalMin, uint32_t aIntervalMax, Mode a
mInterval = Random::NonCrypto::GetUint32InRange(mIntervalMin, mIntervalMax + 1);
StartNewInterval();
exit:
return error;
}
void TrickleTimer::Stop(void)
src/core/common/trickle_timer.hpp
+1 -4
View File
@@ -113,11 +113,8 @@ public:
* @param[in] aIntervalMax The maximum interval for the timer in milliseconds.
* @param[in] aMode The operating mode for the timer.
*
* @retval OT_ERROR_NONE The timer started successfully.
* @retval OT_ERROR_INVALID_ARGS The given parameters are invalid (i.e., max interval is smaller than min).
*
*/
otError Start(uint32_t aIntervalMin, uint32_t aIntervalMax, Mode aMode);
void Start(uint32_t aIntervalMin, uint32_t aIntervalMax, Mode aMode);
/**
* This method stops the trickle timer.
src/core/net/dhcp6_client.cpp
+2 -2
View File
@@ -206,8 +206,8 @@ bool Dhcp6Client::ProcessNextIdentityAssociation()
mIdentityAssociationCurrent = &mIdentityAssociations[i];
IgnoreError(mTrickleTimer.Start(Time::SecToMsec(kTrickleTimerImin), Time::SecToMsec(kTrickleTimerImax),
TrickleTimer::kModeNormal));
mTrickleTimer.Start(Time::SecToMsec(kTrickleTimerImin), Time::SecToMsec(kTrickleTimerImax),
TrickleTimer::kModeNormal);
mTrickleTimer.IndicateInconsistent();
src/core/thread/mle_router.cpp
+5 -5
View File
@@ -403,8 +403,8 @@ void MleRouter::ResetAdvertiseInterval(void)
if (!mAdvertiseTimer.IsRunning())
{
IgnoreError(mAdvertiseTimer.Start(Time::SecToMsec(kAdvertiseIntervalMin),
Time::SecToMsec(kAdvertiseIntervalMax), TrickleTimer::kModeNormal));
mAdvertiseTimer.Start(Time::SecToMsec(kAdvertiseIntervalMin), Time::SecToMsec(kAdvertiseIntervalMax),
TrickleTimer::kModeNormal);
}
mAdvertiseTimer.IndicateInconsistent();
@@ -1783,9 +1783,9 @@ void MleRouter::HandleStateUpdateTimer(void)
{
SendAdvertisement();
IgnoreError(mAdvertiseTimer.Start(Time::SecToMsec(kReedAdvertiseInterval),
Time::SecToMsec(kReedAdvertiseInterval + kReedAdvertiseJitter),
TrickleTimer::kModePlainTimer));
mAdvertiseTimer.Start(Time::SecToMsec(kReedAdvertiseInterval),
Time::SecToMsec(kReedAdvertiseInterval + kReedAdvertiseJitter),
TrickleTimer::kModePlainTimer);
}
ExitNow();