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

[mle] remove GetNextHop() and directly use RouterTable method (#10417)

Browse Source 
This commit removes the `MleRouter::GetNextHop()` method and instead
directly uses `RouterTable::GetNextHop()`. This improves consistency
across all modules.
This commit is contained in:
Abtin Keshavarzian
2024-06-20 20:41:49 -07:00
committed by GitHub
parent 1b87190509
commit 89b54dca2b
3 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mesh_forwarder_ftd.cpp
+2 -2
View File
@@ -374,7 +374,7 @@ Error MeshForwarder::UpdateMeshRoute(Message &aMessage)
IgnoreError(meshHeader.ParseFrom(aMessage)); IgnoreError(meshHeader.ParseFrom(aMessage));
nextHop = Get<Mle::MleRouter>().GetNextHop(meshHeader.GetDestination()); nextHop = Get<RouterTable>().GetNextHop(meshHeader.GetDestination());
if (nextHop != Mac::kShortAddrInvalid) if (nextHop != Mac::kShortAddrInvalid)
{ {
@@ -577,7 +577,7 @@ Error MeshForwarder::UpdateIp6RouteFtd(const Ip6::Header &aIp6Header, Message &a
SuccessOrExit(error = mle.CheckReachability(mMeshDest, aIp6Header)); SuccessOrExit(error = mle.CheckReachability(mMeshDest, aIp6Header));
aMessage.SetMeshDest(mMeshDest); aMessage.SetMeshDest(mMeshDest);
mMacAddrs.mDestination.SetShort(mle.GetNextHop(mMeshDest)); mMacAddrs.mDestination.SetShort(Get<RouterTable>().GetNextHop(mMeshDest));
if (mMacAddrs.mDestination.GetShort() != mMeshDest) if (mMacAddrs.mDestination.GetShort() != mMeshDest)
{ {
src/core/thread/mle_router.cpp
+2 -2
View File
@@ -3217,7 +3217,7 @@ void MleRouter::ResolveRoutingLoops(uint16_t aSourceMac, uint16_t aDestRloc16)
{ {
Router *router; Router *router;
if (aSourceMac != GetNextHop(aDestRloc16)) if (aSourceMac != mRouterTable.GetNextHop(aDestRloc16))
{ {
ExitNow(); ExitNow();
} }
@@ -3263,7 +3263,7 @@ Error MleRouter::CheckReachability(uint16_t aMeshDest, const Ip6::Header &aIp6He
ExitNow(); ExitNow();
} }
isReachable = (GetNextHop(aMeshDest) != Mac::kShortAddrInvalid); isReachable = (mRouterTable.GetNextHop(aMeshDest) != Mac::kShortAddrInvalid);
exit: exit:
return isReachable ? kErrorNone : kErrorNoRoute; return isReachable ? kErrorNone : kErrorNoRoute;
src/core/thread/mle_router.hpp
-10
View File
@@ -236,16 +236,6 @@ public:
*/ */
void SetRouterId(uint8_t aRouterId); void SetRouterId(uint8_t aRouterId);
/**
* Returns the next hop towards an RLOC16 destination.
*
* @param[in] aDestination The RLOC16 of the destination.
*
* @returns A RLOC16 of the next hop if a route is known, kInvalidRloc16 otherwise.
*
*/
uint16_t GetNextHop(uint16_t aDestination) { return mRouterTable.GetNextHop(aDestination); }
/** /**
* Returns the NETWORK_ID_TIMEOUT value. * Returns the NETWORK_ID_TIMEOUT value.
* *