Merge branch 'fix/network-diag-cluster-guard' into 'main'

components/esp_matter: gate network diagnostics clusters on transport config

See merge request app-frameworks/esp-matter!1495
This commit is contained in:
Shu Chen
2026-04-20 10:02:31 +00:00
@@ -91,12 +91,15 @@ esp_err_t add(endpoint_t *endpoint, config_t *config)
#endif // CHIP_CONFIG_ENABLE_ICD_LIT
}
#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
#if defined(CONFIG_SUPPORT_WIFI_NETWORK_DIAGNOSTICS_CLUSTER)
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI && defined(CONFIG_SUPPORT_WIFI_NETWORK_DIAGNOSTICS_CLUSTER)
wifi_network_diagnostics::create(endpoint, nullptr, CLUSTER_FLAG_SERVER);
#endif
#if defined(CONFIG_SUPPORT_THREAD_NETWORK_DIAGNOSTICS_CLUSTER)
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && defined(CONFIG_SUPPORT_THREAD_NETWORK_DIAGNOSTICS_CLUSTER)
thread_network_diagnostics::create(endpoint, nullptr, CLUSTER_FLAG_SERVER);
#endif
return ESP_OK;
}
} /* root_node */