ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vcl: better handlig of ldp apis that rely on gnu source

Browse Source 
Control use of apis that rely on _GNU_SOURCE being defined with compile
time macro.

Also fixes sendmmsg and recvmmsg which were not probably wrapped.

Type: improvement

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I207de23210d4b9dc960bb4289159502760c5614d
(cherry picked from commit 3684794336602435b91b91a1dc5bd9401a974432)
This commit is contained in:
Florin Coras
2023-02-02 12:56:16 -08:00
committed by Dave Wallace
parent c6fe2c3053
commit 90c9bb871f
6 changed files with 139 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/vcl/CMakeLists.txt
View File

@ -30,6 +30,11 @@ add_vpp_library(vppcom
api_headers api_headers
) )
option(LDP_HAS_GNU_SOURCE "LDP configured to use _GNU_SOURCE" ON)
if (LDP_HAS_GNU_SOURCE)
add_compile_definitions(HAVE_GNU_SOURCE)
endif(LDP_HAS_GNU_SOURCE)
add_vpp_library(vcl_ldpreload add_vpp_library(vcl_ldpreload
SOURCES SOURCES
ldp_socket_wrapper.c ldp_socket_wrapper.c

55
src/vcl/ldp.c
View File

@ -12,6 +12,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
#ifdef HAVE_GNU_SOURCE
#define _GNU_SOURCE
#endif
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <signal.h> #include <signal.h>
@ -52,6 +57,12 @@
#define LDP_MAX_NWORKERS 32 #define LDP_MAX_NWORKERS 32
#ifdef HAVE_GNU_SOURCE
#define SOCKADDR_GET_SA(__addr) __addr.__sockaddr__;
#else
#define SOCKADDR_GET_SA(__addr) _addr;
#endif
typedef struct ldp_worker_ctx_ typedef struct ldp_worker_ctx_
{ {
u8 *io_buffer; u8 *io_buffer;
@ -1052,8 +1063,9 @@ socketpair (int domain, int type, int protocol, int fds[2])
} }
int int
bind (int fd, __CONST_SOCKADDR_ARG addr, socklen_t len) bind (int fd, __CONST_SOCKADDR_ARG _addr, socklen_t len)
{ {
const struct sockaddr *addr = SOCKADDR_GET_SA (_addr);
vls_handle_t vlsh; vls_handle_t vlsh;
int rv; int rv;
@ -1124,11 +1136,10 @@ done:
} }
static inline int static inline int
ldp_copy_ep_to_sockaddr (__SOCKADDR_ARG addr, socklen_t * __restrict len, ldp_copy_ep_to_sockaddr (struct sockaddr *addr, socklen_t *__restrict len,
vppcom_endpt_t * ep) vppcom_endpt_t *ep)
{ {
int rv = 0; int rv = 0, sa_len, copy_len;
int sa_len, copy_len;
ldp_init_check (); ldp_init_check ();
@ -1169,8 +1180,9 @@ ldp_copy_ep_to_sockaddr (__SOCKADDR_ARG addr, socklen_t * __restrict len,
} }
int int
getsockname (int fd, __SOCKADDR_ARG addr, socklen_t * __restrict len) getsockname (int fd, __SOCKADDR_ARG _addr, socklen_t *__restrict len)
{ {
struct sockaddr *addr = SOCKADDR_GET_SA (_addr);
vls_handle_t vlsh; vls_handle_t vlsh;
int rv; int rv;
@ -1203,15 +1215,16 @@ getsockname (int fd, __SOCKADDR_ARG addr, socklen_t * __restrict len)
} }
else else
{ {
rv = libc_getsockname (fd, addr, len); rv = libc_getsockname (fd, _addr, len);
} }
return rv; return rv;
} }
int int
connect (int fd, __CONST_SOCKADDR_ARG addr, socklen_t len) connect (int fd, __CONST_SOCKADDR_ARG _addr, socklen_t len)
{ {
const struct sockaddr *addr = SOCKADDR_GET_SA (_addr);
vls_handle_t vlsh; vls_handle_t vlsh;
int rv; int rv;
@ -1291,8 +1304,9 @@ done:
} }
int int
getpeername (int fd, __SOCKADDR_ARG addr, socklen_t * __restrict len) getpeername (int fd, __SOCKADDR_ARG _addr, socklen_t *__restrict len)
{ {
struct sockaddr *addr = SOCKADDR_GET_SA (_addr);
vls_handle_t vlsh; vls_handle_t vlsh;
int rv; int rv;
@ -1543,8 +1557,9 @@ __recv_chk (int fd, void *buf, size_t n, size_t buflen, int flags)
static inline int static inline int
ldp_vls_sendo (vls_handle_t vlsh, const void *buf, size_t n, ldp_vls_sendo (vls_handle_t vlsh, const void *buf, size_t n,
vppcom_endpt_tlv_t *ep_tlv, int flags, vppcom_endpt_tlv_t *ep_tlv, int flags,
__CONST_SOCKADDR_ARG addr, socklen_t addr_len) __CONST_SOCKADDR_ARG _addr, socklen_t addr_len)
{ {
const struct sockaddr *addr = SOCKADDR_GET_SA (_addr);
vppcom_endpt_t *ep = 0; vppcom_endpt_t *ep = 0;
vppcom_endpt_t _ep; vppcom_endpt_t _ep;
@ -1582,11 +1597,11 @@ ldp_vls_sendo (vls_handle_t vlsh, const void *buf, size_t n,
} }
static int static int
ldp_vls_recvfrom (vls_handle_t vlsh, void *__restrict buf, size_t n, ldp_vls_recvfrom (vls_handle_t vlsh, void *__restrict buf, size_t n, int flags,
int flags, __SOCKADDR_ARG addr, __SOCKADDR_ARG _addr, socklen_t *__restrict addr_len)
socklen_t * __restrict addr_len)
{ {
u8 src_addr[sizeof (struct sockaddr_in6)]; u8 src_addr[sizeof (struct sockaddr_in6)];
struct sockaddr *addr = SOCKADDR_GET_SA (_addr);
vppcom_endpt_t ep; vppcom_endpt_t ep;
ssize_t size; ssize_t size;
int rv; int rv;
@ -1611,8 +1626,9 @@ ldp_vls_recvfrom (vls_handle_t vlsh, void *__restrict buf, size_t n,
ssize_t ssize_t
sendto (int fd, const void *buf, size_t n, int flags, sendto (int fd, const void *buf, size_t n, int flags,
__CONST_SOCKADDR_ARG addr, socklen_t addr_len) __CONST_SOCKADDR_ARG _addr, socklen_t addr_len)
{ {
const struct sockaddr *addr = SOCKADDR_GET_SA (_addr);
vls_handle_t vlsh; vls_handle_t vlsh;
ssize_t size; ssize_t size;
@ -1723,7 +1739,7 @@ sendmsg (int fd, const struct msghdr * msg, int flags)
return size; return size;
} }
#ifdef USE_GNU #ifdef _GNU_SOURCE
int int
sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags) sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags)
{ {
@ -1822,7 +1838,7 @@ recvmsg (int fd, struct msghdr * msg, int flags)
return size; return size;
} }
#ifdef USE_GNU #ifdef _GNU_SOURCE
int int
recvmmsg (int fd, struct mmsghdr *vmessages, recvmmsg (int fd, struct mmsghdr *vmessages,
unsigned int vlen, int flags, struct timespec *tmo) unsigned int vlen, int flags, struct timespec *tmo)
@ -2139,9 +2155,10 @@ listen (int fd, int n)
} }
static inline int static inline int
ldp_accept4 (int listen_fd, __SOCKADDR_ARG addr, ldp_accept4 (int listen_fd, __SOCKADDR_ARG _addr,
socklen_t * __restrict addr_len, int flags) socklen_t *__restrict addr_len, int flags)
{ {
struct sockaddr *addr = SOCKADDR_GET_SA (_addr);
vls_handle_t listen_vlsh, accept_vlsh; vls_handle_t listen_vlsh, accept_vlsh;
int rv; int rv;
@ -2671,7 +2688,7 @@ done:
return rv; return rv;
} }
#ifdef USE_GNU #ifdef _GNU_SOURCE
int int
ppoll (struct pollfd *fds, nfds_t nfds, ppoll (struct pollfd *fds, nfds_t nfds,
const struct timespec *timeout, const sigset_t * sigmask) const struct timespec *timeout, const sigset_t * sigmask)

2
src/vcl/ldp.h
View File

@ -23,9 +23,9 @@
#define LDP_DEBUG_INIT 0 #define LDP_DEBUG_INIT 0
#endif #endif
#include <vcl/ldp_glibc_socket.h>
#include <vppinfra/error.h> #include <vppinfra/error.h>
#include <vppinfra/types.h> #include <vppinfra/types.h>
#include <vcl/ldp_glibc_socket.h>
#define LDP_ENV_DEBUG "LDP_DEBUG" #define LDP_ENV_DEBUG "LDP_DEBUG"
#define LDP_ENV_APP_NAME "LDP_APP_NAME" #define LDP_ENV_APP_NAME "LDP_APP_NAME"

11
src/vcl/ldp_glibc_socket.h
View File

@ -200,15 +200,14 @@ recvfrom (int __fd, void *__restrict __buf,
extern ssize_t extern ssize_t
sendmsg (int __fd, const struct msghdr *__message, int __flags); sendmsg (int __fd, const struct msghdr *__message, int __flags);
#ifdef __USE_GNU #ifdef _GNU_SOURCE
/* Send a VLEN messages as described by VMESSAGES to socket FD. /* Send a VLEN messages as described by VMESSAGES to socket FD.
Returns the number of datagrams successfully written or -1 for errors. Returns the number of datagrams successfully written or -1 for errors.
This function is a cancellation point and therefore not marked with This function is a cancellation point and therefore not marked with
__THROW. */ __THROW. */
extern int extern int sendmmsg (int __fd, struct mmsghdr *__vmessages,
sendmmsg (int __fd, struct mmsghdr *__vmessages, unsigned int __vlen, int __flags);
unsigned int __vlen, int __flags);
#endif #endif
/* Receive a message as described by MESSAGE from socket FD. /* Receive a message as described by MESSAGE from socket FD.
@ -218,7 +217,7 @@ sendmmsg (int __fd, struct mmsghdr *__vmessages,
__THROW. */ __THROW. */
extern ssize_t recvmsg (int __fd, struct msghdr *__message, int __flags); extern ssize_t recvmsg (int __fd, struct msghdr *__message, int __flags);
#ifdef __USE_GNU #ifdef _GNU_SOURCE
/* Receive up to VLEN messages as described by VMESSAGES from socket FD. /* Receive up to VLEN messages as described by VMESSAGES from socket FD.
Returns the number of messages received or -1 for errors. Returns the number of messages received or -1 for errors.
@ -337,7 +336,7 @@ epoll_pwait (int __epfd, struct epoll_event *__events,
__THROW. */ __THROW. */
extern int poll (struct pollfd *__fds, nfds_t __nfds, int __timeout); extern int poll (struct pollfd *__fds, nfds_t __nfds, int __timeout);
#ifdef __USE_GNU #ifdef _GNU_SOURCE
/* Like poll, but before waiting the threads signal mask is replaced /* Like poll, but before waiting the threads signal mask is replaced
with that specified in the fourth parameter. For better usability, with that specified in the fourth parameter. For better usability,
the timeout value is specified using a TIMESPEC object. the timeout value is specified using a TIMESPEC object.

119
src/vcl/ldp_socket_wrapper.c
View File

@ -55,6 +55,10 @@
is set. is set.
*/ */
#ifdef HAVE_GNU_SOURCE
#define _GNU_SOURCE
#endif
#include <signal.h> #include <signal.h>
#include <dlfcn.h> #include <dlfcn.h>
@ -67,7 +71,6 @@
#include <vcl/ldp_socket_wrapper.h> #include <vcl/ldp_socket_wrapper.h>
enum swrap_dbglvl_e enum swrap_dbglvl_e
{ {
SWRAP_LOG_ERROR = 0, SWRAP_LOG_ERROR = 0,
@ -156,16 +159,14 @@ PRINTF_ATTRIBUTE (3, 4);
* SWRAP LOADING LIBC FUNCTIONS * SWRAP LOADING LIBC FUNCTIONS
*********************************************************/ *********************************************************/
typedef int (*__libc_accept4) (int sockfd, typedef int (*__libc_accept4) (int sockfd, __SOCKADDR_ARG addr,
struct sockaddr * addr, socklen_t *addrlen, int flags);
socklen_t * addrlen, int flags); typedef int (*__libc_accept) (int sockfd, __SOCKADDR_ARG addr,
typedef int (*__libc_accept) (int sockfd, socklen_t *addrlen);
struct sockaddr * addr, socklen_t * addrlen); typedef int (*__libc_bind) (int sockfd, __CONST_SOCKADDR_ARG addr,
typedef int (*__libc_bind) (int sockfd, socklen_t addrlen);
const struct sockaddr * addr, socklen_t addrlen);
typedef int (*__libc_close) (int fd); typedef int (*__libc_close) (int fd);
typedef int (*__libc_connect) (int sockfd, typedef int (*__libc_connect) (int sockfd, __CONST_SOCKADDR_ARG addr,
const struct sockaddr * addr,
socklen_t addrlen); socklen_t addrlen);
#if 0 #if 0
@ -185,16 +186,12 @@ typedef FILE *(*__libc_fopen64) (const char *name, const char *mode);
#ifdef HAVE_EVENTFD #ifdef HAVE_EVENTFD
typedef int (*__libc_eventfd) (int count, int flags); typedef int (*__libc_eventfd) (int count, int flags);
#endif #endif
typedef int (*__libc_getpeername) (int sockfd, typedef int (*__libc_getpeername) (int sockfd, __SOCKADDR_ARG addr,
struct sockaddr * addr, socklen_t *addrlen);
socklen_t * addrlen); typedef int (*__libc_getsockname) (int sockfd, __SOCKADDR_ARG addr,
typedef int (*__libc_getsockname) (int sockfd, socklen_t *addrlen);
struct sockaddr * addr, typedef int (*__libc_getsockopt) (int sockfd, int level, int optname,
socklen_t * addrlen); void *optval, socklen_t *optlen);
typedef int (*__libc_getsockopt) (int sockfd,
int level,
int optname,
void *optval, socklen_t * optlen);
typedef int (*__libc_ioctl) (int d, unsigned long int request, ...); typedef int (*__libc_ioctl) (int d, unsigned long int request, ...);
typedef int (*__libc_listen) (int sockfd, int backlog); typedef int (*__libc_listen) (int sockfd, int backlog);
typedef int (*__libc_open) (const char *pathname, int flags, mode_t mode); typedef int (*__libc_open) (const char *pathname, int flags, mode_t mode);
@ -204,25 +201,29 @@ typedef int (*__libc_open64) (const char *pathname, int flags, mode_t mode);
typedef int (*__libc_openat) (int dirfd, const char *path, int flags, ...); typedef int (*__libc_openat) (int dirfd, const char *path, int flags, ...);
typedef int (*__libc_pipe) (int pipefd[2]); typedef int (*__libc_pipe) (int pipefd[2]);
typedef int (*__libc_read) (int fd, void *buf, size_t count); typedef int (*__libc_read) (int fd, void *buf, size_t count);
typedef ssize_t (*__libc_readv) (int fd, const struct iovec * iov, typedef ssize_t (*__libc_readv) (int fd, const struct iovec *iov, int iovcnt);
int iovcnt);
typedef int (*__libc_recv) (int sockfd, void *buf, size_t len, int flags); typedef int (*__libc_recv) (int sockfd, void *buf, size_t len, int flags);
typedef int (*__libc_recvfrom) (int sockfd, typedef int (*__libc_recvfrom) (int sockfd, void *buf, size_t len, int flags,
void *buf, __SOCKADDR_ARG src_addr, socklen_t *addrlen);
size_t len, typedef int (*__libc_recvmsg) (int sockfd, const struct msghdr *msg,
int flags,
struct sockaddr * src_addr,
socklen_t * addrlen);
typedef int (*__libc_recvmsg) (int sockfd, const struct msghdr * msg,
int flags); int flags);
#ifdef _GNU_SOURCE
typedef int (*__libc_recvmmsg) (int fd, struct mmsghdr *vmessages,
unsigned int vlen, int flags,
struct timespec *tmo);
#endif
typedef int (*__libc_send) (int sockfd, const void *buf, size_t len, typedef int (*__libc_send) (int sockfd, const void *buf, size_t len,
int flags); int flags);
typedef ssize_t (*__libc_sendfile) (int out_fd, int in_fd, off_t * offset, typedef ssize_t (*__libc_sendfile) (int out_fd, int in_fd, off_t * offset,
size_t len); size_t len);
typedef int (*__libc_sendmsg) (int sockfd, const struct msghdr * msg, typedef int (*__libc_sendmsg) (int sockfd, const struct msghdr * msg,
int flags); int flags);
#ifdef _GNU_SOURCE
typedef int (*__libc_sendmmsg) (int __fd, struct mmsghdr *__vmessages,
unsigned int __vlen, int __flags);
#endif
typedef int (*__libc_sendto) (int sockfd, const void *buf, size_t len, typedef int (*__libc_sendto) (int sockfd, const void *buf, size_t len,
int flags, const struct sockaddr * dst_addr, int flags, __CONST_SOCKADDR_ARG dst_addr,
socklen_t addrlen); socklen_t addrlen);
typedef int (*__libc_setsockopt) (int sockfd, int level, int optname, typedef int (*__libc_setsockopt) (int sockfd, int level, int optname,
const void *optval, socklen_t optlen); const void *optval, socklen_t optlen);
@ -271,7 +272,7 @@ typedef int (*__libc_epoll_pwait) (int __epfd, struct epoll_event * __events,
typedef int (*__libc_poll) (struct pollfd * __fds, nfds_t __nfds, typedef int (*__libc_poll) (struct pollfd * __fds, nfds_t __nfds,
int __timeout); int __timeout);
#ifdef __USE_GNU #ifdef _GNU_SOURCE
typedef int (*__libc_ppoll) (struct pollfd * __fds, nfds_t __nfds, typedef int (*__libc_ppoll) (struct pollfd * __fds, nfds_t __nfds,
const struct timespec * __timeout, const struct timespec * __timeout,
const __sigset_t * __ss); const __sigset_t * __ss);
@ -323,9 +324,15 @@ struct swrap_libc_symbols
SWRAP_SYMBOL_ENTRY (recv); SWRAP_SYMBOL_ENTRY (recv);
SWRAP_SYMBOL_ENTRY (recvfrom); SWRAP_SYMBOL_ENTRY (recvfrom);
SWRAP_SYMBOL_ENTRY (recvmsg); SWRAP_SYMBOL_ENTRY (recvmsg);
#ifdef _GNU_SOURCE
SWRAP_SYMBOL_ENTRY (recvmmsg);
#endif
SWRAP_SYMBOL_ENTRY (send); SWRAP_SYMBOL_ENTRY (send);
SWRAP_SYMBOL_ENTRY (sendfile); SWRAP_SYMBOL_ENTRY (sendfile);
SWRAP_SYMBOL_ENTRY (sendmsg); SWRAP_SYMBOL_ENTRY (sendmsg);
#ifdef _GNU_SOURCE
SWRAP_SYMBOL_ENTRY (sendmmsg);
#endif
SWRAP_SYMBOL_ENTRY (sendto); SWRAP_SYMBOL_ENTRY (sendto);
SWRAP_SYMBOL_ENTRY (setsockopt); SWRAP_SYMBOL_ENTRY (setsockopt);
#ifdef HAVE_SIGNALFD #ifdef HAVE_SIGNALFD
@ -350,7 +357,7 @@ struct swrap_libc_symbols
SWRAP_SYMBOL_ENTRY (epoll_wait); SWRAP_SYMBOL_ENTRY (epoll_wait);
SWRAP_SYMBOL_ENTRY (epoll_pwait); SWRAP_SYMBOL_ENTRY (epoll_pwait);
SWRAP_SYMBOL_ENTRY (poll); SWRAP_SYMBOL_ENTRY (poll);
#ifdef __USE_GNU #ifdef _GNU_SOURCE
SWRAP_SYMBOL_ENTRY (ppoll); SWRAP_SYMBOL_ENTRY (ppoll);
#endif #endif
}; };
@ -480,8 +487,7 @@ _swrap_bind_symbol (enum swrap_lib lib, const char *fn_name)
* So we need load each function at the point it is called the first time. * So we need load each function at the point it is called the first time.
*/ */
int int
libc_accept4 (int sockfd, libc_accept4 (int sockfd, __SOCKADDR_ARG addr, socklen_t *addrlen, int flags)
struct sockaddr *addr, socklen_t * addrlen, int flags)
{ {
swrap_bind_symbol_libc (accept4); swrap_bind_symbol_libc (accept4);
@ -489,7 +495,7 @@ libc_accept4 (int sockfd,
} }
int int
libc_accept (int sockfd, struct sockaddr *addr, socklen_t * addrlen) libc_accept (int sockfd, __SOCKADDR_ARG addr, socklen_t *addrlen)
{ {
swrap_bind_symbol_libc (accept); swrap_bind_symbol_libc (accept);
@ -497,7 +503,7 @@ libc_accept (int sockfd, struct sockaddr *addr, socklen_t * addrlen)
} }
int int
libc_bind (int sockfd, const struct sockaddr *addr, socklen_t addrlen) libc_bind (int sockfd, __CONST_SOCKADDR_ARG addr, socklen_t addrlen)
{ {
swrap_bind_symbol_libc (bind); swrap_bind_symbol_libc (bind);
@ -513,7 +519,7 @@ libc_close (int fd)
} }
int int
libc_connect (int sockfd, const struct sockaddr *addr, socklen_t addrlen) libc_connect (int sockfd, __CONST_SOCKADDR_ARG addr, socklen_t addrlen)
{ {
swrap_bind_symbol_libc (connect); swrap_bind_symbol_libc (connect);
@ -587,7 +593,7 @@ libc_vioctl (int fd, int cmd, va_list ap)
} }
int int
libc_getpeername (int sockfd, struct sockaddr *addr, socklen_t * addrlen) libc_getpeername (int sockfd, __SOCKADDR_ARG addr, socklen_t *addrlen)
{ {
swrap_bind_symbol_libc (getpeername); swrap_bind_symbol_libc (getpeername);
@ -595,7 +601,7 @@ libc_getpeername (int sockfd, struct sockaddr *addr, socklen_t * addrlen)
} }
int int
libc_getsockname (int sockfd, struct sockaddr *addr, socklen_t * addrlen) libc_getsockname (int sockfd, __SOCKADDR_ARG addr, socklen_t *addrlen)
{ {
swrap_bind_symbol_libc (getsockname); swrap_bind_symbol_libc (getsockname);
@ -647,10 +653,8 @@ libc_recv (int sockfd, void *buf, size_t len, int flags)
} }
int int
libc_recvfrom (int sockfd, libc_recvfrom (int sockfd, void *buf, size_t len, int flags,
void *buf, __SOCKADDR_ARG src_addr, socklen_t *addrlen)
size_t len,
int flags, struct sockaddr *src_addr, socklen_t * addrlen)
{ {
swrap_bind_symbol_libc (recvfrom); swrap_bind_symbol_libc (recvfrom);
@ -667,6 +671,17 @@ libc_recvmsg (int sockfd, struct msghdr *msg, int flags)
return swrap.libc.symbols._libc_recvmsg.f (sockfd, msg, flags); return swrap.libc.symbols._libc_recvmsg.f (sockfd, msg, flags);
} }
#ifdef _GNU_SOURCE
int
libc_recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags,
struct timespec *tmo)
{
swrap_bind_symbol_libc (recvmmsg);
return swrap.libc.symbols._libc_recvmmsg.f (fd, vmessages, vlen, flags, tmo);
}
#endif
int int
libc_send (int sockfd, const void *buf, size_t len, int flags) libc_send (int sockfd, const void *buf, size_t len, int flags)
{ {
@ -691,11 +706,19 @@ libc_sendmsg (int sockfd, const struct msghdr *msg, int flags)
return swrap.libc.symbols._libc_sendmsg.f (sockfd, msg, flags); return swrap.libc.symbols._libc_sendmsg.f (sockfd, msg, flags);
} }
#ifdef _GNU_SOURCE
int int
libc_sendto (int sockfd, libc_sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags)
const void *buf, {
size_t len, swrap_bind_symbol_libc (sendmmsg);
int flags, const struct sockaddr *dst_addr, socklen_t addrlen)
return swrap.libc.symbols._libc_sendmmsg.f (fd, vmessages, vlen, flags);
}
#endif
int
libc_sendto (int sockfd, const void *buf, size_t len, int flags,
__CONST_SOCKADDR_ARG dst_addr, socklen_t addrlen)
{ {
swrap_bind_symbol_libc (sendto); swrap_bind_symbol_libc (sendto);
@ -838,7 +861,7 @@ libc_poll (struct pollfd *__fds, nfds_t __nfds, int __timeout)
return swrap.libc.symbols._libc_poll.f (__fds, __nfds, __timeout); return swrap.libc.symbols._libc_poll.f (__fds, __nfds, __timeout);
} }
#ifdef __USE_GNU #ifdef _GNU_SOURCE
int int
libc_ppoll (struct pollfd *__fds, nfds_t __nfds, libc_ppoll (struct pollfd *__fds, nfds_t __nfds,
const struct timespec *__timeout, const __sigset_t * __ss) const struct timespec *__timeout, const __sigset_t * __ss)

38
src/vcl/ldp_socket_wrapper.h
View File

@ -98,16 +98,16 @@
* has probably something todo with with the linker. * has probably something todo with with the linker.
* So we need load each function at the point it is called the first time. * So we need load each function at the point it is called the first time.
*/ */
int libc_accept4 (int sockfd, struct sockaddr *addr, socklen_t * addrlen, int libc_accept4 (int sockfd, __SOCKADDR_ARG addr, socklen_t *addrlen,
int flags); int flags);
int libc_accept (int sockfd, struct sockaddr *addr, socklen_t * addrlen); int libc_accept (int sockfd, __SOCKADDR_ARG addr, socklen_t *addrlen);
int libc_bind (int sockfd, const struct sockaddr *addr, socklen_t addrlen); int libc_bind (int sockfd, __CONST_SOCKADDR_ARG addr, socklen_t addrlen);
int libc_close (int fd); int libc_close (int fd);
int libc_connect (int sockfd, const struct sockaddr *addr, socklen_t addrlen); int libc_connect (int sockfd, __CONST_SOCKADDR_ARG addr, socklen_t addrlen);
#if 0 #if 0
/* TBD: dup and dup2 to be implemented later */ /* TBD: dup and dup2 to be implemented later */
@ -128,9 +128,9 @@ int libc_vfcntl64 (int fd, int cmd, va_list ap);
int libc_vioctl (int fd, int cmd, va_list ap); int libc_vioctl (int fd, int cmd, va_list ap);
int libc_getpeername (int sockfd, struct sockaddr *addr, socklen_t * addrlen); int libc_getpeername (int sockfd, __SOCKADDR_ARG addr, socklen_t *addrlen);
int libc_getsockname (int sockfd, struct sockaddr *addr, socklen_t * addrlen); int libc_getsockname (int sockfd, __SOCKADDR_ARG addr, socklen_t *addrlen);
int int
libc_getsockopt (int sockfd, libc_getsockopt (int sockfd,
@ -144,25 +144,29 @@ ssize_t libc_readv (int fd, const struct iovec *iov, int iovcnt);
int libc_recv (int sockfd, void *buf, size_t len, int flags); int libc_recv (int sockfd, void *buf, size_t len, int flags);
int int libc_recvfrom (int sockfd, void *buf, size_t len, int flags,
libc_recvfrom (int sockfd, __SOCKADDR_ARG src_addr, socklen_t *addrlen);
void *buf,
size_t len,
int flags, struct sockaddr *src_addr, socklen_t * addrlen);
int libc_recvmsg (int sockfd, struct msghdr *msg, int flags); int libc_recvmsg (int sockfd, struct msghdr *msg, int flags);
#ifdef _GNU_SOURCE
int libc_recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen,
int flags, struct timespec *tmo);
#endif
int libc_send (int sockfd, const void *buf, size_t len, int flags); int libc_send (int sockfd, const void *buf, size_t len, int flags);
ssize_t libc_sendfile (int out_fd, int in_fd, off_t * offset, size_t len); ssize_t libc_sendfile (int out_fd, int in_fd, off_t * offset, size_t len);
int libc_sendmsg (int sockfd, const struct msghdr *msg, int flags); int libc_sendmsg (int sockfd, const struct msghdr *msg, int flags);
int #ifdef _GNU_SOURCE
libc_sendto (int sockfd, int libc_sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen,
const void *buf, int flags);
size_t len, #endif
int flags, const struct sockaddr *dst_addr, socklen_t addrlen);
int libc_sendto (int sockfd, const void *buf, size_t len, int flags,
__CONST_SOCKADDR_ARG dst_addr, socklen_t addrlen);
int int
libc_setsockopt (int sockfd, libc_setsockopt (int sockfd,
@ -210,7 +214,7 @@ int libc_epoll_pwait (int __epfd, struct epoll_event *__events,
int libc_poll (struct pollfd *__fds, nfds_t __nfds, int __timeout); int libc_poll (struct pollfd *__fds, nfds_t __nfds, int __timeout);
#ifdef __USE_GNU #ifdef _GNU_SOURCE
int libc_ppoll (struct pollfd *__fds, nfds_t __nfds, int libc_ppoll (struct pollfd *__fds, nfds_t __nfds,
const struct timespec *__timeout, const __sigset_t * __ss); const struct timespec *__timeout, const __sigset_t * __ss);
#endif #endif