mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

fix a bug where ev_sender wasn't properly set, and convert sender, arg, action, etc. to ev_sender, ev_arg, ev_action, etc.

Browse Source
This commit is contained in:
Michael Graff
2000-04-17 19:21:30 +00:00
parent a81d239754
commit 0d89e0d55c
1 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
lib/dns/resolver.c
View File

@@ -469,9 +469,9 @@ fctx_sendevents(fetchctx_t *fctx, isc_result_t result) {
for (event = ISC_LIST_HEAD(fctx->events); for (event = ISC_LIST_HEAD(fctx->events);
event != NULL; event != NULL;
event = next_event) { event = next_event) {
next_event = ISC_LIST_NEXT(event, link); next_event = ISC_LIST_NEXT(event, ev_link);
task = event->sender; task = event->ev_sender;
event->sender = fctx; event->ev_sender = fctx;
if (!HAVE_ANSWER(fctx)) if (!HAVE_ANSWER(fctx))
event->result = result; event->result = result;
isc_task_sendanddetach(&task, (isc_event_t **)&event); isc_task_sendanddetach(&task, (isc_event_t **)&event);
@@ -505,9 +505,9 @@ fctx_done(fetchctx_t *fctx, isc_result_t result) {
static void static void
resquery_senddone(isc_task_t *task, isc_event_t *event) { resquery_senddone(isc_task_t *task, isc_event_t *event) {
isc_socketevent_t *sevent = (isc_socketevent_t *)event; isc_socketevent_t *sevent = (isc_socketevent_t *)event;
resquery_t *query = event->arg; resquery_t *query = event->ev_arg;
REQUIRE(event->type == ISC_SOCKEVENT_SENDDONE); REQUIRE(event->ev_type == ISC_SOCKEVENT_SENDDONE);
QTRACE("senddone"); QTRACE("senddone");
@@ -966,10 +966,10 @@ resquery_send(resquery_t *query) {
static void static void
resquery_connected(isc_task_t *task, isc_event_t *event) { resquery_connected(isc_task_t *task, isc_event_t *event) {
isc_socketevent_t *sevent = (isc_socketevent_t *)event; isc_socketevent_t *sevent = (isc_socketevent_t *)event;
resquery_t *query = event->arg; resquery_t *query = event->ev_arg;
isc_result_t result; isc_result_t result;
REQUIRE(event->type == ISC_SOCKEVENT_CONNECT); REQUIRE(event->ev_type == ISC_SOCKEVENT_CONNECT);
REQUIRE(VALID_QUERY(query)); REQUIRE(VALID_QUERY(query));
QTRACE("connected"); QTRACE("connected");
@@ -1020,8 +1020,8 @@ fctx_finddone(isc_task_t *task, isc_event_t *event) {
isc_boolean_t bucket_empty = ISC_FALSE; isc_boolean_t bucket_empty = ISC_FALSE;
unsigned int bucketnum; unsigned int bucketnum;
find = event->sender; find = event->ev_sender;
fctx = event->arg; fctx = event->ev_arg;
REQUIRE(VALID_FCTX(fctx)); REQUIRE(VALID_FCTX(fctx));
res = fctx->res; res = fctx->res;
@@ -1038,7 +1038,7 @@ fctx_finddone(isc_task_t *task, isc_event_t *event) {
*/ */
INSIST(!SHUTTINGDOWN(fctx)); INSIST(!SHUTTINGDOWN(fctx));
fctx->attributes &= ~FCTX_ATTR_ADDRWAIT; fctx->attributes &= ~FCTX_ATTR_ADDRWAIT;
if (event->type == DNS_EVENT_ADBMOREADDRESSES) if (event->ev_type == DNS_EVENT_ADBMOREADDRESSES)
want_try = ISC_TRUE; want_try = ISC_TRUE;
else if (fctx->pending == 0) { else if (fctx->pending == 0) {
/* /*
@@ -1588,7 +1588,7 @@ fctx_destroy(fetchctx_t *fctx) {
static void static void
fctx_timeout(isc_task_t *task, isc_event_t *event) { fctx_timeout(isc_task_t *task, isc_event_t *event) {
fetchctx_t *fctx = event->arg; fetchctx_t *fctx = event->ev_arg;
REQUIRE(VALID_FCTX(fctx)); REQUIRE(VALID_FCTX(fctx));
@@ -1596,7 +1596,7 @@ fctx_timeout(isc_task_t *task, isc_event_t *event) {
FCTXTRACE("timeout"); FCTXTRACE("timeout");
if (event->type == ISC_TIMEREVENT_LIFE) { if (event->ev_type == ISC_TIMEREVENT_LIFE) {
fctx_done(fctx, ISC_R_TIMEDOUT); fctx_done(fctx, ISC_R_TIMEDOUT);
} else { } else {
/* /*
@@ -1652,7 +1652,7 @@ fctx_shutdown(fetchctx_t *fctx) {
static void static void
fctx_doshutdown(isc_task_t *task, isc_event_t *event) { fctx_doshutdown(isc_task_t *task, isc_event_t *event) {
fetchctx_t *fctx = event->arg; fetchctx_t *fctx = event->ev_arg;
isc_boolean_t bucket_empty = ISC_FALSE; isc_boolean_t bucket_empty = ISC_FALSE;
dns_resolver_t *res; dns_resolver_t *res;
unsigned int bucketnum; unsigned int bucketnum;
@@ -1696,7 +1696,7 @@ fctx_doshutdown(isc_task_t *task, isc_event_t *event) {
static void static void
fctx_start(isc_task_t *task, isc_event_t *event) { fctx_start(isc_task_t *task, isc_event_t *event) {
fetchctx_t *fctx = event->arg; fetchctx_t *fctx = event->ev_arg;
isc_boolean_t done = ISC_FALSE, bucket_empty = ISC_FALSE; isc_boolean_t done = ISC_FALSE, bucket_empty = ISC_FALSE;
dns_resolver_t *res; dns_resolver_t *res;
unsigned int bucketnum; unsigned int bucketnum;
@@ -1802,9 +1802,9 @@ fctx_join(fetchctx_t *fctx, isc_task_t *task, isc_taskaction_t action,
* first event if it is needed by any of the events. * first event if it is needed by any of the events.
*/ */
if (event->sigrdataset != NULL) if (event->sigrdataset != NULL)
ISC_LIST_PREPEND(fctx->events, event, link); ISC_LIST_PREPEND(fctx->events, event, ev_link);
else else
ISC_LIST_APPEND(fctx->events, event, link); ISC_LIST_APPEND(fctx->events, event, ev_link);
fctx->references++; fctx->references++;
fetch->magic = DNS_FETCH_MAGIC; fetch->magic = DNS_FETCH_MAGIC;
@@ -2039,9 +2039,9 @@ clone_results(fetchctx_t *fctx) {
if (hevent == NULL) if (hevent == NULL)
return; return;
hname = dns_fixedname_name(&hevent->foundname); hname = dns_fixedname_name(&hevent->foundname);
for (event = ISC_LIST_NEXT(hevent, link); for (event = ISC_LIST_NEXT(hevent, ev_link);
event != NULL; event != NULL;
event = ISC_LIST_NEXT(event, link)) { event = ISC_LIST_NEXT(event, ev_link)) {
name = dns_fixedname_name(&event->foundname); name = dns_fixedname_name(&event->foundname);
result = dns_name_concatenate(hname, NULL, name, NULL); result = dns_name_concatenate(hname, NULL, name, NULL);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
@@ -2082,8 +2082,9 @@ validated(isc_task_t *task, isc_event_t *event) {
dns_dbnode_t *node = NULL; dns_dbnode_t *node = NULL;
UNUSED(task); /* for now */ UNUSED(task); /* for now */
REQUIRE(event->type == DNS_EVENT_VALIDATORDONE);
fctx = event->arg; REQUIRE(event->ev_type == DNS_EVENT_VALIDATORDONE);
fctx = event->ev_arg;
REQUIRE(VALID_FCTX(fctx)); REQUIRE(VALID_FCTX(fctx));
REQUIRE(fctx->validating > 0); REQUIRE(fctx->validating > 0);
@@ -3289,7 +3290,7 @@ answer_response(fetchctx_t *fctx) {
static void static void
resquery_response(isc_task_t *task, isc_event_t *event) { resquery_response(isc_task_t *task, isc_event_t *event) {
isc_result_t result; isc_result_t result;
resquery_t *query = event->arg; resquery_t *query = event->ev_arg;
dns_dispatchevent_t *devent = (dns_dispatchevent_t *)event; dns_dispatchevent_t *devent = (dns_dispatchevent_t *)event;
isc_boolean_t keep_trying, broken_server, get_nameservers, resend; isc_boolean_t keep_trying, broken_server, get_nameservers, resend;
isc_boolean_t truncated; isc_boolean_t truncated;
@@ -3307,7 +3308,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
fctx = query->fctx; fctx = query->fctx;
options = query->options; options = query->options;
REQUIRE(VALID_FCTX(fctx)); REQUIRE(VALID_FCTX(fctx));
REQUIRE(event->type == DNS_EVENT_DISPATCH); REQUIRE(event->ev_type == DNS_EVENT_DISPATCH);
UNUSED(task); UNUSED(task);
QTRACE("response"); QTRACE("response");
@@ -3801,10 +3802,10 @@ send_shutdown_events(dns_resolver_t *res) {
for (event = ISC_LIST_HEAD(res->whenshutdown); for (event = ISC_LIST_HEAD(res->whenshutdown);
event != NULL; event != NULL;
event = next_event) { event = next_event) {
next_event = ISC_LIST_NEXT(event, link); next_event = ISC_LIST_NEXT(event, ev_link);
ISC_LIST_UNLINK(res->whenshutdown, event, link); ISC_LIST_UNLINK(res->whenshutdown, event, ev_link);
etask = event->sender; etask = event->ev_sender;
event->sender = res; event->ev_sender = res;
isc_task_sendanddetach(&etask, &event); isc_task_sendanddetach(&etask, &event);
} }
} }
@@ -4039,9 +4040,9 @@ prime_done(isc_task_t *task, isc_event_t *event) {
dns_fetchevent_t *fevent; dns_fetchevent_t *fevent;
dns_fetch_t *fetch; dns_fetch_t *fetch;
REQUIRE(event->type == DNS_EVENT_FETCHDONE); REQUIRE(event->ev_type == DNS_EVENT_FETCHDONE);
fevent = (dns_fetchevent_t *)event; fevent = (dns_fetchevent_t *)event;
res = event->arg; res = event->ev_arg;
REQUIRE(VALID_RESOLVER(res)); REQUIRE(VALID_RESOLVER(res));
UNUSED(task); UNUSED(task);
@@ -4186,13 +4187,13 @@ dns_resolver_whenshutdown(dns_resolver_t *res, isc_task_t *task,
/* /*
* We're already shutdown. Send the event. * We're already shutdown. Send the event.
*/ */
event->sender = res; event->ev_sender = res;
isc_task_send(task, &event); isc_task_send(task, &event);
} else { } else {
clone = NULL; clone = NULL;
isc_task_attach(task, &clone); isc_task_attach(task, &clone);
event->sender = clone; event->ev_sender = clone;
ISC_LIST_APPEND(res->whenshutdown, event, link); ISC_LIST_APPEND(res->whenshutdown, event, ev_link);
} }
UNLOCK(&res->lock); UNLOCK(&res->lock);
@@ -4431,16 +4432,16 @@ dns_resolver_cancelfetch(dns_fetch_t *fetch) {
for (event = ISC_LIST_HEAD(fctx->events); for (event = ISC_LIST_HEAD(fctx->events);
event != NULL; event != NULL;
event = next_event) { event = next_event) {
next_event = ISC_LIST_NEXT(event, link); next_event = ISC_LIST_NEXT(event, ev_link);
if (event->fetch == fetch) { if (event->fetch == fetch) {
ISC_LIST_UNLINK(fctx->events, event, ISC_LIST_UNLINK(fctx->events, event, ev_link);
link);
break; break;
} }
} }
} }
if (event != NULL) { if (event != NULL) {
etask = event->sender; etask = event->ev_sender;
event->ev_sender = fctx;
event->result = ISC_R_CANCELED; event->result = ISC_R_CANCELED;
isc_task_sendanddetach(&etask, (isc_event_t **)&event); isc_task_sendanddetach(&etask, (isc_event_t **)&event);
} }
@@ -4478,7 +4479,7 @@ dns_resolver_destroyfetch(dns_fetch_t **fetchp) {
for (event = ISC_LIST_HEAD(fctx->events); for (event = ISC_LIST_HEAD(fctx->events);
event != NULL; event != NULL;
event = next_event) { event = next_event) {
next_event = ISC_LIST_NEXT(event, link); next_event = ISC_LIST_NEXT(event, ev_link);
RUNTIME_CHECK(event->fetch != fetch); RUNTIME_CHECK(event->fetch != fetch);
} }
} }