Skip to content

feat: speed up incoming packet parsing #1830

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 12 commits into from
Aug 28, 2026
Merged

feat: speed up incoming packet parsing #1830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
02137cb
test: add fuzzing coverage for incoming packet parsing
bdraco Aug 28, 2026
a17aaf1
test: skip hypothesis fuzzing on pypy
bdraco Aug 28, 2026
2f17ae8
test: address fuzzing review feedback
bdraco Aug 28, 2026
9cb6fde
feat: speed up incoming packet parsing
bdraco Aug 28, 2026
81b5dc4
feat: replace the incoming memoryview with a bounds checked buffer
bdraco Aug 28, 2026
8448b77
feat: harden incoming buffer against pickling and oversized messages
bdraco Aug 28, 2026
04b3a43
test: cover the question and character string guards
bdraco Aug 28, 2026
aa41716
test: cover every buffer bounds guard the security audit traced
bdraco Aug 28, 2026
25551cf
Merge branch 'master' into speed_up_incoming_parser
bdraco Aug 28, 2026
e0abe0b
test: fuzz record arithmetic near the size cap
bdraco Aug 28, 2026
1f07f73
Merge branch 'master' into speed_up_incoming_parser
bdraco Aug 28, 2026
59acf2c
test: draw the clean decode path in the size cap fuzz
bdraco Aug 28, 2026
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
38 changes: 30 additions & 8 deletions src/zeroconf/_protocol/incoming.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ cdef cython.uint DNS_COMPRESSION_HEADER_LEN
cdef cython.uint MAX_DNS_LABELS
cdef cython.uint DNS_COMPRESSION_POINTER_LEN
cdef cython.uint MAX_NAME_LENGTH
cdef cython.uint MAX_MSG_LEN

cdef cython.uint _TYPE_A
cdef cython.uint _TYPE_CNAME
Expand All @@ -16,7 +17,6 @@ cdef cython.uint _TYPE_HINFO
cdef cython.uint _TYPE_AAAA
cdef cython.uint _TYPE_NSEC
cdef cython.uint _FLAGS_QR_MASK
cdef cython.uint _FLAGS_QR_MASK
cdef cython.uint _FLAGS_TC
cdef cython.uint _FLAGS_QR_QUERY
cdef cython.uint _FLAGS_QR_RESPONSE
Expand Down Expand Up @@ -44,10 +44,11 @@ cdef class DNSIncoming:
cdef bint _did_read_others
cdef public unsigned int flags
cdef cython.uint offset
cdef public bytes data
cdef const unsigned char [:] view
cdef readonly bytes data
cdef const unsigned char* _buf
cdef unsigned int _data_len
cdef cython.dict _name_cache
cdef cython.dict _name_str_cache
cdef cython.list _questions
cdef cython.list _answers
cdef public cython.uint id
Expand Down Expand Up @@ -81,30 +82,39 @@ cdef class DNSIncoming:
link="unsigned int",
link_data="unsigned int",
link_py_int=object,
linked_labels=cython.list
linked_labels=cython.list,
buf="const unsigned char *",
)
cdef unsigned int _decode_labels_at_offset(self, unsigned int off, cython.list labels, cython.set seen_pointers, unsigned int depth)

@cython.locals(offset="unsigned int")
@cython.locals(offset="unsigned int", buf="const unsigned char *")
cdef void _read_header(self)

cdef void _initial_parse(self)

@cython.locals(
end="unsigned int",
length="unsigned int",
offset="unsigned int"
offset="unsigned int",
answers=cython.list,
buf="const unsigned char *",
)
cdef void _read_others(self)

@cython.locals(offset="unsigned int", question=DNSQuestion)
@cython.locals(offset="unsigned int", question=DNSQuestion, buf="const unsigned char *")
cdef _read_questions(self)

@cython.locals(
length="unsigned int",
start="unsigned int",
end="unsigned int",
)
cdef str _read_character_string(self)

@cython.locals(
start="unsigned int",
end="unsigned int",
)
cdef bytes _read_string(self, unsigned int length)

@cython.locals(
Expand All @@ -116,20 +126,32 @@ cdef class DNSIncoming:
srv_rec=DNSService,
hinfo_rec=DNSHinfo,
nsec_rec=DNSNsec,
buf="const unsigned char *",
)
cdef _read_record(self, str domain, unsigned int type_, unsigned int class_, unsigned int ttl, unsigned int length)

@cython.locals(
offset="unsigned int",
offset_plus_one="unsigned int",
offset_plus_two="unsigned int",
window="unsigned int",
bit="unsigned int",
byte="unsigned int",
i="unsigned int",
bitmap_length="unsigned int",
bitmap_end="unsigned int",
window_base="unsigned int",
bit_base="unsigned int",
buf="const unsigned char *",
)
cdef list _read_bitmap(self, unsigned int end)

@cython.locals(
original_offset="unsigned int",
length="unsigned int",
link="unsigned int",
is_pure_pointer=cython.bint,
name=str,
cached_name=str,
name_str_cache=cython.dict,
)
cdef str _read_name(self)
Loading
Loading