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

[br-tracker] move iteration logic out of RoutingManager::Iterator (#11962)

Browse Source 
This change moves the logic for iterating over the `NetDataPeerBrTracker`
entries from `RoutingManager::RxRaTracker::Iterator` directly into the
`NetDataPeerBrTracker::GetNext()` method.

This decouples the `NetDataPeerBrTracker` from the `RoutingManager`'s
iterator implementation, allowing the removal of `RoutingManager` as a
friend class of `NetDataPeerBrTracker`.

This commit also includes smaller enhancements and changes to the
`RoutingManager::RxRaTracker::Iterator`:
- `Iterator::EntryType` is renamed to `PrefixType` for clarity.
- `Iterator::AdvanceToNextEntry()` is renamed to
  `AdvanceToNextPrefixEntry()`.
This commit is contained in:
Abtin Keshavarzian
2025-09-24 16:42:24 -07:00
committed by GitHub
parent 38781d43c9
commit a5c36a685a
4 changed files with 43 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/border_router/br_tracker.cpp
+21 -5
View File
@@ -69,13 +69,29 @@ Error NetDataPeerBrTracker::GetNext(TableIterator &aIterator, PeerBrEntry &aEntr
{
using Iterator = RoutingManager::RxRaTracker::Iterator;
Iterator &iterator = static_cast<Iterator &>(aIterator);
Error error;
Iterator &iterator = static_cast<Iterator &>(aIterator);
Error error = kErrorNone;
const PeerBr *entry;
SuccessOrExit(error = iterator.AdvanceToNextPeerBr(mPeerBrs.GetHead()));
if (iterator.GetType() == Iterator::kUnspecified)
{
iterator.SetType(Iterator::kNetDataBrIterator);
entry = mPeerBrs.GetHead();
}
else
{
VerifyOrExit(iterator.GetType() == Iterator::kNetDataBrIterator, error = kErrorInvalidArgs);
entry = static_cast<const PeerBr *>(iterator.GetEntry());
VerifyOrExit(entry != nullptr, error = kErrorNotFound);
entry = entry->GetNext();
}
aEntry.mRloc16 = iterator.GetPeerBrEntry()->mRloc16;
aEntry.mAge = iterator.GetPeerBrEntry()->GetAge(iterator.GetInitUptime());
VerifyOrExit(entry != nullptr, error = kErrorNotFound);
iterator.SetEntry(entry);
aEntry.mRloc16 = entry->mRloc16;
aEntry.mAge = entry->GetAge(iterator.GetInitUptime());
exit:
return error;
src/core/border_router/br_tracker.hpp
-1
View File
@@ -54,7 +54,6 @@ class RoutingManager;
*/
class NetDataPeerBrTracker : public InstanceLocator
{
friend class RoutingManager;
friend class ot::Notifier;
public:
src/core/border_router/routing_manager.cpp
+8 -34
View File
@@ -2122,11 +2122,11 @@ Error RoutingManager::RxRaTracker::GetNextEntry(PrefixTableIterator &aIterator,
ClearAllBytes(aEntry);
SuccessOrExit(error = iterator.AdvanceToNextEntry());
SuccessOrExit(error = iterator.AdvanceToNextPrefixEntry());
iterator.GetRouter()->CopyInfoTo(aEntry.mRouter, iterator.GetInitTime(), iterator.GetInitUptime());
switch (iterator.GetEntryType())
switch (iterator.GetPrefixType())
{
case Iterator::kOnLinkPrefix:
iterator.GetEntry<OnLinkPrefix>()->CopyInfoTo(aEntry, iterator.GetInitTime());
@@ -2268,7 +2268,7 @@ void RoutingManager::RxRaTracker::Iterator::Init(const Entry<Router> *aRoutersHe
SetType(kUnspecified);
SetRouter(aRoutersHead);
SetEntry(nullptr);
SetEntryType(kRoutePrefix);
SetPrefixType(kRoutePrefix);
}
Error RoutingManager::RxRaTracker::Iterator::AdvanceToNextRouter(Type aType)
@@ -2300,7 +2300,7 @@ exit:
return error;
}
Error RoutingManager::RxRaTracker::Iterator::AdvanceToNextEntry(void)
Error RoutingManager::RxRaTracker::Iterator::AdvanceToNextPrefixEntry(void)
{
Error error = kErrorNone;
@@ -2308,7 +2308,7 @@ Error RoutingManager::RxRaTracker::Iterator::AdvanceToNextEntry(void)
if (HasEntry())
{
switch (GetEntryType())
switch (GetPrefixType())
{
case kOnLinkPrefix:
SetEntry(GetEntry<OnLinkPrefix>()->GetNext());
@@ -2321,7 +2321,7 @@ Error RoutingManager::RxRaTracker::Iterator::AdvanceToNextEntry(void)
while (!HasEntry())
{
switch (GetEntryType())
switch (GetPrefixType())
{
case kOnLinkPrefix:
@@ -2329,7 +2329,7 @@ Error RoutingManager::RxRaTracker::Iterator::AdvanceToNextEntry(void)
// the current router.
SetEntry(GetRouter()->mRoutePrefixes.GetHead());
SetEntryType(kRoutePrefix);
SetPrefixType(kRoutePrefix);
break;
case kRoutePrefix:
@@ -2343,7 +2343,7 @@ Error RoutingManager::RxRaTracker::Iterator::AdvanceToNextEntry(void)
SuccessOrExit(error = AdvanceToNextRouter(kPrefixIterator));
SetEntry(GetRouter()->mOnLinkPrefixes.GetHead());
SetEntryType(kOnLinkPrefix);
SetPrefixType(kOnLinkPrefix);
break;
}
}
@@ -2396,32 +2396,6 @@ exit:
return error;
}
#if OPENTHREAD_CONFIG_BORDER_ROUTING_TRACK_PEER_BR_INFO_ENABLE
Error RoutingManager::RxRaTracker::Iterator::AdvanceToNextPeerBr(const PeerBr *aPeerBrsHead)
{
Error error = kErrorNone;
if (GetType() == kUnspecified)
{
SetType(kPeerBrIterator);
SetEntry(aPeerBrsHead);
}
else
{
VerifyOrExit(GetType() == kPeerBrIterator, error = kErrorInvalidArgs);
VerifyOrExit(GetPeerBrEntry() != nullptr, error = kErrorNotFound);
SetEntry(GetPeerBrEntry()->GetNext());
}
VerifyOrExit(GetPeerBrEntry() != nullptr, error = kErrorNotFound);
exit:
return error;
}
#endif // OPENTHREAD_CONFIG_BORDER_ROUTING_TRACK_PEER_BR_INFO_ENABLE
//---------------------------------------------------------------------------------------------------------------------
// RxRaTracker::Router
src/core/border_router/routing_manager.hpp
+14 -23
View File
@@ -1154,9 +1154,8 @@ private:
//- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
class Iterator : public PrefixTableIterator
struct Iterator : public PrefixTableIterator
{
public:
enum Type : uint8_t
{
kUnspecified,
@@ -1164,10 +1163,10 @@ private:
kPrefixIterator,
kRdnssAddrIterator,
kIfAddrIterator,
kPeerBrIterator,
kNetDataBrIterator, // Used by `NetDataPeerBrTracker`
};
enum EntryType : uint8_t
enum PrefixType : uint8_t
{
kOnLinkPrefix,
kRoutePrefix,
@@ -1175,35 +1174,27 @@ private:
void Init(const Entry<Router> *aRoutersHead, uint32_t aUptime);
Error AdvanceToNextRouter(Type aType);
Error AdvanceToNextEntry(void);
Error AdvanceToNextPrefixEntry(void);
Error AdvanceToNextRdnssAddrEntry(void);
Error AdvanceToNextIfAddrEntry(const Entry<IfAddress> *aListHead);
uint32_t GetInitUptime(void) const { return mData0; }
void SetInitUptime(uint32_t aUptime) { mData0 = aUptime; }
TimeMilli GetInitTime(void) const { return TimeMilli(mData1); }
Type GetType(void) const { return static_cast<Type>(mData2); }
void SetInitTime(void) { mData1 = TimerMilli::GetNow().GetValue(); }
const Entry<Router> *GetRouter(void) const { return static_cast<const Entry<Router> *>(mPtr1); }
EntryType GetEntryType(void) const { return static_cast<EntryType>(mData3); }
void SetRouter(const Entry<Router> *aRouter) { mPtr1 = aRouter; }
Type GetType(void) const { return static_cast<Type>(mData2); }
void SetType(Type aType) { mData2 = aType; }
const void *GetEntry(void) const { return mPtr2; }
void SetEntry(const void *aEntry) { mPtr2 = aEntry; }
bool HasEntry(void) const { return mPtr2 != nullptr; }
PrefixType GetPrefixType(void) const { return static_cast<PrefixType>(mData3); }
void SetPrefixType(PrefixType aType) { mData3 = aType; }
template <typename ObjectType> const Entry<ObjectType> *GetEntry(void) const
{
return static_cast<const Entry<ObjectType> *>(mPtr2);
}
#if OPENTHREAD_CONFIG_BORDER_ROUTING_TRACK_PEER_BR_INFO_ENABLE
using PeerBr = NetDataPeerBrTracker::PeerBr;
Error AdvanceToNextPeerBr(const PeerBr *aPeerBrsHead);
const PeerBr *GetPeerBrEntry(void) const { return static_cast<const PeerBr *>(mPtr2); }
#endif
private:
void SetRouter(const Entry<Router> *aRouter) { mPtr1 = aRouter; }
void SetInitUptime(uint32_t aUptime) { mData0 = aUptime; }
void SetInitTime(void) { mData1 = TimerMilli::GetNow().GetValue(); }
void SetEntry(const void *aEntry) { mPtr2 = aEntry; }
bool HasEntry(void) const { return mPtr2 != nullptr; }
void SetEntryType(EntryType aType) { mData3 = aType; }
void SetType(Type aType) { mData2 = aType; }
};
//- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -