diff options
author | nectar <nectar@FreeBSD.org> | 2002-09-09 16:43:18 +0000 |
---|---|---|
committer | nectar <nectar@FreeBSD.org> | 2002-09-09 16:43:18 +0000 |
commit | f005a7d8a019151f00fed1e56fd983935498ec67 (patch) | |
tree | 9c5890331a637818b0c83bf129dde8832e5e7677 | |
parent | 38c1241397d4842137e208a9bb1e3c901e533dd6 (diff) | |
download | FreeBSD-src-f005a7d8a019151f00fed1e56fd983935498ec67.zip FreeBSD-src-f005a7d8a019151f00fed1e56fd983935498ec67.tar.gz |
Back out previous commit. I was a bit overzealous: the fd_set size is
calculated dynamically here.
-rw-r--r-- | sbin/ping6/ping6.c | 2 | ||||
-rw-r--r-- | usr.sbin/traceroute6/traceroute6.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c index 24176f0..d9f49b9 100644 --- a/sbin/ping6/ping6.c +++ b/sbin/ping6/ping6.c @@ -1029,8 +1029,6 @@ main(argc, argv) tv = &timeout; } else tv = NULL; - if (s >= FD_SETSIZE) - errx(1, "descriptor too big"); memset(fdmaskp, 0, fdmasks); FD_SET(s, fdmaskp); cc = select(s + 1, fdmaskp, NULL, NULL, tv); diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c index 37f639b..f5f3fbe 100644 --- a/usr.sbin/traceroute6/traceroute6.c +++ b/usr.sbin/traceroute6/traceroute6.c @@ -934,8 +934,6 @@ wait_for_reply(sock, mhdr) fdsn = howmany(sock + 1, NFDBITS) * sizeof(fd_mask); if ((fdsp = (fd_set *)malloc(fdsn)) == NULL) err(1, "malloc"); - if (sock >= FD_SETSIZE) - errx(1, "descriptor too big"); memset(fdsp, 0, fdsn); FD_SET(sock, fdsp); wait.tv_sec = waittime; wait.tv_usec = 0; |