Skip to content

Commit 6a844ba

Browse files
Revert ClusterCommand and move fix to the PairingCommand
1 parent eb86614 commit 6a844ba

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

examples/chip-tool/commands/clusters/ClusterCommand.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class ClusterCommand : public InteractionModelCommands, public ModelCommand, pub
6969
const chip::app::Clusters::IcdManagement::Commands::RegisterClient::Type & value)
7070
{
7171
ReturnErrorOnFailure(InteractionModelCommands::SendCommand(device, endpointId, clusterId, commandId, value));
72-
mScopedNodeId = chip::ScopedNodeId(device->GetDeviceId(), device->GetSecureSession().Value()->GetFabricIndex());
72+
mScopedNodeId = chip::ScopedNodeId(value.checkInNodeID device->GetSecureSession().Value()->GetFabricIndex());
7373
mMonitoredSubject = value.monitoredSubject;
7474
mClientType = value.clientType;
7575
memcpy(mICDSymmetricKey, value.key.data(), value.key.size());

examples/chip-tool/commands/pairing/PairingCommand.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ void PairingCommand::OnICDRegistrationComplete(ScopedNodeId nodeId, uint32_t icd
449449
sizeof(icdSymmetricKeyHex), chip::Encoding::HexFlags::kNullTerminate);
450450

451451
app::ICDClientInfo clientInfo;
452-
clientInfo.peer_node = nodeId;
452+
clientInfo.peer_node = mICDCheckInNodeId.Value();
453453
clientInfo.monitored_subject = mICDMonitoredSubject.Value();
454454
clientInfo.start_icd_counter = icdCounter;
455455

examples/fabric-admin/commands/pairing/PairingCommand.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ void PairingCommand::OnICDRegistrationComplete(ScopedNodeId nodeId, uint32_t icd
449449
sizeof(icdSymmetricKeyHex), chip::Encoding::HexFlags::kNullTerminate);
450450

451451
app::ICDClientInfo clientInfo;
452-
clientInfo.peer_node = nodeId;
452+
clientInfo.peer_node = mICDCheckInNodeId.Value();
453453
clientInfo.monitored_subject = mICDMonitoredSubject.Value();
454454
clientInfo.start_icd_counter = icdCounter;
455455

0 commit comments

Comments
 (0)