fix: restructure recent-packets dedup around pop() and type new tests

bluetoothbot · bluetoothbot · commit 5d9864bdf741 · 2026-05-20T03:21:11.000Z
diff --git a/src/zeroconf/_listener.pxd b/src/zeroconf/_listener.pxd
@@ -32,7 +32,7 @@ cdef class AsyncListener:
     @cython.locals(now=double, debug=cython.bint)
     cpdef datagram_received(self, cython.bytes bytes, cython.tuple addrs)
 
-    @cython.locals(msg=DNSIncoming, recent_packets=cython.dict, recent=cython.tuple)
+    @cython.locals(msg=DNSIncoming, recent_packets=cython.dict, recent=cython.tuple, was_present=cython.bint)
     cpdef _process_datagram_at_time(self, bint debug, cython.uint data_len, double now, bytes data, cython.tuple addrs)
 
     cdef _cancel_any_timers_for_addr(self, object addr)
diff --git a/src/zeroconf/_listener.py b/src/zeroconf/_listener.py
@@ -152,8 +152,8 @@ def _process_datagram_at_time(
         msg = DNSIncoming(data, addr_port, scope, now)
         # Move-to-end so a repeat payload refreshes its position and only
         # cold entries are evicted when the window is full.
-        recent_packets.pop(data, None)
-        elif len(recent_packets) >= _RECENT_PACKETS_MAX:
+        was_present = recent_packets.pop(data, None) is not None
+        if not was_present and len(recent_packets) >= _RECENT_PACKETS_MAX:
             del recent_packets[next(iter(recent_packets))]
         recent_packets[data] = (now, msg.has_qu_question())
         if msg.valid is True:
diff --git a/tests/test_asyncio.py b/tests/test_asyncio.py
@@ -901,7 +901,7 @@ async def test_async_unregister_all_services(quick_timing: None) -> None:
 
 
 @pytest.mark.asyncio
-async def test_async_zeroconf_service_types(quick_timing: None, disable_duplicate_packet_suppression) -> None:
+async def test_async_zeroconf_service_types(quick_timing: None, disable_duplicate_packet_suppression: None) -> None:
     type_ = "_test-srvc-type._tcp.local."
     name = "xxxyyy"
     registration_name = f"{name}.{type_}"
diff --git a/tests/test_listener.py b/tests/test_listener.py
@@ -278,7 +278,7 @@ def handle_query_or_defer(
     zc.close()
 
 
-def test_guard_against_alternating_duplicate_packets():
+def test_guard_against_alternating_duplicate_packets() -> None:
     """Alternating two distinct payloads must not bypass duplicate suppression."""
     zc = Zeroconf(interfaces=["127.0.0.1"])
     zc.registry.async_add(
@@ -334,7 +334,7 @@ def handle_query_or_defer(
     zc.close()
 
 
-def test_recent_packets_window_is_bounded():
+def test_recent_packets_window_is_bounded() -> None:
     """Distinct payloads beyond the recency window evict oldest entries."""
     zc = Zeroconf(interfaces=["127.0.0.1"])
     zc.registry.async_add(
