Skip to content

Commit 150bd9f

Browse files
committed
Move the sources of GenericThreadBorderRouterDelegate to src/platform
1 parent 08dfc13 commit 150bd9f

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

src/platform/BUILD.gn

+6
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,12 @@ if (chip_device_platform != "none") {
518518
"OpenThread/GenericNetworkCommissioningThreadDriver.cpp",
519519
"OpenThread/GenericNetworkCommissioningThreadDriver.h",
520520
]
521+
if (chip_openthread_border_router) {
522+
sources += [
523+
"OpenThread/GenericThreadBorderRouterDelegate.cpp",
524+
"OpenThread/GenericThreadBorderRouterDelegate.h",
525+
]
526+
}
521527
}
522528

523529
cflags = [ "-Wconversion" ]

src/platform/ESP32/BUILD.gn

-8
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,6 @@ static_library("ESP32") {
158158

159159
if (chip_enable_openthread) {
160160
sources += [
161-
"../OpenThread/GenericNetworkCommissioningThreadDriver.cpp",
162-
"../OpenThread/GenericNetworkCommissioningThreadDriver.h",
163161
"../OpenThread/OpenThreadUtils.cpp",
164162
"OpenthreadLauncher.cpp",
165163
"OpenthreadLauncher.h",
@@ -172,12 +170,6 @@ static_library("ESP32") {
172170
"../OpenThread/OpenThreadDnssdImpl.h",
173171
]
174172
}
175-
if (chip_openthread_border_router) {
176-
sources += [
177-
"../OpenThread/GenericThreadBorderRouterDelegate.cpp",
178-
"../OpenThread/GenericThreadBorderRouterDelegate.h",
179-
]
180-
}
181173
configs -= [ "${chip_root}/build/config/compiler:warnings_default" ]
182174
}
183175

src/platform/OpenThread/GenericThreadBorderRouterDelegate.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,9 @@ CHIP_ERROR GenericOpenThreadBorderRouterDelegate::SetPendingDataset(const Thread
209209
VerifyOrReturnError(otInst, CHIP_ERROR_INCORRECT_STATE);
210210

211211
otOperationalDatasetTlvs datasetTlvs;
212+
VerifyOrDie(pendingDataset.AsByteSpan().size() <= OT_OPERATIONAL_DATASET_MAX_LENGTH);
212213
memcpy(datasetTlvs.mTlvs, pendingDataset.AsByteSpan().data(), pendingDataset.AsByteSpan().size());
213-
datasetTlvs.mLength = pendingDataset.AsByteSpan().size();
214+
datasetTlvs.mLength = static_cast<uint8_t>(pendingDataset.AsByteSpan().size());
214215
{
215216
ScopedThreadLock threadLock;
216217
ReturnErrorCodeIf(otDatasetSetPendingTlvs(otInst, &datasetTlvs) != OT_ERROR_NONE, CHIP_ERROR_INTERNAL);

0 commit comments

Comments
 (0)