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

More work on lease and router lifetime calculation.

Browse Source
This commit is contained in:
Simon Kelley
2012-12-28 11:31:44 +00:00
parent 60225f4e75
commit 3bc0d932d0
4 changed files with 51 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/radv.c
View File

@@ -344,6 +344,7 @@ static int add_prefixes(struct in6_addr *local, int prefix,
int do_prefix = 0;
int do_slaac = 0;
int deprecate = 0;
int constructed = 0;
unsigned int time = 0xffffffff;
struct dhcp_context *context;
@@ -383,6 +384,10 @@ static int add_prefixes(struct in6_addr *local, int prefix,
if (context->flags & CONTEXT_DEPRECATE)
deprecate = 1;
if (context->flags & CONTEXT_CONSTRUCTED)
constructed = 1;
/* collect dhcp-range tags */
if (context->netid.next == &context->netid && context->netid.net)
@@ -408,18 +413,19 @@ static int add_prefixes(struct in6_addr *local, int prefix,
}
/* configured time is ceiling */
if (valid > time)
if (!constructed || valid > time)
valid = time;
if ((flags & IFACE_DEPRECATED) || deprecate)
if (flags & IFACE_DEPRECATED)
preferred = 0;
else
{
/* configured time is ceiling */
if (preferred > time)
preferred = time;
}
if (deprecate)
time = 0;
/* configured time is ceiling */
if (!constructed || preferred > time)
preferred = time;
if (preferred > param->pref_time)
{
param->pref_time = preferred;