diff options
| author | Christian Mauderer <christian.mauderer@embedded-brains.de> | 2021-02-25 11:29:56 +0100 |
|---|---|---|
| committer | Christian Mauderer <christian.mauderer@embedded-brains.de> | 2021-05-11 08:37:43 +0200 |
| commit | 35bdef1fa0c03d26d5a9f767b5857d88adef7ae1 (patch) | |
| tree | a8e5c51e8b8b47cc618724cc24190b16c76753e8 | |
| parent | racoon/session: Honor file descriptor maximum (diff) | |
| download | rtems-libbsd-35bdef1fa0c03d26d5a9f767b5857d88adef7ae1.tar.bz2 | |
ping6: Honor file descriptor maximum
This is basically the same as the patch for ping.
Fix #4361
| -rw-r--r-- | freebsd/sbin/ping6/ping6.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/freebsd/sbin/ping6/ping6.c b/freebsd/sbin/ping6/ping6.c index db3ab05a..96bd60e3 100644 --- a/freebsd/sbin/ping6/ping6.c +++ b/freebsd/sbin/ping6/ping6.c @@ -115,6 +115,7 @@ __FBSDID("$FreeBSD$"); #include <getopt.h> #include <machine/rtems-bsd-program.h> #include <machine/rtems-bsd-commands.h> +#include <rtems/libio_.h> #endif /* __rtems__ */ #include <sys/param.h> #include <sys/capsicum.h> @@ -1198,7 +1199,13 @@ main(int argc, char *argv[]) struct timespec now, timeout; struct msghdr m; struct iovec iov[2]; +#ifndef __rtems__ fd_set rfds; +#else /* __rtems__ */ + fd_set big_enough_rfds[howmany(rtems_libio_number_iops, + sizeof(fd_set) * 8)]; +#define rfds (*(fd_set *)(&big_enough_rfds[0])) +#endif /* __rtems__ */ int n; /* signal handling */ @@ -1211,7 +1218,11 @@ main(int argc, char *argv[]) continue; } #endif +#ifndef __rtems__ FD_ZERO(&rfds); +#else /* __rtems__ */ + memset(big_enough_rfds, 0, sizeof(big_enough_rfds)); +#endif /* __rtems__ */ FD_SET(srecv, &rfds); clock_gettime(CLOCK_MONOTONIC, &now); timespecadd(&last, &intvl, &timeout); |