Revert "Cancel incomplete BLE connection when CloseAllBleConnections() is called (#27304)" #28143
Conversation
This file contains hidden or 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
…) is called (project-chip#27304)" This reverts commit ad5403e. There are two issues: * project-chip#27607 which has had no response for weeks. * project-chip#28139 which breaks commissioning on Mac, and would break it on Linux if it implemented BLE connection cancellation. We need to sort out why CHIPDeviceController is canceling BLE connections when starting PASE over BLE (!).
woody-apple
approved these changes
Jul 21, 2023
|
@bzbarsky-apple The change makes logical sense though, to cancel any connections being established though? Why is this causing issues? |
|
@woody-apple Because of this stack: Now why we end up doing |
vivien-apple
approved these changes
Jul 21, 2023
There was a problem hiding this comment.
I think we should revert as you suggest. The original patch may probably be retargeted to call mSystemState->BleLayer()->CancelBleIncompleteConnection(); in DeviceCommissioner::OnSessionEstablishmentError.
Something like:
void DeviceCommissioner::OnSessionEstablishmentError(CHIP_ERROR err)
{
...
if (mPairingDelegate != nullptr)
{
mPairingDelegate->OnStatusUpdate(DevicePairingDelegate::SecurePairingFailed);
}
auto device = self->mDeviceInPASEEstablishment;
if (nullptr != device && device->GetDeviceTransportType() == Transport::Type::kBle)
{
mSystemState->BleLayer()->CancelBleIncompleteConnection();
}
RendezvousCleanup(err);
}
saurabhst
approved these changes
Jul 24, 2023
cecille
approved these changes
Jul 24, 2023
This was referenced Jul 24, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
This reverts commit ad5403e.
There are two issues:
We need to sort out why CHIPDeviceController is canceling BLE connections when starting PASE over BLE (!).
Fixes #28139