summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-08-05 01:51:40 +0200
committerLennart Poettering <lennart@poettering.net>2014-08-05 01:52:25 +0200
commitdc4d47e2c79aafa3ef646e32ff3422c4ce935c1b (patch)
tree7d8fdea3f49ea941ca6d3860dc88cd6248586724
parent4d926a69bc27b8fbd4891bb10c03336bd8d93b7a (diff)
resolved: never reuse transactions for probing that are already completed based on cached data
-rw-r--r--src/resolve/resolved-dns-query.c2
-rw-r--r--src/resolve/resolved-dns-scope.c14
-rw-r--r--src/resolve/resolved-dns-scope.h2
-rw-r--r--src/resolve/resolved-dns-zone.c2
4 files changed, 15 insertions, 5 deletions
diff --git a/src/resolve/resolved-dns-query.c b/src/resolve/resolved-dns-query.c
index 36cfc026ea..ae285ef112 100644
--- a/src/resolve/resolved-dns-query.c
+++ b/src/resolve/resolved-dns-query.c
@@ -156,7 +156,7 @@ static int dns_query_add_transaction(DnsQuery *q, DnsScope *s, DnsResourceKey *k
} else
question = dns_question_ref(q->question);
- t = dns_scope_find_transaction(s, question);
+ t = dns_scope_find_transaction(s, question, true);
if (!t) {
r = dns_transaction_new(&t, s, question);
if (r < 0)
diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c
index 0f654a6102..f1de9bc2eb 100644
--- a/src/resolve/resolved-dns-scope.c
+++ b/src/resolve/resolved-dns-scope.c
@@ -546,7 +546,7 @@ void dns_scope_process_query(DnsScope *s, DnsStream *stream, DnsPacket *p) {
}
}
-DnsTransaction *dns_scope_find_transaction(DnsScope *scope, DnsQuestion *question) {
+DnsTransaction *dns_scope_find_transaction(DnsScope *scope, DnsQuestion *question, bool cache_ok) {
DnsTransaction *t;
assert(scope);
@@ -555,9 +555,19 @@ DnsTransaction *dns_scope_find_transaction(DnsScope *scope, DnsQuestion *questio
/* Try to find an ongoing transaction that is a equal or a
* superset of the specified question */
- LIST_FOREACH(transactions_by_scope, t, scope->transactions)
+ LIST_FOREACH(transactions_by_scope, t, scope->transactions) {
+
+ /* Refuse reusing transactions that completed based on
+ * cached data instead of a real packet, if that's
+ * requested. */
+ if (!cache_ok &&
+ IN_SET(t->state, DNS_TRANSACTION_SUCCESS, DNS_TRANSACTION_FAILURE) &&
+ !t->received)
+ continue;
+
if (dns_question_is_superset(t->question, question) > 0)
return t;
+ }
return NULL;
}
diff --git a/src/resolve/resolved-dns-scope.h b/src/resolve/resolved-dns-scope.h
index 313c6178dd..7c18bff2b7 100644
--- a/src/resolve/resolved-dns-scope.h
+++ b/src/resolve/resolved-dns-scope.h
@@ -77,4 +77,4 @@ int dns_scope_llmnr_membership(DnsScope *s, bool b);
void dns_scope_process_query(DnsScope *s, DnsStream *stream, DnsPacket *p);
-DnsTransaction *dns_scope_find_transaction(DnsScope *scope, DnsQuestion *question);
+DnsTransaction *dns_scope_find_transaction(DnsScope *scope, DnsQuestion *question, bool cache_ok);
diff --git a/src/resolve/resolved-dns-zone.c b/src/resolve/resolved-dns-zone.c
index d4e0552887..649cc5c73d 100644
--- a/src/resolve/resolved-dns-zone.c
+++ b/src/resolve/resolved-dns-zone.c
@@ -187,7 +187,7 @@ static int dns_zone_item_probe_start(DnsZoneItem *i) {
if (r < 0)
return r;
- t = dns_scope_find_transaction(i->scope, question);
+ t = dns_scope_find_transaction(i->scope, question, false);
if (!t) {
r = dns_transaction_new(&t, i->scope, question);
if (r < 0)