- Fix dns64 with prefetch that the prefetch is stored in cache.

diff --git a/dns64/dns64.c b/dns64/dns64.c
index cfb6ce63e1878bdf66a2153dac4736a44cfcee3c..49718e3d8eac8e895ec38da20f8a0d6d00debadb 100644 (file)
--- a/dns64/dns64.c
+++ b/dns64/dns64.c
@@ -657,7 +657,7 @@ handle_event_moddone(struct module_qstate* qstate, int id)
                qstate->return_msg->rep &&
                !dns_cache_store(
                        qstate->env, &qstate->qinfo, qstate->return_msg->rep,
-                       0, 0, 0, NULL,
+                       0, qstate->prefetch_leeway, 0, NULL,
                        qstate->query_flags, qstate->qstarttime))
                log_err("out of memory");
 
@@ -1007,7 +1007,7 @@ dns64_inform_super(struct module_qstate* qstate, int id,
        /* Store the generated response in cache. */
        if ( (!super_dq || !super_dq->started_no_cache_store) &&
                !dns_cache_store(super->env, &super->qinfo, super->return_msg->rep,
-               0, 0, 0, NULL, super->query_flags, qstate->qstarttime))
+               0, super->prefetch_leeway, 0, NULL, super->query_flags, qstate->qstarttime))
                log_err("out of memory");
 }
 

diff --git a/doc/Changelog b/doc/Changelog
index ed3bc87003f16624aa915adb242bfd3c2bc7ba28..d9af117a125d0a5050876a339df3f9148cf279e2 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+23 September 2024: Wouter
+       - Fix dns64 with prefetch that the prefetch is stored in cache.
+
 17 September 2024: Wouter
        - Add redis-command-timeout: 20 and redis-connect-timeout: 200,
          that can set the timeout separately for commands and the

diff --git a/services/cache/dns.c b/services/cache/dns.c
index e79002b7910809fbe9bcb0447db76ecd1cca546c..dd8df45545db993a88c78814a50790c059309b97 100644 (file)
--- a/services/cache/dns.c
+++ b/services/cache/dns.c
@@ -88,7 +88,7 @@ store_rrsets(struct module_env* env, struct reply_info* rep, time_t now,
                /* update ref if it was in the cache */
                switch(rrset_cache_update(env->rrset_cache, &rep->ref[i],
                                env->alloc, ((ntohs(rep->ref[i].key->rk.type)==
-                               LDNS_RR_TYPE_NS && !pside)?qstarttime:now + leeway))) {
+                               LDNS_RR_TYPE_NS && !pside)?qstarttime:now) + leeway)) {
                case 0: /* ref unchanged, item inserted */
                        break;
                case 2: /* ref updated, cache is superior */

diff --git a/testdata/dns64_prefetch_cache.rpl b/testdata/dns64_prefetch_cache.rpl
new file mode 100644 (file)
index 0000000..a23b92f
--- /dev/null
+++ b/testdata/dns64_prefetch_cache.rpl
@@ -0,0 +1,195 @@
+; config options
+server:
+       target-fetch-policy: "0 0 0 0 0"
+       qname-minimisation: "no"
+       module-config: "dns64 iterator"
+       dns64-prefix: 64:ff9b::0/96
+       minimal-responses: no
+       prefetch: yes
+
+stub-zone:
+       name: "."
+       stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.
+CONFIG_END
+
+SCENARIO_BEGIN Test dns64 with prefetch and cache store.
+
+; K.ROOT-SERVERS.NET.
+RANGE_BEGIN 0 200
+       ADDRESS 193.0.14.129 
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+. IN NS
+SECTION ANSWER
+. IN NS        K.ROOT-SERVERS.NET.
+SECTION ADDITIONAL
+K.ROOT-SERVERS.NET. IN A 193.0.14.129
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode subdomain
+ADJUST copy_id copy_query
+REPLY QR NOERROR
+SECTION QUESTION
+com. IN NS
+SECTION AUTHORITY
+com. IN NS a.gtld-servers.net.
+SECTION ADDITIONAL
+a.gtld-servers.net. IN A 192.5.6.30
+ENTRY_END
+RANGE_END
+
+; a.gtld-servers.net.
+RANGE_BEGIN 0 200
+       ADDRESS 192.5.6.30
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+com. IN NS
+SECTION ANSWER
+com. IN NS a.gtld-servers.net.
+SECTION ADDITIONAL
+a.gtld-servers.net. IN A 192.5.6.30
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode subdomain
+ADJUST copy_id copy_query
+REPLY QR NOERROR
+SECTION QUESTION
+example.com. IN NS
+SECTION AUTHORITY
+example.com. IN NS ns.example.com.
+SECTION ADDITIONAL
+ns.example.com. IN A 1.2.3.4
+ENTRY_END
+RANGE_END
+
+; ns.example.com.
+RANGE_BEGIN 0 100
+       ADDRESS 1.2.3.4
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA NOERROR
+SECTION QUESTION
+example.com. IN NS
+SECTION ANSWER
+example.com. IN NS ns.example.com.
+SECTION ADDITIONAL
+ns.example.com. IN A 1.2.3.4
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA NOERROR
+SECTION QUESTION
+www.example.com. IN A
+SECTION ANSWER
+www.example.com. IN A  10.20.30.40
+SECTION AUTHORITY
+example.com. IN NS ns.example.com.
+SECTION ADDITIONAL
+ns.example.com. IN A 1.2.3.4
+ENTRY_END
+RANGE_END
+
+STEP 1 QUERY
+ENTRY_BEGIN
+REPLY RD
+SECTION QUESTION
+www.example.com. IN A
+ENTRY_END
+
+; recursion happens here.
+STEP 10 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all ttl
+REPLY QR RD RA NOERROR
+SECTION QUESTION
+www.example.com. IN A
+SECTION ANSWER
+www.example.com. 3600 IN A     10.20.30.40
+SECTION AUTHORITY
+example.com. 3600 IN NS ns.example.com.
+SECTION ADDITIONAL
+ns.example.com. 3600 IN A 1.2.3.4
+ENTRY_END
+
+STEP 20 TIME_PASSES ELAPSE 3500
+
+STEP 30 QUERY
+ENTRY_BEGIN
+REPLY RD
+SECTION QUESTION
+www.example.com. IN A
+ENTRY_END
+
+; the prefetch is started, the older cache reply is returned.
+STEP 40 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all ttl
+REPLY QR RD RA NOERROR
+SECTION QUESTION
+www.example.com. IN A
+SECTION ANSWER
+www.example.com. 100 IN A      10.20.30.40
+SECTION AUTHORITY
+example.com. 100 IN NS ns.example.com.
+SECTION ADDITIONAL
+ns.example.com. 100 IN A 1.2.3.4
+ENTRY_END
+
+; check what is in the cache
+STEP 42 QUERY
+ENTRY_BEGIN
+REPLY RD
+SECTION QUESTION
+www.example.com. IN A
+ENTRY_END
+
+STEP 43 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all ttl
+REPLY QR RD RA NOERROR
+SECTION QUESTION
+www.example.com. IN A
+SECTION ANSWER
+www.example.com. 3600 IN A     10.20.30.40
+SECTION AUTHORITY
+example.com. 3600 IN NS ns.example.com.
+SECTION ADDITIONAL
+ns.example.com. 3600 IN A 1.2.3.4
+ENTRY_END
+
+STEP 50 TIME_PASSES ELAPSE 300
+
+; now the upstream is offline, the prefetched answer should be in the cache.
+STEP 110 QUERY
+ENTRY_BEGIN
+REPLY RD
+SECTION QUESTION
+www.example.com. IN A
+ENTRY_END
+
+STEP 120 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all ttl
+REPLY QR RD RA NOERROR
+SECTION QUESTION
+www.example.com. IN A
+SECTION ANSWER
+www.example.com. 3300 IN A     10.20.30.40
+SECTION AUTHORITY
+example.com. 3300 IN NS ns.example.com.
+SECTION ADDITIONAL
+ns.example.com. 3300 IN A 1.2.3.4
+ENTRY_END
+
+SCENARIO_END