espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-12 12:10:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[routing-manager] remove prefix change tracking in PdPrefixManager (#11246)

Browse Source 
This commit simplifies the `PdPrefixManager` class by removing the
`currentPrefixUpdated` flag. The flag was used to track PD prefix
changes during prefix processing, solely to determine if a prefix was
deprecated. This deprecation check can be performed independently,
eliminating the need for the flag and simplifying the code.
This commit is contained in:
Abtin Keshavarzian
2025-02-13 12:56:07 -08:00
committed by GitHub
parent 5e822c1f3c
commit ae76f12a3e
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/border_router/routing_manager.cpp
+8 -13
View File
@@ -4115,8 +4115,7 @@ void RoutingManager::PdPrefixManager::Process(const InfraIf::Icmp6Packet *aRaPac
// an RA message or directly set. Requires either `aRaPacket` or // an RA message or directly set. Requires either `aRaPacket` or
// `aPrefixTableEntry` to be non-null. // `aPrefixTableEntry` to be non-null.
bool currentPrefixUpdated = false; Error error = kErrorNone;
Error error = kErrorNone;
PdPrefix favoredPrefix; PdPrefix favoredPrefix;
PdPrefix prefix; PdPrefix prefix;
@@ -4137,7 +4136,7 @@ void RoutingManager::PdPrefixManager::Process(const InfraIf::Icmp6Packet *aRaPac
mNumPlatformPioProcessed++; mNumPlatformPioProcessed++;
prefix.SetFrom(static_cast<const PrefixInfoOption &>(option)); prefix.SetFrom(static_cast<const PrefixInfoOption &>(option));
currentPrefixUpdated |= ProcessPdPrefix(prefix, favoredPrefix); ProcessPdPrefix(prefix, favoredPrefix);
} }
mNumPlatformRaReceived++; mNumPlatformRaReceived++;
@@ -4146,10 +4145,10 @@ void RoutingManager::PdPrefixManager::Process(const InfraIf::Icmp6Packet *aRaPac
else // aPrefixTableEntry != nullptr else // aPrefixTableEntry != nullptr
{ {
prefix.SetFrom(*aPrefixTableEntry); prefix.SetFrom(*aPrefixTableEntry);
currentPrefixUpdated = ProcessPdPrefix(prefix, favoredPrefix); ProcessPdPrefix(prefix, favoredPrefix);
} }
if (currentPrefixUpdated && mPrefix.IsDeprecated()) if (HasPrefix() && mPrefix.IsDeprecated())
{ {
LogInfo("DHCPv6 PD prefix %s is deprecated", mPrefix.GetPrefix().ToString().AsCString()); LogInfo("DHCPv6 PD prefix %s is deprecated", mPrefix.GetPrefix().ToString().AsCString());
mPrefix.Clear(); mPrefix.Clear();
@@ -4158,8 +4157,7 @@ void RoutingManager::PdPrefixManager::Process(const InfraIf::Icmp6Packet *aRaPac
if (favoredPrefix.IsFavoredOver(mPrefix)) if (favoredPrefix.IsFavoredOver(mPrefix))
{ {
mPrefix = favoredPrefix; mPrefix = favoredPrefix;
currentPrefixUpdated = true;
LogInfo("DHCPv6 PD prefix set to %s", mPrefix.GetPrefix().ToString().AsCString()); LogInfo("DHCPv6 PD prefix set to %s", mPrefix.GetPrefix().ToString().AsCString());
Get<RoutingManager>().ScheduleRoutingPolicyEvaluation(kImmediately); Get<RoutingManager>().ScheduleRoutingPolicyEvaluation(kImmediately);
} }
@@ -4178,10 +4176,8 @@ exit:
OT_UNUSED_VARIABLE(error); OT_UNUSED_VARIABLE(error);
} }
bool RoutingManager::PdPrefixManager::ProcessPdPrefix(PdPrefix &aPrefix, PdPrefix &aFavoredPrefix) void RoutingManager::PdPrefixManager::ProcessPdPrefix(PdPrefix &aPrefix, PdPrefix &aFavoredPrefix)
{ {
bool currentPrefixUpdated = false;
if (!aPrefix.IsValidPdPrefix()) if (!aPrefix.IsValidPdPrefix())
{ {
LogWarn("Ignore invalid DHCPv6 PD prefix %s", aPrefix.GetPrefix().ToString().AsCString()); LogWarn("Ignore invalid DHCPv6 PD prefix %s", aPrefix.GetPrefix().ToString().AsCString());
@@ -4196,8 +4192,7 @@ bool RoutingManager::PdPrefixManager::ProcessPdPrefix(PdPrefix &aPrefix, PdPrefi
if (HasPrefix() && (mPrefix.GetPrefix() == aPrefix.GetPrefix())) if (HasPrefix() && (mPrefix.GetPrefix() == aPrefix.GetPrefix()))
{ {
currentPrefixUpdated = true; mPrefix = aPrefix;
mPrefix = aPrefix;
} }
VerifyOrExit(!aPrefix.IsDeprecated()); VerifyOrExit(!aPrefix.IsDeprecated());
@@ -4213,7 +4208,7 @@ bool RoutingManager::PdPrefixManager::ProcessPdPrefix(PdPrefix &aPrefix, PdPrefi
} }
exit: exit:
return currentPrefixUpdated; return;
} }
bool RoutingManager::PdPrefixManager::PdPrefix::IsValidPdPrefix(void) const bool RoutingManager::PdPrefixManager::PdPrefix::IsValidPdPrefix(void) const
src/core/border_router/routing_manager.hpp
+1 -1
View File
@@ -1497,7 +1497,7 @@ private:
}; };
void Process(const InfraIf::Icmp6Packet *aRaPacket, const PrefixTableEntry *aPrefixTableEntry); void Process(const InfraIf::Icmp6Packet *aRaPacket, const PrefixTableEntry *aPrefixTableEntry);
bool ProcessPdPrefix(PdPrefix &aPrefix, PdPrefix &aFavoredPrefix); void ProcessPdPrefix(PdPrefix &aPrefix, PdPrefix &aFavoredPrefix);
void EvaluateStateChange(State aOldState); void EvaluateStateChange(State aOldState);
void WithdrawPrefix(void); void WithdrawPrefix(void);
void StartStop(bool aStart); void StartStop(bool aStart);