[mle] add ConnectivityTlv::IsSingleton() (openthread#10329)

This is used to simplify `Mle::HandleParentResponse()`.
konradderda · Jun 4, 2024 · b4ec4ce · b4ec4ce
1 parent e1918b3
commit b4ec4ce
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp
@@ -3224,7 +3224,7 @@ void Mle::HandleParentResponse(RxInfo &aRxInfo)
         case kBetterPartition:
             VerifyOrExit(!isPartitionIdSame);
 
-            VerifyOrExit(MleRouter::ComparePartitions(connectivityTlv.GetActiveRouters() <= 1, leaderData,
+            VerifyOrExit(MleRouter::ComparePartitions(connectivityTlv.IsSingleton(), leaderData,
                                                       Get<MleRouter>().IsSingleton(), mLeaderData) > 0);
             break;
         }
@@ -3243,7 +3243,7 @@ void Mle::HandleParentResponse(RxInfo &aRxInfo)
 #if OPENTHREAD_FTD
         if (IsFullThreadDevice())
         {
-            compare = MleRouter::ComparePartitions(connectivityTlv.GetActiveRouters() <= 1, leaderData,
+            compare = MleRouter::ComparePartitions(connectivityTlv.IsSingleton(), leaderData,
                                                    mParentCandidate.mIsSingleton, mParentCandidate.mLeaderData);
         }
 
@@ -3305,7 +3305,7 @@ void Mle::HandleParentResponse(RxInfo &aRxInfo)
     mParentCandidate.mSedBufferSize    = connectivityTlv.GetSedBufferSize();
     mParentCandidate.mSedDatagramCount = connectivityTlv.GetSedDatagramCount();
     mParentCandidate.mLeaderData       = leaderData;
-    mParentCandidate.mIsSingleton      = connectivityTlv.GetActiveRouters() <= 1;
+    mParentCandidate.mIsSingleton      = connectivityTlv.IsSingleton();
     mParentCandidate.mLinkMargin       = linkMargin;
 
 exit:

diff --git a/src/core/thread/mle_tlvs.hpp b/src/core/thread/mle_tlvs.hpp
@@ -851,6 +851,15 @@ class ConnectivityTlv : public Tlv, public TlvInfo<Tlv::kConnectivity>
      */
     uint8_t GetActiveRouters(void) const { return mActiveRouters; }
 
+    /**
+     * Indicates whether or not the partition is a singleton based on Active Routers value.
+     *
+     * @retval TRUE   The partition is a singleton.
+     * @retval FALSE  The partition is not a singleton.
+     *
+     */
+    bool IsSingleton(void) const { return (mActiveRouters <= 1); }
+
     /**
      * Sets the Active Routers value.
      *