3352. [bug] Ensure that learned server attributes timeout of the

                        adb cache. [RT #29856]

diff --git a/CHANGES b/CHANGES
index 577100719e318569442b631bc68fd7ab8a5a0c5b..584b2c931350362b555971b3466007104f83d3df 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3352.  [bug]           Ensure that learned server attributes timeout of the
+                       adb cache. [RT #29856]
+
 3350.  [bug]           Memory read overrun in isc___mem_reallocate if
                        ISC_MEM_DEBUGCTX memory debugging flag is set.
                        [RT #30240]

diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index e021b8d9b93f6ba66c22b7de9c1b45b141b5c7ca..35b4caeb0be2136dd968b9f7abd9dc33d71936fd 100644 (file)
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -3430,8 +3430,10 @@ dns_adb_adjustsrtt(dns_adb_t *adb, dns_adbaddrinfo_t *addr,
        addr->entry->srtt = new_srtt;
        addr->srtt = new_srtt;
 
-       isc_stdtime_get(&now);
-       addr->entry->expires = now + ADB_ENTRY_WINDOW;
+       if (addr->entry->expires == 0) {
+               isc_stdtime_get(&now);
+               addr->entry->expires = now + ADB_ENTRY_WINDOW;
+       }
 
        UNLOCK(&adb->entrylocks[bucket]);
 }
@@ -3441,6 +3443,7 @@ dns_adb_changeflags(dns_adb_t *adb, dns_adbaddrinfo_t *addr,
                    unsigned int bits, unsigned int mask)
 {
        int bucket;
+       isc_stdtime_t now;
 
        REQUIRE(DNS_ADB_VALID(adb));
        REQUIRE(DNS_ADBADDRINFO_VALID(addr));
@@ -3449,6 +3452,11 @@ dns_adb_changeflags(dns_adb_t *adb, dns_adbaddrinfo_t *addr,
        LOCK(&adb->entrylocks[bucket]);
 
        addr->entry->flags = (addr->entry->flags & ~mask) | (bits & mask);
+       if (addr->entry->expires == 0) {
+               isc_stdtime_get(&now);
+               addr->entry->expires = now + ADB_ENTRY_WINDOW;
+       }
+
        /*
         * Note that we do not update the other bits in addr->flags with
         * the most recent values from addr->entry->flags.
@@ -3527,15 +3535,16 @@ dns_adb_freeaddrinfo(dns_adb_t *adb, dns_adbaddrinfo_t **addrp) {
        entry = addr->entry;
        REQUIRE(DNS_ADBENTRY_VALID(entry));
 
-       isc_stdtime_get(&now);
-
        *addrp = NULL;
        overmem = isc_mem_isovermem(adb->mctx);
 
        bucket = addr->entry->lock_bucket;
        LOCK(&adb->entrylocks[bucket]);
 
-       entry->expires = now + ADB_ENTRY_WINDOW;
+       if (entry->expires == 0) {
+               isc_stdtime_get(&now);
+               entry->expires = now + ADB_ENTRY_WINDOW;
+       }
 
        want_check_exit = dec_entry_refcnt(adb, overmem, entry, ISC_FALSE);