diff --git a/src/core/thread/mesh_forwarder_ftd.cpp b/src/core/thread/mesh_forwarder_ftd.cpp index 2daae86b5..78020bc9d 100644 --- a/src/core/thread/mesh_forwarder_ftd.cpp +++ b/src/core/thread/mesh_forwarder_ftd.cpp @@ -374,7 +374,7 @@ Error MeshForwarder::UpdateMeshRoute(Message &aMessage) IgnoreError(meshHeader.ParseFrom(aMessage)); - nextHop = Get().GetNextHop(meshHeader.GetDestination()); + nextHop = Get().GetNextHop(meshHeader.GetDestination()); if (nextHop != Mac::kShortAddrInvalid) { @@ -577,7 +577,7 @@ Error MeshForwarder::UpdateIp6RouteFtd(const Ip6::Header &aIp6Header, Message &a SuccessOrExit(error = mle.CheckReachability(mMeshDest, aIp6Header)); aMessage.SetMeshDest(mMeshDest); - mMacAddrs.mDestination.SetShort(mle.GetNextHop(mMeshDest)); + mMacAddrs.mDestination.SetShort(Get().GetNextHop(mMeshDest)); if (mMacAddrs.mDestination.GetShort() != mMeshDest) { diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp index 615b6a308..8374accaa 100644 --- a/src/core/thread/mle_router.cpp +++ b/src/core/thread/mle_router.cpp @@ -3217,7 +3217,7 @@ void MleRouter::ResolveRoutingLoops(uint16_t aSourceMac, uint16_t aDestRloc16) { Router *router; - if (aSourceMac != GetNextHop(aDestRloc16)) + if (aSourceMac != mRouterTable.GetNextHop(aDestRloc16)) { ExitNow(); } @@ -3263,7 +3263,7 @@ Error MleRouter::CheckReachability(uint16_t aMeshDest, const Ip6::Header &aIp6He ExitNow(); } - isReachable = (GetNextHop(aMeshDest) != Mac::kShortAddrInvalid); + isReachable = (mRouterTable.GetNextHop(aMeshDest) != Mac::kShortAddrInvalid); exit: return isReachable ? kErrorNone : kErrorNoRoute; diff --git a/src/core/thread/mle_router.hpp b/src/core/thread/mle_router.hpp index e7d7b47c0..2b4d0fb79 100644 --- a/src/core/thread/mle_router.hpp +++ b/src/core/thread/mle_router.hpp @@ -236,16 +236,6 @@ public: */ 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. *