shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-31 07:51:21 +03:00
Code

resolved: don't abort if a transaction is aborted because its scope is removed

Browse Source
This commit is contained in:
Lennart Poettering 2014-08-05 17:02:23 +02:00
parent 6e06847294
commit e56187ca4a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/resolve/resolved-dns-transaction.c
View File

@ -147,7 +147,9 @@ void dns_transaction_complete(DnsTransaction *t, DnsTransactionState state) {
assert(t);
assert(!IN_SET(state, DNS_TRANSACTION_NULL, DNS_TRANSACTION_PENDING));
assert(IN_SET(t->state, DNS_TRANSACTION_NULL, DNS_TRANSACTION_PENDING));
if (!IN_SET(t->state, DNS_TRANSACTION_NULL, DNS_TRANSACTION_PENDING))
return;
/* Note that this call might invalidate the query. Callers
* should hence not attempt to access the query or transaction
@ -443,7 +445,7 @@ int dns_transaction_go(DnsTransaction *t) {
dns_transaction_stop(t);
log_debug("Beginning transaction on scope %s on %s/%s",
log_debug("Excercising transaction on scope %s on %s/%s",
dns_protocol_to_string(t->scope->protocol),
t->scope->link ? t->scope->link->name : "*",
t->scope->family == AF_UNSPEC ? "*" : af_to_name(t->scope->family));