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

[routing-manager] fix BR incorrectly removing route for local on-link prefix (#7724)

Browse Source 
This commit fixes a bug that BR could incorrectly remove the route of
the local on-link prefix in Network Data when it's still advertising
the local on-link prefix.

This is a short-term fix because in the long term we want to refactor
how `RoutingManager` manages external routes and the default route.
This commit is contained in:
Simon Lin
2022-05-23 11:04:28 -07:00
committed by GitHub
parent fcbc4bef9b
commit c319046599
1 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/border_router/routing_manager.cpp
+39 -5
View File
@@ -616,8 +616,25 @@ void RoutingManager::HandleOnLinkPrefixDeprecateTimer(Timer &aTimer)
void RoutingManager::HandleOnLinkPrefixDeprecateTimer(void)
{
bool discoveredLocalOnLinkPrefix = false;
OT_ASSERT(!mIsAdvertisingLocalOnLinkPrefix);
LogInfo("Local on-link prefix %s expired", mLocalOnLinkPrefix.ToString().AsCString());
UnpublishExternalRoute(mLocalOnLinkPrefix);
for (const ExternalPrefix &prefix : mDiscoveredPrefixes)
{
if (prefix.mIsOnLinkPrefix && prefix.mPrefix == mLocalOnLinkPrefix)
{
discoveredLocalOnLinkPrefix = true;
break;
}
}
if (!discoveredLocalOnLinkPrefix)
{
UnpublishExternalRoute(mLocalOnLinkPrefix);
}
}
void RoutingManager::DeprecateOnLinkPrefix(void)
@@ -726,8 +743,17 @@ void RoutingManager::EvaluateRoutingPolicy(void)
}
// 3. Update advertised on-link & OMR prefixes information.
mIsAdvertisingLocalOnLinkPrefix = (newOnLinkPrefix == &mLocalOnLinkPrefix);
mAdvertisedOmrPrefixes = newOmrPrefixes;
{
bool wasAdvertisingLocalOnLinkPrefix = mIsAdvertisingLocalOnLinkPrefix;
mIsAdvertisingLocalOnLinkPrefix = (newOnLinkPrefix == &mLocalOnLinkPrefix);
if (!wasAdvertisingLocalOnLinkPrefix && mIsAdvertisingLocalOnLinkPrefix)
{
InvalidateDiscoveredPrefixes();
}
mAdvertisedOmrPrefixes = newOmrPrefixes;
}
}
void RoutingManager::StartRoutingPolicyEvaluationJitter(uint32_t aJitterMilli)
@@ -1382,6 +1408,9 @@ void RoutingManager::InvalidateDiscoveredPrefixes(const Ip6::Prefix *aPrefix, bo
for (const ExternalPrefix &prefix : mDiscoveredPrefixes)
{
bool isAdvertisedLocalOnLinkPrefix =
mIsAdvertisingLocalOnLinkPrefix && prefix.mIsOnLinkPrefix && mLocalOnLinkPrefix == prefix.mPrefix;
if (
// Invalidate specified prefix
(aPrefix != nullptr && prefix.mPrefix == *aPrefix && prefix.mIsOnLinkPrefix == aIsOnLinkPrefix) ||
@@ -1389,9 +1418,14 @@ void RoutingManager::InvalidateDiscoveredPrefixes(const Ip6::Prefix *aPrefix, bo
(prefix.GetExpireTime() <= now) ||
// Invalidate Local OMR prefixes
(!prefix.mIsOnLinkPrefix &&
(mAdvertisedOmrPrefixes.Contains(prefix.mPrefix) || NetworkDataContainsOmrPrefix(prefix.mPrefix))))
(mAdvertisedOmrPrefixes.Contains(prefix.mPrefix) || NetworkDataContainsOmrPrefix(prefix.mPrefix))) ||
// Remove local on-link prefix if the BR is advertising on-link prefix
isAdvertisedLocalOnLinkPrefix)
{
UnpublishExternalRoute(prefix.mPrefix);
if (!isAdvertisedLocalOnLinkPrefix)
{
UnpublishExternalRoute(prefix.mPrefix);
}
}
else
{