Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Alter DHCP address selection after DECLINE in consec-addr mode.

Browse Source 
Avoid offering the same address after a recieving a DECLINE message
to stop an infinite protocol loop. This has long been done in
default address allocation mode: this adds similar behaviour
when allocaing addresses consecutively.
This commit is contained in:
Simon Kelley
2018-12-31 20:51:15 +00:00
parent b683cf37f9
commit e7bfd556c0
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/dhcp.c
View File

@@ -754,6 +754,19 @@ int address_allocate(struct dhcp_context *context,
if (addr.s_addr == d->router.s_addr) if (addr.s_addr == d->router.s_addr)
break; break;
/* in consec-ip mode, skip addresses equal to
the number of addresses rejected by clients. This
should avoid the same client being offered the same
address after it has rjected it. */
if (option_bool(OPT_CONSEC_ADDR))
{
if (c->addr_epoch)
{
c->addr_epoch--;
d = context; /* d non-NULL skips the address. */
}
}
/* Addresses which end in .255 and .0 are broken in Windows even when using /* Addresses which end in .255 and .0 are broken in Windows even when using
supernetting. ie dhcp-range=192.168.0.1,192.168.1.254,255,255,254.0 supernetting. ie dhcp-range=192.168.0.1,192.168.1.254,255,255,254.0
then 192.168.0.255 is a valid IP address, but not for Windows as it's then 192.168.0.255 is a valid IP address, but not for Windows as it's

11
src/dhcp6.c
View File

@@ -431,8 +431,15 @@ struct dhcp_context *address6_allocate(struct dhcp_context *context, unsigned c
else else
{ {
if (!temp_addr && option_bool(OPT_CONSEC_ADDR)) if (!temp_addr && option_bool(OPT_CONSEC_ADDR))
/* seed is largest extant lease addr in this context */ {
start = lease_find_max_addr6(c) + serial; /* seed is largest extant lease addr in this context,
skip addresses equal to the number of addresses rejected
by clients. This should avoid the same client being offered the same
address after it has rjected it. */
start = lease_find_max_addr6(c) + serial + c->addr_epoch;
if (c->addr_epoch)
c->addr_epoch--;
}
else else
{ {
u64 range = 1 + addr6part(&c->end6) - addr6part(&c->start6); u64 range = 1 + addr6part(&c->end6) - addr6part(&c->start6);