Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Thread]Fix thread network scan list encode when no network was found #27896

Merged
merged 1 commit into from
Jul 11, 2023
Merged

[Thread]Fix thread network scan list encode when no network was found #27896

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 48 additions & 43 deletions src/app/clusters/network-commissioning/network-commissioning.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,62 +542,67 @@ void Instance::OnFinished(Status status, CharSpan debugText, ThreadScanResponseI
SuccessOrExit(err = writer->StartContainer(TLV::ContextTag(Commands::ScanNetworksResponse::Fields::kThreadScanResults),
TLV::TLVType::kTLVType_Array, listContainerType));

VerifyOrExit(scanResponseArray.Alloc(chip::min(networks->Count(), kMaxNetworksInScanResponse)), err = CHIP_ERROR_NO_MEMORY);
for (; networks != nullptr && networks->Next(scanResponse);)
// If no network was found, we encode an empty list, don't call a zero-sized alloc.
if (networks->Count() > 0)
{
if ((scanResponseArrayLength == kMaxNetworksInScanResponse) &&
(scanResponseArray[scanResponseArrayLength - 1].rssi > scanResponse.rssi))
VerifyOrExit(scanResponseArray.Alloc(chip::min(networks->Count(), kMaxNetworksInScanResponse)), err = CHIP_ERROR_NO_MEMORY);
for (; networks != nullptr && networks->Next(scanResponse);)
{
continue;
}
if ((scanResponseArrayLength == kMaxNetworksInScanResponse) &&
(scanResponseArray[scanResponseArrayLength - 1].rssi > scanResponse.rssi))
{
continue;
}

bool isDuplicated = false;
bool isDuplicated = false;

for (size_t i = 0; i < scanResponseArrayLength; i++)
{
if ((scanResponseArray[i].panId == scanResponse.panId) &&
(scanResponseArray[i].extendedPanId == scanResponse.extendedPanId))
for (size_t i = 0; i < scanResponseArrayLength; i++)
{
if (scanResponseArray[i].rssi < scanResponse.rssi)
if ((scanResponseArray[i].panId == scanResponse.panId) &&
(scanResponseArray[i].extendedPanId == scanResponse.extendedPanId))
{
scanResponseArray[i] = scanResponseArray[--scanResponseArrayLength];
if (scanResponseArray[i].rssi < scanResponse.rssi)
{
scanResponseArray[i] = scanResponseArray[--scanResponseArrayLength];
}
else
{
isDuplicated = true;
}
break;
}
else
{
isDuplicated = true;
}
break;
}
}

if (isDuplicated)
{
continue;
if (isDuplicated)
{
continue;
}

if (scanResponseArrayLength < kMaxNetworksInScanResponse)
{
scanResponseArrayLength++;
}
scanResponseArray[scanResponseArrayLength - 1] = scanResponse;
Sorting::InsertionSort(
scanResponseArray.Get(), scanResponseArrayLength,
[](const ThreadScanResponse & a, const ThreadScanResponse & b) -> bool { return a.rssi > b.rssi; });
}

if (scanResponseArrayLength < kMaxNetworksInScanResponse)
for (size_t i = 0; i < scanResponseArrayLength; i++)
{
scanResponseArrayLength++;
Structs::ThreadInterfaceScanResultStruct::Type result;
Encoding::BigEndian::Put64(extendedAddressBuffer, scanResponseArray[i].extendedAddress);
result.panId = scanResponseArray[i].panId;
result.extendedPanId = scanResponseArray[i].extendedPanId;
result.networkName = CharSpan(scanResponseArray[i].networkName, scanResponseArray[i].networkNameLen);
result.channel = scanResponseArray[i].channel;
result.version = scanResponseArray[i].version;
result.extendedAddress = ByteSpan(extendedAddressBuffer);
result.rssi = scanResponseArray[i].rssi;
result.lqi = scanResponseArray[i].lqi;

SuccessOrExit(err = DataModel::Encode(*writer, TLV::AnonymousTag(), result));
}
scanResponseArray[scanResponseArrayLength - 1] = scanResponse;
Sorting::InsertionSort(scanResponseArray.Get(), scanResponseArrayLength,
[](const ThreadScanResponse & a, const ThreadScanResponse & b) -> bool { return a.rssi > b.rssi; });
}

for (size_t i = 0; i < scanResponseArrayLength; i++)
{
Structs::ThreadInterfaceScanResultStruct::Type result;
Encoding::BigEndian::Put64(extendedAddressBuffer, scanResponseArray[i].extendedAddress);
result.panId = scanResponseArray[i].panId;
result.extendedPanId = scanResponseArray[i].extendedPanId;
result.networkName = CharSpan(scanResponseArray[i].networkName, scanResponseArray[i].networkNameLen);
result.channel = scanResponseArray[i].channel;
result.version = scanResponseArray[i].version;
result.extendedAddress = ByteSpan(extendedAddressBuffer);
result.rssi = scanResponseArray[i].rssi;
result.lqi = scanResponseArray[i].lqi;

SuccessOrExit(err = DataModel::Encode(*writer, TLV::AnonymousTag(), result));
}

SuccessOrExit(err = writer->EndContainer(listContainerType));
Expand Down