espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-07-30 23:57:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[link-metrics] simplify HandleManagementRequest() (#8714)

Browse Source
This commit is contained in:
Abtin Keshavarzian
2023-02-03 21:37:55 -08:00
committed by GitHub
parent a3d353af8c
commit 7defbc95bf
2 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/link_metrics.cpp
+42 -38
View File
@@ -280,66 +280,70 @@ exit:
Error LinkMetrics::HandleManagementRequest(const Message &aMessage, Neighbor &aNeighbor, Status &aStatus)
{
Error error = kErrorNone;
Tlv tlv;
uint8_t seriesId;
uint8_t seriesFlagsMask;
EnhAckFlags enhAckFlags;
Metrics metrics;
bool hasForwardProbingRegistrationTlv = false;
bool hasEnhAckProbingTlv = false;
uint16_t offset;
uint16_t length;
uint16_t index = 0;
Error error = kErrorNone;
uint16_t offset;
uint16_t endOffset;
uint16_t tlvEndOffset;
uint16_t length;
FwdProbingRegSubTlv fwdProbingSubTlv;
EnhAckConfigSubTlv enhAckConfigSubTlv;
Metrics metrics;
SuccessOrExit(error = Tlv::FindTlvValueOffset(aMessage, Mle::Tlv::Type::kLinkMetricsManagement, offset, length));
endOffset = offset + length;
while (index < length)
// Set sub-TLV lengths to zero to indicate that we have
// not yet seen them in the message.
fwdProbingSubTlv.SetLength(0);
enhAckConfigSubTlv.SetLength(0);
for (; offset < endOffset; offset = tlvEndOffset)
{
uint16_t pos = offset + index;
Tlv tlv;
uint16_t minTlvSize;
Tlv *subTlv;
SuccessOrExit(aMessage.Read(pos, tlv));
SuccessOrExit(error = aMessage.Read(offset, tlv));
pos += sizeof(tlv);
VerifyOrExit(offset + tlv.GetSize() <= endOffset, error = kErrorParse);
tlvEndOffset = static_cast<uint16_t>(offset + tlv.GetSize());
switch (tlv.GetType())
{
case SubTlv::kFwdProbingReg:
VerifyOrExit(!hasForwardProbingRegistrationTlv && !hasEnhAckProbingTlv, error = kErrorParse);
VerifyOrExit(tlv.GetLength() >= sizeof(seriesId) + sizeof(seriesFlagsMask), error = kErrorParse);
SuccessOrExit(aMessage.Read(pos, seriesId));
pos += sizeof(seriesId);
SuccessOrExit(aMessage.Read(pos, seriesFlagsMask));
pos += sizeof(seriesFlagsMask);
SuccessOrExit(error = ReadTypeIdsFromMessage(
aMessage, pos, static_cast<uint16_t>(offset + index + tlv.GetSize()), metrics));
hasForwardProbingRegistrationTlv = true;
subTlv = &fwdProbingSubTlv;
minTlvSize = sizeof(Tlv) + FwdProbingRegSubTlv::kMinLength;
break;
case SubTlv::kEnhAckConfig:
VerifyOrExit(!hasForwardProbingRegistrationTlv && !hasEnhAckProbingTlv, error = kErrorParse);
VerifyOrExit(tlv.GetLength() >= sizeof(EnhAckFlags), error = kErrorParse);
SuccessOrExit(aMessage.Read(pos, enhAckFlags));
pos += sizeof(enhAckFlags);
SuccessOrExit(error = ReadTypeIdsFromMessage(
aMessage, pos, static_cast<uint16_t>(offset + index + tlv.GetSize()), metrics));
hasEnhAckProbingTlv = true;
subTlv = &enhAckConfigSubTlv;
minTlvSize = sizeof(Tlv) + EnhAckConfigSubTlv::kMinLength;
break;
default:
break;
continue;
}
index += static_cast<uint16_t>(tlv.GetSize());
// Ensure message contains only one sub-TLV.
VerifyOrExit(fwdProbingSubTlv.GetLength() == 0, error = kErrorParse);
VerifyOrExit(enhAckConfigSubTlv.GetLength() == 0, error = kErrorParse);
VerifyOrExit(tlv.GetSize() >= minTlvSize, error = kErrorParse);
// Read `subTlv` with its `minTlvSize`, followed by the Type IDs.
SuccessOrExit(error = aMessage.Read(offset, subTlv, minTlvSize));
SuccessOrExit(error = ReadTypeIdsFromMessage(aMessage, offset + minTlvSize, tlvEndOffset, metrics));
}
if (hasForwardProbingRegistrationTlv)
if (fwdProbingSubTlv.GetLength() != 0)
{
aStatus = ConfigureForwardTrackingSeries(seriesId, seriesFlagsMask, metrics, aNeighbor);
aStatus = ConfigureForwardTrackingSeries(fwdProbingSubTlv.GetSeriesId(), fwdProbingSubTlv.GetSeriesFlagsMask(),
metrics, aNeighbor);
}
else if (hasEnhAckProbingTlv)
if (enhAckConfigSubTlv.GetLength() != 0)
{
aStatus = ConfigureEnhAckProbing(enhAckFlags, metrics, aNeighbor);
aStatus = ConfigureEnhAckProbing(enhAckConfigSubTlv.GetEnhAckFlags(), metrics, aNeighbor);
}
exit:
@@ -606,7 +610,7 @@ exit:
}
#if OPENTHREAD_CONFIG_MLE_LINK_METRICS_SUBJECT_ENABLE
Status LinkMetrics::ConfigureEnhAckProbing(EnhAckFlags aEnhAckFlags, const Metrics &aMetrics, Neighbor &aNeighbor)
Status LinkMetrics::ConfigureEnhAckProbing(uint8_t aEnhAckFlags, const Metrics &aMetrics, Neighbor &aNeighbor)
{
Status status = kStatusSuccess;
Error error = kErrorNone;
src/core/thread/link_metrics.hpp
+1 -1
View File
@@ -312,7 +312,7 @@ private:
const Metrics &aMetrics,
Neighbor &aNeighbor);
Status ConfigureEnhAckProbing(EnhAckFlags aEnhAckFlags, const Metrics &aMetrics, Neighbor &aNeighbor);
Status ConfigureEnhAckProbing(uint8_t aEnhAckFlags, const Metrics &aMetrics, Neighbor &aNeighbor);
Error FindNeighbor(const Ip6::Address &aDestination, Neighbor *&aNeighbor) const;