Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@DL6ER
Copy link
Member

@DL6ER DL6ER commented Jul 28, 2025

What does this implement/fix?

Pulling in the latest dnsmasq changes. Mostly, this is modifying DHCP-related code, a new feature is dhcp-split-relay which is useful when client and server networks aren't mutually route-able.


Related issue or feature (if applicable): N/A

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories development branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

simonkelley and others added 12 commits July 28, 2025 19:34
Reading /etc/ethers assumes that dhcp-host cofig has already
been read, and that is the case for dhcp-host, but for unknown
reasons, the analogous congiguration is dhcp-hostfile was being
read after /etc/ethers.

Swap the order.

Thanks to Andreas Kuropka for spotting the problem.

Signed-off-by: DL6ER <[email protected]>
Thanks to Mikhail Dmitrichenko for spotting this.

Signed-off-by: DL6ER <[email protected]>
Traverse the nested data structures more efficiently,
more understandably, and with watertight checking of
buffer boundaries.

Signed-off-by: DL6ER <[email protected]>
Some messages must be sent as multicast.

Signed-off-by: DL6ER <[email protected]>
… DHCPv6.

Change the behaviour of the DHVPv6 server when a REBIND message
is received but no lease exists. Under these circumstances a new
lease is created _only_ when the --dhcp-authoritative option is
set. This matches the behavior of the DHCPv4 server.

Signed-off-by: DL6ER <[email protected]>
If the link address in a relayed DHCPv6 message is zero, don't
use it for addresss selection.

Signed-off-by: DL6ER <[email protected]>
If we jump to label request_no_address, address_assigned
has an undefined value, and maybe the wrong status is returned.

Signed-off-by: DL6ER <[email protected]>
Include IA_* options even if no addresses are allocated, and
always return options specified in ORO.

Signed-off-by: DL6ER <[email protected]>
This makes a DHCPv4 relay which is functional when
client and server networks aren't mutually route-able.

Signed-off-by: DL6ER <[email protected]>
@DL6ER DL6ER requested a review from a team as a code owner July 28, 2025 18:05
@DL6ER DL6ER marked this pull request as draft July 28, 2025 18:06
…s. This warning is correct here, see comment in 01-pihole-test.conf why this is needed during our tests

Signed-off-by: DL6ER <[email protected]>
@DL6ER DL6ER marked this pull request as ready for review July 29, 2025 18:21
@DL6ER DL6ER merged commit 2b39506 into development Aug 9, 2025
76 of 84 checks passed
@PromoFaux PromoFaux mentioned this pull request Oct 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants