Skip to content

Commit

Permalink
Fix BLE commissioning. (#11805)
Browse files Browse the repository at this point in the history
While fixing network commissioning I broke BLE. Sorry.

Underlying issue - BLE and IP commissioning both do network adds
incorrectly. BLE uses the PASE connection and handles the network
add in chip-tool. IP uses the CASE connection after commissioning.
Neither are fully spec compliant, but we need to merge the BLE and
IP commissioning flows to get chip-tool to work in a spec-compliant
way in both cases.
  • Loading branch information
cecille authored and pull[bot] committed Nov 4, 2022
1 parent 0eebe97 commit 2fd36bc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/controller/CHIPDeviceController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@ void DeviceCommissioner::RendezvousCleanup(CHIP_ERROR status)
{
FreeRendezvousSession();

if (mDeviceBeingCommissioned != nullptr)
if (mDeviceBeingCommissioned != nullptr && mIsIPRendezvous)
{
// Release the commissionee device. For BLE, this is stored,
// for IP commissioning, we have taken a reference to the
Expand Down

0 comments on commit 2fd36bc

Please sign in to comment.