espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-20 17:39:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[netdata-leader] simplify HandleTmf<kUriCommissionerGet> (#9546)

Browse Source 
This commit simplifies the handling of `kUriCommissionerGet` TMF
message and preparation of its response.
This commit is contained in:
Abtin Keshavarzian
2023-10-18 20:54:10 -07:00
committed by GitHub
parent a69c2db333
commit 95b0869912
3 changed files with 34 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/network_data_leader.hpp
+5 -5
View File
@@ -325,6 +325,11 @@ protected:
void SignalNetDataChanged(void);
const CommissioningDataTlv *FindCommissioningData(void) const;
CommissioningDataTlv *FindCommissioningData(void) { return AsNonConst(AsConst(this)->FindCommissioningData()); }
const MeshCoP::Tlv *FindCommissioningDataSubTlv(uint8_t aType) const;
MeshCoP::Tlv *FindCommissioningDataSubTlv(uint8_t aType)
{
return AsNonConst(AsConst(this)->FindCommissioningDataSubTlv(aType));
}
uint8_t mStableVersion;
uint8_t mVersion;
@@ -347,11 +352,6 @@ private:
Error SteeringDataCheck(const FilterIndexes &aFilterIndexes) const;
void GetContextForMeshLocalPrefix(Lowpan::Context &aContext) const;
Error ReadCommissioningDataUint16SubTlv(MeshCoP::Tlv::Type aType, uint16_t &aValue) const;
const MeshCoP::Tlv *FindCommissioningDataSubTlv(uint8_t aType) const;
MeshCoP::Tlv *FindCommissioningDataSubTlv(uint8_t aType)
{
return AsNonConst(AsConst(this)->FindCommissioningDataSubTlv(aType));
}
uint8_t mTlvBuffer[kMaxSize];
uint8_t mMaxLength;
src/core/thread/network_data_leader_ftd.cpp
+29 -50
View File
@@ -284,74 +284,53 @@ exit:
template <> void Leader::HandleTmf<kUriCommissionerGet>(Coap::Message &aMessage, const Ip6::MessageInfo &aMessageInfo)
{
uint16_t length = 0;
uint16_t offset;
uint16_t length;
uint16_t offset;
Coap::Message *response = nullptr;
VerifyOrExit(Get<Mle::Mle>().IsLeader() && !mWaitingForNetDataSync);
SuccessOrExit(Tlv::FindTlvValueOffset(aMessage, MeshCoP::Tlv::kGet, offset, length));
aMessage.SetOffset(offset);
response = Get<Tmf::Agent>().NewPriorityResponseMessage(aMessage);
VerifyOrExit(response != nullptr);
exit:
if (Get<Mle::MleRouter>().IsLeader())
if (Tlv::FindTlvValueOffset(aMessage, MeshCoP::Tlv::kGet, offset, length) == kErrorNone)
{
SendCommissioningGetResponse(aMessage, length, aMessageInfo);
}
}
// Append the requested sub-TLV types given in Get TLV.
void Leader::SendCommissioningGetResponse(const Coap::Message &aRequest,
uint16_t aLength,
const Ip6::MessageInfo &aMessageInfo)
{
Error error = kErrorNone;
Coap::Message *message;
CommissioningDataTlv *commDataTlv;
uint8_t *data = nullptr;
uint8_t length = 0;
message = Get<Tmf::Agent>().NewPriorityResponseMessage(aRequest);
VerifyOrExit(message != nullptr, error = kErrorNoBufs);
commDataTlv = FindCommissioningData();
if (commDataTlv != nullptr)
{
data = commDataTlv->GetValue();
length = commDataTlv->GetLength();
}
VerifyOrExit(data && length, error = kErrorDrop);
if (aLength == 0)
{
SuccessOrExit(error = message->AppendBytes(data, length));
}
else
{
for (uint16_t index = 0; index < aLength; index++)
for (; length > 0; offset++, length--)
{
uint8_t type;
uint8_t type;
const MeshCoP::Tlv *subTlv;
IgnoreError(aRequest.Read(aRequest.GetOffset() + index, type));
IgnoreError(aMessage.Read(offset, type));
for (MeshCoP::Tlv *cur = reinterpret_cast<MeshCoP::Tlv *>(data);
cur < reinterpret_cast<MeshCoP::Tlv *>(data + length); cur = cur->GetNext())
subTlv = FindCommissioningDataSubTlv(type);
if (subTlv != nullptr)
{
if (cur->GetType() == type)
{
SuccessOrExit(error = cur->AppendTo(*message));
break;
}
SuccessOrExit(subTlv->AppendTo(*response));
}
}
}
else
{
// Append all sub-TLVs in the Commissioning Data.
SuccessOrExit(error = Get<Tmf::Agent>().SendMessage(*message, aMessageInfo));
CommissioningDataTlv *dataTlv = FindCommissioningData();
if (dataTlv != nullptr)
{
SuccessOrExit(response->AppendBytes(dataTlv->GetValue(), dataTlv->GetLength()));
}
}
SuccessOrExit(Get<Tmf::Agent>().SendMessage(*response, aMessageInfo));
response = nullptr; // `SendMessage` takes ownership on success
LogInfo("Sent %s response", UriToString<kUriCommissionerGet>());
exit:
FreeMessageOnError(message, error);
FreeMessage(response);
}
void Leader::SendCommissioningSetResponse(const Coap::Message &aRequest,
src/core/thread/network_data_leader_ftd.hpp
-3
View File
@@ -329,9 +329,6 @@ private:
UpdateStatus UpdateService(ServiceTlv &aService);
UpdateStatus UpdateTlv(NetworkDataTlv &aTlv, const NetworkDataTlv *aSubTlvs);
void SendCommissioningGetResponse(const Coap::Message &aRequest,
uint16_t aLength,
const Ip6::MessageInfo &aMessageInfo);
void SendCommissioningSetResponse(const Coap::Message &aRequest,
const Ip6::MessageInfo &aMessageInfo,
MeshCoP::StateTlv::State aState);