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

Jump to bottom

Restyle Fix wrong IM statusCode container #6303

Closed
wants to merge 2 commits into from
Closed

Restyle Fix wrong IM statusCode container #6303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08c005f
Fix wrong IM statusCode container
yunhanw-google Apr 27, 2021
b4ec437
Restyled by clang-format
restyled-commits Apr 27, 2021
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
18 changes: 12 additions & 6 deletions src/app/Command.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ void Command::Shutdown()
return;
}

CHIP_ERROR Command::PrepareCommand(const CommandPathParams * const apCommandPathParams)
CHIP_ERROR Command::PrepareCommand(const CommandPathParams * const apCommandPathParams, bool aIsStatus)
{
CHIP_ERROR err = CHIP_NO_ERROR;

Expand All @@ -159,8 +159,11 @@ CHIP_ERROR Command::PrepareCommand(const CommandPathParams * const apCommandPath
SuccessOrExit(err);
}

err = commandDataElement.GetWriter()->StartContainer(TLV::ContextTag(CommandDataElement::kCsTag_Data), TLV::kTLVType_Structure,
mDataElementContainerType);
if (!aIsStatus)
{
err = commandDataElement.GetWriter()->StartContainer(TLV::ContextTag(CommandDataElement::kCsTag_Data),
TLV::kTLVType_Structure, mDataElementContainerType);
}
exit:
ChipLogFunctError(err);
return err;
Expand All @@ -171,13 +174,16 @@ TLV::TLVWriter * Command::GetCommandDataElementTLVWriter()
return mInvokeCommandBuilder.GetCommandListBuilder().GetCommandDataElementBuilder().GetWriter();
}

CHIP_ERROR Command::FinishCommand()
CHIP_ERROR Command::FinishCommand(bool aIsStatus)
{
CHIP_ERROR err = CHIP_NO_ERROR;

CommandDataElement::Builder commandDataElement = mInvokeCommandBuilder.GetCommandListBuilder().GetCommandDataElementBuilder();
err = commandDataElement.GetWriter()->EndContainer(mDataElementContainerType);
SuccessOrExit(err);
if (!aIsStatus)
{
err = commandDataElement.GetWriter()->EndContainer(mDataElementContainerType);
SuccessOrExit(err);
}
commandDataElement.EndOfCommandDataElement();
err = commandDataElement.GetError();
SuccessOrExit(err);
Expand Down
4 changes: 2 additions & 2 deletions src/app/Command.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ class Command
*/
CHIP_ERROR FinalizeCommandsMessage();

CHIP_ERROR PrepareCommand(const CommandPathParams * const apCommandPathParams);
CHIP_ERROR PrepareCommand(const CommandPathParams * const apCommandPathParams, bool aIsStatus = false);
TLV::TLVWriter * GetCommandDataElementTLVWriter();
CHIP_ERROR FinishCommand();
CHIP_ERROR FinishCommand(bool aIsStatus = false);
virtual CHIP_ERROR AddStatusCode(const CommandPathParams * apCommandPathParams,
const Protocols::SecureChannel::GeneralStatusCode aGeneralCode,
const Protocols::Id aProtocolId, const uint16_t aProtocolCode)
Expand Down
4 changes: 2 additions & 2 deletions src/app/CommandHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ CHIP_ERROR CommandHandler::AddStatusCode(const CommandPathParams * apCommandPath
CHIP_ERROR err = CHIP_NO_ERROR;
StatusElement::Builder statusElementBuilder;

err = PrepareCommand(apCommandPathParams);
err = PrepareCommand(apCommandPathParams, true);
SuccessOrExit(err);

statusElementBuilder =
Expand All @@ -131,7 +131,7 @@ CHIP_ERROR CommandHandler::AddStatusCode(const CommandPathParams * apCommandPath
err = statusElementBuilder.GetError();
SuccessOrExit(err);

err = FinishCommand();
err = FinishCommand(true);

exit:
ChipLogFunctError(err);
Expand Down