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

fix cancel code

Browse Source
This commit is contained in:
Michael Graff
1999-01-27 04:17:05 +00:00
parent 0fb1c498ec
commit d915cb8961
1 changed files with 101 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
lib/isc/unix/socket.c
View File

@@ -2364,39 +2364,38 @@ isc_socket_cancel(isc_socket_t *sock, isc_task_t *task,
* its done event with status of "ISC_R_CANCELED". * its done event with status of "ISC_R_CANCELED".
* o Reset any state needed. * o Reset any state needed.
*/ */
if ((how & ISC_SOCKCANCEL_RECV) && !EMPTY(sock->recv_list)) { if (((how & ISC_SOCKCANCEL_RECV) == ISC_SOCKCANCEL_RECV)
rwintev_t * iev; && !EMPTY(sock->recv_list)) {
rwintev_t * next; rwintev_t *iev;
isc_socketevent_t * dev; rwintev_t *next;
isc_socketevent_t *dev;
isc_task_t *current_task;
iev = HEAD(sock->recv_list); iev = HEAD(sock->recv_list);
next = NEXT(iev, link);
/* if ((task == NULL || task == iev->task) && !iev->canceled) {
* If the internal event was posted, try to remove dev = iev->done_ev;
* it from the task's queue. If this fails, current_task = iev->task;
* set the canceled flag, post the done event, and
* point "iev" to the next item on the list, and enter if (iev->posted) {
* the while loop. Otherwise, just enter the while loop if (isc_task_purge(task, sock,
* and let it dispatch the done event. ISC_SOCKEVENT_INTRECV)
*/ == 0) {
if ((task == NULL || task == iev->task)
&& iev->posted && !iev->canceled) {
if (isc_task_purge(task, sock,
ISC_SOCKEVENT_INTRECV) == 0) {
iev->canceled = ISC_TRUE; iev->canceled = ISC_TRUE;
/*
* pull off the done event and post it.
*/
dev = iev->done_ev;
iev->done_ev = NULL; iev->done_ev = NULL;
dev->result = ISC_R_CANCELED; }
ISC_TASK_SEND(iev->task, } else {
(isc_event_t **)&dev); isc_event_free((isc_event_t **)&iev);
iev = NEXT(iev, link);
} }
dev->result = ISC_R_CANCELED;
ISC_TASK_SEND(current_task, (isc_event_t **)&dev);
isc_task_detach(&current_task);
} }
iev = next;
/* /*
* run through the event queue, posting done events with the * run through the event queue, posting done events with the
* canceled result, and freeing the internal event. * canceled result, and freeing the internal event.
@@ -2413,43 +2412,38 @@ isc_socket_cancel(isc_socket_t *sock, isc_task_t *task,
} }
} }
if (how & ISC_SOCKCANCEL_SEND && !EMPTY(sock->send_list)) { if (((how & ISC_SOCKCANCEL_SEND) == ISC_SOCKCANCEL_SEND)
rwintev_t * iev; && !EMPTY(sock->send_list)) {
rwintev_t * next; rwintev_t *iev;
isc_socketevent_t * dev; rwintev_t *next;
isc_socketevent_t *dev;
isc_task_t *current_task;
iev = HEAD(sock->send_list); iev = HEAD(sock->send_list);
next = NEXT(iev, link);
/* if ((task == NULL || task == iev->task) && !iev->canceled) {
* If the internal event was posted, try to remove dev = iev->done_ev;
* it from the task's queue. If this fails, current_task = iev->task;
* set the canceled flag, post the done event, and
* point "iev" to the next item on the list, and enter if (iev->posted) {
* the while loop. Otherwise, just enter the while loop if (isc_task_purge(current_task, sock,
* and let it dispatch the done event. ISC_SOCKEVENT_INTSEND)
*/ == 0) {
if ((task == NULL || task == iev->task)
&& iev->posted && !iev->canceled) {
if (isc_task_purge(task, sock,
ISC_SOCKEVENT_INTSEND) == 0) {
iev->canceled = ISC_TRUE; iev->canceled = ISC_TRUE;
/*
* pull off the done event and post it.
*/
dev = iev->done_ev;
iev->done_ev = NULL; iev->done_ev = NULL;
dev->result = ISC_R_CANCELED; }
ISC_TASK_SEND(iev->task, } else {
(isc_event_t **)&dev); isc_event_free((isc_event_t **)&iev);
iev = NEXT(iev, link);
} }
dev->result = ISC_R_CANCELED;
ISC_TASK_SEND(current_task, (isc_event_t **)&dev);
isc_task_detach(&current_task);
} }
/* iev = next;
* run through the event queue, posting done events with the
* canceled result, and freeing the internal event.
*/
while (iev != NULL) { while (iev != NULL) {
next = NEXT(iev, link); next = NEXT(iev, link);
@@ -2462,37 +2456,49 @@ isc_socket_cancel(isc_socket_t *sock, isc_task_t *task,
} }
} }
if ((how & ISC_SOCKCANCEL_ACCEPT) && !EMPTY(sock->accept_list)) { if (((how & ISC_SOCKCANCEL_ACCEPT) == ISC_SOCKCANCEL_ACCEPT)
&& !EMPTY(sock->accept_list)) {
ncintev_t * iev; ncintev_t * iev;
ncintev_t * next; ncintev_t * next;
isc_socket_newconnev_t *dev; isc_socket_newconnev_t *dev;
isc_task_t *current_task;
iev = HEAD(sock->accept_list); iev = HEAD(sock->accept_list);
next = NEXT(iev, link);
if ((task == NULL || task == iev->task) if ((task == NULL || task == iev->task)
&& iev->posted && !iev->canceled) { && iev->posted && !iev->canceled) {
if (isc_task_purge(task, sock, dev = iev->done_ev;
ISC_SOCKEVENT_INTACCEPT) == 0) { current_task = iev->task;
iev->canceled = ISC_TRUE;
dev = iev->done_ev;
iev->done_ev = NULL;
dev->result = ISC_R_CANCELED;
dev->newsocket->references--;
free_socket(&dev->newsocket);
ISC_TASK_SEND(iev->task,
(isc_event_t **)&dev);
isc_task_detach(&iev->task);
iev = NEXT(iev, link); if (iev->posted) {
if (isc_task_purge(task, sock,
ISC_SOCKEVENT_INTACCEPT)
== 0) {
iev->canceled = ISC_TRUE;
iev->done_ev = NULL;
}
} else {
isc_event_free((isc_event_t **)&iev);
} }
dev->newsocket->references--;
free_socket(&dev->newsocket);
dev->result = ISC_R_CANCELED;
ISC_TASK_SEND(current_task, (isc_event_t **)&dev);
isc_task_detach(&current_task);
} }
iev = next;
while (iev != NULL) { while (iev != NULL) {
next = NEXT(iev, link); next = NEXT(iev, link);
if (task == NULL || task == iev->task) { if (task == NULL || task == iev->task) {
dev = iev->done_ev; dev = iev->done_ev;
iev->done_ev = NULL; iev->done_ev = NULL;
dev->newsocket->references--; dev->newsocket->references--;
free_socket(&dev->newsocket); free_socket(&dev->newsocket);
DEQUEUE(sock->accept_list, iev, link); DEQUEUE(sock->accept_list, iev, link);
@@ -2503,8 +2509,34 @@ isc_socket_cancel(isc_socket_t *sock, isc_task_t *task,
} }
} }
/* XXX implement */ if (((how & ISC_SOCKCANCEL_CONNECT) == ISC_SOCKCANCEL_CONNECT)
if (how & ISC_SOCKCANCEL_CONNECT) { && sock->connect_ev != NULL) {
cnintev_t * iev;
isc_socket_connev_t *dev;
isc_task_t *current_task;
iev = sock->connect_ev;
dev = iev->done_ev;
current_task = iev->task;
if ((task == NULL || task == iev->task) && !iev->canceled) {
if (iev->posted) {
if (isc_task_purge(task, sock,
ISC_SOCKEVENT_INTCONN)
== 0) {
iev->canceled = ISC_TRUE;
iev->done_ev = NULL;
}
} else {
isc_event_free((isc_event_t **)&iev);
}
sock->connect_ev = NULL;
dev->result = ISC_R_CANCELED;
ISC_TASK_SEND(current_task, (isc_event_t **)&dev);
isc_task_detach(&current_task);
}
} }
/* /*