066c85321e
Refresh patches and backport upstream to current HEAD: 1f1873a Log warning on very large cachesize config, instead of truncating it. 0a496f0 Do unsolicited RAs for interfaces which appear after dnsmasq startup. e27825b Fix logging in previous. 1f60a18 Retry SERVFAIL DNSSEC queries to a different server, if possible. a0088e8 Handle query retry on REFUSED or SERVFAIL for DNSSEC-generated queries. 34e26e1 Retry query to other servers on receipt of SERVFAIL rcode. 6b17335 Add packet-dump debugging facility. 07ed585 Add logging for DNS error returns from upstream and local configuration. 0669ee7 Fix DHCP broken-ness when --no-ping AND --dhcp-sequential-ip are set. f84e674 Be persistent with broken-upstream-DNSSEC warnings. Compile & run tested: ar71xx Archer C7 v2 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
From 1f1873aadd092a0fab505dd278a484d887ba0ec3 Mon Sep 17 00:00:00 2001
|
|
From: Simon Kelley <simon@thekelleys.org.uk>
|
|
Date: Fri, 11 May 2018 23:38:23 +0100
|
|
Subject: [PATCH 10/10] Log warning on very large cachesize config, instead of
|
|
truncating it.
|
|
|
|
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
|
|
---
|
|
src/dnsmasq.c | 6 +++++-
|
|
src/option.c | 2 --
|
|
2 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
--- a/src/dnsmasq.c
|
|
+++ b/src/dnsmasq.c
|
|
@@ -740,7 +740,11 @@ int main (int argc, char **argv)
|
|
else
|
|
{
|
|
if (daemon->cachesize != 0)
|
|
- my_syslog(LOG_INFO, _("started, version %s cachesize %d"), VERSION, daemon->cachesize);
|
|
+ {
|
|
+ my_syslog(LOG_INFO, _("started, version %s cachesize %d"), VERSION, daemon->cachesize);
|
|
+ if (daemon->cachesize > 10000)
|
|
+ my_syslog(LOG_WARNING, _("cache size greater than 10000 may cause performance issues, and is unlikely to be useful."));
|
|
+ }
|
|
else
|
|
my_syslog(LOG_INFO, _("started, version %s cache disabled"), VERSION);
|
|
|
|
--- a/src/option.c
|
|
+++ b/src/option.c
|
|
@@ -2603,8 +2603,6 @@ static int one_opt(int option, char *arg
|
|
|
|
if (size < 0)
|
|
size = 0;
|
|
- else if (size > 10000)
|
|
- size = 10000;
|
|
|
|
daemon->cachesize = size;
|
|
}
|