feat: speed up parsing NSEC records (#1169) · python-zeroconf/python-zeroconf@06fa94d · GitHub

python-zeroconf / python-zeroconf Public

• Notifications You must be signed in to change notification settings
• Fork 230
• Star 734

• Code
• Issues 46
• Pull requests 8
• Discussions
• Actions
• Projects
• Wiki
• Security and quality 5
• Insights

Additional navigation options

Commit 06fa94d

Browse filesBrowse the repository at this point in the historyBrowse files

bdraco

authored

feat: speed up parsing NSEC records (#1169)

1 parent 7e7690c commit 06fa94d
Copy full SHA for 06fa94d

3 files changed

+36-4Lines changed: 36 additions & 4 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• bench
  • incoming.py
• src/zeroconf/_protocol
  • incoming.pxd
  • incoming.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎bench/incoming.py‎

Copy file name to clipboardExpand all lines: bench/incoming.py

+19-1Lines changed: 19 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -3,7 +3,15 @@
3	3	import timeit
4	4	from typing import List
5	5
6		- from zeroconf import DNSAddress, DNSIncoming, DNSOutgoing, DNSService, DNSText, const
	6	+ from zeroconf import (
	7	+ DNSAddress,
	8	+ DNSIncoming,
	9	+ DNSNsec,
	10	+ DNSOutgoing,
	11	+ DNSService,
	12	+ DNSText,
	13	+ const,
	14	+ )
7	15
8	16
9	17	def generate_packets() -> List[bytes]:
@@ -150,6 +158,16 @@ def generate_packets() -> List[bytes]:
150	158	record["address"], # type: ignore
151	159	)
152	160	)
	161	+ out.add_additional_answer(
	162	+ DNSNsec(
	163	+ record["name"], # type: ignore
	164	+ const._TYPE_NSEC,
	165	+ const._CLASS_IN | const._CLASS_UNIQUE,
	166	+ const._DNS_OTHER_TTL,
	167	+ record["name"], # type: ignore
	168	+ [const._TYPE_TXT, const._TYPE_SRV],
	169	+ )
	170	+ )
153	171
154	172	return out.packets()
155	173

Collapse file

‎src/zeroconf/_protocol/incoming.pxd‎

Copy file name to clipboardExpand all lines: src/zeroconf/_protocol/incoming.pxd

+10Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -95,6 +95,16 @@ cdef class DNSIncoming:
95	95	)
96	96	cdef _read_record(self, object domain, unsigned int type_, object class_, object ttl, unsigned int length)
97	97
	98	+ @cython.locals(
	99	+ offset=cython.uint,
	100	+ offset_plus_one=cython.uint,
	101	+ offset_plus_two=cython.uint,
	102	+ window=cython.uint,
	103	+ bit=cython.uint,
	104	+ byte=cython.uint,
	105	+ i=cython.uint,
	106	+ bitmap_length=cython.uint,
	107	+ )
98	108	cdef _read_bitmap(self, unsigned int end)
99	109
100	110	cdef _read_name(self)

Collapse file

‎src/zeroconf/_protocol/incoming.py‎

Copy file name to clipboardExpand all lines: src/zeroconf/_protocol/incoming.py

+7-3Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -318,9 +318,13 @@ def _read_bitmap(self, end: int) -> List[int]:
318	318	"""Reads an NSEC bitmap from the packet."""
319	319	rdtypes = []
320	320	while self.offset < end:
321		- window = self.data[self.offset]
322		- bitmap_length = self.data[self.offset + 1]
323		- for i, byte in enumerate(self.data[self.offset + 2 : self.offset + 2 + bitmap_length]):
	321	+ offset = self.offset
	322	+ offset_plus_one = offset + 1
	323	+ offset_plus_two = offset + 2
	324	+ window = self.data[offset]
	325	+ bitmap_length = self.data[offset_plus_one]
	326	+ bitmap_end = offset_plus_two + bitmap_length
	327	+ for i, byte in enumerate(self.data[offset_plus_two:bitmap_end]):
324	328	for bit in range(0, 8):
325	329	if byte & (0x80 >> bit):
326	330	rdtypes.append(bit + window * 256 + i * 8)

0 commit comments

Comments

0 (0)