From 3d7934d6cc1e912df76d8525c0a716b4beeff9fd Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Wed, 15 Jun 2022 20:18:20 -0400 Subject: [PATCH] Make the chip-tool and darwin-framework-tool logging about pairing clearer. (#19587) Make it clear whern PASE vs CASE is done. Fixes https://github.com/project-chip/connectedhomeip/issues/19451 --- examples/chip-tool/commands/pairing/PairingCommand.cpp | 2 ++ .../commands/pairing/PairingDelegateBridge.mm | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/examples/chip-tool/commands/pairing/PairingCommand.cpp b/examples/chip-tool/commands/pairing/PairingCommand.cpp index 1e092c51dcabd7..557f25ad431216 100644 --- a/examples/chip-tool/commands/pairing/PairingCommand.cpp +++ b/examples/chip-tool/commands/pairing/PairingCommand.cpp @@ -144,6 +144,7 @@ void PairingCommand::OnStatusUpdate(DevicePairingDelegate::Status status) { case DevicePairingDelegate::Status::SecurePairingSuccess: ChipLogProgress(chipTool, "Secure Pairing Success"); + ChipLogProgress(chipTool, "CASE establishment successful"); break; case DevicePairingDelegate::Status::SecurePairingFailed: ChipLogError(chipTool, "Secure Pairing Failed"); @@ -157,6 +158,7 @@ void PairingCommand::OnPairingComplete(CHIP_ERROR err) if (err == CHIP_NO_ERROR) { ChipLogProgress(chipTool, "Pairing Success"); + ChipLogProgress(chipTool, "PASE establishment successful"); if (mPairingMode == PairingMode::CodePaseOnly) { SetCommandExitStatus(err); diff --git a/examples/darwin-framework-tool/commands/pairing/PairingDelegateBridge.mm b/examples/darwin-framework-tool/commands/pairing/PairingDelegateBridge.mm index 4a10feff9a5dda..64467e476d8f47 100644 --- a/examples/darwin-framework-tool/commands/pairing/PairingDelegateBridge.mm +++ b/examples/darwin-framework-tool/commands/pairing/PairingDelegateBridge.mm @@ -29,6 +29,7 @@ - (void)onStatusUpdate:(CHIPPairingStatus)status switch (status) { case kSecurePairingSuccess: ChipLogProgress(chipTool, "Secure Pairing Success"); + ChipLogProgress(chipTool, "CASE establishment successful"); break; case kSecurePairingFailed: ChipLogError(chipTool, "Secure Pairing Failed"); @@ -42,10 +43,12 @@ - (void)onStatusUpdate:(CHIPPairingStatus)status - (void)onPairingComplete:(NSError *)error { if (error != nil) { + ChipLogProgress(chipTool, "PASE establishment failed"); _commandBridge->SetCommandExitStatus(error); return; } - ChipLogProgress(chipTool, "Pairing Complete"); + ChipLogProgress(chipTool, "Pairing Success"); + ChipLogProgress(chipTool, "PASE establishment successful"); NSError * commissionError; [_commissioner commissionDevice:_deviceID commissioningParams:_params error:&commissionError]; if (commissionError != nil) {