summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-07-30 11:26:49 +0200
committerLennart Poettering <lennart@poettering.net>2014-07-30 14:05:48 +0200
commitddf163393bd93baf39fa7a2c567f6758570cc209 (patch)
tree1d6c7ecd5b9119abe36bfb68c6326da9aae3f62e /src
parent9f20a8a376f924c8eb5423cfc1f98644fc1e2d1a (diff)
resolved: never cache ANY lookups
Diffstat (limited to 'src')
-rw-r--r--src/resolve/resolved-dns-cache.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/resolve/resolved-dns-cache.c b/src/resolve/resolved-dns-cache.c
index c971167452..28a375baed 100644
--- a/src/resolve/resolved-dns-cache.c
+++ b/src/resolve/resolved-dns-cache.c
@@ -270,6 +270,11 @@ static int dns_cache_put_positive(DnsCache *c, DnsResourceRecord *rr, usec_t tim
return 0;
}
+ if (rr->key->class == DNS_CLASS_ANY)
+ return 0;
+ if (rr->key->type == DNS_TYPE_ANY)
+ return 0;
+
/* Entry exists already? Update TTL and timestamp */
existing = dns_cache_get(c, rr);
if (existing) {
@@ -311,6 +316,11 @@ static int dns_cache_put_negative(DnsCache *c, DnsResourceKey *key, int rcode, u
dns_cache_remove(c, key);
+ if (key->class == DNS_CLASS_ANY)
+ return 0;
+ if (key->type == DNS_TYPE_ANY)
+ return 0;
+
if (!IN_SET(rcode, DNS_RCODE_SUCCESS, DNS_RCODE_NXDOMAIN))
return 0;
@@ -426,6 +436,14 @@ int dns_cache_lookup(DnsCache *c, DnsQuestion *q, int *rcode, DnsAnswer **ret) {
for (i = 0; i < q->n_keys; i++) {
DnsCacheItem *j;
+ if (q->keys[i]->type == DNS_TYPE_ANY ||
+ q->keys[i]->class == DNS_CLASS_ANY) {
+ /* If we have ANY lookups we simply refresh */
+ *ret = NULL;
+ *rcode = 0;
+ return 0;
+ }
+
j = hashmap_get(c->by_key, q->keys[i]);
if (!j) {
/* If one question cannot be answered we need to refresh */