- Fix #1275: cached data in cachedb is never used.

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

diff --git a/cachedb/cachedb.c b/cachedb/cachedb.c
index d5e31d8de45177c3785bf4b475ae22ab8dd925d2..9a63101edee38a0152b236976e168f68203b28f2 100644 (file)
--- a/cachedb/cachedb.c
+++ b/cachedb/cachedb.c
@@ -375,6 +375,36 @@ good_expiry_and_qinfo(struct module_qstate* qstate, struct sldns_buffer* buf)
        return 1;
 }
 
+static void
+packed_rrset_ttl_subtract(struct packed_rrset_data* data, time_t subtract)
+{
+        size_t i;
+        size_t total = data->count + data->rrsig_count;
+       if(data->ttl > subtract)
+               data->ttl -= subtract;
+       else    data->ttl = 0;
+        for(i=0; i<total; i++) {
+               if(data->rr_ttl[i] > subtract)
+                       data->rr_ttl[i] -= subtract;
+                else   data->rr_ttl[i] = 0;
+       }
+}
+
+static void
+adjust_msg_ttl(struct dns_msg* msg, time_t adjust)
+{
+       size_t i;
+       if(msg->rep->ttl > adjust)
+               msg->rep->ttl -= adjust;
+       else    msg->rep->ttl = 0;
+       msg->rep->prefetch_ttl = PREFETCH_TTL_CALC(msg->rep->ttl);
+
+       for(i=0; i<msg->rep->rrset_count; i++) {
+               packed_rrset_ttl_subtract((struct packed_rrset_data*)msg->
+                       rep->rrsets[i]->entry.data, adjust);
+       }
+}
+
 /** convert dns message in buffer to return_msg */
 static int
 parse_data(struct module_qstate* qstate, struct sldns_buffer* buf)
@@ -421,24 +451,18 @@ parse_data(struct module_qstate* qstate, struct sldns_buffer* buf)
        qstate->return_rcode = LDNS_RCODE_NOERROR;
 
        /* see how much of the TTL expired, and remove it */
+       if(*qstate->env->now <= (time_t)timestamp) {
+               verbose(VERB_ALGO, "cachedb msg adjust by zero");
+               return 1; /* message from the future (clock skew?) */
+       }
        adjust = *qstate->env->now - (time_t)timestamp;
+       if(qstate->return_msg->rep->ttl < adjust) {
+               verbose(VERB_ALGO, "cachedb msg expired");
+               return 0; /* message expired */
+       }
        verbose(VERB_ALGO, "cachedb msg adjusted down by %d", (int)adjust);
-       /*adjust_msg(qstate->return_msg, adjust);*/
-       /* TODO:
-               msg->rep->ttl = r->ttl - adjust;
-               msg->rep->prefetch_ttl = PREFETCH_TTL_CALC(msg->rep->ttl);
-               for(i=0; i<d->count + d->rrsig_count; i++) {
-                       if(d->rr_ttl[i] < adjust)
-                               d->rr_ttl[i] = 0;
-                       else    d->rr_ttl[i] -= adjust;
-               }
-               if(d->ttl < adjust)
-                       d->ttl = 0;
-               else    d->ttl -= adjust;
-               */
-       /* TODO */
-
-       return 0;
+       adjust_msg_ttl(qstate->return_msg, adjust);
+       return 1;
 }
 
 /**

diff --git a/doc/Changelog b/doc/Changelog
index 3c58162778aa5169aea7854b32194ad57fd70336..020b4e9794f8ecc34bde3026608b8141b609db40 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 6 June 2017: Wouter
        - Add an explicit type cast for TCP FASTOPEN fix.
        - renumbering B-Root's IPv6 address to 2001:500:200::b.
+       - Fix #1275: cached data in cachedb is never used.
 
 1 June 2017: Ralph
        - Fix #1274: automatically trim chroot path from dnscrypt key/cert paths