diff options
| -rw-r--r-- | ext/kgio/accept.c | 9 | ||||
| -rw-r--r-- | ext/kgio/missing/accept4.h | 11 |
2 files changed, 17 insertions, 3 deletions
diff --git a/ext/kgio/accept.c b/ext/kgio/accept.c index 4762676..4856234 100644 --- a/ext/kgio/accept.c +++ b/ext/kgio/accept.c @@ -56,8 +56,15 @@ static VALUE get_accepted(VALUE klass) static VALUE xaccept(void *ptr) { struct accept_args *a = ptr; + int rv; + + rv = accept_fn(a->fd, a->addr, a->addrlen, accept4_flags); + if (rv == -1 && errno == ENOSYS && accept_fn != my_accept4) { + accept_fn = my_accept4; + rv = accept_fn(a->fd, a->addr, a->addrlen, accept4_flags); + } - return (VALUE)accept4(a->fd, a->addr, a->addrlen, accept4_flags); + return (VALUE)rv; } #ifdef HAVE_RB_THREAD_BLOCKING_REGION diff --git a/ext/kgio/missing/accept4.h b/ext/kgio/missing/accept4.h index f2f3ba9..22bd9bc 100644 --- a/ext/kgio/missing/accept4.h +++ b/ext/kgio/missing/accept4.h @@ -13,10 +13,11 @@ # define SOCK_NONBLOCK O_NONBLOCK # endif # endif +#endif /* !HAVE_ACCEPT4 */ /* accept4() is currently a Linux-only goodie */ static int -accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags) +my_accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags) { int fd = accept(sockfd, addr, addrlen); @@ -49,4 +50,10 @@ accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags) } return fd; } -#endif /* !HAVE_ACCEPT4 */ + +typedef int accept_fn_t(int, struct sockaddr *, socklen_t *, int); +#ifdef HAVE_ACCEPT4 +static accept_fn_t *accept_fn = accept4; +#else +static accept_fn_t *accept_fn = my_accept4; +#endif |