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

[mle] simplify appending of Address Registration TLV entries (#8958)

Browse Source 
This commit adds helper methods to append an IPv6 Address Entry in an
Address Registration TLV using compressed format where the entry
contains a lowpan context ID and the address's IID, or uncompressed
format where the full IPv6 address is appended.
This commit is contained in:
Abtin Keshavarzian
2023-04-14 11:00:19 -07:00
committed by GitHub
parent f9cd4b4182
commit e63c5d321a
3 changed files with 86 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle.cpp
+49 -46
View File
@@ -4577,22 +4577,17 @@ Error Mle::TxMessage::AppendVersionTlv(void) { return Tlv::Append<VersionTlv>(*t
Error Mle::TxMessage::AppendAddressRegistrationTlv(AddressRegistrationMode aMode)
{
Error error = kErrorNone;
Tlv tlv;
AddressRegistrationEntry entry;
Lowpan::Context context;
uint8_t length = 0;
uint8_t counter = 0;
uint16_t startOffset = GetLength();
Error error = kErrorNone;
Tlv tlv;
Lowpan::Context context;
uint8_t counter = 0;
uint16_t startOffset = GetLength();
tlv.SetType(Tlv::kAddressRegistration);
SuccessOrExit(error = Append(tlv));
// Prioritize ML-EID
entry.SetContextId(kMeshLocalPrefixContextId);
entry.SetIid(Get<Mle>().GetMeshLocal64().GetIid());
SuccessOrExit(error = AppendBytes(&entry, entry.GetLength()));
length += entry.GetLength();
SuccessOrExit(error = AppendCompressedAddressEntry(kMeshLocalPrefixContextId, Get<Mle>().GetMeshLocal64()));
// Continue to append the other addresses if not `kAppendMeshLocalOnly` mode
VerifyOrExit(aMode != kAppendMeshLocalOnly);
@@ -4603,10 +4598,8 @@ Error Mle::TxMessage::AppendAddressRegistrationTlv(AddressRegistrationMode aMode
(Get<NetworkData::Leader>().GetContext(Get<DuaManager>().GetDomainUnicastAddress(), context) == kErrorNone))
{
// Prioritize DUA, compressed entry
entry.SetContextId(context.mContextId);
entry.SetIid(Get<DuaManager>().GetDomainUnicastAddress().GetIid());
SuccessOrExit(error = AppendBytes(&entry, entry.GetLength()));
length += entry.GetLength();
SuccessOrExit(
error = AppendCompressedAddressEntry(context.mContextId, Get<DuaManager>().GetDomainUnicastAddress()));
counter++;
}
#endif
@@ -4628,19 +4621,13 @@ Error Mle::TxMessage::AppendAddressRegistrationTlv(AddressRegistrationMode aMode
if (Get<NetworkData::Leader>().GetContext(addr.GetAddress(), context) == kErrorNone)
{
// compressed entry
entry.SetContextId(context.mContextId);
entry.SetIid(addr.GetAddress().GetIid());
SuccessOrExit(error = AppendCompressedAddressEntry(context.mContextId, addr.GetAddress()));
}
else
{
// uncompressed entry
entry.SetUncompressed();
entry.SetIp6Address(addr.GetAddress());
SuccessOrExit(error = AppendAddressEntry(addr.GetAddress()));
}
SuccessOrExit(error = AppendBytes(&entry, entry.GetLength()));
length += entry.GetLength();
counter++;
// only continue to append if there is available entry.
VerifyOrExit(counter < kMaxIpAddressesToRegister);
@@ -4668,11 +4655,7 @@ Error Mle::TxMessage::AppendAddressRegistrationTlv(AddressRegistrationMode aMode
}
#endif
entry.SetUncompressed();
entry.SetIp6Address(addr.GetAddress());
SuccessOrExit(error = AppendBytes(&entry, entry.GetLength()));
length += entry.GetLength();
SuccessOrExit(error = AppendAddressEntry(addr.GetAddress()));
counter++;
// only continue to append if there is available entry.
VerifyOrExit(counter < kMaxIpAddressesToRegister);
@@ -4681,15 +4664,44 @@ Error Mle::TxMessage::AppendAddressRegistrationTlv(AddressRegistrationMode aMode
exit:
if (error == kErrorNone && length > 0)
if (error == kErrorNone)
{
tlv.SetLength(length);
tlv.SetLength(static_cast<uint8_t>(GetLength() - startOffset - sizeof(Tlv)));
Write(startOffset, tlv);
}
return error;
}
Error Mle::TxMessage::AppendCompressedAddressEntry(uint8_t aContextId, const Ip6::Address &aAddress)
{
// Append an IPv6 address entry in an Address Registration TLV
// using compressed format (context ID with IID).
Error error;
SuccessOrExit(error = Append<uint8_t>(AddressRegistrationTlv::ControlByteFor(aContextId)));
error = Append(aAddress.GetIid());
exit:
return error;
}
Error Mle::TxMessage::AppendAddressEntry(const Ip6::Address &aAddress)
{
// Append an IPv6 address entry in an Address Registration TLV
// using uncompressed format
Error error;
uint8_t controlByte = AddressRegistrationTlv::kControlByteUncompressed;
SuccessOrExit(error = Append(controlByte));
error = Append(aAddress);
exit:
return error;
}
Error Mle::TxMessage::AppendSupervisionIntervalTlv(uint16_t aInterval)
{
return Tlv::Append<SupervisionIntervalTlv>(*this, aInterval);
@@ -4854,12 +4866,10 @@ Error Mle::TxMessage::AppendConnectivityTlv(void)
Error Mle::TxMessage::AppendAddressRegistrationTlv(Child &aChild)
{
Error error;
Tlv tlv;
AddressRegistrationEntry entry;
Lowpan::Context context;
uint8_t length = 0;
uint16_t startOffset = GetLength();
Error error;
Tlv tlv;
Lowpan::Context context;
uint16_t startOffset = GetLength();
tlv.SetType(Tlv::kAddressRegistration);
SuccessOrExit(error = Append(tlv));
@@ -4868,26 +4878,19 @@ Error Mle::TxMessage::AppendAddressRegistrationTlv(Child &aChild)
{
if (address.IsMulticast() || Get<NetworkData::Leader>().GetContext(address, context) != kErrorNone)
{
// uncompressed entry
entry.SetUncompressed();
entry.SetIp6Address(address);
SuccessOrExit(error = AppendAddressEntry(address));
}
else if (context.mContextId != kMeshLocalPrefixContextId)
{
// compressed entry
entry.SetContextId(context.mContextId);
entry.SetIid(address.GetIid());
SuccessOrExit(error = AppendCompressedAddressEntry(context.mContextId, address));
}
else
{
continue;
}
SuccessOrExit(error = AppendBytes(&entry, entry.GetLength()));
length += entry.GetLength();
}
tlv.SetLength(length);
tlv.SetLength(static_cast<uint8_t>(GetLength() - startOffset - sizeof(Tlv)));
Write(startOffset, tlv);
exit:
src/core/thread/mle.hpp
+4
View File
@@ -1281,6 +1281,10 @@ protected:
*
*/
Error SendAfterDelay(const Ip6::Address &aDestination, uint16_t aDelay);
private:
Error AppendCompressedAddressEntry(uint8_t aContextId, const Ip6::Address &aAddress);
Error AppendAddressEntry(const Ip6::Address &aAddress);
};
/**
src/core/thread/mle_tlvs.hpp
+33 -1
View File
@@ -975,7 +975,39 @@ struct StatusTlv : public UintTlvInfo<Tlv::kStatus, uint8_t>
};
/**
* This class implements Source Address TLV generation and parsing.
* This class provides constants and methods for generation and parsing of Address Registration TLV.
*
*/
class AddressRegistrationTlv : public TlvInfo<Tlv::kAddressRegistration>
{
public:
/**
* This constant defines the control byte to use in an uncompressed entry where the full IPv6 address is included in
* the TLV.
*
*/
static constexpr uint8_t kControlByteUncompressed = 0;
/**
* This static method returns the control byte to use in a compressed entry where the 64-prefix is replaced with a
* 6LoWPAN context identifier.
*
* @param[in] aContextId The 6LoWPAN context ID.
*
* @returns The control byte associated with compressed entry with @p aContextId.
*
*/
static uint8_t ControlByteFor(uint8_t aContextId) { return kCompressed | (aContextId & kContextIdMask); }
AddressRegistrationTlv(void) = delete;
private:
static constexpr uint8_t kCompressed = 1 << 7;
static constexpr uint8_t kContextIdMask = 0xf;
};
/**
* This class implements Address Registration Entry generation and parsing.
*
*/
OT_TOOL_PACKED_BEGIN