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

[dataset] use Tlv::Find<>() to check commissioner session ID (#10019)

Browse Source 
This commit simplifies `DatasetManager::SendSetRequest()` by using
`Tv::Find<TlvType>()` helper method to search within the given
sequence of TLVs for `CommissionerSessionIdTlv`.
This commit is contained in:
Abtin Keshavarzian
2024-04-11 12:40:40 -07:00
committed by GitHub
parent d7b5939fb7
commit 3b272023ab
1 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/meshcop/dataset_manager.cpp
+3 -22
View File
@@ -466,30 +466,11 @@ Error DatasetManager::SendSetRequest(const Dataset::Info &aDatasetInfo,
VerifyOrExit(message != nullptr, error = kErrorNoBufs);
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
if (Get<Commissioner>().IsActive())
if (Get<Commissioner>().IsActive() && (Tlv::Find<CommissionerSessionIdTlv>(aTlvs, aLength) == nullptr))
{
const Tlv *end = reinterpret_cast<const Tlv *>(aTlvs + aLength);
bool hasSessionId = false;
for (const Tlv *cur = reinterpret_cast<const Tlv *>(aTlvs); cur < end; cur = cur->GetNext())
{
VerifyOrExit((cur + 1) <= end, error = kErrorInvalidArgs);
if (cur->GetType() == Tlv::kCommissionerSessionId)
{
hasSessionId = true;
break;
}
}
if (!hasSessionId)
{
SuccessOrExit(error = Tlv::Append<CommissionerSessionIdTlv>(*message, Get<Commissioner>().GetSessionId()));
}
SuccessOrExit(error = Tlv::Append<CommissionerSessionIdTlv>(*message, Get<Commissioner>().GetSessionId()));
}
#endif // OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
#endif
SuccessOrExit(error = AppendDatasetToMessage(aDatasetInfo, *message));