From e07ed85620a20b244a14ce5091307a917d34dd11 Mon Sep 17 00:00:00 2001 From: Abtin Keshavarzian Date: Fri, 10 Oct 2025 12:56:54 -0700 Subject: [PATCH] [border-router] rename RxRaTracker callback for clarity (#12019) Renames the callback used by `RxRaTracker` to inform `RoutingManager` to `HandleRxRaTrackerDecisionFactorChanged()`. This name more accurately reflects the triggering condition, as the callback is invoked whenever any of the "decision factors" change, not just when the on-link prefix table is updated. For consistency, the related method in `OnLinkPrefixManager` is also renamed to `HandleRxRaTrackerChanged()`. --- src/core/border_router/routing_manager.cpp | 9 +++++---- src/core/border_router/routing_manager.hpp | 4 ++-- src/core/border_router/rx_ra_tracker.cpp | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/core/border_router/routing_manager.cpp b/src/core/border_router/routing_manager.cpp index af9f8cd9c..1aac2c6ad 100644 --- a/src/core/border_router/routing_manager.cpp +++ b/src/core/border_router/routing_manager.cpp @@ -723,14 +723,15 @@ exit: return; } -void RoutingManager::HandleRaPrefixTableChanged(void) +void RoutingManager::HandleRxRaTrackerDecisionFactorChanged(void) { // This is a callback from `RxRaTracker` indicating that - // there has been a change in the table. + // there has been a change impacting one of the decision + // factors. VerifyOrExit(mIsRunning); - mOnLinkPrefixManager.HandleRaPrefixTableChanged(); + mOnLinkPrefixManager.HandleRxRaTrackerChanged(); mRoutePublisher.Evaluate(); #if OPENTHREAD_CONFIG_BORDER_ROUTING_MULTI_AIL_DETECTION_ENABLE mMultiAilDetector.Evaluate(); @@ -1578,7 +1579,7 @@ bool RoutingManager::OnLinkPrefixManager::IsInitalEvaluationDone(void) const return (mAilPrefix.GetLength() != 0 || IsPublishingOrAdvertising()); } -void RoutingManager::OnLinkPrefixManager::HandleRaPrefixTableChanged(void) +void RoutingManager::OnLinkPrefixManager::HandleRxRaTrackerChanged(void) { // This is a callback from `RxRaTracker` indicating that // there has been a change in the table. If the favored on-link diff --git a/src/core/border_router/routing_manager.hpp b/src/core/border_router/routing_manager.hpp index 4c3c5d4c7..724306dbc 100644 --- a/src/core/border_router/routing_manager.hpp +++ b/src/core/border_router/routing_manager.hpp @@ -767,7 +767,7 @@ private: const Ip6::Prefix &GetFavoredPrefix(void) const { return mFavoredPrefix; } bool AddressMatchesLocalPrefix(const Ip6::Address &aAddress) const; bool IsInitalEvaluationDone(void) const; - void HandleRaPrefixTableChanged(void); + void HandleRxRaTrackerChanged(void); bool ShouldPublishUlaRoute(void) const; Error AppendAsPiosTo(RouterAdvert::TxMessage &aRaMessage); void HandleNetDataChange(void); @@ -1157,7 +1157,7 @@ private: void HandleNeighborAdvertisement(const InfraIf::Icmp6Packet &aPacket); bool NetworkDataContainsUlaRoute(void) const; - void HandleRaPrefixTableChanged(void); + void HandleRxRaTrackerDecisionFactorChanged(void); void HandleLocalOnLinkPrefixChanged(void); static bool IsValidBrUlaPrefix(const Ip6::Prefix &aBrUlaPrefix); diff --git a/src/core/border_router/rx_ra_tracker.cpp b/src/core/border_router/rx_ra_tracker.cpp index 1381fafb4..4fe6dec83 100644 --- a/src/core/border_router/rx_ra_tracker.cpp +++ b/src/core/border_router/rx_ra_tracker.cpp @@ -812,7 +812,7 @@ exit: void RxRaTracker::HandleExpirationTimer(void) { Evaluate(); } -void RxRaTracker::HandleSignalTask(void) { Get().HandleRaPrefixTableChanged(); } +void RxRaTracker::HandleSignalTask(void) { Get().HandleRxRaTrackerDecisionFactorChanged(); } void RxRaTracker::HandleRdnssAddrTask(void) { mRdnssCallback.InvokeIfSet(); }