[mle] track LeaderCost in Parent class (#8052)

zephyrproject-rtos · Aug 22, 2022 · b8b88d9 · b8b88d9
1 parent 96bba36
commit b8b88d9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp
@@ -83,7 +83,6 @@ Mle::Mle(Instance &aInstance)
     , mAttachTimer(aInstance, Mle::HandleAttachTimer)
     , mDelayedResponseTimer(aInstance, Mle::HandleDelayedResponseTimer)
     , mMessageTransmissionTimer(aInstance, Mle::HandleMessageTransmissionTimer)
-    , mParentLeaderCost(0)
     , mAttachMode(kAnyPartition)
     , mParentPriority(0)
     , mParentLinkQuality3(0)
@@ -3259,6 +3258,7 @@ void Mle::HandleParentResponse(RxInfo &aRxInfo)
     mParentCandidate.SetLinkQualityOut(LinkQualityInfo::ConvertLinkMarginToLinkQuality(linkMarginFromTlv));
     mParentCandidate.SetState(Neighbor::kStateParentResponse);
     mParentCandidate.SetKeySequence(aRxInfo.mKeySequence);
+    mParentCandidate.SetLeaderCost(connectivity.GetLeaderCost());
 #if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE
     mParentCandidate.SetCslAccuracy(cslAccuracy);
 #endif
@@ -3267,7 +3267,6 @@ void Mle::HandleParentResponse(RxInfo &aRxInfo)
     mParentLinkQuality3     = connectivity.GetLinkQuality3();
     mParentLinkQuality2     = connectivity.GetLinkQuality2();
     mParentLinkQuality1     = connectivity.GetLinkQuality1();
-    mParentLeaderCost       = connectivity.GetLeaderCost();
     mParentSedBufferSize    = connectivity.GetSedBufferSize();
     mParentSedDatagramCount = connectivity.GetSedDatagramCount();
     mParentLeaderData       = leaderData;

diff --git a/src/core/thread/mle.hpp b/src/core/thread/mle.hpp
@@ -1787,7 +1787,6 @@ class Mle : public InstanceLocator, private NonCopyable
     TimerMilli    mAttachTimer;              ///< The timer for driving the attach process.
     TimerMilli    mDelayedResponseTimer;     ///< The timer to delay MLE responses.
     TimerMilli    mMessageTransmissionTimer; ///< The timer for (re-)sending of MLE messages (e.g. Child Update).
-    uint8_t       mParentLeaderCost;
 
 private:
     static constexpr uint8_t kMleHopLimit        = 255;

diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp
@@ -3876,7 +3876,7 @@ void MleRouter::HandleAddressSolicitResponse(Coap::Message *         aMessage,
     if (leader != router)
     {
         // Keep route path to the Leader reported by the parent before it is updated.
-        leader->SetCost(mParentLeaderCost);
+        leader->SetCost(mParent.GetLeaderCost());
         leader->SetNextHop(RouterIdFromRloc16(mParent.GetRloc16()));
     }
 

diff --git a/src/core/thread/topology.hpp b/src/core/thread/topology.hpp
@@ -1487,6 +1487,22 @@ class Parent : public Router
      */
     void Clear(void);
 
+    /**
+     * This method gets route cost from parent to leader.
+     *
+     * @returns The route cost from parent to leader
+     *
+     */
+    uint8_t GetLeaderCost(void) const { return mLeaderCost; }
+
+    /**
+     * This method sets route cost from parent to leader.
+     *
+     * @param[in] aLaderConst  The route cost.
+     *
+     */
+    void SetLeaderCost(uint8_t aLeaderCost) { mLeaderCost = aLeaderCost; }
+
 #if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE
     /**
      * This method gets the CSL accuracy (clock accuracy and uncertainty).
@@ -1506,6 +1522,7 @@ class Parent : public Router
 #endif
 
 private:
+    uint8_t mLeaderCost;
 #if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE
     Mac::CslAccuracy mCslAccuracy; // CSL accuracy (clock accuracy in ppm and uncertainty).
 #endif