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

Previous change turned invalid peer address returns from accept()

Browse Source 
into hard errors - they should be soft errors
This commit is contained in:
Andreas Gustafsson
2001-04-10 21:48:27 +00:00
parent a84cfaa3f2
commit 7900390a52
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: socket.c,v 1.195 2001/04/10 21:38:33 gson Exp $ */
/* $Id: socket.c,v 1.196 2001/04/10 21:48:27 gson Exp $ */
#include <config.h>
@@ -1674,9 +1674,7 @@ internal_accept(isc_task_t *me, isc_event_t *ev) {
(void *)&addrlen);
if (fd < 0) {
if (SOFT_ERROR(errno)) {
select_poke(sock->manager, sock->fd, SELECT_POKE_ACCEPT);
UNLOCK(&sock->lock);
return;
goto soft_error;
} else {
UNEXPECTED_ERROR(__FILE__, __LINE__,
"internal_accept: accept() %s: %s",
@@ -1685,6 +1683,7 @@ internal_accept(isc_task_t *me, isc_event_t *ev) {
ISC_MSG_FAILED,
"failed"),
strerror(errno));
fd = -1;
result = ISC_R_UNEXPECTED;
}
} else {
@@ -1695,8 +1694,7 @@ internal_accept(isc_task_t *me, isc_event_t *ev) {
"remote address");
(void)close(fd);
fd = -1;
result = ISC_R_UNEXPECTED;
goto soft_error;
} else if (dev->newsocket->address.type.sa.sa_family !=
sock->pf)
{
@@ -1708,8 +1706,7 @@ internal_accept(isc_task_t *me, isc_event_t *ev) {
type.sa.sa_family,
sock->pf);
(void)close(fd);
fd = -1;
result = ISC_R_UNEXPECTED;
goto soft_error;
}
}
@@ -1777,6 +1774,12 @@ internal_accept(isc_task_t *me, isc_event_t *ev) {
dev->ev_sender = sock;
isc_task_sendanddetach(&task, (isc_event_t **)&dev);
return;
soft_error:
select_poke(sock->manager, sock->fd, SELECT_POKE_ACCEPT);
UNLOCK(&sock->lock);
return;
}
static void