diff options
Diffstat (limited to 'src/socket_wrapper.c')
| -rw-r--r-- | src/socket_wrapper.c | 43 |
1 files changed, 41 insertions, 2 deletions
diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c index f78c896..6e65a7e 100644 --- a/src/socket_wrapper.c +++ b/src/socket_wrapper.c @@ -335,9 +335,16 @@ static void swrap_log(enum swrap_dbglvl_e dbglvl, #include <dlfcn.h> struct swrap_libc_fns { +#ifdef HAVE_ACCEPT4 + int (*libc_accept4)(int sockfd, + struct sockaddr *addr, + socklen_t *addrlen, + int flags); +#else int (*libc_accept)(int sockfd, struct sockaddr *addr, socklen_t *addrlen); +#endif int (*libc_bind)(int sockfd, const struct sockaddr *addr, socklen_t addrlen); @@ -552,12 +559,26 @@ static void *_swrap_load_lib_function(enum swrap_lib lib, const char *fn_name) * has probably something todo with with the linker. * So we need load each function at the point it is called the first time. */ +#ifdef HAVE_ACCEPT4 +static int libc_accept4(int sockfd, + struct sockaddr *addr, + socklen_t *addrlen, + int flags) +{ + swrap_load_lib_function(SWRAP_LIBSOCKET, accept4); + + return swrap.fns.libc_accept4(sockfd, addr, addrlen, flags); +} + +#else /* HAVE_ACCEPT4 */ + static int libc_accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen) { swrap_load_lib_function(SWRAP_LIBSOCKET, accept); return swrap.fns.libc_accept(sockfd, addr, addrlen); } +#endif /* HAVE_ACCEPT4 */ static int libc_bind(int sockfd, const struct sockaddr *addr, @@ -2575,7 +2596,10 @@ int pipe(int pipefd[2]) * ACCEPT ***************************************************************************/ -static int swrap_accept(int s, struct sockaddr *addr, socklen_t *addrlen) +static int swrap_accept(int s, + struct sockaddr *addr, + socklen_t *addrlen, + int flags) { struct socket_info *parent_si, *child_si; struct socket_info_fd *child_fi; @@ -2596,7 +2620,11 @@ static int swrap_accept(int s, struct sockaddr *addr, socklen_t *addrlen) parent_si = find_socket_info(s); if (!parent_si) { +#ifdef HAVE_ACCEPT4 + return libc_accept4(s, addr, addrlen, flags); +#else return libc_accept(s, addr, addrlen); +#endif } /* @@ -2609,7 +2637,11 @@ static int swrap_accept(int s, struct sockaddr *addr, socklen_t *addrlen) return -1; } +#ifdef HAVE_ACCEPT4 + ret = libc_accept4(s, &un_addr.sa.s, &un_addr.sa_socklen, flags); +#else ret = libc_accept(s, &un_addr.sa.s, &un_addr.sa_socklen); +#endif if (ret == -1) { if (errno == ENOTSOCK) { /* Remove stale fds */ @@ -2713,13 +2745,20 @@ static int swrap_accept(int s, struct sockaddr *addr, socklen_t *addrlen) return fd; } +#ifdef HAVE_ACCEPT4 +int accept4(int s, struct sockaddr *addr, socklen_t *addrlen, int flags) +{ + return swrap_accept(s, addr, (socklen_t *)addrlen, flags); +} +#endif + #ifdef HAVE_ACCEPT_PSOCKLEN_T int accept(int s, struct sockaddr *addr, Psocklen_t addrlen) #else int accept(int s, struct sockaddr *addr, socklen_t *addrlen) #endif { - return swrap_accept(s, addr, (socklen_t *)addrlen); + return swrap_accept(s, addr, (socklen_t *)addrlen, 0); } static int autobind_start_init; |