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

Do a better job of 942a35f517

Browse Source
This commit is contained in:
Simon Kelley
2025-04-18 14:01:14 +01:00
parent 0620309b73
commit ae57f84061
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/cache.c
View File

@@ -844,12 +844,15 @@ void cache_end_insert(void)
#ifdef HAVE_DNSSEC #ifdef HAVE_DNSSEC
/* Sneak out possibly updated crypto HWM values. */ /* Sneak out possibly updated crypto HWM values. */
m = daemon->metrics[METRIC_CRYPTO_HWM]; read_write(daemon->pipe_to_parent,
read_write(daemon->pipe_to_parent, (unsigned char *)&m, sizeof(m), RW_WRITE); (unsigned char *)&daemon->metrics[METRIC_CRYPTO_HWM],
m = daemon->metrics[METRIC_SIG_FAIL_HWM]; sizeof(daemon->metrics[METRIC_CRYPTO_HWM]), RW_WRITE);
read_write(daemon->pipe_to_parent, (unsigned char *)&m, sizeof(m), RW_WRITE); read_write(daemon->pipe_to_parent,
m = daemon->metrics[METRIC_WORK_HWM]; (unsigned char *)&daemon->metrics[METRIC_SIG_FAIL_HWM],
read_write(daemon->pipe_to_parent, (unsigned char *)&m, sizeof(m), RW_WRITE); sizeof(daemon->metrics[METRIC_SIG_FAIL_HWM]), RW_WRITE);
read_write(daemon->pipe_to_parent,
(unsigned char *)&daemon->metrics[METRIC_WORK_HWM],
sizeof(daemon->metrics[METRIC_WORK_HWM]), RW_WRITE);
#endif #endif
} }
@@ -879,18 +882,20 @@ int cache_recv_insert(time_t now, int fd)
{ {
#ifdef HAVE_DNSSEC #ifdef HAVE_DNSSEC
/* Sneak in possibly updated crypto HWM. */ /* Sneak in possibly updated crypto HWM. */
if (!read_write(fd, (unsigned char *)&m, sizeof(m), RW_READ)) unsigned int val;
if (!read_write(fd, (unsigned char *)&val, sizeof(val), RW_READ))
return 0; return 0;
if ((unsigned int)m > daemon->metrics[METRIC_CRYPTO_HWM]) if (val > daemon->metrics[METRIC_CRYPTO_HWM])
daemon->metrics[METRIC_CRYPTO_HWM] = m; daemon->metrics[METRIC_CRYPTO_HWM] = val;
if (!read_write(fd, (unsigned char *)&m, sizeof(m), RW_READ)) if (!read_write(fd, (unsigned char *)&val, sizeof(val), RW_READ))
return 0; return 0;
if ((unsigned int)m > daemon->metrics[METRIC_SIG_FAIL_HWM]) if (val > daemon->metrics[METRIC_SIG_FAIL_HWM])
daemon->metrics[METRIC_SIG_FAIL_HWM] = m; daemon->metrics[METRIC_SIG_FAIL_HWM] = val;
if (!read_write(fd, (unsigned char *)&m, sizeof(m), RW_READ)) if (!read_write(fd, (unsigned char *)&val, sizeof(val), RW_READ))
return 0; return 0;
if ((unsigned int)m > daemon->metrics[METRIC_WORK_HWM]) if (val > daemon->metrics[METRIC_WORK_HWM])
daemon->metrics[METRIC_WORK_HWM] = m; daemon->metrics[METRIC_WORK_HWM] = val;
#endif #endif
cache_end_insert(); cache_end_insert();
return 1; return 1;