Fix EP0 in dynamic bridge app (#23179)

* Fix EP0 in dynamic bridge app Currently this conflicts with EP0 Descriptor clusters, we register an override that can't provide EP0 values and it vectors into that * Instead just ignore desciptor clusters * remove dead code * Fix style * Update main.cpp remove constant * force add a descriptor cluster to every device
project-chip · Oct 17, 2022 · b96f795 · b96f795
1 parent 3eeac9a
commit b96f795
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/examples/dynamic-bridge-app/linux/DynamicDevice.cpp b/examples/dynamic-bridge-app/linux/DynamicDevice.cpp
@@ -17,12 +17,27 @@
  *    limitations under the License.
  */
 
+#include <app-common/zap-generated/af-structs.h>
+#include <app-common/zap-generated/attribute-id.h>
+#include <app-common/zap-generated/cluster-id.h>
+
 #include "DynamicDevice.h"
 
 #define DEVICE_TYPE_BRIDGED_NODE 0x0013
 // Device Version for dynamic endpoints:
 #define DEVICE_VERSION_DEFAULT 1
 
+namespace {
+static const int kDescriptorAttributeArraySize = 254;
+
+DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(descriptorAttrs)
+DECLARE_DYNAMIC_ATTRIBUTE(ZCL_DEVICE_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0),     /* device list */
+    DECLARE_DYNAMIC_ATTRIBUTE(ZCL_SERVER_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* server list */
+    DECLARE_DYNAMIC_ATTRIBUTE(ZCL_CLIENT_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* client list */
+    DECLARE_DYNAMIC_ATTRIBUTE(ZCL_PARTS_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0),  /* parts list */
+    DECLARE_DYNAMIC_ATTRIBUTE_LIST_END();
+} // namespace
+
 DynamicDevice::DynamicDevice() {}
 
 void DynamicDevice::AddDeviceType(EmberAfDeviceType type)
@@ -34,10 +49,14 @@ Device DynamicDevice::CreateDevice()
 {
     // All nodes are bridged devices.
     mDeviceTypes.push_back(EmberAfDeviceType{ DEVICE_TYPE_BRIDGED_NODE, DEVICE_VERSION_DEFAULT });
-    mVersions.resize(mClusterRawPtrs.size());
+    mVersions.resize(mClusterRawPtrs.size() + 1); // +1 for the descriptor cluster
     for (auto * c : mClusterRawPtrs)
         mClusterBaseRawPtrs.push_back(c);
 
+    // Force a default descriptor cluster to be present.
+    mClusterDecls.emplace_back(
+        EmberAfCluster DECLARE_DYNAMIC_CLUSTER(ZCL_DESCRIPTOR_CLUSTER_ID, descriptorAttrs, nullptr, nullptr));
+
     return Device(chip::Span<chip::DataVersion>(mVersions.data(), mVersions.size()),
                   chip::Span<EmberAfCluster>(mClusterDecls.data(), mClusterDecls.size()),
                   chip::Span<ClusterInterface *>(mClusterBaseRawPtrs.data(), mClusterBaseRawPtrs.size()),

diff --git a/examples/dynamic-bridge-app/linux/main.cpp b/examples/dynamic-bridge-app/linux/main.cpp
@@ -294,8 +294,12 @@ int main(int argc, char * argv[])
     clusterAccess.reserve(std::extent<decltype(clusters::kKnownClusters)>::value);
     for (auto & entry : clusters::kKnownClusters)
     {
-        clusterAccess.emplace_back(chip::Optional<EndpointId>(), entry.id);
-        registerAttributeAccessOverride(&clusterAccess.back());
+        // Desciptor clusters should not be overridden.
+        if (entry.id != chip::app::Clusters::Descriptor::Id)
+        {
+            clusterAccess.emplace_back(chip::Optional<EndpointId>(), entry.id);
+            registerAttributeAccessOverride(&clusterAccess.back());
+        }
     }
 
     ChipLinuxAppMainLoop();