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

rem: dev: remove fields from struct fetchctx

Browse Source 
struct fetchctx does have several fields which are now unused or confusing, removing those.

Merge branch 'colin/remove-fctx-validator' into 'main'

See merge request isc-projects/bind9!9945
This commit is contained in:
Colin Vidal
2025-01-22 10:31:22 +00:00
parent 87b0c1c1a0 c9529c0acb
commit 1732346fcc
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/dns/include/dns/resolver.h
View File

@@ -633,4 +633,4 @@ dns_resolver_freefresp(dns_fetchresponse_t **frespp);
* *
* Requires: * Requires:
* \li 'frespp' is valid. No-op if *frespp == NULL * \li 'frespp' is valid. No-op if *frespp == NULL
*/ */

19
lib/dns/resolver.c
View File

@@ -350,7 +350,6 @@ struct fetchctx {
bool hashed; bool hashed;
bool cloned; bool cloned;
bool spilled; bool spilled;
ISC_LINK(struct fetchctx) link;
ISC_LIST(dns_fetchresponse_t) resps; ISC_LIST(dns_fetchresponse_t) resps;
dns_edelist_t edelist; dns_edelist_t edelist;
@@ -381,7 +380,6 @@ struct fetchctx {
isc_sockaddrlist_t bad; isc_sockaddrlist_t bad;
ISC_LIST(struct tried) edns; ISC_LIST(struct tried) edns;
isc_sockaddrlist_t bad_edns; isc_sockaddrlist_t bad_edns;
dns_validator_t *validator;
ISC_LIST(dns_validator_t) validators; ISC_LIST(dns_validator_t) validators;
dns_db_t *cache; dns_db_t *cache;
dns_adb_t *adb; dns_adb_t *adb;
@@ -983,10 +981,6 @@ valcreate(fetchctx_t *fctx, dns_message_t *message, dns_adbaddrinfo_t *addrinfo,
&fctx->nfails, fctx->qc, fctx->gqc, &validator); &fctx->nfails, fctx->qc, fctx->gqc, &validator);
RUNTIME_CHECK(result == ISC_R_SUCCESS); RUNTIME_CHECK(result == ISC_R_SUCCESS);
inc_stats(fctx->res, dns_resstatscounter_val); inc_stats(fctx->res, dns_resstatscounter_val);
if ((valoptions & DNS_VALIDATOR_DEFER) == 0) {
INSIST(fctx->validator == NULL);
fctx->validator = validator;
}
ISC_LIST_APPEND(fctx->validators, validator, link); ISC_LIST_APPEND(fctx->validators, validator, link);
return ISC_R_SUCCESS; return ISC_R_SUCCESS;
} }
@@ -4787,7 +4781,6 @@ fctx_create(dns_resolver_t *res, isc_loop_t *loop, const dns_name_t *name,
dns_view_getadb(res->view, &fctx->adb); dns_view_getadb(res->view, &fctx->adb);
ISC_LIST_INIT(fctx->resps); ISC_LIST_INIT(fctx->resps);
ISC_LINK_INIT(fctx, link);
fctx->magic = FCTX_MAGIC; fctx->magic = FCTX_MAGIC;
/* /*
@@ -5174,6 +5167,7 @@ has_000_label(dns_rdataset_t *nsecset) {
static void static void
validated(void *arg) { validated(void *arg) {
dns_validator_t *val = (dns_validator_t *)arg; dns_validator_t *val = (dns_validator_t *)arg;
dns_validator_t *nextval = NULL;
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;
@@ -5219,7 +5213,6 @@ validated(void *arg) {
LOCK(&fctx->lock); LOCK(&fctx->lock);
ISC_LIST_UNLINK(fctx->validators, val, link); ISC_LIST_UNLINK(fctx->validators, val, link);
fctx->validator = NULL;
UNLOCK(&fctx->lock); UNLOCK(&fctx->lock);
/* /*
@@ -5346,11 +5339,9 @@ validated(void *arg) {
UNLOCK(&fctx->lock); UNLOCK(&fctx->lock);
INSIST(fctx->validator == NULL); nextval = ISC_LIST_HEAD(fctx->validators);
if (nextval != NULL) {
fctx->validator = ISC_LIST_HEAD(fctx->validators); dns_validator_send(nextval);
if (fctx->validator != NULL) {
dns_validator_send(fctx->validator);
goto cleanup_fetchctx; goto cleanup_fetchctx;
} else if (sentresponse) { } else if (sentresponse) {
done = true; done = true;
@@ -11078,4 +11069,4 @@ dns_resolver_freefresp(dns_fetchresponse_t **frespp) {
*frespp = NULL; *frespp = NULL;
dns_ede_unlinkall(fresp->mctx, &fresp->edelist); dns_ede_unlinkall(fresp->mctx, &fresp->edelist);
isc_mem_putanddetach(&fresp->mctx, fresp, sizeof(*fresp)); isc_mem_putanddetach(&fresp->mctx, fresp, sizeof(*fresp));
} }