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

Apply ceiling of lease length to TTL when --dhcp-ttl in use.

Browse Source
This commit is contained in:
Simon Kelley
2016-02-26 21:58:20 +00:00
parent bec366b404
commit 7480aeffc8
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/rfc1035.c
View File

@@ -1167,10 +1167,18 @@ int add_resource_record(struct dns_header *header, char *limit, int *truncp, int
static unsigned long crec_ttl(struct crec *crecp, time_t now) static unsigned long crec_ttl(struct crec *crecp, time_t now)
{ {
/* Return 0 ttl for DHCP entries, which might change /* Return 0 ttl for DHCP entries, which might change
before the lease expires. */ before the lease expires, unless configured otherwise. */
if (crecp->flags & F_DHCP) if (crecp->flags & F_DHCP)
return daemon->use_dhcp_ttl ? daemon->dhcp_ttl : daemon->local_ttl; {
int conf_ttl = daemon->use_dhcp_ttl ? daemon->dhcp_ttl : daemon->local_ttl;
/* Apply ceiling of actual lease length to configured TTL. */
if (!(crecp->flags & F_IMMORTAL) && (crecp->ttd - now) < conf_ttl)
return crecp->ttd - now;
return conf_ttl;
}
/* Immortal entries other than DHCP are local, and hold TTL in TTD field. */ /* Immortal entries other than DHCP are local, and hold TTL in TTD field. */
if (crecp->flags & F_IMMORTAL) if (crecp->flags & F_IMMORTAL)