diff options
Diffstat (limited to 'src/vcl/ldp.c')
| -rw-r--r-- | src/vcl/ldp.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/src/vcl/ldp.c b/src/vcl/ldp.c index af9742063fa..304a70a3c6a 100644 --- a/src/vcl/ldp.c +++ b/src/vcl/ldp.c @@ -477,13 +477,8 @@ writev (int fd, const struct iovec * iov, int iovcnt) return size; } -#ifdef HAVE_FCNTL64 -int -fcntl64 (int fd, int cmd, ...) -#else int fcntl (int fd, int cmd, ...) -#endif { vls_handle_t vlsh; int rv = 0; @@ -544,6 +539,18 @@ fcntl (int fd, int cmd, ...) } int +fcntl64 (int fd, int cmd, ...) +{ + va_list ap; + int rv; + + va_start (ap, cmd); + rv = fcntl (fd, cmd, ap); + va_end (ap); + return rv; +} + +int ioctl (int fd, unsigned long int cmd, ...) { vls_handle_t vlsh; @@ -620,12 +627,13 @@ ldp_select_init_maps (fd_set * __restrict original, if (vlsh == VLS_INVALID_HANDLE) clib_bitmap_set_no_check (*libcb, fd, 1); else - clib_bitmap_set_no_check (*vclb, vlsh_to_session_index (vlsh), 1); + *vclb = clib_bitmap_set (*vclb, vlsh_to_session_index (vlsh), 1); })); /* *INDENT-ON* */ si_bits_set = clib_bitmap_last_set (*vclb) + 1; *si_bits = (si_bits_set > *si_bits) ? si_bits_set : *si_bits; + clib_bitmap_validate (*resultb, *si_bits); libc_bits_set = clib_bitmap_last_set (*libcb) + 1; *libc_bits = (libc_bits_set > *libc_bits) ? libc_bits_set : *libc_bits; @@ -756,15 +764,15 @@ ldp_pselect (int nfds, fd_set * __restrict readfds, { if (readfds) clib_memcpy_fast (ldpw->rd_bitmap, ldpw->si_rd_bitmap, - vec_len (ldpw->rd_bitmap) * + vec_len (ldpw->si_rd_bitmap) * sizeof (clib_bitmap_t)); if (writefds) clib_memcpy_fast (ldpw->wr_bitmap, ldpw->si_wr_bitmap, - vec_len (ldpw->wr_bitmap) * + vec_len (ldpw->si_wr_bitmap) * sizeof (clib_bitmap_t)); if (exceptfds) clib_memcpy_fast (ldpw->ex_bitmap, ldpw->si_ex_bitmap, - vec_len (ldpw->ex_bitmap) * + vec_len (ldpw->si_ex_bitmap) * sizeof (clib_bitmap_t)); rv = vls_select (si_bits, readfds ? ldpw->rd_bitmap : NULL, @@ -774,6 +782,7 @@ ldp_pselect (int nfds, fd_set * __restrict readfds, { errno = -rv; rv = -1; + goto done; } else if (rv > 0) { |