- Fix in infra cache that could cause rto larger than TOP_TIMEOUT kept.

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

diff --git a/doc/Changelog b/doc/Changelog
index 66e8da8234da8303c496efcdf6b0dfcd3a0a3dda..ff6067aa313775790d1f5036400162688dd2b41c 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+23 December 2010: Wouter
+       - Fix in infra cache that could cause rto larger than TOP_TIMEOUT kept.
+
 21 December 2010: Wouter
        - algorithm compromise protection using the algorithms signalled in
          the DS record.  Also, trust anchors, DLV, and RFC5011 receive this,

diff --git a/services/cache/infra.c b/services/cache/infra.c
index 4e39886e57c15d68c0f6ceef41779fa8d499fe65..cbc603ebfbdcceabfcbe177e72d455cb94adefd9 100644 (file)
--- a/services/cache/infra.c
+++ b/services/cache/infra.c
@@ -275,7 +275,8 @@ infra_host(struct infra_cache* infra, struct sockaddr_storage* addr,
                        wr = 1;
                        /* TOP_TIMEOUT remains on reuse */
                        if(old >= USEFUL_SERVER_TOP_TIMEOUT)
-                               ((struct infra_host_data*)e->data)->rtt.rto=old;
+                               ((struct infra_host_data*)e->data)->rtt.rto
+                                       = USEFUL_SERVER_TOP_TIMEOUT;
                }
        }
        if(!e) {