@@ -55,12 +55,19 @@ class ClusterCommand : public InteractionModelCommands, public ModelCommand, pub
55
55
return InteractionModelCommands::SendCommand (device, endpointId, clusterId, commandId, value);
56
56
}
57
57
58
+ CHIP_ERROR SendCommand (chip::DeviceProxy * device, chip::EndpointId endpointId, chip::ClusterId clusterId,
59
+ chip::CommandId commandId,
60
+ const chip::app::Clusters::IcdManagement::Commands::UnregisterClient::Type & value)
61
+ {
62
+ ReturnErrorOnFailure (InteractionModelCommands::SendCommand (device, endpointId, clusterId, commandId, value));
63
+ mScopedNodeId = chip::ScopedNodeId (value.checkInNodeID ,device->GetSecureSession ().Value ()->GetFabricIndex ());
64
+ return CHIP_NO_ERROR;
65
+ }
66
+
58
67
CHIP_ERROR SendCommand (chip::DeviceProxy * device, chip::EndpointId endpointId, chip::ClusterId clusterId,
59
68
chip::CommandId commandId,
60
69
const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsRequest::Type & value)
61
70
{
62
- mPeerNodeId = device->GetDeviceId ();
63
- mFabricIndex = device->GetSecureSession ().Value ()->GetFabricIndex ();
64
71
ReturnErrorOnFailure (InteractionModelCommands::SendCommand (device, endpointId, clusterId, commandId, value));
65
72
66
73
if (value.transferFileDesignator .HasValue () &&
@@ -114,7 +121,7 @@ class ClusterCommand : public InteractionModelCommands, public ModelCommand, pub
114
121
if ((path.mEndpointId == chip::kRootEndpointId ) && (path.mClusterId == chip::app::Clusters::IcdManagement::Id) &&
115
122
(path.mCommandId == chip::app::Clusters::IcdManagement::Commands::UnregisterClient::Id))
116
123
{
117
- ModelCommand::ClearICDEntry (chip::ScopedNodeId ( mPeerNodeId , mFabricIndex ) );
124
+ ModelCommand::ClearICDEntry (mScopedNodeId );
118
125
}
119
126
}
120
127
@@ -215,8 +222,7 @@ class ClusterCommand : public InteractionModelCommands, public ModelCommand, pub
215
222
private:
216
223
chip::ClusterId mClusterId ;
217
224
chip::CommandId mCommandId ;
218
- chip::FabricIndex mFabricIndex = 0 ;
219
- chip::NodeId mPeerNodeId = 0 ;
225
+ chip::ScopedNodeId mScopedNodeId ;
220
226
CHIP_ERROR mError = CHIP_NO_ERROR;
221
227
CustomArgument mPayload ;
222
228
};
0 commit comments