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

Optimise cache code when stale caching in use.

Browse Source 
Exclude DNSSEC entries from stale caching.
This commit is contained in:
Simon Kelley
2022-09-16 12:07:01 +01:00
parent f32498465d
commit 9403664616
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/cache.c
View File

@@ -374,8 +374,9 @@ static int is_outdated_cname_pointer(struct crec *crecp)
static int is_expired(time_t now, struct crec *crecp) static int is_expired(time_t now, struct crec *crecp)
{ {
/* Don't dump expired entries if we're using them, cache becomes strictly LRU in that case. */ /* Don't dump expired entries if we're using them, cache becomes strictly LRU in that case.
if (option_bool(OPT_STALE_CACHE)) Never use expired DS or DNSKEY entries. */
if (option_bool(OPT_STALE_CACHE) && !(crecp->flags & (F_DS | F_DNSKEY)))
return 0; return 0;
if (crecp->flags & F_IMMORTAL) if (crecp->flags & F_IMMORTAL)
@@ -557,7 +558,7 @@ static struct crec *really_insert(char *name, union all_addr *addr, unsigned sho
{ {
struct crec *new, *target_crec = NULL; struct crec *new, *target_crec = NULL;
union bigname *big_name = NULL; union bigname *big_name = NULL;
int freed_all = flags & F_REVERSE; int freed_all = (flags & F_REVERSE);
int free_avail = 0; int free_avail = 0;
unsigned int target_uid; unsigned int target_uid;
@@ -632,8 +633,12 @@ static struct crec *really_insert(char *name, union all_addr *addr, unsigned sho
{ {
/* For DNSSEC records, uid holds class. */ /* For DNSSEC records, uid holds class. */
free_avail = 1; /* Must be free space now. */ free_avail = 1; /* Must be free space now. */
/* condition valid when stale-caching */
if (difftime(now, new->ttd) < 0)
daemon->metrics[METRIC_DNS_CACHE_LIVE_FREED]++;
cache_scan_free(cache_get_name(new), &new->addr, new->uid, now, new->flags, NULL, NULL); cache_scan_free(cache_get_name(new), &new->addr, new->uid, now, new->flags, NULL, NULL);
daemon->metrics[METRIC_DNS_CACHE_LIVE_FREED]++;
} }
else else
{ {