From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 18 Dec 2015 13:26:48 +0000 (+0100)
Subject: resolved: stop timeout timer when validating transactions
X-Git-Tag: v229~201^2~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=423659abb8e5ff7b43fc458ab0436074f89f03b1;p=thirdparty%2Fsystemd.git

resolved: stop timeout timer when validating transactions

We need no separate timeout anymore as soon as we received a reply, as
the auxiliary transactions have their own timeouts.
---

diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c
index f3418191279..e65593e1436 100644
--- a/src/resolve/resolved-dns-transaction.c
+++ b/src/resolve/resolved-dns-transaction.c
@@ -659,6 +659,7 @@ void dns_transaction_process_reply(DnsTransaction *t, DnsPacket *p) {
                 if (r > 0) {
                         /* There are DNSSEC transactions pending now. Update the state accordingly. */
                         t->state = DNS_TRANSACTION_VALIDATING;
+                        dns_transaction_stop(t);
                         return;
                 }
         }
@@ -748,6 +749,8 @@ static int on_transaction_timeout(sd_event_source *s, usec_t usec, void *userdat
                         t->initial_jitter_elapsed = true;
         }
 
+        log_debug("Timeout reached on transaction %" PRIu16 ".", t->id);
+
         /* ...and try again with a new server */
         dns_transaction_next_dns_server(t);