From e034886b8022e871300e69418171bda00f937220 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 12 Jun 2020 20:17:15 +0200 Subject: [PATCH 1/2] resolved: Don't complain too much when downgrading from EDNS --- src/resolve/resolved-dns-server.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/resolve/resolved-dns-server.c b/src/resolve/resolved-dns-server.c index 106b002bc6..557b31602b 100644 --- a/src/resolve/resolved-dns-server.c +++ b/src/resolve/resolved-dns-server.c @@ -422,6 +422,7 @@ DnsServerFeatureLevel dns_server_possible_feature_level(DnsServer *s) { s->possible_feature_level = s->verified_feature_level; else { DnsServerFeatureLevel p = s->possible_feature_level; + int log_level = LOG_WARNING; if (s->n_failed_tcp >= DNS_SERVER_FEATURE_RETRY_ATTEMPTS && s->possible_feature_level == DNS_SERVER_FEATURE_LEVEL_TCP) { @@ -449,6 +450,10 @@ DnsServerFeatureLevel dns_server_possible_feature_level(DnsServer *s) { log_debug("Server doesn't support EDNS(0) properly, downgrading feature level..."); s->possible_feature_level = DNS_SERVER_FEATURE_LEVEL_UDP; + /* Users often don't control the DNS server they use so let's not complain too loudly + * when we can't use EDNS because the DNS server doesn't support it. */ + log_level = LOG_NOTICE; + } else if (s->packet_rrsig_missing && s->possible_feature_level >= DNS_SERVER_FEATURE_LEVEL_DO) { @@ -493,9 +498,9 @@ DnsServerFeatureLevel dns_server_possible_feature_level(DnsServer *s) { /* We changed the feature level, reset the counting */ dns_server_reset_counters(s); - log_warning("Using degraded feature set (%s) for DNS server %s.", - dns_server_feature_level_to_string(s->possible_feature_level), - dns_server_string(s)); + log_full(log_level, "Using degraded feature set (%s) for DNS server %s.", + dns_server_feature_level_to_string(s->possible_feature_level), + dns_server_string(s)); } } From 4f571b4061f32a0d45371453470f55e858ee8c57 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sat, 13 Jun 2020 14:48:40 +0200 Subject: [PATCH 2/2] resolved: Log the feature level we're downgrading from as well --- src/resolve/resolved-dns-server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resolve/resolved-dns-server.c b/src/resolve/resolved-dns-server.c index 557b31602b..60de1b29e7 100644 --- a/src/resolve/resolved-dns-server.c +++ b/src/resolve/resolved-dns-server.c @@ -498,9 +498,9 @@ DnsServerFeatureLevel dns_server_possible_feature_level(DnsServer *s) { /* We changed the feature level, reset the counting */ dns_server_reset_counters(s); - log_full(log_level, "Using degraded feature set (%s) for DNS server %s.", + log_full(log_level, "Using degraded feature set %s instead of %s for DNS server %s.", dns_server_feature_level_to_string(s->possible_feature_level), - dns_server_string(s)); + dns_server_feature_level_to_string(p), dns_server_string(s)); } }