Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 8 commits into from
Mar 2, 2023
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dd0d82d
[Telink] Block device role changing into Router if commissioning wind…
s07641069 Mar 1, 2023
17571fe
[Telink] Add CHIP_DEVICE_CONFIG_ENABLE_THREAD check
s07641069 Mar 1, 2023
79fe9dc
[Telink] - Add API in ThreadStackManager
s07641069 Mar 1, 2023
29055ab
[Telink] Fix typo
s07641069 Mar 1, 2023
3f77303
[Telink] Move device role check into SetRouterPromotion
s07641069 Mar 1, 2023
01991d3
[Telink] Use _SetRouterPromotion only for FTD
s07641069 Mar 1, 2023
d32c5c9
[Telink] Move SetRouterPromotion(false) at the end of OpenCommissioni…
s07641069 Mar 2, 2023
332fd6a
Merge branch 'master' into block_device_role_changing_if_comm_window_…
s07641069 Mar 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions src/app/server/CommissioningWindowManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
#include <platform/CommissionableDataProvider.h>
#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

using namespace chip::app::Clusters;
using namespace chip::System::Clock;

Expand Down Expand Up @@ -547,6 +552,23 @@ void CommissioningWindowManager::UpdateWindowStatus(CommissioningWindowStatusEnu
MatterReportingAttributeChangeCallback(kRootEndpointId, AdministratorCommissioning::Id,
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 &&
s07641069 marked this conversation as resolved.
Show resolved Hide resolved
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)
Expand Down
4 changes: 4 additions & 0 deletions src/app/server/CommissioningWindowManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,10 @@ class CommissioningWindowManager : public Messaging::UnsolicitedMessageHandler,
bool mSEDActiveModeEnabled = false;
#endif

#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_THREAD_FTD
bool mRecoverRouterDeviceRole = false;
#endif

// For tests only, so that we can test the commissioning window timeout
// without having to wait 3 minutes.
Optional<System::Clock::Seconds16> mMinCommissioningTimeoutOverride;
Expand Down