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

[mlr] use Array<> to track old registered MLR addresses (#9134)

Browse Source
This commit is contained in:
Abtin Keshavarzian
2023-06-06 18:10:58 -07:00
committed by GitHub
parent 6a549d1cdb
commit b69dfef1cc
3 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle_router.cpp
+4 -5
View File
@@ -1802,8 +1802,7 @@ Error MleRouter::ProcessAddressRegistrationTlv(RxInfo &aRxInfo, Child &aChild)
Ip6::Address oldDua;
#endif
#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE
Ip6::Address oldMlrRegisteredAddresses[kMaxChildIpAddresses - 1];
uint16_t oldMlrRegisteredAddressNum = 0;
MlrManager::MlrAddressArray oldMlrRegisteredAddresses;
#endif
SuccessOrExit(error = Tlv::FindTlvValueOffset(aRxInfo.mMessage, Tlv::kAddressRegistration, offset, length));
@@ -1833,7 +1832,7 @@ Error MleRouter::ProcessAddressRegistrationTlv(RxInfo &aRxInfo, Child &aChild)
{
if (aChild.GetAddressMlrState(childAddress) == kMlrStateRegistered)
{
oldMlrRegisteredAddresses[oldMlrRegisteredAddressNum++] = childAddress;
IgnoreError(oldMlrRegisteredAddresses.PushBack(childAddress));
}
}
}
@@ -1975,7 +1974,7 @@ Error MleRouter::ProcessAddressRegistrationTlv(RxInfo &aRxInfo, Child &aChild)
#endif
#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE
Get<MlrManager>().UpdateProxiedSubscriptions(aChild, oldMlrRegisteredAddresses, oldMlrRegisteredAddressNum);
Get<MlrManager>().UpdateProxiedSubscriptions(aChild, oldMlrRegisteredAddresses);
#endif
if (count == 0)
@@ -3942,7 +3941,7 @@ void MleRouter::SetChildStateToValid(Child &aChild)
IgnoreError(mChildTable.StoreChild(aChild));
#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE
Get<MlrManager>().UpdateProxiedSubscriptions(aChild, nullptr, 0);
Get<MlrManager>().UpdateProxiedSubscriptions(aChild, MlrManager::MlrAddressArray());
#endif
mNeighborTable.Signal(NeighborTable::kChildAdded, aChild);
src/core/thread/mlr_manager.cpp
+2 -14
View File
@@ -146,26 +146,14 @@ exit:
return ret;
}
void MlrManager::UpdateProxiedSubscriptions(Child &aChild,
const Ip6::Address *aOldMlrRegisteredAddresses,
uint16_t aOldMlrRegisteredAddressNum)
void MlrManager::UpdateProxiedSubscriptions(Child &aChild, const MlrAddressArray &aOldMlrRegisteredAddresses)
{
VerifyOrExit(aChild.IsStateValid());
// Search the new multicast addresses and set its flag accordingly
for (const Ip6::Address &address : aChild.IterateIp6Addresses(Ip6::Address::kTypeMulticastLargerThanRealmLocal))
{
bool isMlrRegistered = false;
// Check if it's a new multicast address against old addresses
for (size_t i = 0; i < aOldMlrRegisteredAddressNum; i++)
{
if (aOldMlrRegisteredAddresses[i] == address)
{
isMlrRegistered = true;
break;
}
}
bool isMlrRegistered = aOldMlrRegisteredAddresses.Contains(address);
#if OPENTHREAD_CONFIG_MLR_ENABLE
// Check if it's a new multicast address against parent Netif
src/core/thread/mlr_manager.hpp
+6 -5
View File
@@ -98,17 +98,18 @@ public:
void HandleBackboneRouterPrimaryUpdate(BackboneRouter::Leader::State aState, const BackboneRouter::Config &aConfig);
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE
static constexpr uint16_t kMaxMlrAddresses = OPENTHREAD_CONFIG_MLE_IP_ADDRS_PER_CHILD - 1; ///< Max MLR addresses
typedef Array<Ip6::Address, kMaxMlrAddresses> MlrAddressArray; ///< Registered MLR addresses array.
/**
* Updates the Multicast Subscription Table according to the Child information.
*
* @param[in] aChild A reference to the child information.
* @param[in] aOldMlrRegisteredAddresses Pointer to an array of the Child's previously registered IPv6 addresses.
* @param[in] aOldMlrRegisteredAddressNum The number of previously registered IPv6 addresses.
* @param[in] aOldMlrRegisteredAddresses Array of the Child's previously registered IPv6 addresses.
*
*/
void UpdateProxiedSubscriptions(Child &aChild,
const Ip6::Address *aOldMlrRegisteredAddresses,
uint16_t aOldMlrRegisteredAddressNum);
void UpdateProxiedSubscriptions(Child &aChild, const MlrAddressArray &aOldMlrRegisteredAddresses);
#endif
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE