wt/dnsmasq
1
0 Fork 0
mirror of http://thekelleys.org.uk/git/dnsmasq.git synced 2026-10-29 12:50:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle standard and contructed dhcp-ranges on the same interface.

Browse Source
This commit is contained in:
Simon Kelley committed 2018-06-02 13:06:00 +01:00
1 parent 1f1873aadd
commit c488b68e75
2 files changed
+23 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/dhcp6.c
+17 -12
View File
@@ -667,23 +667,28 @@ static int construct_worker(struct in6_addr *local, int prefix,
end6 = *local;
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)
if ((context->flags & CONTEXT_CONSTRUCTED) &&
if (!(context->flags & CONTEXT_TEMPLATE) &&
IN6_ARE_ADDR_EQUAL(&start6, &context->start6) &&
IN6_ARE_ADDR_EQUAL(&end6, &context->end6))
{
int flags = context->flags;
context->flags &= ~(CONTEXT_GC | CONTEXT_OLD);
if (flags & CONTEXT_OLD)
if (context->flags & CONTEXT_CONSTRUCTED)
{
/* address went, now it's back */
log_context(AF_INET6, context);
/* fast RAs for a while */
ra_start_unsolicited(param->now, context);
param->newone = 1;
/* Add address to name again */
if (context->flags & CONTEXT_RA_NAME)
param->newname = 1;
int cflags = context->flags;
context->flags &= ~(CONTEXT_GC | CONTEXT_OLD);
if (cflags & CONTEXT_OLD)
{
/* address went, now it's back */
log_context(AF_INET6, context);
/* fast RAs for a while */
ra_start_unsolicited(param->now, context);
param->newone = 1;
/* Add address to name again */
if (context->flags & CONTEXT_RA_NAME)
param->newname = 1;
}
}
break;
}