diff --git a/src/core/border_router/routing_manager.cpp b/src/core/border_router/routing_manager.cpp index 3461f429fdb..e49ee7cebce 100644 --- a/src/core/border_router/routing_manager.cpp +++ b/src/core/border_router/routing_manager.cpp @@ -4115,10 +4115,10 @@ void RoutingManager::PdPrefixManager::Process(const InfraIf::Icmp6Packet *aRaPac // an RA message or directly set. Requires either `aRaPacket` or // `aPrefixTableEntry` to be non-null. - bool currentPrefixUpdated = false; - Error error = kErrorNone; - PrefixEntry favoredEntry; - PrefixEntry entry; + bool currentPrefixUpdated = false; + Error error = kErrorNone; + PdPrefix favoredPrefix; + PdPrefix prefix; VerifyOrExit(mEnabled, error = kErrorInvalidState); @@ -4136,8 +4136,8 @@ void RoutingManager::PdPrefixManager::Process(const InfraIf::Icmp6Packet *aRaPac } mNumPlatformPioProcessed++; - entry.SetFrom(static_cast(option)); - currentPrefixUpdated |= ProcessPrefixEntry(entry, favoredEntry); + prefix.SetFrom(static_cast(option)); + currentPrefixUpdated |= ProcessPdPrefix(prefix, favoredPrefix); } mNumPlatformRaReceived++; @@ -4145,8 +4145,8 @@ void RoutingManager::PdPrefixManager::Process(const InfraIf::Icmp6Packet *aRaPac } else // aPrefixTableEntry != nullptr { - entry.SetFrom(*aPrefixTableEntry); - currentPrefixUpdated = ProcessPrefixEntry(entry, favoredEntry); + prefix.SetFrom(*aPrefixTableEntry); + currentPrefixUpdated = ProcessPdPrefix(prefix, favoredPrefix); } if (currentPrefixUpdated && mPrefix.IsDeprecated()) @@ -4156,9 +4156,9 @@ void RoutingManager::PdPrefixManager::Process(const InfraIf::Icmp6Packet *aRaPac Get().ScheduleRoutingPolicyEvaluation(kImmediately); } - if (favoredEntry.IsFavoredOver(mPrefix)) + if (favoredPrefix.IsFavoredOver(mPrefix)) { - mPrefix = favoredEntry; + mPrefix = favoredPrefix; currentPrefixUpdated = true; LogInfo("DHCPv6 PD prefix set to %s", mPrefix.GetPrefix().ToString().AsCString()); Get().ScheduleRoutingPolicyEvaluation(kImmediately); @@ -4178,45 +4178,45 @@ void RoutingManager::PdPrefixManager::Process(const InfraIf::Icmp6Packet *aRaPac OT_UNUSED_VARIABLE(error); } -bool RoutingManager::PdPrefixManager::ProcessPrefixEntry(PrefixEntry &aEntry, PrefixEntry &aFavoredEntry) +bool RoutingManager::PdPrefixManager::ProcessPdPrefix(PdPrefix &aPrefix, PdPrefix &aFavoredPrefix) { bool currentPrefixUpdated = false; - if (!aEntry.IsValidPdPrefix()) + if (!aPrefix.IsValidPdPrefix()) { - LogWarn("Ignore invalid DHCPv6 PD prefix %s", aEntry.GetPrefix().ToString().AsCString()); + LogWarn("Ignore invalid DHCPv6 PD prefix %s", aPrefix.GetPrefix().ToString().AsCString()); ExitNow(); } - aEntry.GetPrefix().Tidy(); - aEntry.GetPrefix().SetLength(kOmrPrefixLength); + aPrefix.GetPrefix().Tidy(); + aPrefix.GetPrefix().SetLength(kOmrPrefixLength); // Check if there is an update to the current prefix. The valid or // preferred lifetime may have changed. - if (HasPrefix() && (mPrefix.GetPrefix() == aEntry.GetPrefix())) + if (HasPrefix() && (mPrefix.GetPrefix() == aPrefix.GetPrefix())) { currentPrefixUpdated = true; - mPrefix = aEntry; + mPrefix = aPrefix; } - VerifyOrExit(!aEntry.IsDeprecated()); + VerifyOrExit(!aPrefix.IsDeprecated()); // Some platforms may delegate multiple prefixes. We'll select the // smallest one, as GUA prefixes (`2000::/3`) are inherently // smaller than ULA prefixes (`fc00::/7`). This rule prefers GUA // prefixes over ULA. - if (aEntry.IsFavoredOver(aFavoredEntry)) + if (aPrefix.IsFavoredOver(aFavoredPrefix)) { - aFavoredEntry = aEntry; + aFavoredPrefix = aPrefix; } exit: return currentPrefixUpdated; } -bool RoutingManager::PdPrefixManager::PrefixEntry::IsValidPdPrefix(void) const +bool RoutingManager::PdPrefixManager::PdPrefix::IsValidPdPrefix(void) const { // We should accept ULA prefix since it could be used by the internet infrastructure like NAT64. @@ -4224,7 +4224,7 @@ bool RoutingManager::PdPrefixManager::PrefixEntry::IsValidPdPrefix(void) const !GetPrefix().IsMulticast(); } -bool RoutingManager::PdPrefixManager::PrefixEntry::IsFavoredOver(const PrefixEntry &aOther) const +bool RoutingManager::PdPrefixManager::PdPrefix::IsFavoredOver(const PdPrefix &aOther) const { bool isFavored; diff --git a/src/core/border_router/routing_manager.hpp b/src/core/border_router/routing_manager.hpp index 9b98032bea9..c377b25d823 100644 --- a/src/core/border_router/routing_manager.hpp +++ b/src/core/border_router/routing_manager.hpp @@ -1487,17 +1487,17 @@ class RoutingManager : public InstanceLocator void Evaluate(void); private: - class PrefixEntry : public OnLinkPrefix + class PdPrefix : public OnLinkPrefix { public: - PrefixEntry(void) { Clear(); } + PdPrefix(void) { Clear(); } bool IsEmpty(void) const { return (GetPrefix().GetLength() == 0); } bool IsValidPdPrefix(void) const; - bool IsFavoredOver(const PrefixEntry &aOther) const; + bool IsFavoredOver(const PdPrefix &aOther) const; }; void Process(const InfraIf::Icmp6Packet *aRaPacket, const PrefixTableEntry *aPrefixTableEntry); - bool ProcessPrefixEntry(PrefixEntry &aEntry, PrefixEntry &aFavoredEntry); + bool ProcessPdPrefix(PdPrefix &aPrefix, PdPrefix &aFavoredPrefix); void EvaluateStateChange(State aOldState); void WithdrawPrefix(void); void StartStop(bool aStart); @@ -1517,7 +1517,7 @@ class RoutingManager : public InstanceLocator TimeMilli mLastPlatformRaTime; StateCallback mStateCallback; PrefixTimer mTimer; - PrefixEntry mPrefix; + PdPrefix mPrefix; }; #endif // OPENTHREAD_CONFIG_BORDER_ROUTING_DHCP6_PD_ENABLE