- no timeout backoff if meanwhile a query succeeded.

git-svn-id: file:///svn/unbound/trunk@2308 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 3b37ad762d4c8c0ec3234f2831410ff01f734a21..2e4e6d0021fed82a0358b50db7b2fcfa2346e0a8 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 26 October 2010: Wouter
        - dump_infra and flush_infra commands for unbound-control.
+       - no timeout backoff if meanwhile a query succeeded.
 
 25 October 2010: Wouter
        - Configure errors if ldns is not found.

diff --git a/util/rtt.c b/util/rtt.c
index af21cc39f8e47d76ee4b362b4ec798f08878204b..df1d437e4791775225ace7d7047ed3cfd3f8f706 100644 (file)
--- a/util/rtt.c
+++ b/util/rtt.c
@@ -99,6 +99,10 @@ rtt_lost(struct rtt_info* rtt, int orig)
 {
        /* exponential backoff */
 
+       /* if a query succeeded and put down the rto meanwhile, ignore this */
+       if(rtt->rto < orig)
+               return;
+
        /* the original rto is doubled, not the current one to make sure
         * that the values in the cache are not increased by lots of
         * queries simultaneously as they time out at the same time */