Skip to content

Commit 1aac5f1

Browse files
committed
Copy into the caller provided buffer
1 parent bc83618 commit 1aac5f1

File tree

3 files changed

+5
-14
lines changed

3 files changed

+5
-14
lines changed

src/platform/Tizen/ConnectivityManagerImpl.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -255,11 +255,15 @@ bool ConnectivityManagerImpl::IsWiFiManagementStarted()
255255

256256
CHIP_ERROR ConnectivityManagerImpl::GetWiFiBssId(MutableByteSpan & value)
257257
{
258+
constexpr size_t bssIdSize = 6;
259+
VerifyOrReturnError(value.size() >= bssIdSize, CHIP_ERROR_BUFFER_TOO_SMALL);
260+
258261
uint8_t * bssId = nullptr;
259262
CHIP_ERROR err = Internal::WiFiMgr().GetBssId(bssId);
260263
ReturnErrorOnFailure(err);
261264

262-
value = MutableByteSpan(bssId, 6);
265+
memcpy(value.data(), bssId, bssIdSize);
266+
value.reduce_size(bssIdSize);
263267

264268
return CHIP_NO_ERROR;
265269
}

src/platform/Tizen/DiagnosticDataProviderImpl.cpp

-7
Original file line numberDiff line numberDiff line change
@@ -487,17 +487,10 @@ CHIP_ERROR DiagnosticDataProviderImpl::ResetEthNetworkDiagnosticsCounts()
487487
}
488488

489489
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
490-
/*
491490
CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBssId(MutableByteSpan & bssId)
492491
{
493492
return ConnectivityMgrImpl().GetWiFiBssId(bssId);
494493
}
495-
*/
496-
497-
CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBssId(ByteSpan & bssId)
498-
{
499-
return CHIP_ERROR_NOT_IMPLEMENTED;
500-
}
501494

502495
CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType)
503496
{

src/platform/Tizen/DiagnosticDataProviderImpl.h

-6
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
6868
CHIP_ERROR ResetEthNetworkDiagnosticsCounts() override;
6969

7070
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
71-
/*
72-
CHIP_ERROR chip::DeviceLayer::DiagnosticDataProvider::GetWiFiBssId(ByteSpan & value)
73-
The API signature is broken. it has to change from ByteSpan to MutableByteSpan.
74-
After this is changed, it will be changed to next API and added.
7571
CHIP_ERROR GetWiFiBssId(MutableByteSpan & bssId) override;
76-
*/
77-
CHIP_ERROR GetWiFiBssId(ByteSpan & bssId) override;
7872
CHIP_ERROR GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType) override;
7973
CHIP_ERROR GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wiFiVersion) override;
8074
CHIP_ERROR GetWiFiChannelNumber(uint16_t & channelNumber) override;

0 commit comments

Comments
 (0)