mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-01 06:45:27 +00:00
Code Issues Releases Wiki Activity

[master] Honor prefix length hint for returning clients

Browse Source 
Merges in rt45780.
This commit is contained in:
Thomas Markwalder
2017-09-06 10:25:17 -04:00
parent f883cc9031
commit d1489a35a9
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/dhcpv6.c
View File

@@ -4664,6 +4664,19 @@ find_client_prefix(struct reply_state *reply) {
best_prefix = prefix_compare(reply, prefix,
best_prefix);
}
/*
* If we have prefix length hint and we're not igoring them,
* then toss the best match if it doesn't match the hint,
* unless this is in response to a rebind. In the latter
* case we're supposed to return it with zero lifetimes.
* (See rt45780) */
if (best_prefix && (reply->preflen > 0)
&& (prefix_length_mode != PLM_IGNORE)
&& (reply->preflen != best_prefix->plen)
&& (reply->packet->dhcpv6_msg_type != DHCPV6_REBIND)) {
best_prefix = NULL;
}
}
/* Try to pick a new prefix if we didn't find one, or if we found an