[mle] remove redundant checks in otThreadBecomeRouter #11107
Merged
+2
−20
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The MleRouter::BecomeRouter already checks the device role and the API claims only return OT_ERROR_INVALID_STATE when the role is disabled. This commit consolidates the device role check in MleRouter::BecomeRouter.
Size Report of OpenThread
|
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #11107 +/- ##
==========================================
+ Coverage 74.82% 75.41% +0.59%
==========================================
Files 619 620 +1
Lines 84846 93742 +8896
==========================================
+ Hits 63483 70693 +7210
- Misses 21363 23049 +1686
|
abtink
approved these changes
Jan 2, 2025
src/core/thread/mle_router.cpp
Outdated
| @@ -238,7 +238,7 @@ Error MleRouter::BecomeRouter(ThreadStatusTlv::Status aStatus) | |||
| Error error = kErrorNone; | |||
|
|
|||
| VerifyOrExit(!IsDisabled(), error = kErrorInvalidState); | |||
| VerifyOrExit(!IsRouter(), error = kErrorNone); | |||
| VerifyOrExit(!IsRouter() && !IsLeader(), error = kErrorNone); | |||
src/core/thread/mle_router.cpp
Outdated
| @@ -238,7 +238,7 @@ Error MleRouter::BecomeRouter(ThreadStatusTlv::Status aStatus) | |||
| Error error = kErrorNone; | |||
|
|
|||
| VerifyOrExit(!IsDisabled(), error = kErrorInvalidState); | |||
| VerifyOrExit(!IsRouter(), error = kErrorNone); | |||
| VerifyOrExit(!IsRouter() && !IsLeader(), error = kErrorNone); | |||
There was a problem hiding this comment.
May be good to check that adding IsLeader() is safe/fine here, i.e. we do not call BecomeRouter() anywhere in the code when the current role may be "leader".
There was a problem hiding this comment.
I did go through all places in the OT core code where BecomeRouter() is called, seems to be okay to add IsLeader() check.
We also expose this as a public API, but it is intended for testing, so changing its behavior should be fine.
jwhui
changed the title
jwhui
approved these changes
Jan 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The MleRouter::BecomeRouter already checks the device role and the API claims only return OT_ERROR_INVALID_STATE when the role is disabled.
This commit consolidates the device role check in
MleRouter::BecomeRouter.