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

[dua] fix Parent failed to send reregister for MTD Child on receiving ST_DUA_REREGISTER (#6637)

Browse Source 
This commit enhances DUA response handling for ST_DUA_REREGISTER:
- Parent will stop registering DUA for MTD Child until the next Child
  Update Request.
- MTD Child will re-register its DUA by Child Update Request or
  DUA.req.
This commit is contained in:
Simon Lin
2021-05-17 22:22:53 -07:00
committed by GitHub
parent 6792eb76af
commit cf21d5760a
4 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/dua_manager.cpp
+11 -13
View File
@@ -61,7 +61,6 @@ DuaManager::DuaManager(Instance &aInstance)
#endif
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE
, mChildIndexDuaRegistering(0)
, mRegisterCurrentChildIndex(false)
#endif
{
mDelay.mValue = 0;
@@ -98,7 +97,6 @@ void DuaManager::HandleDomainPrefixUpdate(BackboneRouter::Leader::DomainPrefixSt
{
mChildDuaMask.Clear();
mChildDuaRegisteredMask.Clear();
mRegisterCurrentChildIndex = false;
}
#endif
}
@@ -476,7 +474,7 @@ void DuaManager::PerformNextRegistration(void)
const Ip6::Address *duaPtr = nullptr;
Child * child = nullptr;
if (!mRegisterCurrentChildIndex)
if (!mChildDuaMask.Get(mChildIndexDuaRegistering))
{
for (Child &iter : Get<ChildTable>().Iterate(Child::kInStateValid))
{
@@ -623,8 +621,11 @@ Error DuaManager::ProcessDuaResponse(Coap::Message &aMessage)
mDuaState = kRegistered;
break;
case ThreadStatusTlv::kDuaReRegister:
mDuaState = kToRegister;
mDelay.mFields.mCheckDelay = Mle::kImmediateReRegisterDelay;
if (Get<ThreadNetif>().HasUnicastAddress(GetDomainUnicastAddress()))
{
RemoveDomainUnicastAddress();
AddDomainUnicastAddress();
}
break;
case ThreadStatusTlv::kDuaInvalid:
// Domain Prefix might be invalid.
@@ -649,8 +650,6 @@ Error DuaManager::ProcessDuaResponse(Coap::Message &aMessage)
VerifyOrExit(child != nullptr, error = kErrorNotFound);
VerifyOrExit(child->HasIp6Address(target), error = kErrorNotFound);
mRegisterCurrentChildIndex = false;
switch (status)
{
case ThreadStatusTlv::kDuaSuccess:
@@ -658,8 +657,9 @@ Error DuaManager::ProcessDuaResponse(Coap::Message &aMessage)
mChildDuaRegisteredMask.Set(mChildIndexDuaRegistering, true);
break;
case ThreadStatusTlv::kDuaReRegister:
mRegisterCurrentChildIndex = true;
mDelay.mFields.mCheckDelay = Mle::kImmediateReRegisterDelay;
// Parent stops registering for the Child's DUA until next Child Update Request
mChildDuaMask.Set(mChildIndexDuaRegistering, false);
mChildDuaRegisteredMask.Set(mChildIndexDuaRegistering, false);
break;
case ThreadStatusTlv::kDuaInvalid:
case ThreadStatusTlv::kDuaDuplicate:
@@ -738,16 +738,14 @@ void DuaManager::UpdateChildDomainUnicastAddress(const Child &aChild, Mle::Child
#endif
{
IgnoreError(Get<Tmf::Agent>().AbortTransaction(&DuaManager::HandleDuaResponse, this));
// Reset mRegisterCurrentChildIndex properly
mRegisterCurrentChildIndex = mRegisterCurrentChildIndex && (aState == Mle::ChildDuaState::kRemoved);
}
mChildDuaMask.Set(childIndex, false);
mChildDuaRegisteredMask.Set(childIndex, false);
}
if (aState == Mle::ChildDuaState::kAdded || aState == Mle::ChildDuaState::kChanged)
if (aState == Mle::ChildDuaState::kAdded || aState == Mle::ChildDuaState::kChanged ||
(aState == Mle::ChildDuaState::kUnchanged && !mChildDuaMask.Get(childIndex)))
{
if (mChildDuaMask == mChildDuaRegisteredMask)
{