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

hold a nta reference while fetching

Browse Source
This commit is contained in:
Mark Andrews 2014-07-10 10:24:47 +10:00
parent 1c1290afab
commit dcc7a2738f
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/dns/nta.c
View File

@ -55,6 +55,15 @@ struct dns_nta {
#define NTA_MAGIC ISC_MAGIC('N', 'T', 'A', 'n') #define NTA_MAGIC ISC_MAGIC('N', 'T', 'A', 'n')
#define VALID_NTA(nn) ISC_MAGIC_VALID(nn, NTA_MAGIC) #define VALID_NTA(nn) ISC_MAGIC_VALID(nn, NTA_MAGIC)
/*
* Obtain a reference to the nta object. Released by
* nta_detach.
*/
static void
nta_ref(dns_nta_t *nta) {
isc_refcount_increment(&nta->refcount, NULL);
}
static void static void
nta_detach(isc_mem_t *mctx, dns_nta_t **ntap) { nta_detach(isc_mem_t *mctx, dns_nta_t **ntap) {
unsigned int refs; unsigned int refs;
@ -197,6 +206,7 @@ fetch_done(isc_task_t *task, isc_event_t *event) {
dns_nta_t *nta = devent->ev_arg; dns_nta_t *nta = devent->ev_arg;
isc_result_t eresult = devent->result; isc_result_t eresult = devent->result;
dns_ntatable_t *ntatable = nta->ntatable; dns_ntatable_t *ntatable = nta->ntatable;
dns_view_t *view = ntatable->view;
isc_stdtime_t now; isc_stdtime_t now;
UNUSED(task); UNUSED(task);
@ -234,6 +244,7 @@ fetch_done(isc_task_t *task, isc_event_t *event) {
if (nta->timer != NULL && nta->expiry - now < ntatable->recheck) if (nta->timer != NULL && nta->expiry - now < ntatable->recheck)
(void) isc_timer_reset(nta->timer, isc_timertype_inactive, (void) isc_timer_reset(nta->timer, isc_timertype_inactive,
NULL, NULL, ISC_TRUE); NULL, NULL, ISC_TRUE);
nta_detach(view->mctx, &nta);
} }
static void static void
@ -241,6 +252,7 @@ checkbogus(isc_task_t *task, isc_event_t *event) {
dns_nta_t *nta = event->ev_arg; dns_nta_t *nta = event->ev_arg;
dns_ntatable_t *ntatable = nta->ntatable; dns_ntatable_t *ntatable = nta->ntatable;
dns_view_t *view = ntatable->view; dns_view_t *view = ntatable->view;
isc_result_t result;
if (nta->fetch != NULL) { if (nta->fetch != NULL) {
dns_resolver_cancelfetch(nta->fetch); dns_resolver_cancelfetch(nta->fetch);
@ -253,14 +265,17 @@ checkbogus(isc_task_t *task, isc_event_t *event) {
isc_event_free(&event); isc_event_free(&event);
(void)dns_resolver_createfetch(view->resolver, nta->name, nta_ref(nta);
dns_rdatatype_nsec, result = dns_resolver_createfetch(view->resolver, nta->name,
NULL, NULL, NULL, dns_rdatatype_nsec,
DNS_FETCHOPT_NONTA, NULL, NULL, NULL,
task, fetch_done, nta, DNS_FETCHOPT_NONTA,
&nta->rdataset, task, fetch_done, nta,
&nta->sigrdataset, &nta->rdataset,
&nta->fetch); &nta->sigrdataset,
&nta->fetch);
if (result != ISC_R_SUCCESS)
nta_detach(view->mctx, &nta);
} }
static isc_result_t static isc_result_t