WEBDIENSTE/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-09-28 20:54:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Draft the idea of unjostable queries if upstreams are explicitly configured.

Browse Source
This commit is contained in:
Yorgos Thessalonikefs
2024-12-06 16:05:59 +01:00
parent ded4c82ced
commit f0e6c4fa2c
8 changed files with 213 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/mesh.c
+50 -25
View File
@@ -43,6 +43,8 @@
* send back to clients.
*/
#include "config.h"
#include "iterator/iter_hints.h"
#include "iterator/iter_fwd.h"
#include "services/mesh.h"
#include "services/outbound_list.h"
#include "services/cache/dns.h"
@@ -275,37 +277,60 @@ mesh_delete_all(struct mesh_area* mesh)
int mesh_make_new_space(struct mesh_area* mesh, sldns_buffer* qbuf)
{
struct mesh_state* m = mesh->jostle_first;
/* free space is available */
if(mesh->num_reply_states < mesh->max_reply_states)
if(mesh->num_reply_states < mesh->max_reply_states) {
/* free space is available */
return 1;
}
/* try to kick out a jostle-list item */
if(m && m->reply_list && m->list_select == mesh_jostle_list) {
/* how old is it? */
struct timeval age;
struct iter_hints_stub* stub = NULL;
struct delegpt* fwd = NULL;
/* how old is it? */
timeval_subtract(&age, mesh->env->now_tv,
&m->reply_list->start_time);
if(timeval_smaller(&mesh->jostle_max, &age)) {
/* its a goner */
log_nametypeclass(VERB_ALGO, "query jostled out to "
"make space for a new one",
m->s.qinfo.qname, m->s.qinfo.qtype,
m->s.qinfo.qclass);
/* backup the query */
if(qbuf) sldns_buffer_copy(mesh->qbuf_bak, qbuf);
/* notify supers */
if(m->super_set.count > 0) {
verbose(VERB_ALGO, "notify supers of failure");
m->s.return_msg = NULL;
m->s.return_rcode = LDNS_RCODE_SERVFAIL;
mesh_walk_supers(mesh, m);
}
mesh->stats_jostled ++;
mesh_state_delete(&m->s);
/* restore the query - note that the qinfo ptr to
* the querybuffer is then correct again. */
if(qbuf) sldns_buffer_copy(qbuf, mesh->qbuf_bak);
return 1;
if(!timeval_smaller(&mesh->jostle_max, &age)
|| m->has_configured_upstream) {
/* can't jostle out; still fresh or has configured
* upstreams */
return 0;
}
if((stub=hints_lookup_stub(mesh->env->hints,
m->s.qinfo.qname, m->s.qinfo.qclass, NULL, 0))
|| (fwd=forwards_find(mesh->env->fwds,
m->s.qinfo.qname, m->s.qinfo.qclass, 0))) {
/* can't jostle out; there is a configured upstream
* for this */
m->has_configured_upstream = 1;
if(stub) {
lock_rw_unlock(&mesh->env->hints->lock);
}
if(fwd) {
lock_rw_unlock(&mesh->env->fwds->lock);
}
return 0;
}
/* its a goner; older than jostle-timeout and there are no
* configured upstreams that could give it 'persistence' */
log_nametypeclass(VERB_ALGO, "query jostled out to "
"make space for a new one",
m->s.qinfo.qname, m->s.qinfo.qtype,
m->s.qinfo.qclass);
/* backup the query */
if(qbuf) sldns_buffer_copy(mesh->qbuf_bak, qbuf);
/* notify supers */
if(m->super_set.count > 0) {
verbose(VERB_ALGO, "notify supers of failure");
m->s.return_msg = NULL;
m->s.return_rcode = LDNS_RCODE_SERVFAIL;
mesh_walk_supers(mesh, m);
}
mesh->stats_jostled ++;
mesh_state_delete(&m->s);
/* restore the query - note that the qinfo ptr to
* the querybuffer is then correct again. */
if(qbuf) sldns_buffer_copy(qbuf, mesh->qbuf_bak);
return 1;
}
/* no space for new item */
return 0;
@@ -1441,7 +1466,7 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep,
* Need to explicitly check for rep->security otherwise failed
* validation paths may attach to a secure answer. */
if(m->s.env->cfg->ede && rep &&
(rep->security <= sec_status_bogus ||
(rep->security <= sec_status_bogus || rep->security == sec_status_insecure ||
rep->security == sec_status_secure_sentinel_fail)) {
mesh_find_and_attach_ede_and_reason(m, rep, r);
}
services/mesh.h
+6
View File
@@ -206,6 +206,12 @@ struct mesh_state {
/** pointer to this state for uniqueness or NULL */
struct mesh_state* unique;
/** if the qname of this mesh state will go out to one of the
* configured upstreams (stub-zone or forward-zone).
* Only used when trying to make space (jostle) for new client
* queries. */
int has_configured_upstream;
/** true if replies have been sent out (at end for alignment) */
uint8_t replies_sent;
};