Skip to content

feat: optimize incoming parser by using unpack_from #1115

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
Dec 18, 2022
Merged

feat: optimize incoming parser by using unpack_from #1115

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
15 changes: 8 additions & 7 deletions src/zeroconf/_protocol/incoming.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@

DECODE_EXCEPTIONS = (IndexError, struct.error, IncomingDecodeError)

UNPACK_3H = struct.Struct(b'!3H').unpack
UNPACK_6H = struct.Struct(b'!6H').unpack
UNPACK_HH = struct.Struct(b'!HH').unpack
UNPACK_HHiH = struct.Struct(b'!HHiH').unpack
UNPACK_3H = struct.Struct(b'!3H').unpack_from
UNPACK_6H = struct.Struct(b'!6H').unpack_from
UNPACK_HH = struct.Struct(b'!HH').unpack_from
UNPACK_HHiH = struct.Struct(b'!HHiH').unpack_from

_seen_logs: Dict[str, Union[int, tuple]] = {}

Expand Down Expand Up @@ -184,9 +184,9 @@ def __repr__(self) -> str:
]
)

def _unpack(self, unpacker: Callable[[bytes], tuple], length: int) -> tuple:
def _unpack(self, unpacker: Callable[[bytes, int], tuple], length: int) -> tuple:
self.offset += length
return unpacker(self.data[self.offset - length : self.offset])
return unpacker(self.data, self.offset - length)

def _read_header(self) -> None:
"""Reads header portion of packet"""
Expand Down Expand Up @@ -224,7 +224,8 @@ def _read_others(self) -> None:
n = self.num_answers + self.num_authorities + self.num_additionals
for _ in range(n):
domain = self._read_name()
type_, class_, ttl, length = self._unpack(UNPACK_HHiH, 10)
type_, class_, ttl, length = UNPACK_HHiH(self.data, self.offset)
self.offset += 10
end = self.offset + length
rec = None
try:
Expand Down