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

Improve Exit Error Handling for failures in PASE pairing requests #36160

Merged
merged 4 commits into from
Oct 22, 2024
Merged

Improve Exit Error Handling for failures in PASE pairing requests #36160

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cb692f
Improve Error Handling for failures in PASE pairing requests
Alami-Amine Oct 19, 2024
dd11eaf
Integrating comments
Alami-Amine Oct 21, 2024
283039c
clarifying Pair API contract regarding the delegate
Alami-Amine Oct 22, 2024
55e346b
integrating comment on API
Alami-Amine Oct 22, 2024
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
8 changes: 8 additions & 0 deletions src/protocols/secure_channel/PASESession.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,15 @@ CHIP_ERROR PASESession::Pair(SessionManager & sessionManager, uint32_t peerSetUp
exit:
if (err != CHIP_NO_ERROR)
{
// If a failure happens before we have placed the incoming exchange into `mExchangeCtxt`, we need to make
// sure to close the exchange to fulfill our API contract.
if (!mExchangeCtxt.HasValue())
{
exchangeCtxt->Close();
}
Clear();
ChipLogError(SecureChannel, "Failed during PASE session pairing request: %" CHIP_ERROR_FORMAT, err.Format());
MATTER_TRACE_COUNTER("PASEFail");
Alami-Amine marked this conversation as resolved.
Show resolved Hide resolved
}
return err;
}
Expand Down
Loading