From f19864a2ac31c206de48dc4875f2a12564f1812f Mon Sep 17 00:00:00 2001
From: Yang Song <yangsongcn@google.com>
Date: Tue, 14 Oct 2025 22:35:31 +0800
Subject: [PATCH] [nat64] rename NAT64 discovery handlers for clarity (#12034)

This commit renames NAT64 prefix discovery handler functions in
`RoutingManager` and `Nat64PrefixManager` to be more specific. This is
a non-functional refactoring that improves code clarity and
maintainability.

The new names, `HandleInfraIfDiscoverNat64PrefixDone` and
`HandleInfraIfDiscoverDone`, clarify that these handlers are for NAT64
prefixes discovered on the infrastructure interface.

This change makes the code easier to understand and prepares it for
potential future enhancements, such as discovering NAT64 prefixes from
Router Advertisements.
---
 src/core/border_router/infra_if.cpp        | 2 +-
 src/core/border_router/routing_manager.cpp | 5 +++--
 src/core/border_router/routing_manager.hpp | 7 +++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/core/border_router/infra_if.cpp b/src/core/border_router/infra_if.cpp
index bc3fa7b25..d0eac1b7e 100644
--- a/src/core/border_router/infra_if.cpp
+++ b/src/core/border_router/infra_if.cpp
@@ -122,7 +122,7 @@ void InfraIf::DiscoverNat64PrefixDone(uint32_t aIfIndex, const Ip6::Prefix &aPre
     VerifyOrExit(mInitialized && mIsRunning, error = kErrorInvalidState);
     VerifyOrExit(aIfIndex == mIfIndex, error = kErrorInvalidArgs);
 
-    Get<RoutingManager>().HandleDiscoverNat64PrefixDone(aPrefix);
+    Get<RoutingManager>().HandleInfraIfDiscoverNat64PrefixDone(aPrefix);
 
 exit:
     if (error != kErrorNone)
diff --git a/src/core/border_router/routing_manager.cpp b/src/core/border_router/routing_manager.cpp
index 65304c476..c6688b74a 100644
--- a/src/core/border_router/routing_manager.cpp
+++ b/src/core/border_router/routing_manager.cpp
@@ -2614,11 +2614,12 @@ void RoutingManager::Nat64PrefixManager::Discover(void)
     }
 }
 
-void RoutingManager::Nat64PrefixManager::HandleDiscoverDone(const Ip6::Prefix &aPrefix)
+void RoutingManager::Nat64PrefixManager::HandleInfraIfDiscoverDone(const Ip6::Prefix &aPrefix)
 {
     mInfraIfPrefix = aPrefix;
 
-    LogInfo("Infraif NAT64 prefix: %s", mInfraIfPrefix.IsValidNat64() ? mInfraIfPrefix.ToString().AsCString() : "none");
+    LogInfo("InfraIf Discovered NAT64 prefix: %s",
+            mInfraIfPrefix.IsValidNat64() ? mInfraIfPrefix.ToString().AsCString() : "none");
     Get<RoutingManager>().ScheduleRoutingPolicyEvaluation(kAfterRandomDelay);
 }
 
diff --git a/src/core/border_router/routing_manager.hpp b/src/core/border_router/routing_manager.hpp
index a59913365..3a513edbc 100644
--- a/src/core/border_router/routing_manager.hpp
+++ b/src/core/border_router/routing_manager.hpp
@@ -437,7 +437,10 @@ public:
      *
      * @param[in]  aPrefix  The discovered NAT64 prefix on `InfraIf`.
      */
-    void HandleDiscoverNat64PrefixDone(const Ip6::Prefix &aPrefix) { mNat64PrefixManager.HandleDiscoverDone(aPrefix); }
+    void HandleInfraIfDiscoverNat64PrefixDone(const Ip6::Prefix &aPrefix)
+    {
+        mNat64PrefixManager.HandleInfraIfDiscoverDone(aPrefix);
+    }
 
 #endif // OPENTHREAD_CONFIG_NAT64_BORDER_ROUTING_ENABLE
 
@@ -914,7 +917,7 @@ private:
         const Ip6::Prefix &GetLocalPrefix(void) const { return mLocalPrefix; }
         const Ip6::Prefix &GetFavoredPrefix(RoutePreference &aPreference) const;
         void               Evaluate(void);
-        void               HandleDiscoverDone(const Ip6::Prefix &aPrefix);
+        void               HandleInfraIfDiscoverDone(const Ip6::Prefix &aPrefix);
         void               HandleTimer(void);
 
     private: