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

Another logic problem in refactor.

Browse Source
This commit is contained in:
Simon Kelley
2013-03-06 22:43:26 +00:00
parent 3a654c506f
commit 52a1ae72f0
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/rfc3315.c
View File

@@ -511,6 +511,9 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
if (ignore) if (ignore)
return 0; return 0;
/* reset USED bits in leases */
lease6_reset();
for (opt = state.packet_options; opt; opt = opt6_next(opt, state.end)) for (opt = state.packet_options; opt; opt = opt6_next(opt, state.end))
{ {
void *ia_option, *ia_end; void *ia_option, *ia_end;
@@ -539,8 +542,9 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
config_ok = 0; /* configured address leased elsewhere */ config_ok = 0; /* configured address leased elsewhere */
} }
/* reset USED bits in leases */ /* reset USED bits in contexts - one address per prefix per IAID */
lease6_reset(); for (c = context; c; c = c->current)
c->flags &= ~CONTEXT_USED;
o = build_ia(&state, &t1cntr); o = build_ia(&state, &t1cntr);
@@ -550,10 +554,6 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
ltmp = lease6_find_by_addr(req_addr, 128, 0); ltmp = lease6_find_by_addr(req_addr, 128, 0);
requested_time = opt6_uint(ia_option, 16, 4); requested_time = opt6_uint(ia_option, 16, 4);
/* reset USED bits in contexts - one address per prefix per IAID */
for (c = context; c; c = c->current)
c->flags &= ~CONTEXT_USED;
if ((c = address6_valid(context, req_addr, tagif))) if ((c = address6_valid(context, req_addr, tagif)))
{ {
lease_time = c->lease_time; lease_time = c->lease_time;