mirror of
https://github.com/espressif/openthread.git
synced 2026-10-08 08:47:38 +00:00
[mle] rename Get{Addr}() to Compose{Addr}() (#13197)
This commit renames several methods in the `Mle` class that construct an IPv6 address from the mesh-local prefix and an RLOC16/ALOC16 from `Get...()` to `Compose...()` to better reflect their behavior. The affected methods are: - `GetLeaderRloc()` -> `ComposeLeaderRloc()` - `GetLeaderAloc()` -> `ComposeLeaderAloc()` - `GetCommissionerAloc()` -> `ComposeCommissionerAloc()` - `GetServiceAloc()` -> `ComposeServiceAloc()`
This commit is contained in:
@@ -172,7 +172,7 @@ void Core::SaveTestInfo(const char *aFilename, Node *aLeaderNode)
|
||||
if (leaderNode->Get<Mle::Mle>().IsLeader())
|
||||
{
|
||||
Ip6::Address aloc;
|
||||
leaderNode->Get<Mle::Mle>().GetLeaderAloc(aloc);
|
||||
leaderNode->Get<Mle::Mle>().ComposeLeaderAloc(aloc);
|
||||
fprintf(file, " \"leader_aloc\": \"%s\",\n", aloc.ToString().AsCString());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -151,7 +151,7 @@ void RunTest9_2_3(Topology aTopology, const char *aJsonFile)
|
||||
MeshCoP::Dataset::Components components;
|
||||
Ip6::Address leaderAloc;
|
||||
|
||||
leader.Get<Mle::Mle>().GetLeaderAloc(leaderAloc);
|
||||
leader.Get<Mle::Mle>().ComposeLeaderAloc(leaderAloc);
|
||||
components.Clear();
|
||||
SuccessOrQuit(
|
||||
commissioner.Get<MeshCoP::ActiveDatasetManager>().SendGetRequest(components, nullptr, 0, &leaderAloc));
|
||||
@@ -198,7 +198,7 @@ void RunTest9_2_3(Topology aTopology, const char *aJsonFile)
|
||||
Ip6::Address leaderAloc;
|
||||
uint8_t tlvs[] = {MeshCoP::Tlv::kChannelMask, MeshCoP::Tlv::kMeshLocalPrefix, MeshCoP::Tlv::kNetworkName};
|
||||
|
||||
leader.Get<Mle::Mle>().GetLeaderAloc(leaderAloc);
|
||||
leader.Get<Mle::Mle>().ComposeLeaderAloc(leaderAloc);
|
||||
components.Clear();
|
||||
SuccessOrQuit(commissioner.Get<MeshCoP::ActiveDatasetManager>().SendGetRequest(components, tlvs, sizeof(tlvs),
|
||||
&leaderAloc));
|
||||
@@ -246,7 +246,7 @@ void RunTest9_2_3(Topology aTopology, const char *aJsonFile)
|
||||
uint8_t tlvs[] = {MeshCoP::Tlv::kChannel, MeshCoP::Tlv::kMeshLocalPrefix, MeshCoP::Tlv::kNetworkName,
|
||||
MeshCoP::Tlv::kScanDuration, MeshCoP::Tlv::kEnergyList};
|
||||
|
||||
leader.Get<Mle::Mle>().GetLeaderAloc(leaderAloc);
|
||||
leader.Get<Mle::Mle>().ComposeLeaderAloc(leaderAloc);
|
||||
components.Clear();
|
||||
SuccessOrQuit(commissioner.Get<MeshCoP::ActiveDatasetManager>().SendGetRequest(components, tlvs, sizeof(tlvs),
|
||||
&leaderAloc));
|
||||
|
||||
@@ -136,7 +136,7 @@ void TestAnycastLocator(void)
|
||||
Log("1. Locate leader ALOC from all nodes");
|
||||
|
||||
Ip6::Address leaderAloc;
|
||||
leader.Get<Mle::Mle>().GetLeaderAloc(leaderAloc);
|
||||
leader.Get<Mle::Mle>().ComposeLeaderAloc(leaderAloc);
|
||||
|
||||
LocateResult result;
|
||||
|
||||
|
||||
@@ -70,7 +70,7 @@ void TestIPv6SourceSelection(void)
|
||||
Ip6::Address leaderMleid = leader.Get<Mle::Mle>().GetMeshLocalEid();
|
||||
Ip6::Address leaderLinkLocal = leader.Get<Mle::Mle>().GetLinkLocalAddress();
|
||||
Ip6::Address leaderAloc;
|
||||
leader.Get<Mle::Mle>().GetLeaderAloc(leaderAloc);
|
||||
leader.Get<Mle::Mle>().ComposeLeaderAloc(leaderAloc);
|
||||
|
||||
Ip6::Address routerRloc = router.Get<Mle::Mle>().GetMeshLocalRloc();
|
||||
Ip6::Address routerMleid = router.Get<Mle::Mle>().GetMeshLocalEid();
|
||||
|
||||
@@ -86,7 +86,7 @@ void TestPbbrAloc(void)
|
||||
Ip6::Address aloc;
|
||||
|
||||
// 1. Leader ALOC
|
||||
leader.Get<Mle::Mle>().GetLeaderAloc(aloc);
|
||||
leader.Get<Mle::Mle>().ComposeLeaderAloc(aloc);
|
||||
Log("Pinging Leader ALOC %s from ROUTER", aloc.ToString().AsCString());
|
||||
nexus.SendAndVerifyEchoRequest(router, aloc);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user