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

[network-data] remove all matching entries from RemoveRloc methods (#3082)

Browse Source 
This commit makes changes to ensure the `Leader::RemoveRloc` methods
remove all matching entries from a `BorderRouterTlv` or `HasRouteTlv`
It adds new methods to `BorderRouterTlv` and `HasRouteTlv` to get the
first entry or last entry and allow an easier way to iterate over all
the entries.
This commit also adds a new helper method `RlocMatch()` to simplify
the comparison of RLOC16 values (exact match vs router id match).
This commit is contained in:
Abtin Keshavarzian
2018-09-19 11:31:11 -10:00
committed by Jonathan Hui
parent b43d83f43f
commit 75522066c1
3 changed files with 84 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/network_data_leader_ftd.cpp
+24 -30
View File
@@ -433,6 +433,12 @@ exit:
}
}
bool Leader::RlocMatch(uint16_t aFirstRloc16, uint16_t aSecondRloc16, bool aExactMatch)
{
return ((aExactMatch && aFirstRloc16 == aSecondRloc16) ||
(!aExactMatch && Mle::Mle::RouterIdMatch(aFirstRloc16, aSecondRloc16)));
}
otError Leader::RlocLookup(uint16_t aRloc16,
bool & aIn,
bool & aStable,
@@ -485,8 +491,7 @@ otError Leader::RlocLookup(uint16_t aRloc16,
{
borderRouterEntry = borderRouter->GetEntry(i);
if ((aExactMatch && borderRouterEntry->GetRloc() == aRloc16) ||
(!aExactMatch && (Mle::Mle::RouterIdMatch(borderRouterEntry->GetRloc(), aRloc16))))
if (RlocMatch(borderRouterEntry->GetRloc(), aRloc16, aExactMatch))
{
aIn = true;
@@ -510,8 +515,7 @@ otError Leader::RlocLookup(uint16_t aRloc16,
{
hasRouteEntry = hasRoute->GetEntry(i);
if ((aExactMatch && hasRouteEntry->GetRloc() == aRloc16) ||
(!aExactMatch && (Mle::Mle::RouterIdMatch(hasRouteEntry->GetRloc(), aRloc16))))
if (RlocMatch(hasRouteEntry->GetRloc(), aRloc16, aExactMatch))
{
aIn = true;
@@ -564,8 +568,7 @@ otError Leader::RlocLookup(uint16_t aRloc16,
server = static_cast<ServerTlv *>(subCur);
VerifyOrExit(server->IsValid(), error = OT_ERROR_PARSE);
if ((aExactMatch && server->GetServer16() == aRloc16) ||
(!aExactMatch && (Mle::Mle::RouterIdMatch(server->GetServer16(), aRloc16))))
if (RlocMatch(server->GetServer16(), aRloc16, aExactMatch))
{
aIn = true;
@@ -1387,8 +1390,7 @@ otError Leader::RemoveRloc(ServiceTlv &service, uint16_t aRloc16, bool aExactMat
case NetworkDataTlv::kTypeServer:
server = static_cast<ServerTlv *>(cur);
if ((aExactMatch && server->GetServer16() == aRloc16) ||
(!aExactMatch && (Mle::Mle::RouterIdMatch(server->GetServer16(), aRloc16))))
if (RlocMatch(server->GetServer16(), aRloc16, aExactMatch))
{
removeLength = sizeof(ServerTlv) + server->GetServerDataLength();
service.SetSubTlvsLength(service.GetSubTlvsLength() - removeLength);
@@ -1411,23 +1413,19 @@ otError Leader::RemoveRloc(ServiceTlv &service, uint16_t aRloc16, bool aExactMat
otError Leader::RemoveRloc(PrefixTlv &aPrefix, HasRouteTlv &aHasRoute, uint16_t aRloc16, bool aExactMatch)
{
HasRouteEntry *entry;
HasRouteEntry *entry = aHasRoute.GetFirstEntry();
// remove rloc from has route tlv
for (uint8_t i = 0; i < aHasRoute.GetNumEntries(); i++)
while (entry <= aHasRoute.GetLastEntry())
{
entry = aHasRoute.GetEntry(i);
if ((aExactMatch && entry->GetRloc() != aRloc16) ||
(!aExactMatch && !(Mle::Mle::RouterIdMatch(entry->GetRloc(), aRloc16))))
if (RlocMatch(entry->GetRloc(), aRloc16, aExactMatch))
{
aHasRoute.SetLength(aHasRoute.GetLength() - sizeof(HasRouteEntry));
aPrefix.SetSubTlvsLength(aPrefix.GetSubTlvsLength() - sizeof(HasRouteEntry));
Remove(reinterpret_cast<uint8_t *>(entry), sizeof(HasRouteEntry));
continue;
}
aHasRoute.SetLength(aHasRoute.GetLength() - sizeof(HasRouteEntry));
aPrefix.SetSubTlvsLength(aPrefix.GetSubTlvsLength() - sizeof(HasRouteEntry));
Remove(reinterpret_cast<uint8_t *>(entry), sizeof(*entry));
break;
entry = entry->GetNext();
}
return OT_ERROR_NONE;
@@ -1435,23 +1433,19 @@ otError Leader::RemoveRloc(PrefixTlv &aPrefix, HasRouteTlv &aHasRoute, uint16_t
otError Leader::RemoveRloc(PrefixTlv &aPrefix, BorderRouterTlv &aBorderRouter, uint16_t aRloc16, bool aExactMatch)
{
BorderRouterEntry *entry;
BorderRouterEntry *entry = aBorderRouter.GetFirstEntry();
// remove rloc from border router tlv
for (uint8_t i = 0; i < aBorderRouter.GetNumEntries(); i++)
while (entry <= aBorderRouter.GetLastEntry())
{
entry = aBorderRouter.GetEntry(i);
if ((aExactMatch && entry->GetRloc() != aRloc16) ||
(!aExactMatch && !(Mle::Mle::RouterIdMatch(entry->GetRloc(), aRloc16))))
if (RlocMatch(entry->GetRloc(), aRloc16, aExactMatch))
{
aBorderRouter.SetLength(aBorderRouter.GetLength() - sizeof(BorderRouterEntry));
aPrefix.SetSubTlvsLength(aPrefix.GetSubTlvsLength() - sizeof(BorderRouterEntry));
Remove(reinterpret_cast<uint8_t *>(entry), sizeof(*entry));
continue;
}
aBorderRouter.SetLength(aBorderRouter.GetLength() - sizeof(BorderRouterEntry));
aPrefix.SetSubTlvsLength(aPrefix.GetSubTlvsLength() - sizeof(BorderRouterEntry));
Remove(reinterpret_cast<uint8_t *>(entry), sizeof(*entry));
break;
entry = entry->GetNext();
}
return OT_ERROR_NONE;
src/core/thread/network_data_leader_ftd.hpp
+2
View File
@@ -191,6 +191,8 @@ private:
otError RemoveRloc(PrefixTlv &aPrefix, HasRouteTlv &aHasRoute, uint16_t aRloc16, bool aExactMatch);
otError RemoveRloc(PrefixTlv &aPrefix, BorderRouterTlv &aBorderRouter, uint16_t aRloc16, bool aExactMatch);
static bool RlocMatch(uint16_t aFirstRloc16, uint16_t aSecondRloc16, bool aExactMatch);
otError RlocLookup(uint16_t aRloc16,
bool & aIn,
bool & aStable,
src/core/thread/network_data_tlvs.hpp
+58
View File
@@ -226,6 +226,14 @@ public:
mFlags = (mFlags & ~kPreferenceMask) | ((aPrf << kPreferenceOffset) & kPreferenceMask);
}
/**
* This method returns a pointer to the next HasRouteEntry.
*
* @returns A pointer to the next HasRouteEntry.
*
*/
HasRouteEntry *GetNext(void) { return (this + 1); }
private:
enum
{
@@ -276,6 +284,27 @@ public:
{
return reinterpret_cast<HasRouteEntry *>(GetValue() + (i * sizeof(HasRouteEntry)));
}
/**
* This method returns a pointer to the first HasRouteEntry (at index 0'th).
*
* @returns A pointer to the first HasRouteEntry.
*
*/
HasRouteEntry *GetFirstEntry(void) { return reinterpret_cast<HasRouteEntry *>(GetValue()); }
/**
* This method returns a pointer to the last HasRouteEntry.
*
* If there are no entries the pointer will be invalid but guaranteed to be before the `GetFirstEntry()` pointer.
*
* @returns A pointer to the last HasRouteEntry.
*
*/
HasRouteEntry *GetLastEntry(void)
{
return reinterpret_cast<HasRouteEntry *>(GetValue() + GetLength() - sizeof(HasRouteEntry));
}
} OT_TOOL_PACKED_END;
/**
@@ -586,6 +615,14 @@ public:
*/
void SetOnMesh(void) { mFlags |= kOnMeshFlag; }
/**
* This method returns a pointer to the next BorderRouterEntry
*
* @returns A pointer to the next BorderRouterEntry.
*
*/
BorderRouterEntry *GetNext(void) { return (this + 1); }
private:
uint16_t mRloc;
uint8_t mFlags;
@@ -631,6 +668,27 @@ public:
{
return reinterpret_cast<BorderRouterEntry *>(GetValue() + (i * sizeof(BorderRouterEntry)));
}
/**
* This method returns a pointer to the first BorderRouterEntry (at index 0'th).
*
* @returns A pointer to the first BorderRouterEntry.
*
*/
BorderRouterEntry *GetFirstEntry(void) { return reinterpret_cast<BorderRouterEntry *>(GetValue()); }
/**
* This method returns a pointer to the last BorderRouterEntry.
*
* If there are no entries the pointer will be invalid but guaranteed to be before the `GetFirstEntry()` pointer.
*
* @returns A pointer to the last BorderRouterEntry.
*
*/
BorderRouterEntry *GetLastEntry(void)
{
return reinterpret_cast<BorderRouterEntry *>(GetValue() + GetLength() - sizeof(BorderRouterEntry));
}
} OT_TOOL_PACKED_END;
/**