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

[network-data] optimize ContainsOmrPrefix() (#10239)

Browse Source 
This commit simplifies the `Leader::ContainsOmrPrefix()` method by
eliminating the loop over sub-TLVs based on stable flag status. Since
OMR prefixes must be marked as stable, the search for a given OMR
prefix can be restricted to stable sub-TLV only.
This commit is contained in:
Abtin Keshavarzian
2024-05-15 10:29:07 -07:00
committed by GitHub
parent f66f095d4d
commit 4fe428d079
2 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/network_data_leader.hpp
+1 -1
View File
@@ -431,7 +431,7 @@ public:
* @retval FALSE Otherwise.
*
*/
bool ContainsOmrPrefix(const Ip6::Prefix &aPrefix);
bool ContainsOmrPrefix(const Ip6::Prefix &aPrefix) const;
#endif
#endif // OPENTHREAD_FTD
src/core/thread/network_data_leader_ftd.cpp
+18 -22
View File
@@ -1358,44 +1358,40 @@ void Leader::HandleTimer(void)
}
}
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_BORDER_ROUTING_ENABLE
bool Leader::ContainsOmrPrefix(const Ip6::Prefix &aPrefix)
#if OPENTHREAD_CONFIG_BORDER_ROUTING_ENABLE
bool Leader::ContainsOmrPrefix(const Ip6::Prefix &aPrefix) const
{
PrefixTlv *prefixTlv;
bool contains = false;
bool contains = false;
const PrefixTlv *prefixTlv;
const BorderRouterTlv *brSubTlv;
VerifyOrExit(BorderRouter::RoutingManager::IsValidOmrPrefix(aPrefix));
prefixTlv = FindPrefix(aPrefix);
VerifyOrExit(prefixTlv != nullptr);
for (int i = 0; i < 2; i++)
brSubTlv = prefixTlv->FindSubTlv<BorderRouterTlv>(/* aStable */ true);
VerifyOrExit(brSubTlv != nullptr);
for (const BorderRouterEntry *entry = brSubTlv->GetFirstEntry(); entry <= brSubTlv->GetLastEntry(); entry++)
{
const BorderRouterTlv *borderRouter = prefixTlv->FindSubTlv<BorderRouterTlv>(/* aStable */ (i == 0));
OnMeshPrefixConfig config;
if (borderRouter == nullptr)
config.SetFrom(*prefixTlv, *brSubTlv, *entry);
if (BorderRouter::RoutingManager::IsValidOmrPrefix(config))
{
continue;
}
for (const BorderRouterEntry *entry = borderRouter->GetFirstEntry(); entry <= borderRouter->GetLastEntry();
entry = entry->GetNext())
{
OnMeshPrefixConfig config;
config.SetFrom(*prefixTlv, *borderRouter, *entry);
if (BorderRouter::RoutingManager::IsValidOmrPrefix(config))
{
ExitNow(contains = true);
}
ExitNow(contains = true);
}
}
exit:
return contains;
}
#endif
#endif // OPENTHREAD_CONFIG_BORDER_ROUTING_ENABLE
//---------------------------------------------------------------------------------------------------------------------
// Leader::ContextIds