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

[router-table] rename loop variables in UpdateAllocation() (#3453)

Browse Source
This commit is contained in:
Abtin Keshavarzian
2019-01-11 09:03:42 -08:00
committed by Jonathan Hui
parent 1056c7c93a
commit 2057a141ef
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/router_table.cpp
+18 -18
View File
@@ -113,22 +113,22 @@ void RouterTable::UpdateAllocation(void)
mActiveRouterCount = 0;
// build index map
for (uint8_t i = 0; i <= Mle::kMaxRouterId; i++)
for (uint8_t routerId = 0; routerId <= Mle::kMaxRouterId; routerId++)
{
if (IsAllocated(i) && mActiveRouterCount < Mle::kMaxRouters)
if (IsAllocated(routerId) && mActiveRouterCount < Mle::kMaxRouters)
{
indexMap[i] = mActiveRouterCount++;
indexMap[routerId] = mActiveRouterCount++;
}
else
{
indexMap[i] = Mle::kInvalidRouterId;
indexMap[routerId] = Mle::kInvalidRouterId;
}
}
// shift entries forward
for (int i = Mle::kMaxRouters - 2; i >= 0; i--)
for (int index = Mle::kMaxRouters - 2; index >= 0; index--)
{
uint8_t routerId = mRouters[i].GetRouterId();
uint8_t routerId = mRouters[index].GetRouterId();
uint8_t newIndex;
if (routerId > Mle::kMaxRouterId || indexMap[routerId] == Mle::kInvalidRouterId)
@@ -138,16 +138,16 @@ void RouterTable::UpdateAllocation(void)
newIndex = indexMap[routerId];
if (newIndex > i)
if (newIndex > index)
{
mRouters[newIndex] = mRouters[i];
mRouters[newIndex] = mRouters[index];
}
}
// shift entries backward
for (uint8_t i = 1; i < Mle::kMaxRouters; i++)
for (uint8_t index = 1; index < Mle::kMaxRouters; index++)
{
uint8_t routerId = mRouters[i].GetRouterId();
uint8_t routerId = mRouters[index].GetRouterId();
uint8_t newIndex;
if (routerId > Mle::kMaxRouterId || indexMap[routerId] == Mle::kInvalidRouterId)
@@ -157,34 +157,34 @@ void RouterTable::UpdateAllocation(void)
newIndex = indexMap[routerId];
if (newIndex < i)
if (newIndex < index)
{
mRouters[newIndex] = mRouters[i];
mRouters[newIndex] = mRouters[index];
}
}
// fix replaced entries
for (uint8_t i = 0; i <= Mle::kMaxRouterId; i++)
for (uint8_t routerId = 0; routerId <= Mle::kMaxRouterId; routerId++)
{
uint8_t index = indexMap[i];
uint8_t index = indexMap[routerId];
if (index != Mle::kInvalidRouterId)
{
Router &router = mRouters[index];
if (router.GetRouterId() != i)
if (router.GetRouterId() != routerId)
{
memset(&router, 0, sizeof(router));
router.SetRloc16(Mle::Mle::GetRloc16(i));
router.SetRloc16(Mle::Mle::GetRloc16(routerId));
router.SetNextHop(Mle::kInvalidRouterId);
}
}
}
// clear unused entries
for (uint8_t i = mActiveRouterCount; i < Mle::kMaxRouters; i++)
for (uint8_t index = mActiveRouterCount; index < Mle::kMaxRouters; index++)
{
Router &router = mRouters[i];
Router &router = mRouters[index];
memset(&router, 0, sizeof(router));
router.SetRloc16(0xffff);
}