Skip to content
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

Jump to bottom

dhcp protocol update #1254

Open
wants to merge 93 commits into
base: master
Choose a base branch
from
Open

dhcp protocol update #1254

wants to merge 93 commits into from
+3,458 −286

Conversation

svinota
Copy link
Owner

@svinota svinota commented Jan 21, 2025

Bug-Url: #1250

etene and others added 19 commits January 15, 2025 09:44
@etene
WIP: add an async dhcp client
f1a9a74
@etene
add StrEnum and async sock recv compat for python < 3.11
353efde
@etene
remove typing.Self to restore compat with older pythons
3d009de
@etene
dnsmasq fixture: ensure consistent output language (LANG=C)
3f34271
@etene
dhcp client: indent lease files
e2ce512
@etene
dhcp client: split send/recv into separate tasks
14eaf41
@etene
add ETHERTYPE_IP compat for python < 3.12
2176061
@etene
typing fixes and compat
e1d2a4f
@etene
dhcp client: replace match/case with if/else
52937a2
@etene
dhcp client: use Optional everywhere for py39 compat
b6b752a
@etene
improve dnsmasq fixture & handling of timeouts in dhcp client tests
e0566b0
@etene
dhcp client: add basic NAK support
2a45a26
@etene
dhcp client: handle expired leases on loading
ba3d62a
@etene
dhcp client: fix coroutine warnings in timer callbacks
e941c98
@etene
dhcp client: fix logic error when loading lease
091056d
@etene
dhcp client: add comments, improve waiting for state
1e195c4
@etene
dhcp client: add a udhcpd fixture and a test with it
417a8d9
@etene
properly do unicast & broadcast for REQUESTs according to RFC
c5679a0
@svinota
dhcp: Merge pull request #1250 from etene/async-dhcp-client
d9128e8 
add an async dhcp client

Bug-Url: #1250
@svinota
Copy link
Owner Author

svinota commented Jan 21, 2025

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

@svinota svinota marked this pull request as draft January 21, 2025 22:44
@svinota
Copy link
Owner Author

svinota commented Jan 21, 2025

@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.

@etene etene self-assigned this Jan 22, 2025
@etene etene linked an issue Jan 22, 2025 that may be closed by this pull request
DHCP client #1243
Open
@etene etene force-pushed the p10-dhcp-protocol branch from 022d4eb to 4b855c8 Compare January 23, 2025 09:15
svinota
svinota commented Feb 4, 2025
View reviewed changes
pyroute2/compat.py Outdated Show resolved Hide resolved
pyroute2/dhcp/enums/dhcp.py Outdated Show resolved Hide resolved
pyroute2/dhcp/enums/dhcp.py Outdated Show resolved Hide resolved
pyroute2/dhcp/__init__.py
'message_type': DHCPDISCOVER,
'parameter_list': [1, 3, 6, 12, 15, 28],
'message_type': MessageType.DISCOVER,
'parameter_list': [1, 3, 6, 12, 15, 28], # FIXME
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In some coming PRs I have to change to parameter values from the enums

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could do it but i'm starting to think maybe the parameter list should be left empty at this level by default, since there are already default parameters set at the client & cli levels, and one might very well want to send DHCP messages without parameters for testing purposes.

pyroute2/dhcp/leases.py Outdated Show resolved Hide resolved
pyroute2/dhcp/xids.py Show resolved Hide resolved
pyroute2/ext/rawsocket.py Show resolved Hide resolved
tests/test_linux/fixtures/dhcp_servers/__init__.py Show resolved Hide resolved
etene added 17 commits February 5, 2025 10:25
@etene
dhcp: add unit test for request timeout, fix linter
7d2bd75
@etene
dhcp: use SystemRandom for xids
086ab1f
@etene
dhcp: use time.time instead of datetime for lease timestamps
12b4b64
@etene
dhcp: improve option & parameter enum declarations
65122d3
@etene
dhcp: add test, improve fixtures
d6a7125
@etene
dhcp: fix tests for older python versions
aa0ff5f
@etene
dhcp: factorize dhcp option access in leases
8deea4a
@etene
dhcp: refactor cli main()/run_client()
4c0be0b
@etene
dhcp: fix python compat for cli.py
1828465
@etene
dhcp: add a test for a flapping interface + option to disable hooks
b036527
@etene
dhcp: add test for the client pidfile
cae84a2
@etene
dhcp: fix linter, more TimeoutError fixes (?) for older pythons
a50a02c
@etene
dhcp: add options to lease, add hook timeout, try to fix flaky test
073d67e
@etene
dhcp: typing & style fixes
deab017
@etene
dhcp: add wrong xid test, improve & test cli errors
c5a8f20
@etene
dhcp: add a test for unexpected DHCP message, some client refactoring
2f2976e
@etene
dhcp: add missing test pcaps
ea077f6
@svinota svinota changed the title [WIP] dhcp protocol update dhcp protocol update Feb 6, 2025
@svinota svinota marked this pull request as ready for review February 6, 2025 09:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BrianBaboch BrianBaboch BrianBaboch left review comments

@etene etene etene left review comments

Assignees

@etene etene

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

DHCP client
3 participants
@svinota @etene @BrianBaboch