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

Use one more returned-event attribute to indicate fatal error, where

Browse source 
retrying on a socket is pointless, as it will immediately fail.
This commit is contained in:
Michael Graff 1999-12-08 22:53:08 +00:00
parent 9bd232838e
commit 8b7f596003
2 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/isc/include/isc/socket.h
View file

@ -118,6 +118,9 @@ struct isc_socket_connev {
/*
* _ATTACHED: Internal use only.
* _FATALERROR: The socket result code is "sticky" -- that is, any
* further i/o activity of the same type (read or write)
* will return the same code; retrying is pointless.
* _TRUNC: Packet was truncated on receive.
* _CTRUNC: Packet control information was truncated. This can
* indicate that the packet is not complete, even though
@ -126,6 +129,7 @@ struct isc_socket_connev {
* _PKTINFO: The pktinfo member is valid.
*/
#define ISC_SOCKEVENTATTR_ATTACHED 0x8000000U /* internal */
#define ISC_SOCKEVENTATTR_FATALERROR 0x4000000U /* sock is dead */
#define ISC_SOCKEVENTATTR_TRUNC 0x0080000U /* public */
#define ISC_SOCKEVENTATTR_CTRUNC 0x0040000U /* public */
#define ISC_SOCKEVENTATTR_TIMESTAMP 0x0020000U /* public */

26
lib/isc/unix/socket.c
View file

@ -1084,7 +1084,6 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
return (ISC_R_UNEXPECTED);
}
#if 0
#ifdef SO_TIMESTAMP
if (type == isc_sockettype_udp
&& setsockopt(sock->fd, SOL_SOCKET, SO_TIMESTAMP,
@ -1093,7 +1092,6 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
sock->fd);
/* Press on... */
}
#endif
#endif
sock->references = 1;
@ -1292,6 +1290,9 @@ send_recvdone_event(isc_socket_t *sock, isc_socketevent_t **dev,
if (ISC_LINK_LINKED(*dev, link))
ISC_LIST_DEQUEUE(sock->recv_list, *dev, link);
if (sock->recv_result != ISC_R_SUCCESS)
(*dev)->attributes |= ISC_SOCKEVENTATTR_FATALERROR;
if (((*dev)->attributes & ISC_SOCKEVENTATTR_ATTACHED)
== ISC_SOCKEVENTATTR_ATTACHED)
isc_task_sendanddetach(&task, (isc_event_t **)dev);
@ -1318,6 +1319,9 @@ send_senddone_event(isc_socket_t *sock, isc_socketevent_t **dev,
if (ISC_LINK_LINKED(*dev, link))
ISC_LIST_DEQUEUE(sock->send_list, *dev, link);
if (sock->send_result != ISC_R_SUCCESS)
(*dev)->attributes |= ISC_SOCKEVENTATTR_FATALERROR;
if (((*dev)->attributes & ISC_SOCKEVENTATTR_ATTACHED)
== ISC_SOCKEVENTATTR_ATTACHED)
isc_task_sendanddetach(&task, (isc_event_t **)dev);
@ -2972,23 +2976,16 @@ isc_socket_recvmark(isc_socket_t *sock,
UNLOCK(&sock->lock);
return (ISC_R_NOMEMORY);
}
ISC_LINK_INIT(dev, link);
ISC_LIST_INIT(dev->bufferlist);
dev->result = ISC_R_SUCCESS;
dev->attributes = 0;
dev->minimum = 0;
dev->n = 0;
/*
* If the queue is empty, simply return the last error we got on
* this socket as the result code, and send off the done event.
*/
if (EMPTY(sock->recv_list)) {
dev->result = sock->recv_result;
isc_task_send(task, (isc_event_t **)&dev);
send_recvdone_event(sock, &dev, sock->recv_result);
UNLOCK(&sock->lock);
return (ISC_R_SUCCESS);
}
@ -3033,23 +3030,16 @@ isc_socket_sendmark(isc_socket_t *sock,
UNLOCK(&sock->lock);
return (ISC_R_NOMEMORY);
}
ISC_LINK_INIT(dev, link);
ISC_LIST_INIT(dev->bufferlist);
dev->result = ISC_R_SUCCESS;
dev->attributes = 0;
dev->minimum = 0;
dev->n = 0;
/*
* If the queue is empty, simply return the last error we got on
* this socket as the result code, and send off the done event.
*/
if (EMPTY(sock->send_list)) {
dev->result = sock->send_result;
isc_task_send(task, (isc_event_t **)&dev);
send_senddone_event(sock, &dev, sock->send_result);
UNLOCK(&sock->lock);
return (ISC_R_SUCCESS);
}