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

[mesh-forwarder] use Mle::RouterIdMatch() helper method (#4486)

Browse Source
This commit is contained in:
Abtin Keshavarzian
2020-01-22 20:52:09 -08:00
committed by Jonathan Hui
parent e2403f6066
commit b7a56cdfd7
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mesh_forwarder_ftd.cpp
+1 -2
View File
@@ -614,8 +614,7 @@ void MeshForwarder::UpdateRoutes(uint8_t * aFrame,
neighbor = Get<Mle::MleRouter>().GetNeighbor(ip6Header.GetSource()); neighbor = Get<Mle::MleRouter>().GetNeighbor(ip6Header.GetSource());
VerifyOrExit(neighbor != NULL && !neighbor->IsFullThreadDevice()); VerifyOrExit(neighbor != NULL && !neighbor->IsFullThreadDevice());
if (Mle::Mle::RouterIdFromRloc16(aMeshSource.GetShort()) != if (!Mle::Mle::RouterIdMatch(aMeshSource.GetShort(), Get<Mac::Mac>().GetShortAddress()))
Mle::Mle::RouterIdFromRloc16(Get<Mac::Mac>().GetShortAddress()))
{ {
Get<Mle::MleRouter>().RemoveNeighbor(*neighbor); Get<Mle::MleRouter>().RemoveNeighbor(*neighbor);
} }
src/core/thread/mle.hpp
+1 -1
View File
@@ -946,7 +946,7 @@ public:
*/ */
static bool RouterIdMatch(uint16_t aRloc16A, uint16_t aRloc16B) static bool RouterIdMatch(uint16_t aRloc16A, uint16_t aRloc16B)
{ {
return ((aRloc16A >> kRouterIdOffset) == (aRloc16B >> kRouterIdOffset)); return RouterIdFromRloc16(aRloc16A) == RouterIdFromRloc16(aRloc16B);
} }
/** /**