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

[dua] fix assert failure (#6282)

Browse Source 
This commit fix a potential DUA assertion failure.
This commit is contained in:
Simon Lin
2021-03-14 22:50:52 -07:00
committed by GitHub
parent 93c994723e
commit 2da3f98e0d
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/dua_manager.cpp
+15 -8
View File
@@ -429,18 +429,25 @@ void DuaManager::PerformNextRegistration(void)
// Only send DUA.req when necessary // Only send DUA.req when necessary
#if OPENTHREAD_CONFIG_DUA_ENABLE #if OPENTHREAD_CONFIG_DUA_ENABLE
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE #if OPENTHREAD_FTD
VerifyOrExit(mle.IsRouterOrLeader() || !mle.IsExpectedToBecomeRouter(), error = OT_ERROR_INVALID_STATE); VerifyOrExit(mle.IsRouterOrLeader() || !mle.IsExpectedToBecomeRouter(), error = OT_ERROR_INVALID_STATE);
VerifyOrExit((mDuaState == kToRegister && mDelay.mFields.mRegistrationDelay == 0) || #endif
(mChildDuaMask.HasAny() && mChildDuaMask != mChildDuaRegisteredMask),
error = OT_ERROR_NOT_FOUND);
#else
VerifyOrExit(mDuaState == kToRegister && mDelay.mFields.mRegistrationDelay == 0, error = OT_ERROR_NOT_FOUND);
#endif // OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE
VerifyOrExit(mle.IsFullThreadDevice() || mle.GetParent().IsThreadVersion1p1(), error = OT_ERROR_INVALID_STATE); VerifyOrExit(mle.IsFullThreadDevice() || mle.GetParent().IsThreadVersion1p1(), error = OT_ERROR_INVALID_STATE);
#endif // OPENTHREAD_CONFIG_DUA_ENABLE #endif // OPENTHREAD_CONFIG_DUA_ENABLE
{
bool needReg = false;
#if OPENTHREAD_CONFIG_DUA_ENABLE
needReg = (mDuaState == kToRegister && mDelay.mFields.mRegistrationDelay == 0);
#endif
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE
needReg = needReg || (mChildDuaMask.HasAny() && mChildDuaMask != mChildDuaRegisteredMask);
#endif
VerifyOrExit(needReg, error = OT_ERROR_NOT_FOUND);
}
// Prepare DUA.req // Prepare DUA.req
VerifyOrExit((message = Get<Tmf::TmfAgent>().NewPriorityMessage()) != nullptr, error = OT_ERROR_NO_BUFS); VerifyOrExit((message = Get<Tmf::TmfAgent>().NewPriorityMessage()) != nullptr, error = OT_ERROR_NO_BUFS);