upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-08 17:42:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix many bugs.

Browse source
This commit is contained in:
Michael Graff 1999-07-22 01:34:31 +00:00
parent 67e33ba670
commit 6f1422b81e
3 changed files with 216 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

158
bin/tests/dispatch_test.c
View file

@ -26,6 +26,7 @@
#include <isc/assertions.h>
#include <isc/error.h>
#include <isc/mem.h>
#include <isc/mutex.h>
#include <isc/task.h>
#include <isc/thread.h>
#include <isc/result.h>
@ -49,19 +50,27 @@
#include "printmsg.h"
typedef struct {
int count;
isc_buffer_t render;
unsigned char render_buffer[1024];
dns_rdataset_t rdataset;
dns_rdatalist_t rdatalist;
dns_dispentry_t *resp;
} clictx_t;
isc_mem_t *mctx;
isc_taskmgr_t *manager;
isc_socketmgr_t *socketmgr;
dns_dispatch_t *disp;
isc_task_t *t0, *t1, *t2;
isc_buffer_t render;
unsigned char render_buffer[1024];
dns_rdataset_t rdataset;
dns_rdatalist_t rdatalist;
clictx_t clients[16]; /* lots of things might want to use this */
unsigned int client_count = 0;
isc_mutex_t client_lock;
void got_request(isc_task_t *, isc_event_t *);
void got_response(isc_task_t *, isc_event_t *);
void start_response(void);
void start_response(clictx_t *, char *, isc_task_t *);
static inline void CHECKRESULT(dns_result_t, char *);
void send_done(isc_task_t *, isc_event_t *);
void hex_dump(isc_buffer_t *);
@ -98,7 +107,7 @@ void
send_done(isc_task_t *task, isc_event_t *ev_in)
{
isc_socketevent_t *ev = (isc_socketevent_t *)ev_in;
dns_dispentry_t *resp = (dns_dispentry_t *)ev_in->arg;
clictx_t *cli = (clictx_t *)ev_in->arg;
(void)task;
@ -113,15 +122,14 @@ send_done(isc_task_t *task, isc_event_t *ev_in)
isc_event_free(&ev_in);
printf("--- removing response (FAILURE)\n");
dns_dispatch_removeresponse(disp, &resp, NULL);
dns_dispatch_removeresponse(disp, &cli->resp, NULL);
isc_app_shutdown();
}
void
start_response(void)
start_response(clictx_t *cli, char *query, isc_task_t *task)
{
dns_dispentry_t *resp;
dns_messageid_t id;
isc_sockaddr_t from;
dns_message_t *msg;
@ -132,12 +140,9 @@ start_response(void)
isc_buffer_t source;
isc_region_t region;
#define QUESTION "flame.org."
isc_buffer_init(&source, QUESTION, strlen(QUESTION),
ISC_BUFFERTYPE_TEXT);
isc_buffer_add(&source, strlen(QUESTION));
isc_buffer_setactive(&source, strlen(QUESTION));
isc_buffer_init(&source, query, strlen(query), ISC_BUFFERTYPE_TEXT);
isc_buffer_add(&source, strlen(query));
isc_buffer_setactive(&source, strlen(query));
isc_buffer_init(&target, namebuf, sizeof(namebuf),
ISC_BUFFERTYPE_BINARY);
dns_name_init(&name, NULL);
@ -161,26 +166,26 @@ start_response(void)
dns_message_addname(msg, &name, DNS_SECTION_QUESTION);
rdatalist.rdclass = dns_rdataclass_in;
rdatalist.type = dns_rdatatype_a;
rdatalist.ttl = 0;
ISC_LIST_INIT(rdatalist.rdata);
cli->rdatalist.rdclass = dns_rdataclass_in;
cli->rdatalist.type = dns_rdatatype_a;
cli->rdatalist.ttl = 0;
ISC_LIST_INIT(cli->rdatalist.rdata);
dns_rdataset_init(&rdataset);
result = dns_rdatalist_tordataset(&rdatalist, &rdataset);
dns_rdataset_init(&cli->rdataset);
result = dns_rdatalist_tordataset(&cli->rdatalist, &cli->rdataset);
CHECKRESULT(result, "dns_rdatalist_tordataset()");
ISC_LIST_APPEND(name.list, &rdataset, link);
ISC_LIST_APPEND(name.list, &cli->rdataset, link);
result = printmessage(msg);
CHECKRESULT(result, "printmessage()");
isc_buffer_init(&render, render_buffer, sizeof(render_buffer),
ISC_BUFFERTYPE_BINARY);
result = dns_message_renderbegin(msg, &render);
isc_buffer_init(&cli->render, cli->render_buffer,
sizeof(cli->render_buffer), ISC_BUFFERTYPE_BINARY);
result = dns_message_renderbegin(msg, &cli->render);
CHECKRESULT(result, "dns_message_renderbegin()");
rdataset.attributes |= DNS_RDATASETATTR_QUESTION;
cli->rdataset.attributes |= DNS_RDATASETATTR_QUESTION;
result = dns_message_rendersection(msg, DNS_SECTION_QUESTION, 0, 0);
CHECKRESULT(result, "dns_message_rendersection(QUESTION)");
@ -195,9 +200,12 @@ start_response(void)
CHECKRESULT(result, "dns_message_rendersection(AUTHORITY)");
printf("--- adding response\n");
resp = NULL;
result = dns_dispatch_addresponse(disp, &from, t2, got_response, NULL,
&id, &resp);
RUNTIME_CHECK(isc_mutex_lock(&client_lock) == ISC_R_SUCCESS);
client_count++;
RUNTIME_CHECK(isc_mutex_unlock(&client_lock) == ISC_R_SUCCESS);
cli->resp = NULL;
result = dns_dispatch_addresponse(disp, &from, task, got_response,
cli, &id, &cli->resp);
CHECKRESULT(result, "dns_dispatch_addresponse");
printf("Assigned MessageID %d\n", id);
@ -212,9 +220,9 @@ start_response(void)
dns_message_destroy(&msg);
isc_buffer_used(&render, &region);
isc_buffer_used(&cli->render, &region);
result = isc_socket_sendto(dns_dispatch_getsocket(disp), &region,
t2, send_done, resp, &from);
task, send_done, cli->resp, &from);
CHECKRESULT(result, "isc_socket_sendto()");
}
@ -225,12 +233,29 @@ got_response(isc_task_t *task, isc_event_t *ev_in)
dns_dispentry_t *resp = ev->sender;
dns_message_t *msg;
isc_result_t result;
unsigned int cnt;
(void)task;
printf("App: Got response (id %d). Result: %s\n",
ev->id, isc_result_totext(ev->result));
if (ev->result != ISC_R_SUCCESS) {
printf("--- ERROR, shutting down response slot\n");
printf("--- shutting down dispatcher\n");
dns_dispatch_cancel(disp);
printf("--- removing response\n");
dns_dispatch_removeresponse(disp, &resp, &ev);
RUNTIME_CHECK(isc_mutex_lock(&client_lock) == ISC_R_SUCCESS);
INSIST(client_count > 0);
client_count--;
cnt = client_count;
RUNTIME_CHECK(isc_mutex_unlock(&client_lock) == ISC_R_SUCCESS);
if (cnt == 0)
isc_app_shutdown();
return;
}
msg = NULL;
result = dns_message_create(mctx, &msg, DNS_MESSAGE_INTENTPARSE);
CHECKRESULT(result, "dns_message_create() failed");
@ -243,28 +268,43 @@ got_response(isc_task_t *task, isc_event_t *ev_in)
dns_message_destroy(&msg);
printf("--- shutting down dispatcher\n");
dns_dispatch_cancel(disp);
printf("--- removing response\n");
dns_dispatch_removeresponse(disp, &resp, &ev);
isc_app_shutdown();
RUNTIME_CHECK(isc_mutex_lock(&client_lock) == ISC_R_SUCCESS);
INSIST(client_count > 0);
client_count--;
cnt = client_count;
RUNTIME_CHECK(isc_mutex_unlock(&client_lock) == ISC_R_SUCCESS);
if (cnt == 0)
isc_app_shutdown();
}
void
got_request(isc_task_t *task, isc_event_t *ev_in)
{
dns_dispatchevent_t *ev = (dns_dispatchevent_t *)ev_in;
dns_dispentry_t *resp = ev->sender;
static int cnt = 0;
clictx_t *cli = (clictx_t *)ev_in->arg;
dns_message_t *msg;
dns_result_t result;
unsigned int cnt;
printf("App: Got request. Result: %s\n",
isc_result_totext(ev->result));
if (ev->result != DNS_R_SUCCESS) {
printf("Got error, terminating application\n");
dns_dispatch_removerequest(disp, &resp, &ev);
isc_app_shutdown();
RUNTIME_CHECK(isc_mutex_lock(&client_lock) == ISC_R_SUCCESS);
printf("Got error, terminating CLIENT %p resp %p\n",
cli, cli->resp);
dns_dispatch_removerequest(disp, &cli->resp, &ev);
INSIST(client_count > 0);
client_count--;
cnt = client_count;
printf("CLIENT %p ENDING, %d remain\n", cli, client_count);
RUNTIME_CHECK(isc_mutex_unlock(&client_lock) == ISC_R_SUCCESS);
if (cnt == 0)
isc_app_shutdown();
return;
}
@ -283,27 +323,28 @@ got_request(isc_task_t *task, isc_event_t *ev_in)
dns_message_destroy(&msg);
sleep (1);
printf("App: Ready.\n");
cnt++;
switch (cnt) {
case 6:
printf("--- removing request\n");
dns_dispatch_removerequest(disp, &resp, &ev);
start_response();
cli->count++;
printf("App: Client %p ready, count == %d.\n", cli, cli->count);
switch (cli->count) {
case 4:
printf("--- starting DNS lookup\n");
dns_dispatch_freeevent(disp, cli->resp, &ev);
start_response(&clients[3], "flame.org", task);
start_response(&clients[4], "vix.com", task);
start_response(&clients[5], "isc.org", task);
break;
case 3:
case 2:
printf("--- removing request\n");
dns_dispatch_removerequest(disp, &resp, &ev);
dns_dispatch_removerequest(disp, &cli->resp, &ev);
printf("--- adding request\n");
RUNTIME_CHECK(dns_dispatch_addrequest(disp, task, got_request,
NULL, &resp)
cli, &cli->resp)
== DNS_R_SUCCESS);
break;
default:
dns_dispatch_freeevent(disp, resp, &ev);
dns_dispatch_freeevent(disp, cli->resp, &ev);
break;
}
}
@ -313,7 +354,7 @@ main(int argc, char *argv[])
{
isc_socket_t *s0;
isc_sockaddr_t sockaddr;
dns_dispentry_t *resp;
unsigned int i;
(void)argc;
(void)argv;
@ -365,9 +406,18 @@ main(int argc, char *argv[])
RUNTIME_CHECK(dns_dispatch_create(mctx, s0, t0, 512, 6, 1024,
4, &disp) == ISC_R_SUCCESS);
resp = NULL;
RUNTIME_CHECK(dns_dispatch_addrequest(disp, t1, got_request, NULL,
&resp) == ISC_R_SUCCESS);
RUNTIME_CHECK(isc_mutex_init(&client_lock) == ISC_R_SUCCESS);
RUNTIME_CHECK(isc_mutex_lock(&client_lock) == ISC_R_SUCCESS);
for (i = 0 ; i < 2 ; i++) {
clients[i].count = 0;
clients[i].resp = NULL;
RUNTIME_CHECK(dns_dispatch_addrequest(disp, t1, got_request,
&clients[i],
&clients[i].resp)
== ISC_R_SUCCESS);
client_count++;
}
RUNTIME_CHECK(isc_mutex_unlock(&client_lock) == ISC_R_SUCCESS);
isc_app_run();

149
lib/dns/dispatch.c
View file

@ -88,7 +88,7 @@ struct dns_dispatch {
unsigned int recvs_wanted; /* recv() calls wanted */
unsigned int shutting_down : 1,
shutdown_out : 1;
dns_result_t shutdown_why;
isc_result_t shutdown_why;
unsigned int requests; /* how many requests we have */
unsigned int buffers; /* allocated buffers */
ISC_LIST(dns_dispentry_t) rq_handlers; /* request handler list */
@ -301,6 +301,7 @@ free_buffer(dns_dispatch_t *disp, void *buf, unsigned int len)
{
isc_sockettype_t socktype;
INSIST(buf != NULL && len != 0);
INSIST(disp->buffers > 0);
disp->buffers--;
@ -321,7 +322,7 @@ free_buffer(dns_dispatch_t *disp, void *buf, unsigned int len)
isc_mem_put(disp->mctx, buf, len);
break;
default:
INSIST(1);
INSIST(0);
break;
}
}
@ -356,6 +357,7 @@ free_event(dns_dispatch_t *disp, dns_dispatchevent_t *ev)
if (disp->failsafe_ev == ev) {
INSIST(disp->shutdown_out == 1);
disp->shutdown_out = 0;
XDEBUG(("Returning failsafe event to dispatcher\n"));
return;
}
@ -401,7 +403,7 @@ udp_recv(isc_task_t *task, isc_event_t *ev_in)
isc_socketevent_t *ev = (isc_socketevent_t *)ev_in;
dns_dispatch_t *disp = ev_in->arg;
dns_messageid_t id;
dns_result_t dres;
isc_result_t dres;
isc_buffer_t source;
unsigned int flags;
dns_dispentry_t *resp;
@ -417,6 +419,9 @@ udp_recv(isc_task_t *task, isc_event_t *ev_in)
LOCK(&disp->lock);
XDEBUG(("requests: %d, buffers: %d, recvs: %d\n",
disp->requests, disp->buffers, disp->recvs));
INSIST(disp->recvs > 0);
disp->recvs--;
@ -469,11 +474,6 @@ udp_recv(isc_task_t *task, isc_event_t *ev_in)
XDEBUG(("Got valid DNS message header, /QR %c, id %d\n",
((flags & DNS_MESSAGEFLAG_QR) ? '1' : '0'), id));
/*
* Allocate an event to send to the query or response client, and
* allocate a new buffer for our use.
*/
/*
* Look at flags. If query, check to see if we have someone handling
* them. If response, look to see where it goes.
@ -532,8 +532,9 @@ udp_recv(isc_task_t *task, isc_event_t *ev_in)
} else {
ISC_EVENT_INIT(rev, sizeof(*rev), 0, NULL, DNS_EVENT_DISPATCH,
resp->action, resp->arg, resp, NULL, NULL);
XDEBUG(("Sent event for buffer %p (len %d) to task %p\n",
rev->buffer.base, rev->buffer.length, resp->task));
XDEBUG(("Sent event %p buffer %p len %d to task %p, resp %p\n",
rev, rev->buffer.base, rev->buffer.length,
resp->task, resp));
resp->item_out = ISC_TRUE;
ISC_TASK_SEND(resp->task, (isc_event_t **)&rev);
}
@ -578,7 +579,7 @@ tcp_recv(isc_task_t *task, isc_event_t *ev_in)
dns_dispatch_t *disp = ev_in->arg;
dns_tcpmsg_t *tcpmsg = &disp->tcpmsg;
dns_messageid_t id;
dns_result_t dres;
isc_result_t dres;
unsigned int flags;
dns_dispentry_t *resp;
dns_dispatchevent_t *rev;
@ -704,8 +705,9 @@ tcp_recv(isc_task_t *task, isc_event_t *ev_in)
} else {
ISC_EVENT_INIT(rev, sizeof(*rev), 0, NULL, DNS_EVENT_DISPATCH,
resp->action, resp->arg, resp, NULL, NULL);
XDEBUG(("Sent event for buffer %p (len %d) to task %p\n",
rev->buffer.base, rev->buffer.length, resp->task));
XDEBUG(("Sent event %p buffer %p len %d to task %p, resp %p\n",
rev, rev->buffer.base, rev->buffer.length,
resp->task, resp));
resp->item_out = ISC_TRUE;
ISC_TASK_SEND(resp->task, (isc_event_t **)&rev);
}
@ -763,6 +765,7 @@ startrecv(dns_dispatch_t *disp)
disp->task, udp_recv, disp);
if (res != ISC_R_SUCCESS) {
disp->shutdown_why = res;
disp->shutting_down = 1;
do_cancel(disp, NULL);
return;
}
@ -776,6 +779,7 @@ startrecv(dns_dispatch_t *disp)
disp);
if (res != ISC_R_SUCCESS) {
disp->shutdown_why = res;
disp->shutting_down = 1;
do_cancel(disp, NULL);
return;
}
@ -789,7 +793,7 @@ startrecv(dns_dispatch_t *disp)
* Publics.
*/
dns_result_t
isc_result_t
dns_dispatch_create(isc_mem_t *mctx, isc_socket_t *sock, isc_task_t *task,
unsigned int maxbuffersize,
unsigned int maxbuffers, unsigned int maxrequests,
@ -798,7 +802,7 @@ dns_dispatch_create(isc_mem_t *mctx, isc_socket_t *sock, isc_task_t *task,
{
dns_dispatch_t *disp;
unsigned int tablesize;
dns_result_t res;
isc_result_t res;
isc_sockettype_t socktype;
unsigned int i;
@ -986,7 +990,7 @@ dns_dispatch_detach(dns_dispatch_t **dispp)
destroy(disp);
}
dns_result_t
isc_result_t
dns_dispatch_addresponse(dns_dispatch_t *disp, isc_sockaddr_t *dest,
isc_task_t *task, isc_taskaction_t action, void *arg,
dns_messageid_t *idp, dns_dispentry_t **resp)
@ -1116,16 +1120,29 @@ dns_dispatch_removeresponse(dns_dispatch_t *disp, dns_dispentry_t **resp,
isc_task_detach(&res->task);
if (ev != NULL) {
REQUIRE(res->item_out = ISC_TRUE);
REQUIRE(res->item_out == ISC_TRUE);
res->item_out = ISC_FALSE;
free_buffer(disp, ev->buffer.base, ev->buffer.length);
if (ev->buffer.base != NULL)
free_buffer(disp, ev->buffer.base, ev->buffer.length);
free_event(disp, ev);
}
/*
* Free any buffered requests as well
*/
ev = ISC_LIST_HEAD(res->items);
while (ev != NULL) {
ISC_LIST_UNLINK(res->items, ev, link);
if (ev->buffer.base != NULL)
free_buffer(disp, ev->buffer.base, ev->buffer.length);
free_event(disp, ev);
ev = ISC_LIST_HEAD(res->items);
}
isc_mempool_put(disp->rpool, res);
if (disp->shutting_down == 1)
do_cancel(disp, NULL);
startrecv(disp);
else
startrecv(disp);
UNLOCK(&disp->lock);
@ -1133,7 +1150,7 @@ dns_dispatch_removeresponse(dns_dispatch_t *disp, dns_dispentry_t **resp,
destroy(disp);
}
dns_result_t
isc_result_t
dns_dispatch_addrequest(dns_dispatch_t *disp,
isc_task_t *task, isc_taskaction_t action, void *arg,
dns_dispentry_t **resp)
@ -1235,16 +1252,18 @@ dns_dispatch_removerequest(dns_dispatch_t *disp, dns_dispentry_t **resp,
isc_task_detach(&res->task);
isc_mempool_put(disp->rpool, res);
if (ev != NULL) {
REQUIRE(res->item_out = ISC_TRUE);
REQUIRE(res->item_out == ISC_TRUE);
res->item_out = ISC_FALSE;
if (ev->buffer.length != 0)
if (ev->buffer.base != NULL)
free_buffer(disp, ev->buffer.base, ev->buffer.length);
free_event(disp, ev);
}
startrecv(disp);
isc_mempool_put(disp->rpool, res);
if (disp->shutting_down == 1)
do_cancel(disp, NULL);
else
startrecv(disp);
UNLOCK(&disp->lock);
@ -1274,10 +1293,12 @@ dns_dispatch_freeevent(dns_dispatch_t *disp, dns_dispentry_t *resp,
LOCK(&disp->lock);
REQUIRE(ev != disp->failsafe_ev);
REQUIRE(resp->item_out = ISC_TRUE);
REQUIRE(resp->item_out == ISC_TRUE);
REQUIRE(ev->result == ISC_R_SUCCESS);
resp->item_out = ISC_FALSE;
free_buffer(disp, ev->buffer.base, ev->buffer.length);
if (ev->buffer.base != NULL)
free_buffer(disp, ev->buffer.base, ev->buffer.length);
free_event(disp, ev);
if (response)
@ -1285,7 +1306,8 @@ dns_dispatch_freeevent(dns_dispatch_t *disp, dns_dispentry_t *resp,
else
do_next_request(disp, resp);
startrecv(disp);
if (disp->shutting_down == 0)
startrecv(disp);
UNLOCK(&disp->lock);
}
@ -1300,7 +1322,7 @@ do_next_response(dns_dispatch_t *disp, dns_dispentry_t *resp)
ev = ISC_LIST_HEAD(resp->items);
if (ev == NULL) {
if (disp->shutting_down == 1)
do_cancel(disp, resp);
do_cancel(disp, NULL); /* was resp */
return;
}
@ -1309,8 +1331,8 @@ do_next_response(dns_dispatch_t *disp, dns_dispentry_t *resp)
ISC_EVENT_INIT(ev, sizeof(*ev), 0, NULL, DNS_EVENT_DISPATCH,
resp->action, resp->arg, resp, NULL, NULL);
resp->item_out = ISC_TRUE;
XDEBUG(("Sent event for buffer %p (len %d) to task %p\n",
ev->buffer.base, ev->buffer.length, resp->task));
XDEBUG(("Sent event %p for buffer %p (len %d) to task %p, resp %p\n",
ev, ev->buffer.base, ev->buffer.length, resp->task, resp));
ISC_TASK_SEND(resp->task, (isc_event_t **)&ev);
}
@ -1324,7 +1346,7 @@ do_next_request(dns_dispatch_t *disp, dns_dispentry_t *resp)
ev = ISC_LIST_HEAD(disp->rq_events);
if (ev == NULL) {
if (disp->shutting_down == 1)
do_cancel(disp, resp);
do_cancel(disp, NULL); /* was resp */
return;
}
@ -1333,8 +1355,8 @@ do_next_request(dns_dispatch_t *disp, dns_dispentry_t *resp)
ISC_EVENT_INIT(ev, sizeof(*ev), 0, NULL, DNS_EVENT_DISPATCH,
resp->action, resp->arg, resp, NULL, NULL);
resp->item_out = ISC_TRUE;
XDEBUG(("Sent event for buffer %p (len %d) to task %p\n",
ev->buffer.base, ev->buffer.length, resp->task));
XDEBUG(("Sent event %p for buffer %p (len %d) to task %p, resp %p\n",
ev, ev->buffer.base, ev->buffer.length, resp->task, resp));
ISC_TASK_SEND(resp->task, (isc_event_t **)&ev);
}
@ -1347,6 +1369,7 @@ do_cancel(dns_dispatch_t *disp, dns_dispentry_t *resp)
XDEBUG(("do_cancel() call ignored\n"));
return;
}
XDEBUG(("do_cancel: disp = %p, resp = %p\n", disp, resp));
/*
* If no target given, find the first request handler. If
@ -1354,33 +1377,42 @@ do_cancel(dns_dispatch_t *disp, dns_dispentry_t *resp)
* kill them.
*/
if (resp == NULL) {
resp = ISC_LIST_HEAD(disp->rq_handlers);
if (resp != NULL && resp->item_out == ISC_TRUE)
resp = NULL;
XDEBUG(("do_cancel: passed a NULL response, searching...\n"));
if (ISC_LIST_EMPTY(disp->rq_events)) {
XDEBUG(("do_cancel: non-empty request list.\n"));
resp = ISC_LIST_HEAD(disp->rq_handlers);
while (resp != NULL) {
XDEBUG(("do_cancel: resp %p, item_out %s\n",
resp,
(resp->item_out ? "TRUE" : "FALSE")));
if (resp->item_out == ISC_FALSE)
break;
resp = ISC_LIST_NEXT(resp, link);
}
}
}
/*
* Search for the first responce handler without packets outstanding.
* Search for the first response handler without packets outstanding.
*/
if (resp == NULL) {
resp = linear_first(disp);
if (resp == NULL) /* no first item? */
return;
do {
if (resp->item_out == ISC_FALSE)
break;
resp = linear_next(disp, resp);
} while (resp != NULL);
/*
* No one to send the cancel event to, so nothing to do.
*/
if (resp == NULL)
return;
}
/*
* No one to send the cancel event to, so nothing to do.
*/
if (resp == NULL)
return;
/*
* Send the shutdown failsafe event to this resp.
*/
@ -1391,7 +1423,9 @@ do_cancel(dns_dispatch_t *disp, dns_dispentry_t *resp)
ev->buffer.base = NULL;
ev->buffer.length = 0;
disp->shutdown_out = 1;
XDEBUG(("Sending failsafe event to task %p\n", resp->task));
XDEBUG(("Sending failsafe event %p to task %p, resp %p\n",
ev, resp->task, resp));
resp->item_out = ISC_TRUE;
ISC_TASK_SEND(resp->task, (isc_event_t **)&ev);
}
@ -1402,3 +1436,24 @@ dns_dispatch_getsocket(dns_dispatch_t *disp)
return (disp->socket);
}
void
dns_dispatch_cancel(dns_dispatch_t *disp)
{
REQUIRE(VALID_DISPATCH(disp));
LOCK(&disp->lock);
if (disp->shutting_down == 1) {
UNLOCK(&disp->lock);
return;
}
disp->shutdown_why = ISC_R_CANCELED;
disp->shutting_down = 1;
do_cancel(disp, NULL);
UNLOCK(&disp->lock);
return;
}

14
lib/dns/include/dns/dispatch.h
View file

@ -64,7 +64,7 @@ ISC_LANG_BEGINDECLS
typedef struct dns_dispatchevent dns_dispatchevent_t;
struct dns_dispatchevent {
ISC_EVENT_COMMON(dns_dispatchevent_t); /* standard event common */
dns_result_t result; /* result code */
isc_result_t result; /* result code */
isc_int16_t id; /* message id */
isc_sockaddr_t addr; /* address recv'd from */
isc_buffer_t buffer; /* data buffer */
@ -72,7 +72,7 @@ struct dns_dispatchevent {
typedef struct dns_dispentry dns_dispentry_t;
dns_result_t
isc_result_t
dns_dispatch_create(isc_mem_t *mctx, isc_socket_t *sock, isc_task_t *task,
unsigned int maxbuffersize,
unsigned int maxbuffers, unsigned int maxrequests,
@ -138,7 +138,7 @@ dns_dispatch_detach(dns_dispatch_t **dispp);
* < mumble >
*/
dns_result_t
isc_result_t
dns_dispatch_addresponse(dns_dispatch_t *disp, isc_sockaddr_t *dest,
isc_task_t *task, isc_taskaction_t action, void *arg,
isc_uint16_t *idp, dns_dispentry_t **resp);
@ -192,7 +192,7 @@ dns_dispatch_removeresponse(dns_dispatch_t *disp, dns_dispentry_t **resp,
* < mumble >
*/
dns_result_t
isc_result_t
dns_dispatch_addrequest(dns_dispatch_t *disp,
isc_task_t *task, isc_taskaction_t action, void *arg,
dns_dispentry_t **resp);
@ -253,6 +253,12 @@ dns_dispatch_getsocket(dns_dispatch_t *disp);
* Return the socket associated with this dispatcher
*/
void
dns_dispatch_cancel(dns_dispatch_t *disp);
/*
* cancel outstanding clients
*/
ISC_LANG_ENDDECLS
#endif /* DNS_DISPATCH_H */