shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-04 04:58:21 +03:00
Code

resolved: never reuse transactions for probing that are already completed based on cached data

Browse Source
This commit is contained in:
Lennart Poettering 2014-08-05 01:51:40 +02:00
parent 4d926a69bc
commit dc4d47e2c7
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/resolve/resolved-dns-query.c
View File

@ -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)

14
src/resolve/resolved-dns-scope.c
View File

@ -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;
}

2
src/resolve/resolved-dns-scope.h
View File

@ -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);

2
src/resolve/resolved-dns-zone.c
View File

@ -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)