upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update contrib/aaaa-filter-iterator.patch for the recent

Browse source 
generate_sub_request() change and to apply cleanly.
This commit is contained in:
George Thessalonikefs 2020-05-25 11:47:51 +02:00
parent 8af3d73b9b
commit 21cd836e82
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
contrib/aaaa-filter-iterator.patch
View file

@ -13,9 +13,9 @@ Index: trunk/doc/unbound.conf.5.in
+This also causes an additional A query to be sent for each AAAA query. +This also causes an additional A query to be sent for each AAAA query.
+This breaks DNSSEC! +This breaks DNSSEC!
+.TP +.TP
.B private\-address: \fI<IP address or subnet> .B aggressive\-nsec: \fI<yes or no>
Give IPv4 of IPv6 addresses or classless subnets. These are addresses Aggressive NSEC uses the DNSSEC NSEC chain to synthesize NXDOMAIN
on your private network, and are not allowed to be returned for and other denials, using information from previous NXDOMAINs answers.
Index: trunk/iterator/iter_scrub.c Index: trunk/iterator/iter_scrub.c
=================================================================== ===================================================================
--- trunk/iterator/iter_scrub.c (revision 4357) --- trunk/iterator/iter_scrub.c (revision 4357)
@ -125,7 +125,7 @@ Index: trunk/iterator/iterator.c
+ * ASN: This event state was added as an intermediary step between + * ASN: This event state was added as an intermediary step between
+ * QUERYTARGETS_STATE and the next step, in order to cast a subquery for the + * QUERYTARGETS_STATE and the next step, in order to cast a subquery for the
+ * purpose of caching A records for the queried name. + * purpose of caching A records for the queried name.
+ * + *
+ * @param qstate: query state. + * @param qstate: query state.
+ * @param iq: iterator query state. + * @param iq: iterator query state.
+ * @param ie: iterator shared global environment. + * @param ie: iterator shared global environment.
@ -147,9 +147,9 @@ Index: trunk/iterator/iterator.c
+ +
+ /* re-throw same query, but with a different type */ + /* re-throw same query, but with a different type */
+ if(!generate_sub_request(iq->qchase.qname, + if(!generate_sub_request(iq->qchase.qname,
+ iq->qchase.qname_len, LDNS_RR_TYPE_A, + iq->qchase.qname_len, LDNS_RR_TYPE_A,
+ iq->qchase.qclass, qstate, id, iq, + iq->qchase.qclass, qstate, id, iq,
+ INIT_REQUEST_STATE, FINISHED_STATE, &subq, 1)) { + INIT_REQUEST_STATE, FINISHED_STATE, &subq, 1, 0)) {
+ log_nametypeclass(VERB_ALGO, "ASN-AAAA-filter: failed " + log_nametypeclass(VERB_ALGO, "ASN-AAAA-filter: failed "
+ "preloading of A record for", + "preloading of A record for",
+ iq->qchase.qname, LDNS_RR_TYPE_A, + iq->qchase.qname, LDNS_RR_TYPE_A,
@ -188,7 +188,7 @@ Index: trunk/iterator/iterator.c
return 0; return 0;
} }
+/** +/**
+ * ASN: Do final processing on responses to A queries originated from AAAA + * ASN: Do final processing on responses to A queries originated from AAAA
+ * queries. Events reach this state after the iterative resolution algorithm + * queries. Events reach this state after the iterative resolution algorithm
+ * terminates. + * terminates.

4
doc/Changelog
View file

@ -1,3 +1,7 @@
25 May 2020: George
- Update contrib/aaaa-filter-iterator.patch for the recent
generate_sub_request() change and to apply cleanly.
21 May 2020: George 21 May 2020: George
- Fix for integer overflow when printing RDF_TYPE_TIME. - Fix for integer overflow when printing RDF_TYPE_TIME.