diff options
| author | peter <peter@FreeBSD.org> | 1997-06-27 13:00:51 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1997-06-27 13:00:51 +0000 |
| commit | f2163cb4a1fdc0c1433c2019b7d7a88d9efb5b65 (patch) | |
| tree | a07cb950726b9d4f719af013c98764758f1ee646 /lib/libc/net | |
| parent | 21e75aae3104eb74e54c62aaf5c810755d92d17e (diff) | |
| download | FreeBSD-src-f2163cb4a1fdc0c1433c2019b7d7a88d9efb5b65.zip FreeBSD-src-f2163cb4a1fdc0c1433c2019b7d7a88d9efb5b65.tar.gz | |
Dynamically size fd_set in select rather than fail if too many files
are open.
Obtained from: OpenBSD; by deraadt and dm
Diffstat (limited to 'lib/libc/net')
| -rw-r--r-- | lib/libc/net/res_send.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lib/libc/net/res_send.c b/lib/libc/net/res_send.c index a89e67b..798d0f6 100644 --- a/lib/libc/net/res_send.c +++ b/lib/libc/net/res_send.c @@ -56,7 +56,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93"; static char orig_rcsid[] = "From: Id: res_send.c,v 8.13 1997/06/01 20:34:37 vixie Exp"; -static char rcsid[] = "$Id: res_send.c,v 1.15 1997/03/12 11:10:54 peter Exp $"; +static char rcsid[] = "$Id: res_send.c,v 1.16 1997/06/27 08:22:03 peter Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -469,7 +469,7 @@ read_len: * Use datagrams. */ struct timeval timeout; - fd_set dsmask; + fd_set *dsmaskp; struct sockaddr_in from; int fromlen; @@ -574,16 +574,17 @@ read_len: if ((long) timeout.tv_sec <= 0) timeout.tv_sec = 1; timeout.tv_usec = 0; - if (s+1 > FD_SETSIZE) { - Perror(stderr, "s+1 > FD_SETSIZE", EMFILE); + wait: + dsmaskp = (fd_set *)calloc(howmany(s+1, NFDBITS), + sizeof(fd_mask)); + if (dsmaskp == NULL) { res_close(); goto next_ns; } - wait: - FD_ZERO(&dsmask); - FD_SET(s, &dsmask); - n = select(s+1, &dsmask, (fd_set *)NULL, + FD_SET(s, dsmaskp); + n = select(s+1, dsmaskp, (fd_set *)NULL, (fd_set *)NULL, &timeout); + free(dsmaskp); if (n < 0) { if (errno == EINTR) goto wait; |
