Subscribe to all ZDO clusters with a single callback (#178)

Author: puddly

docs/Z-Stack Monitor and Test API.pdf

@@ -856,7 +856,12 @@ def zdo_route_check(self, request):
 
     @reply_to(c.ZDO.MsgCallbackRegister.Req(partial=True))
     def register_zdo_callback(self, request):
-        self.zdo_callbacks.add(request.ClusterId)
+        if request.ClusterId == 0xFFFF:
+            for cluster_id in zdo_t.ZDOCmd:
+                self.zdo_callbacks.add(cluster_id)
+        else:
+            self.zdo_callbacks.add(request.ClusterId)
+
         return c.ZDO.MsgCallbackRegister.Rsp(Status=t.Status.SUCCESS)
 
     @reply_to(c.UTIL.AssocFindDevice.Req(Index=0))

tests/conftest.py

@@ -210,12 +210,7 @@ async def start_network(self, *, read_only=False):
         await self.register_endpoints()
 
         # Receive a callback for every known ZDO command
-        for cluster_id in zdo_t.ZDOCmd:
-            # Ignore outgoing ZDO requests, only receive announcements and responses
-            if cluster_id.name.endswith(("_req", "_set")):
-                continue
-
-            await self._znp.request(c.ZDO.MsgCallbackRegister.Req(ClusterId=cluster_id))
+        await self._znp.request(c.ZDO.MsgCallbackRegister.Req(ClusterId=0xFFFF))
 
         # Setup the coordinator as a zigpy device and initialize it to request node info
         self.devices[self.state.node_info.ieee] = ZNPCoordinator(
@@ -521,6 +516,16 @@ async def on_zdo_message(self, msg: c.ZDO.MsgCbIncoming.Callback) -> None:
         Global callback for all ZDO messages.
         """
 
+        try:
+            zdo_t.ZDOCmd(msg.ClusterId)
+        except ValueError:
+            pass
+        else:
+            # Ignore loopback ZDO requests, only receive announcements and responses
+            if zdo_t.ZDOCmd(msg.ClusterId).name.endswith(("_req", "_set")):
+                LOGGER.debug("Ignoring loopback ZDO request")
+                return
+
         message = t.uint8_t(msg.TSN).serialize() + msg.Data
         hdr, data = zdo_t.ZDOHeader.deserialize(msg.ClusterId, message)
         names, types = zdo_t.CLUSTERS[msg.ClusterId]