Move MatterCommissionerControlPluginServerInitCallback from application to SDK

Author: yufengwangca

examples/fabric-bridge-app/fabric-bridge-common/src/ZCLCallbacks.cpp

@@ -20,7 +20,6 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
-#include <app/clusters/commissioner-control-server/commissioner-control-server.h>
 #include <lib/support/ZclString.h>
 
 using namespace ::chip;
@@ -91,13 +90,3 @@ Protocols::InteractionModel::Status emberAfExternalAttributeWriteCallback(Endpoi
 
     return ret;
 }
-
-void MatterCommissionerControlPluginServerInitCallback()
-{
-    ChipLogProgress(Zcl, "MatterCommissionerControlPluginServerInitCallback");
-
-    BitMask<CommissionerControl::SupportedDeviceCategoryBitmap> supportedDeviceCategories;
-    supportedDeviceCategories.SetField(CommissionerControl::SupportedDeviceCategoryBitmap::kFabricSynchronization, 1);
-    CommissionerControl::CommissionerControlServer::Instance().SetSupportedDeviceCategoriesValue(kRootEndpointId,
-                                                                                                 supportedDeviceCategories);
-}

examples/fabric-bridge-app/linux/main.cpp

@@ -23,6 +23,7 @@
 #include "DeviceManager.h"
 
 #include <app/AttributeAccessInterfaceRegistry.h>
+#include <app/clusters/commissioner-control-server/commissioner-control-server.h>
 
 #if defined(PW_RPC_FABRIC_BRIDGE_SERVICE) && PW_RPC_FABRIC_BRIDGE_SERVICE
 #include "RpcClient.h"
@@ -167,6 +168,18 @@ void ApplicationInit()
     pollingThread.detach();
 
     DeviceMgr().Init();
+
+    ChipLogProgress(Zcl, "Initialize SupportedDeviceCategories of Commissioner Control Cluster for this device.");
+
+    BitMask<CommissionerControl::SupportedDeviceCategoryBitmap> supportedDeviceCategories;
+    supportedDeviceCategories.SetField(CommissionerControl::SupportedDeviceCategoryBitmap::kFabricSynchronization, 1);
+    Protocols::InteractionModel::Status status =
+        CommissionerControl::CommissionerControlServer::Instance().SetSupportedDeviceCategoriesValue(kRootEndpointId,
+                                                                                                     supportedDeviceCategories);
+    if (status != Protocols::InteractionModel::Status::Success)
+    {
+        ChipLogError(NotSpecified, "Failed to set SupportedDeviceCategories: %d", static_cast<int>(status));
+    }
 }
 
 void ApplicationShutdown()

src/app/clusters/commissioner-control-server/commissioner-control-server.cpp

@@ -38,14 +38,6 @@ using chip::Protocols::InteractionModel::Status;
 
 namespace {
 
-NodeId getNodeId(const app::CommandHandler * commandObj)
-{
-    VerifyOrDie(commandObj);
-    auto descriptor = commandObj->GetSubjectDescriptor();
-
-    return descriptor.subject;
-}
-
 void AddReverseOpenCommissioningWindowResponse(CommandHandler * commandObj, const ConcreteCommandPath & path,
                                                const Clusters::CommissionerControl::CommissioningWindowParams & params)
 {
@@ -128,7 +120,8 @@ CommissionerControlServer::SetSupportedDeviceCategoriesValue(EndpointId endpoint
     return status;
 }
 
-CHIP_ERROR CommissionerControlServer::GenerateCommissioningRequestResultEvent(const Events::CommissioningRequestResult::Type & result)
+CHIP_ERROR
+CommissionerControlServer::GenerateCommissioningRequestResultEvent(const Events::CommissioningRequestResult::Type & result)
 {
     EventNumber eventNumber;
     CHIP_ERROR error = LogEvent(result, kRootEndpointId, eventNumber);
@@ -154,7 +147,8 @@ bool emberAfCommissionerControlClusterRequestCommissioningApprovalCallback(
 
     ChipLogProgress(Zcl, "Received command to request commissioning approval");
 
-    auto sourceNodeId = getNodeId(commandObj);
+    auto descriptor   = commandObj->GetSubjectDescriptor();
+    auto sourceNodeId = descriptor.subject;
     auto fabricIndex  = commandObj->GetAccessingFabricIndex();
     auto requestId    = commandData.requestId;
     auto vendorId     = commandData.vendorId;
@@ -197,7 +191,8 @@ bool emberAfCommissionerControlClusterCommissionNodeCallback(
 
     ChipLogProgress(Zcl, "Received command to commission node");
 
-    auto sourceNodeId = getNodeId(commandObj);
+    auto descriptor   = commandObj->GetSubjectDescriptor();
+    auto sourceNodeId = descriptor.subject;
     auto requestId    = commandData.requestId;
 
     auto info       = std::make_unique<Clusters::CommissionerControl::CommissionNodeInfo>();
@@ -210,7 +205,9 @@ bool emberAfCommissionerControlClusterCommissionNodeCallback(
     VerifyOrExit(sourceNodeId != kUndefinedNodeId, err = CHIP_ERROR_WRONG_NODE_ID);
     VerifyOrExit(delegate != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    // Handle commissioning approval request
+    // Handle commissioning approval request, the ipAddress assigned from commandData need to be stored in
+    // CommissionerControl::Delegate which ensure that the backing buffer of ipAddress has a valid lifespan until the deferred task
+    // is executed.
     err = delegate->ValidateCommissionNodeCommand(sourceNodeId, requestId, info->params);
     SuccessOrExit(err == CHIP_NO_ERROR);
 
@@ -229,3 +226,8 @@ bool emberAfCommissionerControlClusterCommissionNodeCallback(
 
     return true;
 }
+
+void MatterCommissionerControlPluginServerInitCallback()
+{
+    ChipLogProgress(Zcl, "Initiating Commissioner Control cluster.");
+}

src/app/clusters/commissioner-control-server/commissioner-control-server.h

@@ -82,7 +82,7 @@ class CommissionerControlServer
      * @brief
      *   Called after the server return SUCCESS to a correctly formatted RequestCommissioningApproval command.
      */
-    CHIP_ERROR EmitCommissioningRequestResultEvent(const Events::CommissioningRequestResult::Type & result);
+    CHIP_ERROR GenerateCommissioningRequestResultEvent(const Events::CommissioningRequestResult::Type & result);
 
 private:
     CommissionerControlServer()  = default;