From 13028cf6bf21f211215ed513e5e03d78b46418eb Mon Sep 17 00:00:00 2001 From: shripad621git <79364691+shripad621git@users.noreply.github.com> Date: Mon, 27 May 2024 18:27:14 +0530 Subject: [PATCH] Adding config checks for functions specific to only wifi and thread in NetworkCommissioning Cluster code. (#33268) (#33606) * Adding config checks for fucntions specific to only wifi and thread in NetworkCommissioning * Restlyed --- .../network-commissioning.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/app/clusters/network-commissioning/network-commissioning.cpp b/src/app/clusters/network-commissioning/network-commissioning.cpp index 1026105160ffbb..124077d34afdad 100644 --- a/src/app/clusters/network-commissioning/network-commissioning.cpp +++ b/src/app/clusters/network-commissioning/network-commissioning.cpp @@ -46,8 +46,11 @@ namespace NetworkCommissioning { using namespace DeviceLayer::NetworkCommissioning; namespace { -// For WiFi and Thread scan results, each item will cose ~60 bytes in TLV, thus 15 is a safe upper bound of scan results. + +// For WiFi and Thread scan results, each item will cost ~60 bytes in TLV, thus 15 is a safe upper bound of scan results. +#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION || CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP || CHIP_DEVICE_CONFIG_ENABLE_THREAD constexpr size_t kMaxNetworksInScanResponse = 15; +#endif enum ValidWiFiCredentialLength { @@ -315,6 +318,7 @@ bool CheckFailSafeArmed(CommandHandlerInterface::HandlerContext & ctx) void Instance::HandleAddOrUpdateWiFiNetwork(HandlerContext & ctx, const Commands::AddOrUpdateWiFiNetwork::DecodableType & req) { +#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION || CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP MATTER_TRACE_SCOPE("HandleAddOrUpdateWiFiNetwork", "NetworkCommissioning"); VerifyOrReturn(CheckFailSafeArmed(ctx)); @@ -369,10 +373,13 @@ void Instance::HandleAddOrUpdateWiFiNetwork(HandlerContext & ctx, const Commands { UpdateBreadcrumb(req.breadcrumb); } +#endif } void Instance::HandleAddOrUpdateThreadNetwork(HandlerContext & ctx, const Commands::AddOrUpdateThreadNetwork::DecodableType & req) { +#if CHIP_DEVICE_CONFIG_ENABLE_THREAD + MATTER_TRACE_SCOPE("HandleAddOrUpdateThreadNetwork", "NetworkCommissioning"); VerifyOrReturn(CheckFailSafeArmed(ctx)); @@ -392,6 +399,7 @@ void Instance::HandleAddOrUpdateThreadNetwork(HandlerContext & ctx, const Comman { UpdateBreadcrumb(req.breadcrumb); } +#endif } void Instance::UpdateBreadcrumb(const Optional & breadcrumb) @@ -508,6 +516,7 @@ void Instance::OnResult(Status commissioningError, CharSpan debugText, int32_t i void Instance::OnFinished(Status status, CharSpan debugText, ThreadScanResponseIterator * networks) { +#if CHIP_DEVICE_CONFIG_ENABLE_THREAD CHIP_ERROR err = CHIP_NO_ERROR; auto commandHandleRef = std::move(mAsyncCommandHandle); auto commandHandle = commandHandleRef.Get(); @@ -618,10 +627,12 @@ void Instance::OnFinished(Status status, CharSpan debugText, ThreadScanResponseI CommitSavedBreadcrumb(); } networks->Release(); +#endif } void Instance::OnFinished(Status status, CharSpan debugText, WiFiScanResponseIterator * networks) { +#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION || CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP CHIP_ERROR err = CHIP_NO_ERROR; auto commandHandleRef = std::move(mAsyncCommandHandle); auto commandHandle = commandHandleRef.Get(); @@ -682,6 +693,7 @@ void Instance::OnFinished(Status status, CharSpan debugText, WiFiScanResponseIte { networks->Release(); } +#endif } void Instance::OnPlatformEventHandler(const DeviceLayer::ChipDeviceEvent * event, intptr_t arg)