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

Make wildcard-configured addresses work on multiple networks.

Browse Source
This commit is contained in:
Simon Kelley
2013-03-15 18:25:10 +00:00
parent 0f128eb58c
commit de92b479d9
3 changed files with 163 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/dhcp6.c
View File

@@ -371,31 +371,38 @@ struct dhcp_context *address6_valid(struct dhcp_context *context,
return NULL;
}
static int is_config_in_context6(struct dhcp_context *context, struct dhcp_config *config)
int config_valid(struct dhcp_config *config, struct dhcp_context *context, struct in6_addr *addr)
{
/* expand wildcard on contructed contexts */
if ((config->flags & CONFIG_WILDCARD) &&
(context->flags & CONTEXT_CONSTRUCTED))
if (!config || !(config->flags & CONFIG_ADDR6))
return 0;
if ((config->flags & CONFIG_WILDCARD) && context->prefix == 64)
{
u64 addrpart = addr6part(&config->addr6);
config->addr6 = context->start6;
setaddr6part(&config->addr6, addrpart);
*addr = context->start6;
setaddr6part(addr, addr6part(&config->addr6));
return 1;
}
if (is_same_net6(&context->start6, &config->addr6, context->prefix))
{
*addr = config->addr6;
return 1;
}
if (!(config->flags & CONFIG_ADDR6) || is_addr_in_context6(context, &config->addr6))
return 1;
return 0;
}
int is_addr_in_context6(struct dhcp_context *context, struct in6_addr *addr)
static int is_config_in_context6(struct dhcp_context *context, struct dhcp_config *config)
{
for (; context; context = context->current)
if (is_same_net6(addr, &context->start6, context->prefix))
return 1;
if (!(config->flags & CONFIG_ADDR6) ||
(config->flags & CONFIG_WILDCARD))
return 1;
for (; context; context = context->current)
if (is_same_net6(&config->addr6, &context->start6, context->prefix))
return 1;
return 0;
}