From 150bd9f260034d25253fd127d976e229293a5af7 Mon Sep 17 00:00:00 2001
From: WanqQixiang <wangqixiang@espressif.com>
Date: Wed, 31 Jul 2024 15:18:59 +0800
Subject: [PATCH] Move the sources of GenericThreadBorderRouterDelegate to
 src/platform

---
 src/platform/BUILD.gn                                     | 6 ++++++
 src/platform/ESP32/BUILD.gn                               | 8 --------
 .../OpenThread/GenericThreadBorderRouterDelegate.cpp      | 3 ++-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
index 474e3c17ce284b..4e8a4878aafb31 100644
--- a/src/platform/BUILD.gn
+++ b/src/platform/BUILD.gn
@@ -518,6 +518,12 @@ if (chip_device_platform != "none") {
         "OpenThread/GenericNetworkCommissioningThreadDriver.cpp",
         "OpenThread/GenericNetworkCommissioningThreadDriver.h",
       ]
+      if (chip_openthread_border_router) {
+        sources += [
+          "OpenThread/GenericThreadBorderRouterDelegate.cpp",
+          "OpenThread/GenericThreadBorderRouterDelegate.h",
+        ]
+      }
     }
 
     cflags = [ "-Wconversion" ]
diff --git a/src/platform/ESP32/BUILD.gn b/src/platform/ESP32/BUILD.gn
index 587388e3f969be..bfe7dba543f4cb 100644
--- a/src/platform/ESP32/BUILD.gn
+++ b/src/platform/ESP32/BUILD.gn
@@ -158,8 +158,6 @@ static_library("ESP32") {
 
   if (chip_enable_openthread) {
     sources += [
-      "../OpenThread/GenericNetworkCommissioningThreadDriver.cpp",
-      "../OpenThread/GenericNetworkCommissioningThreadDriver.h",
       "../OpenThread/OpenThreadUtils.cpp",
       "OpenthreadLauncher.cpp",
       "OpenthreadLauncher.h",
@@ -172,12 +170,6 @@ static_library("ESP32") {
         "../OpenThread/OpenThreadDnssdImpl.h",
       ]
     }
-    if (chip_openthread_border_router) {
-      sources += [
-        "../OpenThread/GenericThreadBorderRouterDelegate.cpp",
-        "../OpenThread/GenericThreadBorderRouterDelegate.h",
-      ]
-    }
     configs -= [ "${chip_root}/build/config/compiler:warnings_default" ]
   }
 
diff --git a/src/platform/OpenThread/GenericThreadBorderRouterDelegate.cpp b/src/platform/OpenThread/GenericThreadBorderRouterDelegate.cpp
index e1efc5357520af..82c85fb272d455 100644
--- a/src/platform/OpenThread/GenericThreadBorderRouterDelegate.cpp
+++ b/src/platform/OpenThread/GenericThreadBorderRouterDelegate.cpp
@@ -209,8 +209,9 @@ CHIP_ERROR GenericOpenThreadBorderRouterDelegate::SetPendingDataset(const Thread
     VerifyOrReturnError(otInst, CHIP_ERROR_INCORRECT_STATE);
 
     otOperationalDatasetTlvs datasetTlvs;
+    VerifyOrDie(pendingDataset.AsByteSpan().size() <= OT_OPERATIONAL_DATASET_MAX_LENGTH);
     memcpy(datasetTlvs.mTlvs, pendingDataset.AsByteSpan().data(), pendingDataset.AsByteSpan().size());
-    datasetTlvs.mLength = pendingDataset.AsByteSpan().size();
+    datasetTlvs.mLength = static_cast<uint8_t>(pendingDataset.AsByteSpan().size());
     {
         ScopedThreadLock threadLock;
         ReturnErrorCodeIf(otDatasetSetPendingTlvs(otInst, &datasetTlvs) != OT_ERROR_NONE, CHIP_ERROR_INTERNAL);