Skip to content

Reduce branching in Zeroconf.handle_query #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bdraco merged 1 commit into from
Jun 6, 2021
Merged

Reduce branching in Zeroconf.handle_query #460

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions zeroconf/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2950,21 +2950,19 @@ def handle_query( # pylint: disable=too-many-branches
) -> None:
"""Deal with incoming query packets. Provides a response if
possible."""
out = None

# Support unicast client responses
#
if port != _MDNS_PORT:
out = DNSOutgoing(_FLAGS_QR_RESPONSE | _FLAGS_AA, multicast=False)
for question in msg.questions:
out.add_question(question)
else:
out = DNSOutgoing(_FLAGS_QR_RESPONSE | _FLAGS_AA)

for question in msg.questions:
if question.type == _TYPE_PTR:
if question.name == "_services._dns-sd._udp.local.":
for stype in self.registry.get_types():
if out is None:
out = DNSOutgoing(_FLAGS_QR_RESPONSE | _FLAGS_AA)
out.add_answer(
msg,
DNSPointer(
Expand All @@ -2978,8 +2976,6 @@ def handle_query( # pylint: disable=too-many-branches
continue

for service in self.registry.get_infos_type(question.name):
if out is None:
out = DNSOutgoing(_FLAGS_QR_RESPONSE | _FLAGS_AA)
out.add_answer(msg, service.dns_pointer())
# Add recommended additional answers according to
# https://tools.ietf.org/html/rfc6763#section-12.1.
Expand All @@ -2990,9 +2986,6 @@ def handle_query( # pylint: disable=too-many-branches

continue

if out is None:
out = DNSOutgoing(_FLAGS_QR_RESPONSE | _FLAGS_AA)

name_to_find = question.name.lower()
# Answer A record queries for any service addresses we know
if question.type in (_TYPE_A, _TYPE_ANY):
Expand Down