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

Handle some corner cases in RA contructed interfaces with addresses changing interface.

Browse Source 
Thanks to Vladislav Grishenko for work on this.
This commit is contained in:
Simon Kelley
2018-06-07 21:37:02 +01:00
parent 7dcca6c622
commit db0f488ea8
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/dhcp6.c
View File

@@ -640,7 +640,7 @@ static int construct_worker(struct in6_addr *local, int prefix,
return 0; return 0;
for (template = daemon->dhcp6; template; template = template->next) for (template = daemon->dhcp6; template; template = template->next)
if (!(template->flags & CONTEXT_TEMPLATE)) if (!(template->flags & (CONTEXT_TEMPLATE | CONTEXT_CONSTRUCTED)))
{ {
/* 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 &&
@@ -667,20 +667,23 @@ static int construct_worker(struct in6_addr *local, int prefix,
end6 = *local; end6 = *local;
setaddr6part(&end6, addr6part(&template->end6)); setaddr6part(&end6, addr6part(&template->end6));
/* If there's an absolute address context covering this address
then don't contruct one as well. */
for (context = daemon->dhcp6; context; context = context->next) for (context = daemon->dhcp6; context; context = context->next)
if (!(context->flags & CONTEXT_TEMPLATE) && if (!(context->flags & CONTEXT_TEMPLATE) &&
IN6_ARE_ADDR_EQUAL(&start6, &context->start6) && IN6_ARE_ADDR_EQUAL(&start6, &context->start6) &&
IN6_ARE_ADDR_EQUAL(&end6, &context->end6)) IN6_ARE_ADDR_EQUAL(&end6, &context->end6))
{ {
if (context->flags & CONTEXT_CONSTRUCTED) /* If there's an absolute address context covering this address
then don't construct one as well. */
if (!(context->flags & CONTEXT_CONSTRUCTED))
break;
if (context->if_index == if_index)
{ {
int cflags = context->flags; int cflags = context->flags;
context->flags &= ~(CONTEXT_GC | CONTEXT_OLD); context->flags &= ~(CONTEXT_GC | CONTEXT_OLD);
if (cflags & CONTEXT_OLD) if (cflags & CONTEXT_OLD)
{ {
/* address went, now it's back */ /* address went, now it's back, and on the same interface */
log_context(AF_INET6, context); log_context(AF_INET6, context);
/* fast RAs for a while */ /* fast RAs for a while */
ra_start_unsolicited(param->now, context); ra_start_unsolicited(param->now, context);
@@ -688,10 +691,11 @@ static int construct_worker(struct in6_addr *local, int prefix,
/* Add address to name again */ /* Add address to name again */
if (context->flags & CONTEXT_RA_NAME) if (context->flags & CONTEXT_RA_NAME)
param->newname = 1; param->newname = 1;
}
}
break; break;
} }
}
}
if (!context && (context = whine_malloc(sizeof (struct dhcp_context)))) if (!context && (context = whine_malloc(sizeof (struct dhcp_context))))
{ {