From e6d503581ff3e17899d81d036e15bdbf67170630 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sun, 2 Apr 2023 09:37:12 -1000 Subject: [PATCH] chore: use a constant for address record types --- src/zeroconf/_handlers.py | 2 +- src/zeroconf/_services/browser.py | 5 ++--- src/zeroconf/const.py | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/zeroconf/_handlers.py b/src/zeroconf/_handlers.py index f2e9a606..2579deb2 100644 --- a/src/zeroconf/_handlers.py +++ b/src/zeroconf/_handlers.py @@ -47,6 +47,7 @@ from ._updates import RecordUpdate, RecordUpdateListener from ._utils.time import current_time_millis, millis_to_seconds from .const import ( + _ADDRESS_RECORD_TYPES, _CLASS_IN, _CLASS_UNIQUE, _DNS_OTHER_TTL, @@ -71,7 +72,6 @@ _AnswerWithAdditionalsType = Dict[DNSRecord, Set[DNSRecord]] _MULTICAST_DELAY_RANDOM_INTERVAL = (20, 120) -_ADDRESS_RECORD_TYPES = {_TYPE_A, _TYPE_AAAA} _RESPOND_IMMEDIATE_TYPES = {_TYPE_NSEC, _TYPE_SRV, *_ADDRESS_RECORD_TYPES} diff --git a/src/zeroconf/_services/browser.py b/src/zeroconf/_services/browser.py index e239bc42..8b339f5b 100644 --- a/src/zeroconf/_services/browser.py +++ b/src/zeroconf/_services/browser.py @@ -53,6 +53,7 @@ from .._utils.name import cached_possible_types, service_type_name from .._utils.time import current_time_millis, millis_to_seconds from ..const import ( + _ADDRESS_RECORD_TYPES, _BROWSER_BACKOFF_LIMIT, _BROWSER_TIME, _CLASS_IN, @@ -63,8 +64,6 @@ _MDNS_ADDR, _MDNS_ADDR6, _MDNS_PORT, - _TYPE_A, - _TYPE_AAAA, _TYPE_PTR, ) @@ -386,7 +385,7 @@ def _async_process_record_update( if old_record or record.is_expired(now): return - if record_type in (_TYPE_A, _TYPE_AAAA): + if record_type in _ADDRESS_RECORD_TYPES: # Iterate through the DNSCache and callback any services that use this address for type_, name in self._names_matching_types( {service.name for service in self.zc.cache.async_entries_with_server(record.name)} diff --git a/src/zeroconf/const.py b/src/zeroconf/const.py index d223401e..3b201215 100644 --- a/src/zeroconf/const.py +++ b/src/zeroconf/const.py @@ -139,6 +139,8 @@ _TYPE_NSEC: "nsec", } +_ADDRESS_RECORD_TYPES = {_TYPE_A, _TYPE_AAAA} + _HAS_A_TO_Z = re.compile(r'[A-Za-z]') _HAS_ONLY_A_TO_Z_NUM_HYPHEN = re.compile(r'^[A-Za-z0-9\-]+$') _HAS_ONLY_A_TO_Z_NUM_HYPHEN_UNDERSCORE = re.compile(r'^[A-Za-z0-9\-\_]+$')