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

Optimse memory use for arbitrary-RR caching.

Browse Source 
RRs 13 bytes or less don't need to allocate block storage.
This commit is contained in:
Simon Kelley
2023-03-31 17:44:02 +01:00
parent 153eeb070b
commit 138e1e2a2d
3 changed files with 86 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/cache.c
View File

@@ -275,8 +275,8 @@ static void cache_blockdata_free(struct crec *crecp)
{
if (!(crecp->flags & F_NEG))
{
if (crecp->flags & F_RR)
blockdata_free(crecp->addr.rr.rrdata);
if (crecp->flags & F_RR && crecp->addr.rr.len == -1)
blockdata_free(crecp->addr.rr.u.block.rrdata);
#ifdef HAVE_DNSSEC
else if (crecp->flags & F_DNSKEY)
blockdata_free(crecp->addr.key.keydata);
@@ -795,8 +795,8 @@ void cache_end_insert(void)
if (flags & F_RR)
{
/* A negative RR entry is possible and has no data, obviously. */
if (!(flags & F_NEG))
blockdata_write(new_chain->addr.rr.rrdata, new_chain->addr.rr.datalen, daemon->pipe_to_parent);
if (!(flags & F_NEG) && new_chain->addr.rr.len == -1)
blockdata_write(new_chain->addr.rr.u.block.rrdata, new_chain->addr.rr.u.block.datalen, daemon->pipe_to_parent);
}
#ifdef HAVE_DNSSEC
if (flags & F_DNSKEY)
@@ -869,7 +869,8 @@ int cache_recv_insert(time_t now, int fd)
if (!read_write(fd, (unsigned char *)&addr, sizeof(addr), 1))
return 0;
if ((flags & F_RR) && !(flags & F_NEG) && !(addr.rr.rrdata = blockdata_read(fd, addr.rr.datalen)))
if ((flags & F_RR) && !(flags & F_NEG) &&
new_chain->addr.rr.len == -1 && !(addr.rr.u.block.rrdata = blockdata_read(fd, addr.rr.u.block.datalen)))
return 0;
#ifdef HAVE_DNSSEC
if (flags & F_DNSKEY)