mirror of
http://thekelleys.org.uk/git/dnsmasq.git
synced 2026-11-21 20:01:54 +00:00
Bugfix for latest DHCPv6 update.
This commit is contained in:
1 parent
49333cbdbe
commit
a1a79edaea
1 file changed
+6
-1
+6
-1
@@ -677,11 +677,16 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
|
|||||||
|
|
||||||
/* Suggest configured address(es) */
|
/* Suggest configured address(es) */
|
||||||
for (c = context; c; c = c->current)
|
for (c = context; c; c = c->current)
|
||||||
if (!(c->flags & CONTEXT_CONF_USED) && config_valid(config, c, &addr) && check_address(&state, &addr))
|
if (!(c->flags & CONTEXT_CONF_USED) &&
|
||||||
|
match_netid(c->filter, solicit_tags, plain_range) &&
|
||||||
|
config_valid(config, c, &addr) &&
|
||||||
|
check_address(&state, &addr))
|
||||||
{
|
{
|
||||||
mark_config_used(context, &addr);
|
mark_config_used(context, &addr);
|
||||||
if (have_config(config, CONFIG_TIME))
|
if (have_config(config, CONFIG_TIME))
|
||||||
lease_time = config->lease_time;
|
lease_time = config->lease_time;
|
||||||
|
else
|
||||||
|
lease_time = c->lease_time;
|
||||||
/* add address to output packet */
|
/* add address to output packet */
|
||||||
#ifdef OPTION6_PREFIX_CLASS
|
#ifdef OPTION6_PREFIX_CLASS
|
||||||
if (dump_all_prefix_classes)
|
if (dump_all_prefix_classes)
|
||||||
|
|||||||
Reference in new issue
Block a user