mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

refactor dns_validator to use loop callbacks

Browse Source 
The validator now uses loop callbacks to post its completion
events. (A task is still used for the fetches.)
This commit is contained in:
Evan Hunt
2022-10-27 16:51:10 -07:00
committed by Ondřej Surý
parent 31aee2ef9c
commit 7a78a85b35
3 changed files with 331 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
lib/dns/include/dns/validator.h
View File

@@ -60,7 +60,7 @@
#include <dst/dst.h> #include <dst/dst.h>
/*% /*%
* A dns_validatorevent_t is sent when a 'validation' completes. * A dns_valstatus_t is sent when a 'validation' completes.
* \brief * \brief
* 'name', 'rdataset', 'sigrdataset', and 'message' are the values that were * 'name', 'rdataset', 'sigrdataset', and 'message' are the values that were
* supplied when dns_validator_create() was called. They are returned to the * supplied when dns_validator_create() was called. They are returned to the
@@ -69,14 +69,19 @@
* If the RESULT is ISC_R_SUCCESS and the answer is secure then * If the RESULT is ISC_R_SUCCESS and the answer is secure then
* proofs[] will contain the names of the NSEC records that hold the * proofs[] will contain the names of the NSEC records that hold the
* various proofs. Note the same name may appear multiple times. * various proofs. Note the same name may appear multiple times.
*
* The structure is freed by dns_validator_destroy().
*/ */
typedef struct dns_validatorevent { typedef struct dns_valstatus {
ISC_EVENT_COMMON(struct dns_validatorevent);
dns_validator_t *validator; dns_validator_t *validator;
isc_result_t result; isc_result_t result;
isc_mem_t *mctx;
/* /*
* Name and type of the response to be validated. * Name and type of the response to be validated.
*/ */
dns_fixedname_t fname;
dns_name_t *name; dns_name_t *name;
dns_rdatatype_t type; dns_rdatatype_t type;
/* /*
@@ -101,7 +106,7 @@ typedef struct dns_validatorevent {
* Answer is secure. * Answer is secure.
*/ */
bool secure; bool secure;
} dns_validatorevent_t; } dns_valstatus_t;
#define DNS_VALIDATOR_NOQNAMEPROOF 0 #define DNS_VALIDATOR_NOQNAMEPROOF 0
#define DNS_VALIDATOR_NODATAPROOF 1 #define DNS_VALIDATOR_NODATAPROOF 1
@@ -121,28 +126,29 @@ struct dns_validator {
isc_mutex_t lock; isc_mutex_t lock;
dns_view_t *view; dns_view_t *view;
/* Locked by lock. */ /* Locked by lock. */
unsigned int options; unsigned int options;
unsigned int attributes; unsigned int attributes;
dns_validatorevent_t *event; dns_valstatus_t *vstat;
dns_fetch_t *fetch; dns_fetch_t *fetch;
dns_validator_t *subvalidator; dns_validator_t *subvalidator;
dns_validator_t *parent; dns_validator_t *parent;
dns_keytable_t *keytable; dns_keytable_t *keytable;
dst_key_t *key; dst_key_t *key;
dns_rdata_rrsig_t *siginfo; dns_rdata_rrsig_t *siginfo;
isc_task_t *task; isc_task_t *task;
isc_taskaction_t action; isc_loop_t *loop;
void *arg; isc_job_cb cb;
unsigned int labels; void *arg;
dns_rdataset_t *currentset; unsigned int labels;
dns_rdataset_t *keyset; dns_rdataset_t *currentset;
dns_rdataset_t *dsset; dns_rdataset_t *keyset;
dns_rdataset_t fdsset; dns_rdataset_t *dsset;
dns_rdataset_t frdataset; dns_rdataset_t fdsset;
dns_rdataset_t fsigrdataset; dns_rdataset_t frdataset;
dns_fixedname_t fname; dns_rdataset_t fsigrdataset;
dns_fixedname_t wild; dns_fixedname_t fname;
dns_fixedname_t closest; dns_fixedname_t wild;
dns_fixedname_t closest;
ISC_LINK(dns_validator_t) link; ISC_LINK(dns_validator_t) link;
bool mustbesecure; bool mustbesecure;
unsigned int depth; unsigned int depth;
@@ -165,8 +171,8 @@ isc_result_t
dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type, dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset,
dns_message_t *message, unsigned int options, dns_message_t *message, unsigned int options,
isc_task_t *task, isc_taskaction_t action, void *arg, isc_task_t *task, isc_loop_t *loop, isc_job_cb cb,
dns_validator_t **validatorp); void *arg, dns_validator_t **validatorp);
/*%< /*%<
* Start a DNSSEC validation. * Start a DNSSEC validation.
* *
@@ -193,8 +199,11 @@ dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
* *
* The validation is performed in the context of 'view'. * The validation is performed in the context of 'view'.
* *
* When the validation finishes, a dns_validatorevent_t with * When the validation finishes, the callback function 'cb' is
* the given 'action' and 'arg' are sent to 'task'. * called, passing a dns_valstatus_t object which contains a
* poiner to 'arg'. The caller is responsible for freeing this
* object.
*
* Its 'result' field will be ISC_R_SUCCESS iff the * Its 'result' field will be ISC_R_SUCCESS iff the
* response was successfully proven to be either secure or * response was successfully proven to be either secure or
* part of a known insecure domain. * part of a known insecure domain.

151
lib/dns/resolver.c
View File

@@ -515,7 +515,6 @@ struct fetchctx {
typedef struct { typedef struct {
dns_adbaddrinfo_t *addrinfo; dns_adbaddrinfo_t *addrinfo;
fetchctx_t *fctx; fetchctx_t *fctx;
dns_message_t *message;
} dns_valarg_t; } dns_valarg_t;
struct dns_fetch { struct dns_fetch {
@@ -669,7 +668,7 @@ ncache_adderesult(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
dns_ttl_t maxttl, bool optout, bool secure, dns_ttl_t maxttl, bool optout, bool secure,
dns_rdataset_t *ardataset, isc_result_t *eresultp); dns_rdataset_t *ardataset, isc_result_t *eresultp);
static void static void
validated(isc_task_t *task, isc_event_t *event); validated(void *arg);
static void static void
maybe_cancel_validators(fetchctx_t *fctx); maybe_cancel_validators(fetchctx_t *fctx);
static void static void
@@ -970,19 +969,16 @@ static isc_result_t
valcreate(fetchctx_t *fctx, dns_message_t *message, dns_adbaddrinfo_t *addrinfo, valcreate(fetchctx_t *fctx, dns_message_t *message, dns_adbaddrinfo_t *addrinfo,
dns_name_t *name, dns_rdatatype_t type, dns_rdataset_t *rdataset, dns_name_t *name, dns_rdatatype_t type, dns_rdataset_t *rdataset,
dns_rdataset_t *sigrdataset, unsigned int valoptions, dns_rdataset_t *sigrdataset, unsigned int valoptions,
isc_task_t *task) { isc_task_t *task, isc_loop_t *loop) {
dns_validator_t *validator = NULL; dns_validator_t *validator = NULL;
dns_valarg_t *valarg; dns_valarg_t *valarg = NULL;
isc_result_t result; isc_result_t result;
valarg = isc_mem_get(fctx->mctx, sizeof(*valarg)); valarg = isc_mem_get(fctx->mctx, sizeof(*valarg));
*valarg = (dns_valarg_t){ *valarg = (dns_valarg_t){
.addrinfo = addrinfo, .addrinfo = addrinfo,
}; };
INSIST(!SHUTTINGDOWN(fctx));
dns_message_attach(message, &valarg->message);
fetchctx_attach(fctx, &valarg->fctx); fetchctx_attach(fctx, &valarg->fctx);
if (!ISC_LIST_EMPTY(fctx->validators)) { if (!ISC_LIST_EMPTY(fctx->validators)) {
@@ -993,14 +989,8 @@ valcreate(fetchctx_t *fctx, dns_message_t *message, dns_adbaddrinfo_t *addrinfo,
result = dns_validator_create(fctx->res->view, name, type, rdataset, result = dns_validator_create(fctx->res->view, name, type, rdataset,
sigrdataset, message, valoptions, task, sigrdataset, message, valoptions, task,
validated, valarg, &validator); loop, validated, valarg, &validator);
if (result != ISC_R_SUCCESS) { RUNTIME_CHECK(result == ISC_R_SUCCESS);
fetchctx_detach(&valarg->fctx);
dns_message_detach(&valarg->message);
isc_mem_put(fctx->mctx, valarg, sizeof(*valarg));
return (result);
}
inc_stats(fctx->res, dns_resstatscounter_val); inc_stats(fctx->res, dns_resstatscounter_val);
if ((valoptions & DNS_VALIDATOR_DEFER) == 0) { if ((valoptions & DNS_VALIDATOR_DEFER) == 0) {
INSIST(fctx->validator == NULL); INSIST(fctx->validator == NULL);
@@ -5336,7 +5326,9 @@ has_000_label(dns_rdataset_t *nsecset) {
* The validator has finished. * The validator has finished.
*/ */
static void static void
validated(isc_task_t *task, isc_event_t *event) { validated(void *arg) {
dns_valstatus_t *vstat = (dns_valstatus_t *)arg;
dns_validator_t *val = vstat->validator;
dns_adbaddrinfo_t *addrinfo = NULL; dns_adbaddrinfo_t *addrinfo = NULL;
dns_dbnode_t *node = NULL; dns_dbnode_t *node = NULL;
dns_dbnode_t *nsnode = NULL; dns_dbnode_t *nsnode = NULL;
@@ -5348,7 +5340,6 @@ validated(isc_task_t *task, isc_event_t *event) {
dns_rdataset_t *sigrdataset = NULL; dns_rdataset_t *sigrdataset = NULL;
dns_resolver_t *res = NULL; dns_resolver_t *res = NULL;
dns_valarg_t *valarg = NULL; dns_valarg_t *valarg = NULL;
dns_validatorevent_t *vevent = NULL;
fetchctx_t *fctx = NULL; fetchctx_t *fctx = NULL;
bool chaining; bool chaining;
bool negative; bool negative;
@@ -5363,10 +5354,7 @@ validated(isc_task_t *task, isc_event_t *event) {
dns_message_t *message = NULL; dns_message_t *message = NULL;
bool done = false; bool done = false;
UNUSED(task); /* for now */ valarg = val->arg;
REQUIRE(event->ev_type == DNS_EVENT_VALIDATORDONE);
valarg = event->ev_arg;
REQUIRE(VALID_FCTX(valarg->fctx)); REQUIRE(VALID_FCTX(valarg->fctx));
REQUIRE(!ISC_LIST_EMPTY(valarg->fctx->validators)); REQUIRE(!ISC_LIST_EMPTY(valarg->fctx->validators));
@@ -5381,14 +5369,11 @@ validated(isc_task_t *task, isc_event_t *event) {
res = fctx->res; res = fctx->res;
addrinfo = valarg->addrinfo; addrinfo = valarg->addrinfo;
message = valarg->message; message = vstat->message;
valarg->message = NULL; fctx->vresult = vstat->result;
vevent = (dns_validatorevent_t *)event;
fctx->vresult = vevent->result;
LOCK(&fctx->lock); LOCK(&fctx->lock);
ISC_LIST_UNLINK(fctx->validators, vevent->validator, link); ISC_LIST_UNLINK(fctx->validators, val, link);
fctx->validator = NULL; fctx->validator = NULL;
UNLOCK(&fctx->lock); UNLOCK(&fctx->lock);
@@ -5396,15 +5381,14 @@ validated(isc_task_t *task, isc_event_t *event) {
* Destroy the validator early so that we can * Destroy the validator early so that we can
* destroy the fctx if necessary. Save the wildcard name. * destroy the fctx if necessary. Save the wildcard name.
*/ */
if (vevent->proofs[DNS_VALIDATOR_NOQNAMEPROOF] != NULL) { if (vstat->proofs[DNS_VALIDATOR_NOQNAMEPROOF] != NULL) {
wild = dns_fixedname_initname(&fwild); wild = dns_fixedname_initname(&fwild);
dns_name_copy(dns_fixedname_name(&vevent->validator->wild), dns_name_copy(dns_fixedname_name(&val->wild), wild);
wild);
} }
dns_validator_destroy(&vevent->validator);
isc_mem_put(fctx->mctx, valarg, sizeof(*valarg)); isc_mem_put(fctx->mctx, valarg, sizeof(*valarg));
negative = (vevent->rdataset == NULL); negative = (vstat->rdataset == NULL);
LOCK(&fctx->lock); LOCK(&fctx->lock);
sentresponse = ((fctx->options & DNS_FETCHOPT_NOVALIDATE) != 0); sentresponse = ((fctx->options & DNS_FETCHOPT_NOVALIDATE) != 0);
@@ -5425,13 +5409,13 @@ validated(isc_task_t *task, isc_event_t *event) {
* If chaining, we need to make sure that the right result code * If chaining, we need to make sure that the right result code
* is returned, and that the rdatasets are bound. * is returned, and that the rdatasets are bound.
*/ */
if (vevent->result == ISC_R_SUCCESS && !negative && if (vstat->result == ISC_R_SUCCESS && !negative &&
vevent->rdataset != NULL && CHAINING(vevent->rdataset)) vstat->rdataset != NULL && CHAINING(vstat->rdataset))
{ {
if (vevent->rdataset->type == dns_rdatatype_cname) { if (vstat->rdataset->type == dns_rdatatype_cname) {
eresult = DNS_R_CNAME; eresult = DNS_R_CNAME;
} else { } else {
INSIST(vevent->rdataset->type == dns_rdatatype_dname); INSIST(vstat->rdataset->type == dns_rdatatype_dname);
eresult = DNS_R_DNAME; eresult = DNS_R_DNAME;
} }
chaining = true; chaining = true;
@@ -5462,28 +5446,28 @@ validated(isc_task_t *task, isc_event_t *event) {
} }
} }
if (vevent->result != ISC_R_SUCCESS) { if (vstat->result != ISC_R_SUCCESS) {
FCTXTRACE("validation failed"); FCTXTRACE("validation failed");
inc_stats(res, dns_resstatscounter_valfail); inc_stats(res, dns_resstatscounter_valfail);
fctx->valfail++; fctx->valfail++;
fctx->vresult = vevent->result; fctx->vresult = vstat->result;
if (fctx->vresult != DNS_R_BROKENCHAIN) { if (fctx->vresult != DNS_R_BROKENCHAIN) {
result = ISC_R_NOTFOUND; result = ISC_R_NOTFOUND;
if (vevent->rdataset != NULL) { if (vstat->rdataset != NULL) {
result = dns_db_findnode( result = dns_db_findnode(
fctx->cache, vevent->name, true, &node); fctx->cache, vstat->name, true, &node);
} }
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {
(void)dns_db_deleterdataset(fctx->cache, node, (void)dns_db_deleterdataset(fctx->cache, node,
NULL, vevent->type, NULL, vstat->type,
0); 0);
} }
if (result == ISC_R_SUCCESS && if (result == ISC_R_SUCCESS &&
vevent->sigrdataset != NULL) vstat->sigrdataset != NULL)
{ {
(void)dns_db_deleterdataset( (void)dns_db_deleterdataset(
fctx->cache, node, NULL, fctx->cache, node, NULL,
dns_rdatatype_rrsig, vevent->type); dns_rdatatype_rrsig, vstat->type);
} }
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {
dns_db_detachnode(fctx->cache, &node); dns_db_detachnode(fctx->cache, &node);
@@ -5495,21 +5479,21 @@ validated(isc_task_t *task, isc_event_t *event) {
* validation. * validation.
*/ */
result = ISC_R_NOTFOUND; result = ISC_R_NOTFOUND;
if (vevent->rdataset != NULL) { if (vstat->rdataset != NULL) {
result = dns_db_findnode( result = dns_db_findnode(
fctx->cache, vevent->name, true, &node); fctx->cache, vstat->name, true, &node);
} }
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {
(void)dns_db_addrdataset( (void)dns_db_addrdataset(
fctx->cache, node, NULL, now, fctx->cache, node, NULL, now,
vevent->rdataset, 0, NULL); vstat->rdataset, 0, NULL);
} }
if (result == ISC_R_SUCCESS && if (result == ISC_R_SUCCESS &&
vevent->sigrdataset != NULL) vstat->sigrdataset != NULL)
{ {
(void)dns_db_addrdataset( (void)dns_db_addrdataset(
fctx->cache, node, NULL, now, fctx->cache, node, NULL, now,
vevent->sigrdataset, 0, NULL); vstat->sigrdataset, 0, NULL);
} }
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {
dns_db_detachnode(fctx->cache, &node); dns_db_detachnode(fctx->cache, &node);
@@ -5569,8 +5553,7 @@ validated(isc_task_t *task, isc_event_t *event) {
covers = fctx->type; covers = fctx->type;
} }
result = dns_db_findnode(fctx->cache, vevent->name, true, result = dns_db_findnode(fctx->cache, vstat->name, true, &node);
&node);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
/* fctx->lock unlocked in noanswer_response */ /* fctx->lock unlocked in noanswer_response */
goto noanswer_response; goto noanswer_response;
@@ -5590,7 +5573,7 @@ validated(isc_task_t *task, isc_event_t *event) {
result = ncache_adderesult(message, fctx->cache, node, covers, result = ncache_adderesult(message, fctx->cache, node, covers,
now, fctx->res->view->minncachettl, now, fctx->res->view->minncachettl,
ttl, vevent->optout, vevent->secure, ttl, vstat->optout, vstat->secure,
ardataset, &eresult); ardataset, &eresult);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
goto noanswer_response; goto noanswer_response;
@@ -5602,28 +5585,28 @@ validated(isc_task_t *task, isc_event_t *event) {
FCTXTRACE("validation OK"); FCTXTRACE("validation OK");
if (vevent->proofs[DNS_VALIDATOR_NOQNAMEPROOF] != NULL) { if (vstat->proofs[DNS_VALIDATOR_NOQNAMEPROOF] != NULL) {
result = dns_rdataset_addnoqname( result = dns_rdataset_addnoqname(
vevent->rdataset, vstat->rdataset,
vevent->proofs[DNS_VALIDATOR_NOQNAMEPROOF]); vstat->proofs[DNS_VALIDATOR_NOQNAMEPROOF]);
RUNTIME_CHECK(result == ISC_R_SUCCESS); RUNTIME_CHECK(result == ISC_R_SUCCESS);
INSIST(vevent->sigrdataset != NULL); INSIST(vstat->sigrdataset != NULL);
vevent->sigrdataset->ttl = vevent->rdataset->ttl; vstat->sigrdataset->ttl = vstat->rdataset->ttl;
if (vevent->proofs[DNS_VALIDATOR_CLOSESTENCLOSER] != NULL) { if (vstat->proofs[DNS_VALIDATOR_CLOSESTENCLOSER] != NULL) {
result = dns_rdataset_addclosest( result = dns_rdataset_addclosest(
vevent->rdataset, vstat->rdataset,
vevent->proofs[DNS_VALIDATOR_CLOSESTENCLOSER]); vstat->proofs[DNS_VALIDATOR_CLOSESTENCLOSER]);
RUNTIME_CHECK(result == ISC_R_SUCCESS); RUNTIME_CHECK(result == ISC_R_SUCCESS);
} }
} else if (vevent->rdataset->trust == dns_trust_answer && } else if (vstat->rdataset->trust == dns_trust_answer &&
vevent->rdataset->type != dns_rdatatype_rrsig) vstat->rdataset->type != dns_rdatatype_rrsig)
{ {
isc_result_t tresult; isc_result_t tresult;
dns_name_t *noqname = NULL; dns_name_t *noqname = NULL;
tresult = findnoqname(fctx, message, vevent->name, tresult = findnoqname(fctx, message, vstat->name,
vevent->rdataset->type, &noqname); vstat->rdataset->type, &noqname);
if (tresult == ISC_R_SUCCESS && noqname != NULL) { if (tresult == ISC_R_SUCCESS && noqname != NULL) {
tresult = dns_rdataset_addnoqname(vevent->rdataset, tresult = dns_rdataset_addnoqname(vstat->rdataset,
noqname); noqname);
RUNTIME_CHECK(tresult == ISC_R_SUCCESS); RUNTIME_CHECK(tresult == ISC_R_SUCCESS);
} }
@@ -5635,7 +5618,7 @@ validated(isc_task_t *task, isc_event_t *event) {
* rdatasets to the first event on the fetch * rdatasets to the first event on the fetch
* event list. * event list.
*/ */
result = dns_db_findnode(fctx->cache, vevent->name, true, &node); result = dns_db_findnode(fctx->cache, vstat->name, true, &node);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
goto noanswer_response; goto noanswer_response;
} }
@@ -5645,7 +5628,7 @@ validated(isc_task_t *task, isc_event_t *event) {
options = DNS_DBADD_PREFETCH; options = DNS_DBADD_PREFETCH;
} }
result = dns_db_addrdataset(fctx->cache, node, NULL, now, result = dns_db_addrdataset(fctx->cache, node, NULL, now,
vevent->rdataset, options, ardataset); vstat->rdataset, options, ardataset);
if (result != ISC_R_SUCCESS && result != DNS_R_UNCHANGED) { if (result != ISC_R_SUCCESS && result != DNS_R_UNCHANGED) {
goto noanswer_response; goto noanswer_response;
} }
@@ -5655,9 +5638,9 @@ validated(isc_task_t *task, isc_event_t *event) {
} else { } else {
eresult = DNS_R_NCACHENXRRSET; eresult = DNS_R_NCACHENXRRSET;
} }
} else if (vevent->sigrdataset != NULL) { } else if (vstat->sigrdataset != NULL) {
result = dns_db_addrdataset(fctx->cache, node, NULL, now, result = dns_db_addrdataset(fctx->cache, node, NULL, now,
vevent->sigrdataset, options, vstat->sigrdataset, options,
asigrdataset); asigrdataset);
if (result != ISC_R_SUCCESS && result != DNS_R_UNCHANGED) { if (result != ISC_R_SUCCESS && result != DNS_R_UNCHANGED) {
goto noanswer_response; goto noanswer_response;
@@ -5788,25 +5771,25 @@ answer_response:
/* /*
* Add the wild card entry. * Add the wild card entry.
*/ */
if (vevent->proofs[DNS_VALIDATOR_NOQNAMEPROOF] != NULL && if (vstat->proofs[DNS_VALIDATOR_NOQNAMEPROOF] != NULL &&
vevent->rdataset != NULL && vstat->rdataset != NULL &&
dns_rdataset_isassociated(vevent->rdataset) && dns_rdataset_isassociated(vstat->rdataset) &&
vevent->rdataset->trust == dns_trust_secure && vstat->rdataset->trust == dns_trust_secure &&
vevent->sigrdataset != NULL && vstat->sigrdataset != NULL &&
dns_rdataset_isassociated(vevent->sigrdataset) && dns_rdataset_isassociated(vstat->sigrdataset) &&
vevent->sigrdataset->trust == dns_trust_secure && wild != NULL) vstat->sigrdataset->trust == dns_trust_secure && wild != NULL)
{ {
dns_dbnode_t *wnode = NULL; dns_dbnode_t *wnode = NULL;
result = dns_db_findnode(fctx->cache, wild, true, &wnode); result = dns_db_findnode(fctx->cache, wild, true, &wnode);
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {
result = dns_db_addrdataset(fctx->cache, wnode, NULL, result = dns_db_addrdataset(fctx->cache, wnode, NULL,
now, vevent->rdataset, 0, now, vstat->rdataset, 0,
NULL); NULL);
} }
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {
(void)dns_db_addrdataset(fctx->cache, wnode, NULL, now, (void)dns_db_addrdataset(fctx->cache, wnode, NULL, now,
vevent->sigrdataset, 0, NULL); vstat->sigrdataset, 0, NULL);
} }
if (wnode != NULL) { if (wnode != NULL) {
dns_db_detachnode(fctx->cache, &wnode); dns_db_detachnode(fctx->cache, &wnode);
@@ -5824,7 +5807,7 @@ answer_response:
if (hevent != NULL) { if (hevent != NULL) {
/* /*
* Negative results must be indicated in event->result. * Negative results must be indicated in vstat->result.
*/ */
INSIST(hevent->rdataset != NULL); INSIST(hevent->rdataset != NULL);
if (dns_rdataset_isassociated(hevent->rdataset) && if (dns_rdataset_isassociated(hevent->rdataset) &&
@@ -5835,7 +5818,7 @@ answer_response:
} }
hevent->result = eresult; hevent->result = eresult;
dns_name_copy(vevent->name, hevent->foundname); dns_name_copy(vstat->name, hevent->foundname);
dns_db_attach(fctx->cache, &hevent->db); dns_db_attach(fctx->cache, &hevent->db);
dns_db_transfernode(fctx->cache, &node, &hevent->node); dns_db_transfernode(fctx->cache, &node, &hevent->node);
clone_results(fctx); clone_results(fctx);
@@ -5856,8 +5839,7 @@ cleanup_fetchctx:
fetchctx_detach(&fctx); fetchctx_detach(&fctx);
INSIST(node == NULL); INSIST(node == NULL);
dns_message_detach(&message); dns_validator_destroy(&val);
isc_event_free(&event);
} }
static void static void
@@ -6350,7 +6332,7 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_message_t *message,
fctx, message, addrinfo, name, fctx, message, addrinfo, name,
rdataset->type, rdataset, rdataset->type, rdataset,
sigrdataset, valoptions, sigrdataset, valoptions,
fctx->restask); fctx->restask, fctx->loop);
} }
} else if (CHAINING(rdataset)) { } else if (CHAINING(rdataset)) {
if (rdataset->type == dns_rdatatype_cname) { if (rdataset->type == dns_rdatatype_cname) {
@@ -6459,7 +6441,7 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_message_t *message,
result = valcreate(fctx, message, addrinfo, name, vtype, result = valcreate(fctx, message, addrinfo, name, vtype,
valrdataset, valsigrdataset, valoptions, valrdataset, valsigrdataset, valoptions,
fctx->restask); fctx->restask, fctx->loop);
} }
if (result == ISC_R_SUCCESS && have_answer) { if (result == ISC_R_SUCCESS && have_answer) {
@@ -6681,7 +6663,8 @@ ncache_message(fetchctx_t *fctx, dns_message_t *message,
* Do negative response validation. * Do negative response validation.
*/ */
result = valcreate(fctx, message, addrinfo, name, fctx->type, result = valcreate(fctx, message, addrinfo, name, fctx->type,
NULL, NULL, valoptions, fctx->restask); NULL, NULL, valoptions, fctx->restask,
fctx->loop);
/* /*
* If validation is necessary, return now. Otherwise * If validation is necessary, return now. Otherwise
* continue to process the message, letting the * continue to process the message, letting the

501
lib/dns/validator.c
View File

File diff suppressed because it is too large Load Diff