Skip to content

Abstract DNSOutgoing ttl write into _write_ttl #695

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 17, 2021
Merged

Abstract DNSOutgoing ttl write into _write_ttl #695

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
9 changes: 5 additions & 4 deletions zeroconf/_dns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,10 @@ def _write_record_class(self, record: Union[DNSQuestion, DNSRecord]) -> None:
else:
self.write_short(record.class_)

def _write_ttl(self, record: DNSRecord, now: float) -> None:
"""Write out the record ttl."""
self._write_int(record.ttl if now == 0 else record.get_remaining_ttl(now))

def _write_record(self, record: DNSRecord, now: float) -> bool:
"""Writes a record (answer, authoritative answer, additional) to
the packet. Returns True on success, or False if we did not
Expand All @@ -818,10 +822,7 @@ def _write_record(self, record: DNSRecord, now: float) -> bool:
self.write_name(record.name)
self.write_short(record.type)
self._write_record_class(record)
if now == 0:
self._write_int(record.ttl)
else:
self._write_int(record.get_remaining_ttl(now))
self._write_ttl(record, now)
index = len(self.data)
self.write_short(0) # Will get replaced with the actual size
record.write(self)
Expand Down