ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

as a workaround for various OS bugs, do not INSIST() that

Browse Source 
accept() returns a valid peer address; instead just log an ugly error message
and continue if the peer address is left unchanged or insane by accept()
[RT #809]
This commit is contained in:
Andreas Gustafsson
2001-02-06 23:04:02 +00:00
parent f96ad6baf5
commit 8dab78b566
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: socket.c,v 1.187 2001/01/27 06:41:36 bwelling Exp $ */
/* $Id: socket.c,v 1.188 2001/02/06 23:04:02 gson Exp $ */
#include <config.h>
@@ -1667,6 +1667,7 @@ internal_accept(isc_task_t *me, isc_event_t *ev) {
* again.
*/
addrlen = sizeof dev->newsocket->address.type;
memset(&dev->newsocket->address.type.sa, 0, addrlen);
fd = accept(sock->fd, &dev->newsocket->address.type.sa,
(void *)&addrlen);
if (fd < 0) {
@@ -1698,7 +1699,20 @@ internal_accept(isc_task_t *me, isc_event_t *ev) {
result = ISC_R_UNEXPECTED;
} else {
INSIST(dev->newsocket->address.type.sa.sa_family == sock->pf);
if (dev->newsocket->address.type.sa.sa_family != sock->pf) {
UNEXPECTED_ERROR(__FILE__, __LINE__,
"internal_accept(): "
"accept() returned peer address "
"family %u (expected %u)",
dev->newsocket->address.
type.sa.sa_family,
sock->pf);
(void)close(fd);
select_poke(sock->manager, sock->fd,
SELECT_POKE_ACCEPT);
UNLOCK(&sock->lock);
return;
}
dev->newsocket->address.length = addrlen;
dev->newsocket->pf = sock->pf;
}