X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Funix.c;h=77a6013f0244572b2c2bb30ae054959db2cdf5c4;hp=2f79f3a280a123bd85a861ff039f72e5e4c6064c;hb=1d8d032800b64945d90c7b5a7b8e9316e733a4b1;hpb=ae9e45b342636e7b42eafc15cd105bccfbbbe373 diff --git a/src/common/sessiond-comm/unix.c b/src/common/sessiond-comm/unix.c index 2f79f3a28..77a6013f0 100644 --- a/src/common/sessiond-comm/unix.c +++ b/src/common/sessiond-comm/unix.c @@ -17,6 +17,7 @@ */ #define _GNU_SOURCE +#define _LGPL_SOURCE #include #include #include @@ -27,15 +28,14 @@ #include #include -#include -#include +#include #include "unix.h" /* * Connect to unix socket using the path name. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN int lttcomm_connect_unix_sock(const char *pathname) { struct sockaddr_un sun; @@ -77,7 +77,7 @@ error: * Do an accept(2) on the sock and return the new file descriptor. The socket * MUST be bind(2) before. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN int lttcomm_accept_unix_sock(int sock) { int new_fd; @@ -93,11 +93,21 @@ int lttcomm_accept_unix_sock(int sock) return new_fd; } +LTTNG_HIDDEN +int lttcomm_create_anon_unix_socketpair(int *fds) +{ + if (socketpair(PF_UNIX, SOCK_STREAM, 0, fds) < 0) { + PERROR("socketpair"); + return -1; + } + return 0; +} + /* * Creates a AF_UNIX local socket using pathname bind the socket upon creation * and return the fd. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN int lttcomm_create_unix_sock(const char *pathname) { struct sockaddr_un sun; @@ -126,13 +136,18 @@ int lttcomm_create_unix_sock(const char *pathname) return fd; error: + if (fd >= 0) { + if (close(fd) < 0) { + PERROR("close create unix sock"); + } + } return ret; } /* * Make the socket listen using LTTNG_SESSIOND_COMM_MAX_LISTEN. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN int lttcomm_listen_unix_sock(int sock) { int ret; @@ -151,12 +166,13 @@ int lttcomm_listen_unix_sock(int sock) * * Return the size of received data. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len) { struct msghdr msg; struct iovec iov[1]; ssize_t ret = -1; + size_t len_last; memset(&msg, 0, sizeof(msg)); @@ -166,11 +182,20 @@ ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len) msg.msg_iovlen = 1; do { - ret = recvmsg(sock, &msg, MSG_WAITALL); - } while (ret < 0 && errno == EINTR); + len_last = iov[0].iov_len; + ret = recvmsg(sock, &msg, MSG_NOSIGNAL); + if (ret > 0) { + iov[0].iov_base += ret; + iov[0].iov_len -= ret; + assert(ret <= len_last); + } + } while ((ret > 0 && ret < len_last) || (ret < 0 && errno == EINTR)); if (ret < 0) { PERROR("recvmsg"); + } else if (ret > 0) { + ret = len; } + /* Else ret = 0 meaning an orderly shutdown. */ return ret; } @@ -180,7 +205,7 @@ ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len) * * Return the size of sent data. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len) { struct msghdr msg; @@ -211,7 +236,7 @@ ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len) /* * Shutdown cleanly a unix socket. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN int lttcomm_close_unix_sock(int sock) { int ret, closeret; @@ -235,7 +260,7 @@ int lttcomm_close_unix_sock(int sock) * * Returns the size of data sent, or negative error value. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd) { struct msghdr msg; @@ -247,6 +272,7 @@ ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd) char dummy = 0; memset(&msg, 0, sizeof(msg)); + memset(tmp, 0, CMSG_SPACE(sizeof_fds) * sizeof(char)); if (nb_fd > LTTCOMM_MAX_SEND_FDS) return -EINVAL; @@ -255,6 +281,9 @@ ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd) msg.msg_controllen = CMSG_LEN(sizeof_fds); cmptr = CMSG_FIRSTHDR(&msg); + if (!cmptr) { + return -1; + } cmptr->cmsg_level = SOL_SOCKET; cmptr->cmsg_type = SCM_RIGHTS; cmptr->cmsg_len = CMSG_LEN(sizeof_fds); @@ -290,7 +319,7 @@ ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd) * Expect at most "nb_fd" file descriptors. Returns the number of fd * actually received in nb_fd. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN ssize_t lttcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd) { struct iovec iov[1]; @@ -356,7 +385,7 @@ end: * * Returns the size of data sent, or negative error value. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len) { struct msghdr msg; @@ -370,6 +399,7 @@ ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len) #endif /* __linux__ */ memset(&msg, 0, sizeof(msg)); + memset(anc_buf, 0, CMSG_SPACE(sizeof_cred) * sizeof(char)); iov[0].iov_base = buf; iov[0].iov_len = len; @@ -381,6 +411,9 @@ ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len) msg.msg_controllen = CMSG_LEN(sizeof_cred); cmptr = CMSG_FIRSTHDR(&msg); + if (!cmptr) { + return -1; + } cmptr->cmsg_level = SOL_SOCKET; cmptr->cmsg_type = LTTNG_SOCK_CREDS; cmptr->cmsg_len = CMSG_LEN(sizeof_cred); @@ -412,13 +445,14 @@ ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len) * * Returns the size of received data, or negative error value. */ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len, lttng_sock_cred *creds) { struct msghdr msg; struct iovec iov[1]; ssize_t ret; + size_t len_last; #ifdef __linux__ struct cmsghdr *cmptr; size_t sizeof_cred = sizeof(lttng_sock_cred); @@ -445,12 +479,21 @@ ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len, #endif /* __linux__ */ do { + len_last = iov[0].iov_len; ret = recvmsg(sock, &msg, 0); - } while (ret < 0 && errno == EINTR); + if (ret > 0) { + iov[0].iov_base += ret; + iov[0].iov_len -= ret; + assert(ret <= len_last); + } + } while ((ret > 0 && ret < len_last) || (ret < 0 && errno == EINTR)); if (ret < 0) { PERROR("recvmsg fds"); goto end; + } else if (ret > 0) { + ret = len; } + /* Else ret = 0 meaning an orderly shutdown. */ #ifdef __linux__ if (msg.msg_flags & MSG_CTRUNC) { @@ -502,7 +545,7 @@ end: * Set socket option to use credentials passing. */ #ifdef __linux__ -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN int lttcomm_setsockopt_creds_unix_sock(int sock) { int ret, on = 1; @@ -515,7 +558,7 @@ int lttcomm_setsockopt_creds_unix_sock(int sock) return ret; } #elif (defined(__FreeBSD__) || defined(__CYGWIN__)) -__attribute__((visibility("hidden"))) +LTTNG_HIDDEN int lttcomm_setsockopt_creds_unix_sock(int sock) { return 0; @@ -523,45 +566,3 @@ int lttcomm_setsockopt_creds_unix_sock(int sock) #else #error "Please implement credential support for your OS." #endif /* __linux__ */ - -/* - * Set socket reciving timeout. - */ -__attribute__((visibility("hidden"))) -int lttcomm_setsockopt_rcv_timeout(int sock, unsigned int sec) -{ - int ret; - struct timeval tv; - - tv.tv_sec = sec; - tv.tv_usec = 0; - - ret = setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)); - if (ret < 0) { - PERROR("setsockopt SO_RCVTIMEO"); - ret = -errno; - } - - return ret; -} - -/* - * Set socket sending timeout. - */ -__attribute__((visibility("hidden"))) -int lttcomm_setsockopt_snd_timeout(int sock, unsigned int sec) -{ - int ret; - struct timeval tv; - - tv.tv_sec = sec; - tv.tv_usec = 0; - - ret = setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)); - if (ret < 0) { - PERROR("setsockopt SO_SNDTIMEO"); - ret = -errno; - } - - return ret; -}