Commit 61b838dd authored by Win King Wan's avatar Win King Wan Committed by Simon Kelley

Don't reply to DHCPv6 SOLICIT messages when not configured for statefull DHCPv6.

parent fbf01f70
...@@ -59,6 +59,10 @@ version 2.73 ...@@ -59,6 +59,10 @@ version 2.73
cheaply than having dnsmasq re-read all its existing cheaply than having dnsmasq re-read all its existing
configuration each time. configuration each time.
Don't reply to DHCPv6 SOLICIT messages if we're not
configured to do stateful DHCPv6. Thanks to Win King Wan
for the patch.
version 2.72 version 2.72
Add ra-advrouter mode, for RFC-3775 mobile IPv6 support. Add ra-advrouter mode, for RFC-3775 mobile IPv6 support.
......
...@@ -824,6 +824,19 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_ ...@@ -824,6 +824,19 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_
} }
else else
{ {
/* Windows 8 always requests an address even if the Managed bit
in RA is 0 and it keeps retrying if it receives a reply
stating that no addresses are available. We solve this
by not replying at all if we're not configured to give any
addresses by DHCPv6. RFC 3315 17.2.1. appears to allow this. */
for (c = state->context; c; c = c->current)
if (!(c->flags & CONTEXT_RA_STATELESS))
break;
if (!c)
return 0;
/* no address, return error */ /* no address, return error */
o1 = new_opt6(OPTION6_STATUS_CODE); o1 = new_opt6(OPTION6_STATUS_CODE);
put_opt6_short(DHCP6NOADDRS); put_opt6_short(DHCP6NOADDRS);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment