]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
resolved: stop timeout timer when validating transactions
authorLennart Poettering <lennart@poettering.net>
Fri, 18 Dec 2015 13:26:48 +0000 (14:26 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 18 Dec 2015 13:48:49 +0000 (14:48 +0100)
We need no separate timeout anymore as soon as we received a reply, as
the auxiliary transactions have their own timeouts.

src/resolve/resolved-dns-transaction.c

index f3418191279c4314c328e167922209a980e3b48c..e65593e143645161ab73c53455bc8bb00c9f9614 100644 (file)
@@ -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);