mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 05:57:52 +00:00
Code Issues Releases Wiki Activity

Canceling or destroying a fetch no longer requires the resolver to be specified

Browse Source 
as an argument to the function.
Conform to dns_adb_createfind() API changes.
cache_name() leaked the node reference in some cases; this would prevent
database cleanup from occurring later on.
This commit is contained in:
Bob Halley 2000-01-21 02:47:30 +00:00
parent 3baef4d529
commit a7f0ce6fe7
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/dns/resolver.c
View File

@ -1153,7 +1153,7 @@ fctx_getaddresses(fetchctx_t *fctx) {
result = dns_adb_createfind(res->view->adb,
res->buckets[fctx->bucketnum].task,
fctx_finddone, fctx, &name,
&fctx->domain, options, now,
&fctx->domain, options, now, NULL,
&find);
if (result != ISC_R_SUCCESS)
return (result);
@ -2031,9 +2031,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, isc_stdtime_t now) {
event->result = eresult;
dns_db_attach(res->view->cachedb, adbp);
*anodep = node;
node = NULL;
clone_results(fctx);
}
} else
}
if (node != NULL)
dns_db_detachnode(res->view->cachedb, &node);
return (result);
@ -3877,16 +3880,16 @@ dns_resolver_createfetch(dns_resolver_t *res, dns_name_t *name,
}
void
dns_resolver_cancelfetch(dns_resolver_t *res, dns_fetch_t *fetch) {
dns_resolver_cancelfetch(dns_fetch_t *fetch) {
fetchctx_t *fctx;
dns_resolver_t *res;
dns_fetchevent_t *event, *next_event;
isc_task_t *etask;
REQUIRE(VALID_RESOLVER(res));
REQUIRE(res->frozen);
REQUIRE(DNS_FETCH_VALID(fetch));
fctx = fetch->private;
REQUIRE(VALID_FCTX(fctx));
res = fctx->res;
FTRACE("cancelfetch");
@ -3915,20 +3918,20 @@ dns_resolver_cancelfetch(dns_resolver_t *res, dns_fetch_t *fetch) {
}
void
dns_resolver_destroyfetch(dns_resolver_t *res, dns_fetch_t **fetchp) {
dns_resolver_destroyfetch(dns_fetch_t **fetchp) {
dns_fetch_t *fetch;
dns_resolver_t *res;
dns_fetchevent_t *event, *next_event;
fetchctx_t *fctx;
unsigned int bucketnum;
isc_boolean_t bucket_empty = ISC_FALSE;
REQUIRE(VALID_RESOLVER(res));
REQUIRE(res->frozen);
REQUIRE(fetchp != NULL);
fetch = *fetchp;
REQUIRE(DNS_FETCH_VALID(fetch));
fctx = fetch->private;
REQUIRE(VALID_FCTX(fctx));
res = fctx->res;
FTRACE("destroyfetch");