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

Relax rules in prefix length in (IPv6) dhcp-range.

Browse Source
This commit is contained in:
Vladislav Grishenko
2013-12-03 16:05:30 +00:00
committed by Simon Kelley
parent 5f45d6a715
commit 4c82efc5ac
4 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@@ -45,6 +45,11 @@ version 2.68
but as it's always possible for IPv6 (the API always but as it's always possible for IPv6 (the API always
exists) then we should do it always. exists) then we should do it always.
Tweak the rules on prefix-lengths in --dhcp-range for
IPv6. The new rule is that the specified prefix length
must be larger than or equal to the prefix length of the
corresponding address on the local interface.
version 2.67 version 2.67
Fix crash if upstream server returns SERVFAIL when Fix crash if upstream server returns SERVFAIL when

3
man/dnsmasq.8
View File

@@ -673,7 +673,8 @@ always optional. It is always
allowed to have more than one dhcp-range in a single subnet. allowed to have more than one dhcp-range in a single subnet.
For IPv6, the parameters are slightly different: instead of netmask For IPv6, the parameters are slightly different: instead of netmask
and broadcast address, there is an optional prefix length. If not and broadcast address, there is an optional prefix length which must
be equal to or larger then the prefix length on the local interface. If not
given, this defaults to 64. Unlike the IPv4 case, the prefix length is not given, this defaults to 64. Unlike the IPv4 case, the prefix length is not
automatically derived from the interface configuration. The mimimum automatically derived from the interface configuration. The mimimum
size of the prefix length is 64. size of the prefix length is 64.

14
src/dhcp6.c
View File

@@ -330,9 +330,9 @@ static int complete_context6(struct in6_addr *local, int prefix,
{ {
if ((context->flags & CONTEXT_DHCP) && if ((context->flags & CONTEXT_DHCP) &&
!(context->flags & (CONTEXT_TEMPLATE | CONTEXT_OLD)) && !(context->flags & (CONTEXT_TEMPLATE | CONTEXT_OLD)) &&
prefix == context->prefix && prefix <= context->prefix &&
is_same_net6(local, &context->start6, prefix) && is_same_net6(local, &context->start6, context->prefix) &&
is_same_net6(local, &context->end6, prefix)) is_same_net6(local, &context->end6, context->prefix))
{ {
@@ -631,9 +631,9 @@ static int construct_worker(struct in6_addr *local, int prefix,
if (!(template->flags & CONTEXT_TEMPLATE)) if (!(template->flags & CONTEXT_TEMPLATE))
{ {
/* non-template entries, just fill in interface and local addresses */ /* non-template entries, just fill in interface and local addresses */
if (prefix == template->prefix && if (prefix <= template->prefix &&
is_same_net6(local, &template->start6, prefix) && is_same_net6(local, &template->start6, template->prefix) &&
is_same_net6(local, &template->end6, prefix)) is_same_net6(local, &template->end6, template->prefix))
{ {
template->if_index = if_index; template->if_index = if_index;
template->local6 = *local; template->local6 = *local;
@@ -641,7 +641,7 @@ static int construct_worker(struct in6_addr *local, int prefix,
} }
else if (wildcard_match(template->template_interface, ifrn_name) && else if (wildcard_match(template->template_interface, ifrn_name) &&
template->prefix == prefix) template->prefix >= prefix)
{ {
start6 = *local; start6 = *local;
setaddr6part(&start6, addr6part(&template->start6)); setaddr6part(&start6, addr6part(&template->start6));

28
src/radv.c
View File

@@ -430,7 +430,7 @@ static int add_prefixes(struct in6_addr *local, int prefix,
else if (!IN6_IS_ADDR_LOOPBACK(local) && else if (!IN6_IS_ADDR_LOOPBACK(local) &&
!IN6_IS_ADDR_MULTICAST(local)) !IN6_IS_ADDR_MULTICAST(local))
{ {
int do_prefix = 0; int real_prefix = 0;
int do_slaac = 0; int do_slaac = 0;
int deprecate = 0; int deprecate = 0;
int constructed = 0; int constructed = 0;
@@ -439,9 +439,9 @@ static int add_prefixes(struct in6_addr *local, int prefix,
for (context = daemon->dhcp6; context; context = context->next) for (context = daemon->dhcp6; context; context = context->next)
if (!(context->flags & (CONTEXT_TEMPLATE | CONTEXT_OLD)) && if (!(context->flags & (CONTEXT_TEMPLATE | CONTEXT_OLD)) &&
prefix == context->prefix && prefix <= context->prefix &&
is_same_net6(local, &context->start6, prefix) && is_same_net6(local, &context->start6, context->prefix) &&
is_same_net6(local, &context->end6, prefix)) is_same_net6(local, &context->end6, context->prefix))
{ {
context->saved_valid = valid; context->saved_valid = valid;
@@ -496,7 +496,7 @@ static int add_prefixes(struct in6_addr *local, int prefix,
if (!param->first) if (!param->first)
context->ra_time = 0; context->ra_time = 0;
context->flags |= CONTEXT_RA_DONE; context->flags |= CONTEXT_RA_DONE;
do_prefix = 1; real_prefix = context->prefix;
} }
param->first = 0; param->first = 0;
@@ -523,18 +523,18 @@ static int add_prefixes(struct in6_addr *local, int prefix,
param->link_global = *local; param->link_global = *local;
} }
if (do_prefix) if (real_prefix != 0)
{ {
struct prefix_opt *opt; struct prefix_opt *opt;
if ((opt = expand(sizeof(struct prefix_opt)))) if ((opt = expand(sizeof(struct prefix_opt))))
{ {
/* zero net part of address */ /* zero net part of address */
setaddr6part(local, addr6part(local) & ~((prefix == 64) ? (u64)-1LL : (1LLU << (128 - prefix)) - 1LLU)); setaddr6part(local, addr6part(local) & ~((real_prefix == 64) ? (u64)-1LL : (1LLU << (128 - real_prefix)) - 1LLU));
opt->type = ICMP6_OPT_PREFIX; opt->type = ICMP6_OPT_PREFIX;
opt->len = 4; opt->len = 4;
opt->prefix_len = prefix; opt->prefix_len = real_prefix;
/* autonomous only if we're not doing dhcp, always set "on-link" */ /* autonomous only if we're not doing dhcp, always set "on-link" */
opt->flags = do_slaac ? 0xC0 : 0x80; opt->flags = do_slaac ? 0xC0 : 0x80;
opt->valid_lifetime = htonl(valid); opt->valid_lifetime = htonl(valid);
@@ -645,9 +645,9 @@ static int iface_search(struct in6_addr *local, int prefix,
for (context = daemon->dhcp6; context; context = context->next) for (context = daemon->dhcp6; context; context = context->next)
if (!(context->flags & (CONTEXT_TEMPLATE | CONTEXT_OLD)) && if (!(context->flags & (CONTEXT_TEMPLATE | CONTEXT_OLD)) &&
prefix == context->prefix && prefix <= context->prefix &&
is_same_net6(local, &context->start6, prefix) && is_same_net6(local, &context->start6, context->prefix) &&
is_same_net6(local, &context->end6, prefix) && is_same_net6(local, &context->end6, context->prefix) &&
context->ra_time != 0 && context->ra_time != 0 &&
difftime(context->ra_time, param->now) <= 0.0) difftime(context->ra_time, param->now) <= 0.0)
{ {
@@ -670,9 +670,9 @@ static int iface_search(struct in6_addr *local, int prefix,
/* zero timers for other contexts on the same subnet, so they don't timeout /* zero timers for other contexts on the same subnet, so they don't timeout
independently */ independently */
for (context = context->next; context; context = context->next) for (context = context->next; context; context = context->next)
if (prefix == context->prefix && if (prefix <= context->prefix &&
is_same_net6(local, &context->start6, prefix) && is_same_net6(local, &context->start6, context->prefix) &&
is_same_net6(local, &context->end6, prefix)) is_same_net6(local, &context->end6, context->prefix))
context->ra_time = 0; context->ra_time = 0;
return 0; /* found, abort */ return 0; /* found, abort */