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

- iana portlist updated.

Browse source 
- queries with CD flag set cause DNSSEC validation, but the answer is
  not withheld if it is bogus.  Thus, unbound will retry if it is bad
  and curb the TTL if it is bad, thus protecting the cache for use by
  downstream validators.


git-svn-id: file:///svn/unbound/trunk@2409 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2011-04-08 13:58:41 +00:00
parent 04fa474ac3
commit efb9c02d54
4 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doc/Changelog
View file

@ -1,3 +1,10 @@
8 April 2011: Wouter
- iana portlist updated.
- queries with CD flag set cause DNSSEC validation, but the answer is
not withheld if it is bogus. Thus, unbound will retry if it is bad
and curb the TTL if it is bad, thus protecting the cache for use by
downstream validators.
29 March 2011: Wouter 29 March 2011: Wouter
- harden-below-nxdomain: changed so that it activates when the - harden-below-nxdomain: changed so that it activates when the
cached nxdomain is dnssec secure. This avoids backwards cached nxdomain is dnssec secure. This avoids backwards

16
services/mesh.c
View file

@ -270,7 +270,11 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo,
uint16_t qflags, struct edns_data* edns, struct comm_reply* rep, uint16_t qflags, struct edns_data* edns, struct comm_reply* rep,
uint16_t qid) uint16_t qid)
{ {
struct mesh_state* s = mesh_area_find(mesh, qinfo, qflags, 0); /* do not use CD flag from user for mesh state, we want the CD-query
* to receive validation anyway, to protect out cache contents and
* avoid bad-data in this cache that a downstream validator cannot
* remove from this cache */
struct mesh_state* s = mesh_area_find(mesh, qinfo, qflags&BIT_RD, 0);
int was_detached = 0; int was_detached = 0;
int was_noreply = 0; int was_noreply = 0;
int added = 0; int added = 0;
@ -298,7 +302,7 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo,
/* see if it already exists, if not, create one */ /* see if it already exists, if not, create one */
if(!s) { if(!s) {
struct rbnode_t* n; struct rbnode_t* n;
s = mesh_state_create(mesh->env, qinfo, qflags, 0); s = mesh_state_create(mesh->env, qinfo, qflags&BIT_RD, 0);
if(!s) { if(!s) {
log_err("mesh_state_create: out of memory; SERVFAIL"); log_err("mesh_state_create: out of memory; SERVFAIL");
error_encode(rep->c->buffer, LDNS_RCODE_SERVFAIL, error_encode(rep->c->buffer, LDNS_RCODE_SERVFAIL,
@ -357,7 +361,7 @@ mesh_new_callback(struct mesh_area* mesh, struct query_info* qinfo,
uint16_t qflags, struct edns_data* edns, ldns_buffer* buf, uint16_t qflags, struct edns_data* edns, ldns_buffer* buf,
uint16_t qid, mesh_cb_func_t cb, void* cb_arg) uint16_t qid, mesh_cb_func_t cb, void* cb_arg)
{ {
struct mesh_state* s = mesh_area_find(mesh, qinfo, qflags, 0); struct mesh_state* s = mesh_area_find(mesh, qinfo, qflags&BIT_RD, 0);
int was_detached = 0; int was_detached = 0;
int was_noreply = 0; int was_noreply = 0;
int added = 0; int added = 0;
@ -366,7 +370,7 @@ mesh_new_callback(struct mesh_area* mesh, struct query_info* qinfo,
/* see if it already exists, if not, create one */ /* see if it already exists, if not, create one */
if(!s) { if(!s) {
struct rbnode_t* n; struct rbnode_t* n;
s = mesh_state_create(mesh->env, qinfo, qflags, 0); s = mesh_state_create(mesh->env, qinfo, qflags&BIT_RD, 0);
if(!s) { if(!s) {
return 0; return 0;
} }
@ -403,7 +407,7 @@ mesh_new_callback(struct mesh_area* mesh, struct query_info* qinfo,
void mesh_new_prefetch(struct mesh_area* mesh, struct query_info* qinfo, void mesh_new_prefetch(struct mesh_area* mesh, struct query_info* qinfo,
uint16_t qflags, uint32_t leeway) uint16_t qflags, uint32_t leeway)
{ {
struct mesh_state* s = mesh_area_find(mesh, qinfo, qflags, 0); struct mesh_state* s = mesh_area_find(mesh, qinfo, qflags&BIT_RD, 0);
struct rbnode_t* n; struct rbnode_t* n;
/* already exists, and for a different purpose perhaps. /* already exists, and for a different purpose perhaps.
* if mesh_no_list, keep it that way. */ * if mesh_no_list, keep it that way. */
@ -420,7 +424,7 @@ void mesh_new_prefetch(struct mesh_area* mesh, struct query_info* qinfo,
mesh->stats_dropped ++; mesh->stats_dropped ++;
return; return;
} }
s = mesh_state_create(mesh->env, qinfo, qflags, 0); s = mesh_state_create(mesh->env, qinfo, qflags&BIT_RD, 0);
if(!s) { if(!s) {
log_err("prefetch mesh_state_create: out of memory"); log_err("prefetch mesh_state_create: out of memory");
return; return;

4
testdata/val_referglue.rpl vendored
View file

@ -244,7 +244,6 @@ ENTRY_END
RANGE_END RANGE_END
; first ask for +CD and get the data in the cache. ; first ask for +CD and get the data in the cache.
STEP 1 QUERY STEP 1 QUERY
ENTRY_BEGIN ENTRY_BEGIN
@ -266,7 +265,8 @@ example.com. IN NS ns.example.com.
example.com. IN NS ns2.sub.example.com. example.com. IN NS ns2.sub.example.com.
SECTION ADDITIONAL SECTION ADDITIONAL
ns.example.com. IN A 1.2.3.4 ns.example.com. IN A 1.2.3.4
ns2.sub.example.com. IN A 100.200.30.40 ; already validated and thus stripped from the answer.
;ns2.sub.example.com. IN A 100.200.30.40
ENTRY_END ENTRY_END
; now the data is in the cache, validate a referral from cache ; now the data is in the cache, validate a referral from cache

1
util/iana_ports.inc
View file

@ -5065,6 +5065,7 @@
14936, 14936,
14937, 14937,
15000, 15000,
15118,
15345, 15345,
15363, 15363,
15555, 15555,