Skip to content

Reduce duplicate code to write records #979

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 3 commits into from
Sep 16, 2021
Merged

Reduce duplicate code to write records #979

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43e6879
Reduce duplicate code to write records
bdraco Sep 16, 2021
c0c2b9d
seq
bdraco Sep 16, 2021
e289d9f
order
bdraco Sep 16, 2021
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
26 changes: 9 additions & 17 deletions zeroconf/_protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import enum
import struct
from typing import Any, Dict, List, Optional, Set, TYPE_CHECKING, Tuple, Union, cast
from typing import Any, Dict, List, Optional, Sequence, Set, TYPE_CHECKING, Tuple, Union, cast


from ._dns import DNSAddress, DNSHinfo, DNSNsec, DNSPointer, DNSQuestion, DNSRecord, DNSService, DNSText
Expand Down Expand Up @@ -586,21 +586,13 @@ def _write_answers_from_offset(self, answer_offset: int) -> int:
answers_written += 1
return answers_written

def _write_authorities_from_offset(self, authority_offset: int) -> int:
authorities_written = 0
for authority in self.authorities[authority_offset:]:
if not self._write_record(authority, 0):
def _write_records_from_offset(self, records: Sequence[DNSRecord], offset: int) -> int:
records_written = 0
for record in records[offset:]:
if not self._write_record(record, 0):
break
authorities_written += 1
return authorities_written

def _write_additionals_from_offset(self, additional_offset: int) -> int:
additionals_written = 0
for additional in self.additionals[additional_offset:]:
if not self._write_record(additional, 0):
break
additionals_written += 1
return additionals_written
records_written += 1
return records_written

def _has_more_to_add(
self, questions_offset: int, answer_offset: int, authority_offset: int, additional_offset: int
Expand Down Expand Up @@ -654,8 +646,8 @@ def packets(self) -> List[bytes]:

questions_written = self._write_questions_from_offset(questions_offset)
answers_written = self._write_answers_from_offset(answer_offset)
authorities_written = self._write_authorities_from_offset(authority_offset)
additionals_written = self._write_additionals_from_offset(additional_offset)
authorities_written = self._write_records_from_offset(self.authorities, authority_offset)
additionals_written = self._write_records_from_offset(self.additionals, additional_offset)

self._insert_short_at_start(additionals_written)
self._insert_short_at_start(authorities_written)
Expand Down