upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

rename fetch response db field to cache

Browse source 
As the `dns_fetchresponse_t` `db` field can only be attached to the
resolver cache database, rename it into `cache` to avoid ambiguities.
This commit is contained in:
Colin Vidal 2026-01-24 17:57:34 +01:00
parent feed0fb43c
commit e62cafd3c7
9 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/named/server.c
View file

@ -6461,8 +6461,8 @@ tat_done(void *arg) {
if (resp->node != NULL) {
dns_db_detachnode(&resp->node);
}
if (resp->db != NULL) {
dns_db_detach(&resp->db);
if (resp->cache != NULL) {
dns_db_detach(&resp->cache);
}
dns_resolver_freefresp(&resp);

4
lib/dns/adb.c
View file

@ -2586,8 +2586,8 @@ fetch_callback(void *arg) {
if (resp->node != NULL) {
dns_db_detachnode(&resp->node);
}
if (resp->db != NULL) {
dns_db_detach(&resp->db);
if (resp->cache != NULL) {
dns_db_detach(&resp->cache);
}
if (atomic_load(&adb->shuttingdown)) {

2
lib/dns/client.c
View file

@ -531,7 +531,7 @@ client_resfind(resctx_t *rctx, dns_fetchresponse_t *resp) {
INSIST(resp != NULL);
INSIST(resp->fetch == rctx->fetch);
dns_resolver_destroyfetch(&rctx->fetch);
db = resp->db;
db = resp->cache;
node = resp->node;
result = resp->result;
vresult = resp->vresult;

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

@ -82,7 +82,7 @@ struct dns_fetchresponse {
isc_result_t vresult;
dns_edectx_t *edectx;
dns_rdatatype_t qtype;
dns_db_t *db;
dns_db_t *cache;
dns_dbnode_t *node;
dns_rdataset_t *rdataset;
dns_rdataset_t *sigrdataset;

4
lib/dns/nta.c
View file

@ -163,8 +163,8 @@ fetch_done(void *arg) {
if (resp->node != NULL) {
dns_db_detachnode(&resp->node);
}
if (resp->db != NULL) {
dns_db_detach(&resp->db);
if (resp->cache != NULL) {
dns_db_detach(&resp->cache);
}
dns_resolver_freefresp(&resp);

18
lib/dns/resolver.c
View file

@ -1645,7 +1645,7 @@ copy_to_resp(fetchctx_t *fctx, dns_fetchresponse_t *resp) {
dns_name_copy(fctx->resp.foundname, resp->foundname);
dns_db_attach(fctx->cache, &resp->db);
dns_db_attach(fctx->cache, &resp->cache);
dns_db_attachnode(fctx->resp_node, &resp->node);
if (dns_rdataset_isassociated(&fctx->resp.rdataset)) {
@ -1666,8 +1666,8 @@ pull_from_resp(dns_fetchresponse_t *resp, fetchctx_t *fctx) {
if (dns_rdataset_isassociated(resp->sigrdataset)) {
dns_rdataset_clone(resp->sigrdataset, &fctx->resp.sigrdataset);
}
if (resp->db != NULL) {
INSIST(resp->db == fctx->cache);
if (resp->cache != NULL) {
INSIST(resp->cache == fctx->cache);
}
if (resp->node != NULL) {
dns_db_attachnode(resp->node, &fctx->resp_node);
@ -4362,8 +4362,8 @@ clear_resp(dns_fetchresponse_t **respp) {
if (resp->node != NULL) {
dns_db_detachnode(&resp->node);
}
if (resp->db != NULL) {
dns_db_detach(&resp->db);
if (resp->cache != NULL) {
dns_db_detach(&resp->cache);
}
dns_rdataset_cleanup(resp->rdataset);
dns_rdataset_cleanup(resp->sigrdataset);
@ -6827,8 +6827,8 @@ resume_dslookup(void *arg) {
if (resp->node != NULL) {
dns_db_detachnode(&resp->node);
}
if (resp->db != NULL) {
dns_db_detach(&resp->db);
if (resp->cache != NULL) {
dns_db_detach(&resp->cache);
}
/* Preserve data from resp before freeing it. */
@ -9804,8 +9804,8 @@ prime_done(void *arg) {
if (resp->node != NULL) {
dns_db_detachnode(&resp->node);
}
if (resp->db != NULL) {
dns_db_detach(&resp->db);
if (resp->cache != NULL) {
dns_db_detach(&resp->cache);
}
dns_rdataset_cleanup(resp->rdataset);
INSIST(resp->sigrdataset == NULL);

8
lib/dns/validator.c
View file

@ -427,8 +427,8 @@ fetch_callback_dnskey(void *arg) {
if (resp->node != NULL) {
dns_db_detachnode(&resp->node);
}
if (resp->db != NULL) {
dns_db_detach(&resp->db);
if (resp->cache != NULL) {
dns_db_detach(&resp->cache);
}
dns_rdataset_cleanup(&val->fsigrdataset);
@ -520,8 +520,8 @@ fetch_callback_ds(void *arg) {
if (resp->node != NULL) {
dns_db_detachnode(&resp->node);
}
if (resp->db != NULL) {
dns_db_detach(&resp->db);
if (resp->cache != NULL) {
dns_db_detach(&resp->cache);
}
dns_rdataset_cleanup(&val->fsigrdataset);

4
lib/dns/zonefetch.c
View file

@ -148,8 +148,8 @@ dns_zonefetch_done(void *arg) {
if (resp->node != NULL) {
dns_db_detachnode(&resp->node);
}
if (resp->db != NULL) {
dns_db_detach(&resp->db);
if (resp->cache != NULL) {
dns_db_detach(&resp->cache);
}
dns_resolver_destroyfetch(&fetch->fetch);

12
lib/ns/query.c
View file

@ -2591,8 +2591,8 @@ free_fresp(ns_client_t *client, dns_fetchresponse_t **frespp) {
if (fresp->node != NULL) {
dns_db_detachnode(&fresp->node);
}
if (fresp->db != NULL) {
dns_db_detach(&fresp->db);
if (fresp->cache != NULL) {
dns_db_detach(&fresp->cache);
}
if (fresp->rdataset != NULL) {
ns_client_putrdataset(client, &fresp->rdataset);
@ -6385,7 +6385,7 @@ query_resume(query_ctx_t *qctx) {
if (qctx->fresp->node != NULL) {
dns_db_detachnode(&qctx->fresp->node);
}
SAVE(qctx->rpz_st->r.db, qctx->fresp->db);
SAVE(qctx->rpz_st->r.db, qctx->fresp->cache);
qctx->rpz_st->r.r_type = qctx->fresp->qtype;
SAVE(qctx->rpz_st->r.r_rdataset, qctx->fresp->rdataset);
ns_client_putrdataset(qctx->client, &qctx->fresp->sigrdataset);
@ -6423,15 +6423,15 @@ query_resume(query_ctx_t *qctx) {
if (qctx->fresp->node != NULL) {
dns_db_detachnode(&qctx->fresp->node);
}
if (qctx->fresp->db != NULL) {
dns_db_detach(&qctx->fresp->db);
if (qctx->fresp->cache != NULL) {
dns_db_detach(&qctx->fresp->cache);
}
} else {
CCTRACE(ISC_LOG_DEBUG(3), "resume from normal recursion");
qctx->authoritative = false;
qctx->qtype = qctx->fresp->qtype;
SAVE(qctx->db, qctx->fresp->db);
SAVE(qctx->db, qctx->fresp->cache);
SAVE(qctx->node, qctx->fresp->node);
SAVE(qctx->rdataset, qctx->fresp->rdataset);
SAVE(qctx->sigrdataset, qctx->fresp->sigrdataset);