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

[routing-manager] add CalculateExpirationTime() (#10207)

Browse Source 
This commit adds `CalculateExpirationTime()`, which simplifies the
calculation of expiration times of discovered prefix entry by
clamping a given lifetime to the maximum value (in seconds) first
before converting to milliseconds.
This commit is contained in:
Abtin Keshavarzian
2024-05-07 13:52:50 -07:00
committed by GitHub
parent 83af14a950
commit 383d0d2815
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/border_router/routing_manager.cpp
+8 -14
View File
@@ -1740,7 +1740,7 @@ bool RoutingManager::DiscoveredPrefixTable::Entry::Matches(const ExpirationCheck
TimeMilli RoutingManager::DiscoveredPrefixTable::Entry::GetExpireTime(void) const
{
return mLastUpdateTime + CalculateExpireDelay(mValidLifetime);
return CalculateExpirationTime(mValidLifetime);
}
TimeMilli RoutingManager::DiscoveredPrefixTable::Entry::GetStaleTime(void) const
@@ -1752,14 +1752,14 @@ TimeMilli RoutingManager::DiscoveredPrefixTable::Entry::GetStaleTime(void) const
TimeMilli RoutingManager::DiscoveredPrefixTable::Entry::GetStaleTimeFromPreferredLifetime(void) const
{
return mLastUpdateTime + CalculateExpireDelay(GetPreferredLifetime());
return CalculateExpirationTime(GetPreferredLifetime());
}
bool RoutingManager::DiscoveredPrefixTable::Entry::IsDeprecated(void) const
{
OT_ASSERT(IsOnLinkPrefix());
return mLastUpdateTime + CalculateExpireDelay(GetPreferredLifetime()) <= TimerMilli::GetNow();
return CalculateExpirationTime(GetPreferredLifetime()) <= TimerMilli::GetNow();
}
RoutingManager::RoutePreference RoutingManager::DiscoveredPrefixTable::Entry::GetPreference(void) const
@@ -1798,20 +1798,14 @@ void RoutingManager::DiscoveredPrefixTable::Entry::AdoptValidAndPreferredLifetim
mLastUpdateTime = aEntry.GetLastUpdateTime();
}
uint32_t RoutingManager::DiscoveredPrefixTable::Entry::CalculateExpireDelay(uint32_t aValidLifetime)
TimeMilli RoutingManager::DiscoveredPrefixTable::Entry::CalculateExpirationTime(uint32_t aLifetime) const
{
uint32_t delay;
// `aLifetime` is in unit of seconds. We clamp the lifetime to max
// interval supported by `Timer` (`2^31` msec or ~24.8 days).
if (aValidLifetime * static_cast<uint64_t>(1000) > Timer::kMaxDelay)
{
delay = Timer::kMaxDelay;
}
else
{
delay = aValidLifetime * 1000;
}
static constexpr uint32_t kMaxLifetime = Time::MsecToSec(Timer::kMaxDelay);
return delay;
return mLastUpdateTime + Time::SecToMsec(Min(aLifetime, kMaxLifetime));
}
//---------------------------------------------------------------------------------------------------------------------
src/core/border_router/routing_manager.hpp
+1 -1
View File
@@ -787,7 +787,7 @@ private:
RoutePreference GetRoutePreference(void) const { return mShared.mRoutePreference; }
private:
static uint32_t CalculateExpireDelay(uint32_t aValidLifetime);
TimeMilli CalculateExpirationTime(uint32_t aLifetime) const;
Entry *mNext;
Ip6::Prefix mPrefix;