Skip to content

Commit 595ef2b

Browse files
committed
[nrf toup] Use cleanup flag for fabric delete in FailSafeCleanup
Cleanup all (even when incomplete) fabric data. Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
1 parent 98fadfe commit 595ef2b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/app/clusters/operational-credentials-server/operational-credentials-server.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,9 @@ const FabricInfo * RetrieveCurrentFabric(CommandHandler * aCommandHandler)
268268
return Server::GetInstance().GetFabricTable().FindFabricWithIndex(index);
269269
}
270270

271-
CHIP_ERROR DeleteFabricFromTable(FabricIndex fabricIndex)
271+
CHIP_ERROR DeleteFabricFromTable(FabricIndex fabricIndex, bool cleanup = false)
272272
{
273-
ReturnErrorOnFailure(Server::GetInstance().GetFabricTable().Delete(fabricIndex));
273+
ReturnErrorOnFailure(Server::GetInstance().GetFabricTable().Delete(fabricIndex, cleanup));
274274
return CHIP_NO_ERROR;
275275
}
276276

@@ -303,7 +303,7 @@ void FailSafeCleanup(const chip::DeviceLayer::ChipDeviceEvent * event)
303303
if (event->FailSafeTimerExpired.addNocCommandHasBeenInvoked)
304304
{
305305
CHIP_ERROR err;
306-
err = DeleteFabricFromTable(fabricIndex);
306+
err = DeleteFabricFromTable(fabricIndex, true);
307307
if (err != CHIP_NO_ERROR)
308308
{
309309
ChipLogError(Zcl, "OpCreds: failed to delete fabric at index %u: %" CHIP_ERROR_FORMAT, fabricIndex, err.Format());

0 commit comments

Comments
 (0)