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

IPv6 address range parsing for --domain.

Browse Source 
Counted string DHCP option type printing
This commit is contained in:
Simon Kelley
2012-02-07 20:51:56 +00:00
parent 70c5e3e076
commit d74942a03d
3 changed files with 126 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cache.c
View File

@@ -913,7 +913,8 @@ char *get_domain(struct in_addr addr)
struct cond_domain *c;
for (c = daemon->cond_domain; c; c = c->next)
if (ntohl(addr.s_addr) >= ntohl(c->start.s_addr) &&
if (!c->is6 &&
ntohl(addr.s_addr) >= ntohl(c->start.s_addr) &&
ntohl(addr.s_addr) <= ntohl(c->end.s_addr))
return c->domain;
@@ -924,14 +925,15 @@ char *get_domain(struct in_addr addr)
#ifdef HAVE_IPV6
char *get_domain6(struct in6_addr *addr)
{
struct cond_domain6 *c;
struct cond_domain *c;
u64 addrpart = addr6part(addr);
for (c = daemon->cond_domain6; c; c = c->next)
if (is_same_net6(addr, &c->start, 64) &&
addrpart >= addr6part(&c->start) &&
addrpart <= addr6part(&c->end))
for (c = daemon->cond_domain; c; c = c->next)
if (c->is6 &&
is_same_net6(addr, &c->start6, 64) &&
addrpart >= addr6part(&c->start6) &&
addrpart <= addr6part(&c->end6))
return c->domain;
return daemon->domain_suffix;