Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid fd_set overrun. sync w/kame

Browse Source
This commit is contained in:
itojun 2002-06-07 00:45:15 +00:00
parent 8a4859803b
commit 6cebe67965
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
usr.sbin/rtadvd/rtadvd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rtadvd.c,v 1.18 2002/05/29 14:40:32 itojun Exp $ */
/* $NetBSD: rtadvd.c,v 1.19 2002/06/07 00:45:15 itojun Exp $ */
/* $KAME: rtadvd.c,v 1.66 2002/05/29 14:18:36 itojun Exp $ */
/*
@ -146,7 +146,8 @@ main(argc, argv)
int argc;
char *argv[];
{
fd_set fdset;
fd_set *fdsetp, *selectfdp;
int fdmasks;
int maxfd = 0;
struct timeval *timeout;
int i, ch;
@ -232,22 +233,33 @@ main(argc, argv)
__FUNCTION__);
}
FD_ZERO(&fdset);
FD_SET(sock, &fdset);
maxfd = sock;
if (sflag == 0) {
rtsock_open();
FD_SET(rtsock, &fdset);
if (rtsock > sock)
maxfd = rtsock;
} else
rtsock = -1;
fdmasks = howmany(maxfd + 1, NFDBITS) * sizeof(fd_mask);
if ((fdsetp = malloc(fdmasks)) == NULL) {
err(1, "malloc");
/*NOTREACHED*/
}
if ((selectfdp = malloc(fdmasks)) == NULL) {
err(1, "malloc");
/*NOTREACHED*/
}
memset(fdsetp, 0, fdmasks);
FD_SET(sock, fdsetp);
if (rtsock >= 0)
FD_SET(rtsock, fdsetp);
signal(SIGTERM, (void *)set_die);
signal(SIGUSR1, (void *)rtadvd_set_dump_file);
while (1) {
struct fd_set select_fd = fdset; /* reinitialize */
memcpy(selectfdp, fdsetp, fdmasks); /* reinitialize */
if (do_dump) { /* SIGUSR1 */
do_dump = 0;
@ -274,8 +286,8 @@ main(argc, argv)
__FUNCTION__);
}
if ((i = select(maxfd + 1, &select_fd,
NULL, NULL, timeout)) < 0) {
if ((i = select(maxfd + 1, selectfdp, NULL, NULL,
timeout)) < 0) {
/* EINTR would occur upon SIGUSR1 for status dump */
if (errno != EINTR)
syslog(LOG_ERR, "<%s> select: %s",
@ -284,9 +296,9 @@ main(argc, argv)
}
if (i == 0) /* timeout */
continue;
if (rtsock != -1 && FD_ISSET(rtsock, &select_fd))
if (rtsock != -1 && FD_ISSET(rtsock, selectfdp))
rtmsg_input();
if (FD_ISSET(sock, &select_fd))
if (FD_ISSET(sock, selectfdp))
rtadvd_input();
}
exit(0); /* NOTREACHED */