[WIP] dhcp protocol update #1254

svinota · 2025-01-21T22:44:10Z

Bug-Url: #1250

add an async dhcp client Bug-Url: #1250

svinota · 2025-01-21T22:44:44Z

@etene moved the branch and created a new PR for that.

svinota · 2025-01-21T22:49:27Z

@etene I will not diverge the code on the branch without letting you know, so you can safely use git push --force on this branch.

as defined in the RFC

…t set

svinota · 2025-01-27T19:44:54Z

tests/test_linux/test_dhcp/test_parser.py

-    '''Decode a simple DHCP handshake using AsyncDHCP4Socket.'''
+def parse_pcap(
+    pcap: PcapFile, expected_packets: int
+) -> list[ReceivedDHCPMessage]:
    decoded_dhcp_messages = [AsyncDHCP4Socket._decode_msg(i) for i in pcap]


Just wondering, how does it work with pcap header.

See also:

pyroute2/pyroute2/decoder/loader.py

Lines 258 to 266 in 3d0d36f

def __init__(self, data, cls, key, data_offset, script):

with open(data, 'rb') as f:

self.raw = f.read()

self.metadata = PcapMetaData(*struct.unpack("IHHiIII", self.raw[:24]))

self.offset = 24

self.key = key

self.data_offset = data_offset

self.cls = cls

self.matcher = Matcher(script)

Oh, i had not noticed it ! I put together a quick test fixture without seeing it, i'll see how i can use this code instead

If you need any changes in the decoder, pls let me know or feel free to fix

(and I have to document this part at least)

…ments Add hooks and other improvements

svinota · 2025-01-28T14:25:13Z

pyroute2/dhcp/enums/dhcp.py

@@ -1,4 +1,4 @@
-from enum import IntEnum
+from enum import EnumType, IntEnum


EnumType was added in Python 3.11, while we declare compatibility up to 3.9.

Found a way to do without !

…thons

svinota · 2025-01-29T22:41:51Z

tests/test_linux/fixtures/dhcp_servers/mock.py

+        self.decoded_requests: list[SentDHCPMessage] = []
+        # save the event_loop fixture, 'cause pytest-asyncio on Python < 3.10
+        # drops the loop in the middle of the test
+        self.loop = event_loop


@etene that did the trick

I've learned something new during this brainstorm :)

svinota · 2025-01-29T22:48:40Z

Gentlemen, it is with great pleasure to inform you that the CI is green again

etene and others added 19 commits January 15, 2025 09:44

WIP: add an async dhcp client

f1a9a74

add StrEnum and async sock recv compat for python < 3.11

353efde

remove typing.Self to restore compat with older pythons

3d009de

dnsmasq fixture: ensure consistent output language (LANG=C)

3f34271

dhcp client: indent lease files

e2ce512

dhcp client: split send/recv into separate tasks

14eaf41

add ETHERTYPE_IP compat for python < 3.12

2176061

typing fixes and compat

e1d2a4f

dhcp client: replace match/case with if/else

52937a2

dhcp client: use Optional everywhere for py39 compat

b6b752a

improve dnsmasq fixture & handling of timeouts in dhcp client tests

e0566b0

dhcp client: add basic NAK support

2a45a26

dhcp client: handle expired leases on loading

ba3d62a

dhcp client: fix coroutine warnings in timer callbacks

e941c98

dhcp client: fix logic error when loading lease

091056d

dhcp client: add comments, improve waiting for state

1e195c4

dhcp client: add a udhcpd fixture and a test with it

417a8d9

properly do unicast & broadcast for REQUESTs according to RFC

c5679a0

dhcp: Merge pull request #1250 from etene/async-dhcp-client

d9128e8

add an async dhcp client Bug-Url: #1250

svinota marked this pull request as draft January 21, 2025 22:44

dhcp: fix & improve docstrings after review

5994076

etene self-assigned this Jan 22, 2025

etene linked an issue Jan 22, 2025 that may be closed by this pull request

DHCP client #1243

Open

etene added 4 commits January 22, 2025 17:02

dhcp client: add randomized retransmission interval

ea56043

dhcp: fix lease loading logic, improve docstrings

9144502

dhcp: use an enum for dhcp options

e1f5810

dhcp: typing + udhcpd fixture fixes

4b855c8

etene force-pushed the p10-dhcp-protocol branch from 022d4eb to 4b855c8 Compare January 23, 2025 09:15

etene and others added 13 commits January 27, 2025 18:57

dhcp: add a decoding test for a wii dhcp discover message

03178b5

dhcp: fix string option parsing bug

7bfffdb

dhcp: set 'secs' in messages, fix its endianness

b492168

dhcp client: convert dotted decimal mask to CIDR

ff80277

dhcp client: routers property should return a list of routers

6ce20a4

as defined in the RFC

dhcp client: add a default gateway property

b3a25ee

dhcp client: add broadcast and mtu properties

289aa80

dhcp client: fix typing and use get to avoid exceptions

50df3db

dhcp client: implement hook to configure IP

4c47a4b

dhcp client: we want unbound the hooks in reverse order

fb3d7db

dhcp client: implement a hook to add default route

b265592

dhcp client: define dhcp exceptions

4a9578c

dhcp client: raise DHCPOptionMissingError if subnet mask option is no…

2c658c6

…t set

svinota commented Jan 27, 2025

View reviewed changes

etene added 3 commits January 28, 2025 09:39

Merge pull request #1257 from BrianBaboch/add-hooks-and-other-improve…

7eeb28a

…ments Add hooks and other improvements

dhcp: small post-merge fixes & comments

558a395

dhcp: refactor Options & Parameters, add missing values

2dbd1be

svinota commented Jan 28, 2025

View reviewed changes

etene added 2 commits January 28, 2025 17:38

dhcp: add a unit test for lease renewing

68925d8

dhcp: add EnumType compat for py311, linter fixes

b713e5c

etene force-pushed the p10-dhcp-protocol branch from 9fa4d33 to b713e5c Compare January 29, 2025 09:21

etene and others added 7 commits January 29, 2025 12:18

dhcp: fix enum mess, try to find a workaround that's valid for all py…

bb030b5

…thons

dhcp client: send queued messages before stopping

3fe4d5a

WIP: dhcp: refactor transaction id handling

062c1be

dhcp client: allow to specify xid

1939fd5

format: fix linting

d684cb4

dhcp xid: fix annotation for python < 3.10

27e8cd0

ci: fix dhcp unit test fixture for python < 3.10

634ee39

svinota commented Jan 29, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] dhcp protocol update #1254

[WIP] dhcp protocol update #1254

svinota commented Jan 21, 2025

svinota commented Jan 21, 2025

svinota commented Jan 21, 2025

svinota Jan 27, 2025

etene Jan 28, 2025

svinota Jan 28, 2025

svinota Jan 28, 2025

etene Jan 29, 2025

svinota Jan 29, 2025

svinota commented Jan 29, 2025

	def __init__(self, data, cls, key, data_offset, script):
	with open(data, 'rb') as f:
	self.raw = f.read()
	self.metadata = PcapMetaData(*struct.unpack("IHHiIII", self.raw[:24]))
	self.offset = 24
	self.key = key
	self.data_offset = data_offset
	self.cls = cls
	self.matcher = Matcher(script)

		@@ -1,4 +1,4 @@
		from enum import IntEnum
		from enum import EnumType, IntEnum

[WIP] dhcp protocol update #1254

Are you sure you want to change the base?

[WIP] dhcp protocol update #1254

Conversation

svinota commented Jan 21, 2025

svinota commented Jan 21, 2025

svinota commented Jan 21, 2025

svinota Jan 27, 2025

Choose a reason for hiding this comment

etene Jan 28, 2025

Choose a reason for hiding this comment

svinota Jan 28, 2025

Choose a reason for hiding this comment

svinota Jan 28, 2025

Choose a reason for hiding this comment

etene Jan 29, 2025

Choose a reason for hiding this comment

svinota Jan 29, 2025

Choose a reason for hiding this comment

svinota commented Jan 29, 2025