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

[mle] rename static methods converting between service ALOC and Id (#4486)

Browse Source
This commit is contained in:
Abtin Keshavarzian
2020-01-22 20:52:09 -08:00
committed by Jonathan Hui
parent c9ce2d42e9
commit 24b84cc762
4 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mesh_forwarder_ftd.cpp
+1 -1
View File
@@ -776,7 +776,7 @@ exit:
otError MeshForwarder::GetDestinationRlocByServiceAloc(uint16_t aServiceAloc, uint16_t &aMeshDest)
{
otError error = OT_ERROR_NONE;
uint8_t serviceId = Mle::Mle::GetServiceIdFromAloc(aServiceAloc);
uint8_t serviceId = Mle::Mle::ServiceIdFromAloc(aServiceAloc);
NetworkData::ServiceTlv *serviceTlv = Get<NetworkData::Leader>().FindServiceById(serviceId);
if (serviceTlv != NULL)
src/core/thread/mle.cpp
+3 -3
View File
@@ -1042,7 +1042,7 @@ otError Mle::GetServiceAloc(uint8_t aServiceId, Ip6::Address &aAddress) const
aAddress.mFields.m16[4] = HostSwap16(0x0000);
aAddress.mFields.m16[5] = HostSwap16(0x00ff);
aAddress.mFields.m16[6] = HostSwap16(0xfe00);
aAddress.mFields.m16[7] = HostSwap16(GetServiceAlocFromId(aServiceId));
aAddress.mFields.m16[7] = HostSwap16(ServiceAlocFromId(aServiceId));
exit:
return error;
@@ -1601,7 +1601,7 @@ void Mle::UpdateServiceAlocs(void)
serviceAloc = HostSwap16(mServiceAlocs[i].GetAddress().mFields.m16[7]);
if ((serviceAloc != Mac::kShortAddrInvalid) &&
(!Get<NetworkData::Leader>().ContainsService(Mle::GetServiceIdFromAloc(serviceAloc), rloc)))
(!Get<NetworkData::Leader>().ContainsService(Mle::ServiceIdFromAloc(serviceAloc), rloc)))
{
Get<ThreadNetif>().RemoveUnicastAddress(mServiceAlocs[i]);
mServiceAlocs[i].GetAddress().mFields.m16[7] = HostSwap16(Mac::kShortAddrInvalid);
@@ -1615,7 +1615,7 @@ void Mle::UpdateServiceAlocs(void)
{
serviceAloc = HostSwap16(mServiceAlocs[i].GetAddress().mFields.m16[7]);
if ((serviceAloc != Mac::kShortAddrInvalid) && (Mle::GetServiceIdFromAloc(serviceAloc) == serviceId))
if ((serviceAloc != Mac::kShortAddrInvalid) && (Mle::ServiceIdFromAloc(serviceAloc) == serviceId))
{
break;
}
src/core/thread/mle.hpp
+4 -7
View File
@@ -871,7 +871,7 @@ public:
*/
otError GetCommissionerAloc(Ip6::Address &aAddress, uint16_t aSessionId) const
{
return GetAlocAddress(aAddress, GetCommissionerAloc16FromId(aSessionId));
return GetAlocAddress(aAddress, CommissionerAloc16FromId(aSessionId));
}
/**
@@ -957,10 +957,7 @@ public:
* @returns The Service ID corresponding to given ALOC16.
*
*/
static uint8_t GetServiceIdFromAloc(uint16_t aAloc16)
{
return static_cast<uint8_t>(aAloc16 - kAloc16ServiceStart);
}
static uint8_t ServiceIdFromAloc(uint16_t aAloc16) { return static_cast<uint8_t>(aAloc16 - kAloc16ServiceStart); }
/**
* This method returns the Service Aloc corresponding to a Service ID.
@@ -970,7 +967,7 @@ public:
* @returns The Service ALOC16 corresponding to given ID.
*
*/
static uint16_t GetServiceAlocFromId(uint8_t aServiceId)
static uint16_t ServiceAlocFromId(uint8_t aServiceId)
{
return static_cast<uint16_t>(aServiceId + kAloc16ServiceStart);
}
@@ -983,7 +980,7 @@ public:
* @returns The Commissioner ALOC16 corresponding to given ID.
*
*/
static uint16_t GetCommissionerAloc16FromId(uint16_t aSessionId)
static uint16_t CommissionerAloc16FromId(uint16_t aSessionId)
{
return static_cast<uint16_t>((aSessionId & kAloc16CommissionerMask) + kAloc16CommissionerStart);
}
src/core/thread/network_data.cpp
+1 -1
View File
@@ -716,7 +716,7 @@ void NetworkData::RemoveTemporaryData(uint8_t *aData, uint8_t &aDataLength, Serv
case NetworkDataTlv::kTypeServer:
{
server = static_cast<ServerTlv *>(cur);
server->SetServer16(Mle::Mle::GetServiceAlocFromId(aService.GetServiceID()));
server->SetServer16(Mle::Mle::ServiceAlocFromId(aService.GetServiceID()));
break;
}