Adjust the legth of kMaxManaulCodeLength and move some long functions from .h to .cpp

Author: yufengwangca

examples/fabric-admin/BUILD.gn

@@ -61,6 +61,8 @@ static_library("fabric-admin-utils") {
     "${chip_root}/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp",
     "commands/clusters/ModelCommand.cpp",
     "commands/clusters/ModelCommand.h",
+    "commands/clusters/ReportCommand.cpp",
+    "commands/clusters/ReportCommand.h",
     "commands/common/CHIPCommand.cpp",
     "commands/common/CHIPCommand.h",
     "commands/common/Command.cpp",

examples/fabric-admin/commands/clusters/ReportCommand.cpp

@@ -0,0 +1,80 @@
+/*
+ *   Copyright (c) 2024 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+
+#include "ReportCommand.h"
+
+#include <app/InteractionModelEngine.h>
+#include <inttypes.h>
+
+using namespace ::chip;
+
+void ReportCommand::OnAttributeData(const app::ConcreteDataAttributePath & path, TLV::TLVReader * data,
+                                    const app::StatusIB & status)
+{
+    CHIP_ERROR error = status.ToChipError();
+    if (CHIP_NO_ERROR != error)
+    {
+        LogErrorOnFailure(RemoteDataModelLogger::LogErrorAsJSON(path, status));
+
+        ChipLogError(NotSpecified, "Response Failure: %s", ErrorStr(error));
+        mError = error;
+        return;
+    }
+
+    if (data == nullptr)
+    {
+        ChipLogError(NotSpecified, "Response Failure: No Data");
+        mError = CHIP_ERROR_INTERNAL;
+        return;
+    }
+
+    LogErrorOnFailure(RemoteDataModelLogger::LogAttributeAsJSON(path, data));
+}
+
+void ReportCommand::OnEventData(const app::EventHeader & eventHeader, TLV::TLVReader * data, const app::StatusIB * status)
+{
+    if (status != nullptr)
+    {
+        CHIP_ERROR error = status->ToChipError();
+        if (CHIP_NO_ERROR != error)
+        {
+            LogErrorOnFailure(RemoteDataModelLogger::LogErrorAsJSON(eventHeader, *status));
+
+            ChipLogError(NotSpecified, "Response Failure: %s", ErrorStr(error));
+            mError = error;
+            return;
+        }
+    }
+
+    if (data == nullptr)
+    {
+        ChipLogError(NotSpecified, "Response Failure: No Data");
+        mError = CHIP_ERROR_INTERNAL;
+        return;
+    }
+
+    LogErrorOnFailure(RemoteDataModelLogger::LogEventAsJSON(eventHeader, data));
+
+    CHIP_ERROR error = DataModelLogger::LogEvent(eventHeader, data);
+    if (CHIP_NO_ERROR != error)
+    {
+        ChipLogError(NotSpecified, "Response Failure: Can not decode Data");
+        mError = error;
+        return;
+    }
+}

examples/fabric-admin/commands/clusters/ReportCommand.h

@@ -32,69 +32,10 @@ class ReportCommand : public InteractionModelReports, public ModelCommand, publi
 
     /////////// ReadClient Callback Interface /////////
     void OnAttributeData(const chip::app::ConcreteDataAttributePath & path, chip::TLV::TLVReader * data,
-                         const chip::app::StatusIB & status) override
-    {
-        CHIP_ERROR error = status.ToChipError();
-        if (CHIP_NO_ERROR != error)
-        {
-            LogErrorOnFailure(RemoteDataModelLogger::LogErrorAsJSON(path, status));
-
-            ChipLogError(NotSpecified, "Response Failure: %s", chip::ErrorStr(error));
-            mError = error;
-            return;
-        }
-
-        if (data == nullptr)
-        {
-            ChipLogError(NotSpecified, "Response Failure: No Data");
-            mError = CHIP_ERROR_INTERNAL;
-            return;
-        }
-
-        LogErrorOnFailure(RemoteDataModelLogger::LogAttributeAsJSON(path, data));
-
-        error = DataModelLogger::LogAttribute(path, data);
-        if (CHIP_NO_ERROR != error)
-        {
-            ChipLogError(NotSpecified, "Response Failure: Can not decode Data");
-            mError = error;
-            return;
-        }
-    }
+                         const chip::app::StatusIB & status) override;
 
     void OnEventData(const chip::app::EventHeader & eventHeader, chip::TLV::TLVReader * data,
-                     const chip::app::StatusIB * status) override
-    {
-        if (status != nullptr)
-        {
-            CHIP_ERROR error = status->ToChipError();
-            if (CHIP_NO_ERROR != error)
-            {
-                LogErrorOnFailure(RemoteDataModelLogger::LogErrorAsJSON(eventHeader, *status));
-
-                ChipLogError(NotSpecified, "Response Failure: %s", chip::ErrorStr(error));
-                mError = error;
-                return;
-            }
-        }
-
-        if (data == nullptr)
-        {
-            ChipLogError(NotSpecified, "Response Failure: No Data");
-            mError = CHIP_ERROR_INTERNAL;
-            return;
-        }
-
-        LogErrorOnFailure(RemoteDataModelLogger::LogEventAsJSON(eventHeader, data));
-
-        CHIP_ERROR error = DataModelLogger::LogEvent(eventHeader, data);
-        if (CHIP_NO_ERROR != error)
-        {
-            ChipLogError(NotSpecified, "Response Failure: Can not decode Data");
-            mError = error;
-            return;
-        }
-    }
+                     const chip::app::StatusIB * status) override;
 
     void OnError(CHIP_ERROR error) override
     {

examples/fabric-admin/commands/fabric-sync/FabricSyncCommand.cpp

@@ -33,7 +33,7 @@ namespace {
 
 // Constants
 constexpr uint32_t kCommissionPrepareTimeMs = 500;
-constexpr uint16_t kMaxManaulCodeLength     = 11;
+constexpr uint16_t kMaxManaulCodeLength     = 21;
 constexpr uint16_t kSubscribeMinInterval    = 0;
 constexpr uint16_t kSubscribeMaxInterval    = 60;
 
@@ -94,6 +94,8 @@ void FabricSyncDeviceCommand::OnCommissioningComplete(chip::NodeId deviceId, CHI
 {
     if (mAssignedNodeId != deviceId)
     {
+        // Ignore if the deviceId does not match the mAssignedNodeId.
+        // This scenario should not occur because no other device should be commissioned during the fabric sync process.
         return;
     }