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

[ip6] remove InitAsRoutingLocator and InitAsAnycastLocator (#13222)

Browse Source 
This commit replaces `Ip6::Address::InitAsRoutingLocator()` and
the now unused `Ip6::Address::InitAsAnycastLocator()` with the
single unified method `Ip6::Address::InitAsLocator()`.

Callers in `Mle` have been updated to use the unified method.
This commit is contained in:
Abtin Keshavarzian
2026-06-08 19:43:31 -07:00
committed by GitHub
parent 8abf9667c3
commit c238bd9a62
2 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/net/ip6_address.hpp
+4 -20
View File
@@ -661,28 +661,13 @@ public:
static const Address &GetRealmLocalAllMplForwarders(void);
/**
* Initializes the IPv6 address to a Routing Locator (RLOC) IPv6 address with a given Network Prefix and RLOC16
* value.
* Initializes the IPv6 address to a Routing/Anycast Locator (RLOC/ALOC) IPv6 address with a given Network Prefix
* and a locator (RLOC16 or ALOC16) value.
*
* @param[in] aNetworkPrefix A Network Prefix.
* @param[in] aRloc16 A RLOC16 value.
* @param[in] aLocator RLOC16 or ALOC16.
*/
void InitAsRoutingLocator(const NetworkPrefix &aNetworkPrefix, uint16_t aRloc16)
{
InitAsLocator(aNetworkPrefix, aRloc16);
}
/**
* Initializes the IPv6 address to a Anycast Locator (ALOC) IPv6 address with a given Network Prefix and ALOC16
* value.
*
* @param[in] aNetworkPrefix A Network Prefix.
* @param[in] aAloc16 A ALOC16 value.
*/
void InitAsAnycastLocator(const NetworkPrefix &aNetworkPrefix, uint16_t aAloc16)
{
InitAsLocator(aNetworkPrefix, aAloc16);
}
void InitAsLocator(const NetworkPrefix &aNetworkPrefix, uint16_t aLocator);
/**
* Indicates whether or not the IPv6 address follows the IPv4-mapped format.
@@ -908,7 +893,6 @@ private:
static constexpr uint8_t kMulticastNetworkPrefixLengthOffset = 3; // Prefix-Based Multicast Address (RFC3306)
static constexpr uint8_t kMulticastNetworkPrefixOffset = 4; // Prefix-Based Multicast Address (RFC3306)
void InitAsLocator(const NetworkPrefix &aNetworkPrefix, uint16_t aLocator);
void ToString(StringWriter &aWriter) const;
void AppendHexWords(StringWriter &aWriter, uint8_t aLength) const;
src/core/thread/mle.cpp
+1 -1
View File
@@ -885,7 +885,7 @@ void Mle::SetLeaderData(uint32_t aPartitionId, uint8_t aWeighting, uint8_t aLead
void Mle::ComposeRloc(uint16_t aRloc16, Ip6::Address &aAddress) const
{
aAddress.InitAsRoutingLocator(mMeshLocalPrefix, aRloc16);
aAddress.InitAsLocator(mMeshLocalPrefix, aRloc16);
}
void Mle::ComposeLeaderRloc(Ip6::Address &aAddress) const { ComposeRloc(GetLeaderRloc16(), aAddress); }