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

[routing-manager] move decision to process PIO/RIO to RxRaTracker (#10270)

Browse Source 
This commit moves functionality from `RoutingManager` to
`RxRaTracker`:

- The `ShouldProcessPrefix/RouteInfoOption()` methods, which decide
  whether to skip or process a PIO/RIO, are moved to `RxRaTracker`.
- `RxRaTracker` is directly notified on network data change, using its
  new `HandleNetDataChange()` method. This replaces
  `UpdateRxRaTrackerOnNetDataChange()`.
This commit is contained in:
Abtin Keshavarzian
2024-05-21 13:25:49 -07:00
committed by GitHub
parent 71bd98744c
commit 3cb454030c
2 changed files with 112 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/border_router/routing_manager.cpp
+108 -117
View File
@@ -313,7 +313,7 @@ void RoutingManager::Start(void)
LogInfo("Starting");
mIsRunning = true;
UpdateRxRaTrackerOnNetDataChange();
mRxRaTracker.Start();
mOnLinkPrefixManager.Start();
mOmrPrefixManager.Start();
mRoutePublisher.Start();
@@ -447,7 +447,7 @@ void RoutingManager::HandleNotifierEvents(Events aEvents)
if (mIsRunning && aEvents.Contains(kEventThreadNetdataChanged))
{
UpdateRxRaTrackerOnNetDataChange();
mRxRaTracker.HandleNetDataChange();
mOnLinkPrefixManager.HandleNetDataChange();
ScheduleRoutingPolicyEvaluation(kAfterRandomDelay);
}
@@ -461,26 +461,6 @@ exit:
return;
}
void RoutingManager::UpdateRxRaTrackerOnNetDataChange(void)
{
NetworkData::Iterator iterator = NetworkData::kIteratorInit;
NetworkData::OnMeshPrefixConfig prefixConfig;
// Remove all OMR prefixes in Network Data from the
// discovered prefix table. Also check if we have
// an OMR prefix with default route flag.
while (Get<NetworkData::Leader>().GetNextOnMeshPrefix(iterator, prefixConfig) == kErrorNone)
{
if (!IsValidOmrPrefix(prefixConfig))
{
continue;
}
mRxRaTracker.RemoveRoutePrefix(prefixConfig.GetPrefix());
}
}
void RoutingManager::EvaluateRoutingPolicy(void)
{
OT_ASSERT(mIsRunning);
@@ -756,75 +736,6 @@ exit:
return;
}
bool RoutingManager::ShouldProcessPrefixInfoOption(const PrefixInfoOption &aPio, const Ip6::Prefix &aPrefix)
{
// Indicate whether to process or skip a given prefix
// from a PIO (from received RA message).
bool shouldProcess = false;
VerifyOrExit(mIsRunning);
if (!IsValidOnLinkPrefix(aPio))
{
LogInfo("- PIO %s - ignore since not a valid on-link prefix", aPrefix.ToString().AsCString());
ExitNow();
}
if (mOnLinkPrefixManager.IsPublishingOrAdvertising())
{
VerifyOrExit(aPrefix != mOnLinkPrefixManager.GetLocalPrefix());
}
shouldProcess = true;
exit:
return shouldProcess;
}
bool RoutingManager::ShouldProcessRouteInfoOption(const RouteInfoOption &aRio, const Ip6::Prefix &aPrefix)
{
// Indicate whether to process or skip a given prefix
// from a RIO (from received RA message).
OT_UNUSED_VARIABLE(aRio);
bool shouldProcess = false;
VerifyOrExit(mIsRunning);
if (aPrefix.GetLength() == 0)
{
// Always process default route ::/0 prefix.
ExitNow(shouldProcess = true);
}
if (!IsValidOmrPrefix(aPrefix))
{
LogInfo("- RIO %s - ignore since not a valid OMR prefix", aPrefix.ToString().AsCString());
ExitNow();
}
VerifyOrExit(mOmrPrefixManager.GetLocalPrefix().GetPrefix() != aPrefix);
// Disregard our own advertised OMR prefixes and those currently
// present in the Thread Network Data.
//
// There should be eventual parity between the `RioAdvertiser`
// prefixes and the OMR prefixes in Network Data, but temporary
// discrepancies can occur due to the tx timing of RAs and time
// required to update Network Data (registering with leader). So
// both checks are necessary.
VerifyOrExit(!mRioAdvertiser.HasAdvertised(aPrefix));
VerifyOrExit(!Get<NetworkData::Leader>().ContainsOmrPrefix(aPrefix));
shouldProcess = true;
exit:
return shouldProcess;
}
void RoutingManager::HandleRaPrefixTableChanged(void)
{
// This is a callback from `mRxRaTracker` indicating that
@@ -1030,6 +941,20 @@ RoutingManager::RxRaTracker::RxRaTracker(Instance &aInstance)
mLocalRaHeader.Clear();
}
void RoutingManager::RxRaTracker::Start(void) { HandleNetDataChange(); }
void RoutingManager::RxRaTracker::Stop(void)
{
mRouters.Free();
mLocalRaHeader.Clear();
mExpirationTimer.Stop();
mStaleTimer.Stop();
mRouterTimer.Stop();
SignalTableChanged();
}
void RoutingManager::RxRaTracker::ProcessRouterAdvertMessage(const RouterAdvert::RxMessage &aRaMessage,
const Ip6::Address &aSrcAddress,
RouterAdvOrigin aRaOrigin)
@@ -1190,7 +1115,7 @@ void RoutingManager::RxRaTracker::ProcessPrefixInfoOption(const PrefixInfoOption
VerifyOrExit(aPio.IsValid());
aPio.GetPrefix(prefix);
VerifyOrExit(Get<RoutingManager>().ShouldProcessPrefixInfoOption(aPio, prefix));
VerifyOrExit(ShouldProcessPrefixInfoOption(aPio, prefix));
LogPrefixInfoOption(prefix, aPio.GetValidLifetime(), aPio.GetPreferredLifetime());
@@ -1227,6 +1152,33 @@ exit:
return;
}
bool RoutingManager::RxRaTracker::ShouldProcessPrefixInfoOption(const PrefixInfoOption &aPio,
const Ip6::Prefix &aPrefix) const
{
// Indicate whether to process or skip a given prefix
// from a PIO (from received RA message).
bool shouldProcess = false;
VerifyOrExit(Get<RoutingManager>().IsRunning());
if (!IsValidOnLinkPrefix(aPio))
{
LogInfo("- PIO %s - ignore since not a valid on-link prefix", aPrefix.ToString().AsCString());
ExitNow();
}
if (Get<RoutingManager>().mOnLinkPrefixManager.IsPublishingOrAdvertising())
{
VerifyOrExit(aPrefix != Get<RoutingManager>().mOnLinkPrefixManager.GetLocalPrefix());
}
shouldProcess = true;
exit:
return shouldProcess;
}
void RoutingManager::RxRaTracker::ProcessRouteInfoOption(const RouteInfoOption &aRio, Router &aRouter)
{
Ip6::Prefix prefix;
@@ -1235,7 +1187,7 @@ void RoutingManager::RxRaTracker::ProcessRouteInfoOption(const RouteInfoOption &
VerifyOrExit(aRio.IsValid());
aRio.GetPrefix(prefix);
VerifyOrExit(Get<RoutingManager>().ShouldProcessRouteInfoOption(aRio, prefix));
VerifyOrExit(ShouldProcessRouteInfoOption(aRio, prefix));
LogRouteInfoOption(prefix, aRio.GetRouteLifetime(), aRio.GetPreference());
@@ -1269,6 +1221,50 @@ exit:
return;
}
bool RoutingManager::RxRaTracker::ShouldProcessRouteInfoOption(const RouteInfoOption &aRio,
const Ip6::Prefix &aPrefix) const
{
// Indicate whether to process or skip a given prefix
// from a RIO (from received RA message).
OT_UNUSED_VARIABLE(aRio);
bool shouldProcess = false;
VerifyOrExit(Get<RoutingManager>().IsRunning());
if (aPrefix.GetLength() == 0)
{
// Always process default route ::/0 prefix.
ExitNow(shouldProcess = true);
}
if (!IsValidOmrPrefix(aPrefix))
{
LogInfo("- RIO %s - ignore since not a valid OMR prefix", aPrefix.ToString().AsCString());
ExitNow();
}
VerifyOrExit(Get<RoutingManager>().mOmrPrefixManager.GetLocalPrefix().GetPrefix() != aPrefix);
// Disregard our own advertised OMR prefixes and those currently
// present in the Thread Network Data.
//
// There should be eventual parity between the `RioAdvertiser`
// prefixes and the OMR prefixes in Network Data, but temporary
// discrepancies can occur due to the tx timing of RAs and time
// required to update Network Data (registering with leader). So
// both checks are necessary.
VerifyOrExit(!Get<RoutingManager>().mRioAdvertiser.HasAdvertised(aPrefix));
VerifyOrExit(!Get<NetworkData::Leader>().ContainsOmrPrefix(aPrefix));
shouldProcess = true;
exit:
return shouldProcess;
}
void RoutingManager::RxRaTracker::ProcessRaFlagsExtOption(const RaFlagsExtOption &aRaFlagsOption, Router &aRouter)
{
VerifyOrExit(aRaFlagsOption.IsValid());
@@ -1417,35 +1413,30 @@ exit:
return;
}
void RoutingManager::RxRaTracker::RemoveRoutePrefix(const Ip6::Prefix &aPrefix)
void RoutingManager::RxRaTracker::HandleNetDataChange(void)
{
bool didRemove = false;
NetworkData::Iterator iterator = NetworkData::kIteratorInit;
NetworkData::OnMeshPrefixConfig prefixConfig;
bool didRemove = false;
for (Router &router : mRouters)
while (Get<NetworkData::Leader>().GetNextOnMeshPrefix(iterator, prefixConfig) == kErrorNone)
{
didRemove |= router.mRoutePrefixes.RemoveAndFreeAllMatching(aPrefix);
if (!IsValidOmrPrefix(prefixConfig))
{
continue;
}
for (Router &router : mRouters)
{
didRemove |= router.mRoutePrefixes.RemoveAndFreeAllMatching(prefixConfig.GetPrefix());
}
}
VerifyOrExit(didRemove);
RemoveRoutersWithNoEntriesOrFlags();
SignalTableChanged();
exit:
return;
}
void RoutingManager::RxRaTracker::Stop(void)
{
mRouters.Free();
mLocalRaHeader.Clear();
mExpirationTimer.Stop();
mStaleTimer.Stop();
mRouterTimer.Stop();
SignalTableChanged();
if (didRemove)
{
RemoveRoutersWithNoEntriesOrFlags();
SignalTableChanged();
}
}
void RoutingManager::RxRaTracker::RemoveOrDeprecateOldEntries(TimeMilli aTimeThreshold)
src/core/border_router/routing_manager.hpp
+4 -4
View File
@@ -741,6 +741,7 @@ private:
public:
explicit RxRaTracker(Instance &aInstance);
void Start(void);
void Stop(void);
void ProcessRouterAdvertMessage(const RouterAdvert::RxMessage &aRaMessage,
@@ -754,8 +755,8 @@ private:
void FindFavoredOnLinkPrefix(Ip6::Prefix &aPrefix) const;
void HandleNetDataChange(void);
void RemoveOnLinkPrefix(const Ip6::Prefix &aPrefix);
void RemoveRoutePrefix(const Ip6::Prefix &aPrefix);
void RemoveOrDeprecateOldEntries(TimeMilli aTimeThreshold);
@@ -896,7 +897,9 @@ private:
void ProcessRaHeader(const RouterAdvert::Header &aRaHeader, Router &aRouter, RouterAdvOrigin aRaOrigin);
void ProcessPrefixInfoOption(const PrefixInfoOption &aPio, Router &aRouter);
bool ShouldProcessPrefixInfoOption(const PrefixInfoOption &aPio, const Ip6::Prefix &aPrefix) const;
void ProcessRouteInfoOption(const RouteInfoOption &aRio, Router &aRouter);
bool ShouldProcessRouteInfoOption(const RouteInfoOption &aRio, const Ip6::Prefix &aPrefix) const;
void ProcessRaFlagsExtOption(const RaFlagsExtOption &aFlagsOption, Router &aRouter);
bool ContainsOnLinkPrefix(OnLinkPrefix::UlaChecker aUlaChecker) const;
void RemoveOrDeprecateEntriesFromInactiveRouters(void);
@@ -1386,9 +1389,6 @@ private:
void HandleRouterAdvertisement(const InfraIf::Icmp6Packet &aPacket, const Ip6::Address &aSrcAddress);
void HandleRouterSolicit(const InfraIf::Icmp6Packet &aPacket, const Ip6::Address &aSrcAddress);
void HandleNeighborAdvertisement(const InfraIf::Icmp6Packet &aPacket);
bool ShouldProcessPrefixInfoOption(const PrefixInfoOption &aPio, const Ip6::Prefix &aPrefix);
bool ShouldProcessRouteInfoOption(const RouteInfoOption &aRio, const Ip6::Prefix &aPrefix);
void UpdateRxRaTrackerOnNetDataChange(void);
bool NetworkDataContainsUlaRoute(void) const;
void HandleRaPrefixTableChanged(void);