[Telink] Block device role changing into Router if commissioning window opened and device not yet Router

src/app/server/CommissioningWindowManager.cpp

@@ -26,7 +26,6 @@
 #include <platform/DeviceControlServer.h>
 
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_THREAD_FTD
-#include <openthread/thread_ftd.h>
 using namespace chip::DeviceLayer;
 #endif
 
@@ -113,6 +112,15 @@ void CommissioningWindowManager::ResetState()
 
     UpdateWindowStatus(CommissioningWindowStatusEnum::kWindowNotOpen);
 
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_THREAD_FTD
+    // Recover Router device role.
+    if (mRecoverRouterDeviceRole)
+    {
+        ThreadStackMgr().SetRouterPromotion(true);
+        mRecoverRouterDeviceRole = false;
+    }
+#endif
+
     UpdateOpenerFabricIndex(NullNullable);
     UpdateOpenerVendorId(NullNullable);
 
@@ -454,6 +462,16 @@ CHIP_ERROR CommissioningWindowManager::StartAdvertisement()
         UpdateWindowStatus(CommissioningWindowStatusEnum::kBasicWindowOpen);
     }
 
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_THREAD_FTD
+    // Block device role changing into Router if commissioning window opened and device not yet Router.
+    if (ConnectivityManagerImpl().GetThreadDeviceType() == ConnectivityManager::kThreadDeviceType_Router &&
+        otThreadGetDeviceRole(DeviceLayer::ThreadStackMgrImpl().OTInstance()) != OT_DEVICE_ROLE_ROUTER)
+    {
+        ThreadStackMgr().SetRouterPromotion(false);
+        mRecoverRouterDeviceRole = true;
+    }
+#endif
+
     if (mAppDelegate != nullptr)
     {
         mAppDelegate->OnCommissioningWindowOpened();
@@ -553,22 +571,6 @@ void CommissioningWindowManager::UpdateWindowStatus(CommissioningWindowStatusEnu
                                                AdministratorCommissioning::Attributes::WindowStatus::Id);
     }
 
-#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_THREAD_FTD
-    // Block device role changing into Router if commissioning window opened and device not yet Router.
-    if (mWindowStatus == CommissioningWindowStatusEnum::kEnhancedWindowOpen &&
-        ConnectivityManagerImpl().GetThreadDeviceType() == ConnectivityManager::kThreadDeviceType_Router &&
-        otThreadGetDeviceRole(DeviceLayer::ThreadStackMgrImpl().OTInstance()) != OT_DEVICE_ROLE_ROUTER)
-    {
-        otThreadSetRouterEligible(DeviceLayer::ThreadStackMgrImpl().OTInstance(), false);
-        mRecoverRouterDeviceRole = true;
-    }
-    // Recover Router device role.
-    else if (mWindowStatus == CommissioningWindowStatusEnum::kWindowNotOpen && mRecoverRouterDeviceRole)
-    {
-        otThreadSetRouterEligible(DeviceLayer::ThreadStackMgrImpl().OTInstance(), true);
-        mRecoverRouterDeviceRole = false;
-    }
-#endif
 }
 
 void CommissioningWindowManager::UpdateOpenerVendorId(Nullable<VendorId> aNewOpenerVendorId)

src/include/platform/ThreadStackManager.h

@@ -106,6 +106,7 @@ class ThreadStackManager
     CHIP_ERROR GetPrimary802154MACAddress(uint8_t * buf);
     CHIP_ERROR GetExternalIPv6Address(chip::Inet::IPAddress & addr);
     CHIP_ERROR GetPollPeriod(uint32_t & buf);
+    void SetRouterPromotion(bool val);
 
     CHIP_ERROR JoinerStart();
     CHIP_ERROR SetThreadProvision(ByteSpan aDataset);
@@ -443,6 +444,11 @@ inline CHIP_ERROR ThreadStackManager::GetPollPeriod(uint32_t & buf)
     return static_cast<ImplClass *>(this)->_GetPollPeriod(buf);
 }
 
+inline void ThreadStackManager::SetRouterPromotion(bool val)
+{
+    static_cast<ImplClass *>(this)->_SetRouterPromotion(val);
+}
+
 inline CHIP_ERROR ThreadStackManager::JoinerStart()
 {
     return static_cast<ImplClass *>(this)->_JoinerStart();

src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp

@@ -1694,6 +1694,14 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetPollPeriod(u
     return CHIP_NO_ERROR;
 }
 
+template <class ImplClass>
+void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_SetRouterPromotion(bool val)
+{
+    Impl()->LockThreadStack();
+    otThreadSetRouterEligible(DeviceLayer::ThreadStackMgrImpl().OTInstance(), val);
+    Impl()->UnlockThreadStack();
+}
+
 template <class ImplClass>
 CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::DoInit(otInstance * otInst)
 {

src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h

@@ -117,6 +117,7 @@ class GenericThreadStackManagerImpl_OpenThread
     void _ResetThreadNetworkDiagnosticsCounts(void);
     CHIP_ERROR _WriteThreadNetworkDiagnosticAttributeToTlv(AttributeId attributeId, app::AttributeValueEncoder & encoder);
     CHIP_ERROR _GetPollPeriod(uint32_t & buf);
+    void _SetRouterPromotion(bool val);
     void _OnWoBLEAdvertisingStart(void);
     void _OnWoBLEAdvertisingStop(void);