From c238bd9a625c2394ccb592a1aa5a8afab6762207 Mon Sep 17 00:00:00 2001 From: Abtin Keshavarzian Date: Mon, 8 Jun 2026 19:43:31 -0700 Subject: [PATCH] [ip6] remove `InitAsRoutingLocator` and `InitAsAnycastLocator` (#13222) 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. --- src/core/net/ip6_address.hpp | 24 ++++-------------------- src/core/thread/mle.cpp | 2 +- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/src/core/net/ip6_address.hpp b/src/core/net/ip6_address.hpp index 5def44d28..945c2fa20 100644 --- a/src/core/net/ip6_address.hpp +++ b/src/core/net/ip6_address.hpp @@ -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; diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp index 45f74a0c5..7a06fcbe1 100644 --- a/src/core/thread/mle.cpp +++ b/src/core/thread/mle.cpp @@ -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); }