Return InvalidCommand instead of UnsupportedCluster if the command is not handled in CHI #37166
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
|
Review changes with |
yufengwangca
force-pushed
the
pr/cluster/dggen
branch
from
5701090 to
990f32f
Compare
andy31415
reviewed
Jan 23, 2025
yufengwangca
force-pushed
the
pr/cluster/dggen
branch
2 times, most recently
from
c7022c9 to
5c36f8c
Compare
bzbarsky-apple
requested changes
Jan 25, 2025
yufengwangca
force-pushed
the
pr/cluster/dggen
branch
from
ec0298a to
289c07d
Compare
andy31415
approved these changes
Jan 31, 2025
|
PR #37166: Size comparison from 435583e to 289c07d Full report (69 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
bzbarsky-apple
requested changes
Jan 31, 2025
src/app/zap-templates/templates/app/im-cluster-command-handler.zapt
Outdated
Show resolved
Hide resolved
….zapt Co-authored-by: Boris Zbarsky <[email protected]>
|
PR #37166: Size comparison from 435583e to 25cb68d Full report (3 builds for cc32xx, stm32)
|
|
PR #37166: Size comparison from c56eb2b to 7ed7fff Full report (72 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
| @@ -75,7 +75,7 @@ Protocols::InteractionModel::Status DispatchServerCommand(CommandHandler * apCom | |||
|
|
|||
| } // namespace Clusters | |||
|
|
|||
| void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj) | |||
| void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj, bool aClusterIsValid) | |||
There was a problem hiding this comment.
Suggested change
| void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj, bool aClusterIsValid) | |
| void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj, bool aClusterExists) |
and similar throughout.
| else | ||
| { | ||
| ChipLogError(Zcl, "Unknown cluster " ChipLogFormatMEI, ChipLogValueMEI(aCommandPath.mClusterId)); | ||
| errorStatus = Protocols::InteractionModel::Status::UnsupportedCluster; |
There was a problem hiding this comment.
How do you know it's not UnsupportedEndpoint?
Again, test coverage would flush out these edge cases...
But I have to admit, now that I think this through more, that none of this is making sense to me. I would have assumed that in general we only reach this point after we have already validated that the cluster and whatnot exist (since we have to do ACL checks before we get here), no? So shouldn't the return status here just always be UnsupportedCommand, period?
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.
Currently, after switching to CHI, any unhandled command is returning Protocols::InteractionModel::Status::UnsupportedCluster. Previously, when Ember handled these commands, we would return Protocols::InteractionModel::Status::InvalidCommand. We should preserve that behavior and continue returning InvalidCommand for runhandled commands in CHI.
Testing
Verified by manually disable command Commands::ResetCounts in WiFiDiagnosticsServer