aboutsummaryrefslogtreecommitdiff
path: root/iterator
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2024-03-16 23:58:33 +0000
committerCy Schubert <cy@FreeBSD.org>2024-03-17 00:00:52 +0000
commit5a33598e88ad8fbc0affa74dee0a2d8cc4010fbc (patch)
tree211c17b0e7eeb34cdd84e378e3720514e8987b8c /iterator
parent217a625642d38bfc0d3d03192b013d4bc7a32458 (diff)
Diffstat (limited to 'iterator')
-rw-r--r--iterator/iter_fwd.c1
-rw-r--r--iterator/iter_hints.c5
-rw-r--r--iterator/iter_scrub.c3
-rw-r--r--iterator/iterator.c8
4 files changed, 8 insertions, 9 deletions
diff --git a/iterator/iter_fwd.c b/iterator/iter_fwd.c
index 151372912476..c4b2411297e3 100644
--- a/iterator/iter_fwd.c
+++ b/iterator/iter_fwd.c
@@ -523,4 +523,3 @@ forwards_delete_stub_hole(struct iter_forwards* fwd, uint16_t c, uint8_t* nm)
fwd_zone_free(z);
fwd_init_parents(fwd);
}
-
diff --git a/iterator/iter_hints.c b/iterator/iter_hints.c
index a60d9a6b1cf2..4f86f3676a29 100644
--- a/iterator/iter_hints.c
+++ b/iterator/iter_hints.c
@@ -129,7 +129,7 @@ compile_time_root_prime(int do_ip4, int do_ip6)
dp->has_parent_side_NS = 1;
if(do_ip4) {
if(!ah(dp, "A.ROOT-SERVERS.NET.", "198.41.0.4")) goto failed;
- if(!ah(dp, "B.ROOT-SERVERS.NET.", "199.9.14.201")) goto failed;
+ if(!ah(dp, "B.ROOT-SERVERS.NET.", "170.247.170.2")) goto failed;
if(!ah(dp, "C.ROOT-SERVERS.NET.", "192.33.4.12")) goto failed;
if(!ah(dp, "D.ROOT-SERVERS.NET.", "199.7.91.13")) goto failed;
if(!ah(dp, "E.ROOT-SERVERS.NET.", "192.203.230.10")) goto failed;
@@ -144,7 +144,7 @@ compile_time_root_prime(int do_ip4, int do_ip6)
}
if(do_ip6) {
if(!ah(dp, "A.ROOT-SERVERS.NET.", "2001:503:ba3e::2:30")) goto failed;
- if(!ah(dp, "B.ROOT-SERVERS.NET.", "2001:500:200::b")) goto failed;
+ if(!ah(dp, "B.ROOT-SERVERS.NET.", "2801:1b8:10::b")) goto failed;
if(!ah(dp, "C.ROOT-SERVERS.NET.", "2001:500:2::c")) goto failed;
if(!ah(dp, "D.ROOT-SERVERS.NET.", "2001:500:2d::d")) goto failed;
if(!ah(dp, "E.ROOT-SERVERS.NET.", "2001:500:a8::e")) goto failed;
@@ -560,4 +560,3 @@ hints_delete_stub(struct iter_hints* hints, uint16_t c, uint8_t* nm)
hints_stub_free(z);
name_tree_init_parents(&hints->tree);
}
-
diff --git a/iterator/iter_scrub.c b/iterator/iter_scrub.c
index 5f2e30337229..48867e50c557 100644
--- a/iterator/iter_scrub.c
+++ b/iterator/iter_scrub.c
@@ -283,7 +283,8 @@ synth_cname_rrset(uint8_t** sname, size_t* snamelen, uint8_t* alias,
sizeof(uint32_t)+sizeof(uint16_t)+aliaslen);
if(!cn->rr_first->ttl_data)
return NULL;
- sldns_write_uint32(cn->rr_first->ttl_data, 0); /* TTL = 0 */
+ memmove(cn->rr_first->ttl_data, rrset->rr_first->ttl_data,
+ sizeof(uint32_t)); /* RFC6672: synth CNAME TTL == DNAME TTL */
sldns_write_uint16(cn->rr_first->ttl_data+4, aliaslen);
memmove(cn->rr_first->ttl_data+6, alias, aliaslen);
cn->rr_first->size = sizeof(uint16_t)+aliaslen;
diff --git a/iterator/iterator.c b/iterator/iterator.c
index 6ff811a27d06..e9fea544aa69 100644
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -4151,10 +4151,10 @@ process_response(struct module_qstate* qstate, struct iter_qstate* iq,
/* like packet got dropped */
goto handle_it;
}
- if(!inplace_cb_edns_back_parsed_call(qstate->env, qstate)) {
- log_err("unable to call edns_back_parsed callback");
- goto handle_it;
- }
+ }
+ if(!inplace_cb_edns_back_parsed_call(qstate->env, qstate)) {
+ log_err("unable to call edns_back_parsed callback");
+ goto handle_it;
}
/* remove CD-bit, we asked for in case we handle validation ourself */