espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-18 08:29:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[tlv] define Tlv::AppendTlvHeader() public and use it in core (#13143)

Browse Source 
This commit makes `Tlv::AppendTlvHeader()` public and updates call
sites to use it. This method automatically handles the formatting
of the TLV header as either a standard TLV header or an extended one
based on the provided length.
This commit is contained in:
Abtin Keshavarzian
2026-05-25 19:38:59 -07:00
committed by GitHub
parent 2dc41cf9a2
commit d50b9b444f
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/common/tlvs.hpp
+15 -1
View File
@@ -550,6 +550,21 @@ public:
return FindStringTlv(aMessage, StringTlvType::kType, StringTlvType::kMaxStringLength, aValue);
}
/**
* Appends a TLV header to a message.
*
* This method automatically formats the header as a standard TLV header or an extended one based on the
* @p aLength value.
*
* @param[in] aMessage The message to append the TLV header to.
* @param[in] aType The TLV type to append.
* @param[in] aLength The length of the TLV value.
*
* @retval kErrorNone Successfully appended the TLV header.
* @retval kErrorNoBufs Could not add the TLV header due to insufficient buffer space.
*/
static Error AppendTlvHeader(Message &aMessage, uint8_t aType, uint16_t aLength);
/**
* Appends an empty TLV (no value) with a given type to a message.
*
@@ -839,7 +854,6 @@ protected:
static const uint8_t kExtendedLength = 255; // Extended Length value.
private:
static Error AppendTlvHeader(Message &aMessage, uint8_t aType, uint16_t aLength);
static Error FindTlv(const Message &aMessage, uint8_t aType, void *aValue, uint16_t aLength);
static Error FindStringTlv(const Message &aMessage, uint8_t aType, uint8_t aMaxStringLength, char *aValue);
static Error AppendStringTlv(Message &aMessage, uint8_t aType, uint8_t aMaxStringLength, const char *aValue);
src/core/meshcop/border_agent.cpp
+2 -5
View File
@@ -903,7 +903,6 @@ Error Manager::CoapDtlsSession::ForwardUdpProxy(const Message &aMessage, const I
{
Error error = kErrorNone;
OwnedPtr<Coap::Message> message;
ExtendedTlv extTlv;
UdpEncapsulationTlvHeader udpEncapHeader;
OffsetRange offsetRange;
@@ -914,13 +913,11 @@ Error Manager::CoapDtlsSession::ForwardUdpProxy(const Message &aMessage, const I
offsetRange.InitFromMessageOffsetToEnd(aMessage);
extTlv.SetType(Tlv::kUdpEncapsulation);
extTlv.SetLength(sizeof(UdpEncapsulationTlvHeader) + offsetRange.GetLength());
udpEncapHeader.SetSourcePort(aMessageInfo.GetPeerPort());
udpEncapHeader.SetDestinationPort(aMessageInfo.GetSockPort());
SuccessOrExit(error = message->Append(extTlv));
SuccessOrExit(error = Tlv::AppendTlvHeader(*message, Tlv::kUdpEncapsulation,
sizeof(UdpEncapsulationTlvHeader) + offsetRange.GetLength()));
SuccessOrExit(error = message->Append(udpEncapHeader));
SuccessOrExit(error = message->AppendBytesFromMessage(aMessage, offsetRange));
tests/nexus/test_border_admitter.cpp
+2 -5
View File
@@ -3196,7 +3196,6 @@ void TestBorderAdmitterForwardingUdpProxy(void)
uint16_t sessionId;
uint16_t rloc16;
MeshCoP::UdpEncapsulationTlvHeader udpEncapHeader;
ExtendedTlv extTlv;
Log("------------------------------------------------------------------------------------------------------");
Log("TestBorderAdmitterForwardingUdpProxy");
@@ -3360,10 +3359,8 @@ void TestBorderAdmitterForwardingUdpProxy(void)
udpEncapHeader.SetSourcePort(Tmf::kUdpPort);
udpEncapHeader.SetDestinationPort(Tmf::kUdpPort);
extTlv.SetType(MeshCoP::Tlv::kUdpEncapsulation);
extTlv.SetLength(sizeof(udpEncapHeader) + diagMessage->GetLength());
SuccessOrQuit(message->Append(extTlv));
SuccessOrQuit(Tlv::AppendTlvHeader(*message, MeshCoP::Tlv::kUdpEncapsulation,
sizeof(udpEncapHeader) + diagMessage->GetLength()));
SuccessOrQuit(message->Append(udpEncapHeader));
SuccessOrQuit(message->AppendBytesFromMessage(*diagMessage, 0, diagMessage->GetLength()));
diagMessage->Free();