X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Funix.c;h=bee133d8d9cbf8f32c70e8d849c4371ac6e7e1fc;hp=fea56e8efa19a404bc1170627ef5300101a39f4a;hb=665886a6f89c35ccb8e6348a7798272778115e4d;hpb=90e535ef0d0433d31e805775f85e4d187b1cf82c diff --git a/src/common/sessiond-comm/unix.c b/src/common/sessiond-comm/unix.c index fea56e8ef..bee133d8d 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 @@ -37,7 +38,7 @@ LTTNG_HIDDEN int lttcomm_connect_unix_sock(const char *pathname) { - struct sockaddr_un sun; + struct sockaddr_un s_un; int fd, ret, closeret; fd = socket(PF_UNIX, SOCK_STREAM, 0); @@ -47,12 +48,12 @@ int lttcomm_connect_unix_sock(const char *pathname) goto error; } - memset(&sun, 0, sizeof(sun)); - sun.sun_family = AF_UNIX; - strncpy(sun.sun_path, pathname, sizeof(sun.sun_path)); - sun.sun_path[sizeof(sun.sun_path) - 1] = '\0'; + memset(&s_un, 0, sizeof(s_un)); + s_un.sun_family = AF_UNIX; + strncpy(s_un.sun_path, pathname, sizeof(s_un.sun_path)); + s_un.sun_path[sizeof(s_un.sun_path) - 1] = '\0'; - ret = connect(fd, (struct sockaddr *) &sun, sizeof(sun)); + ret = connect(fd, (struct sockaddr *) &s_un, sizeof(s_un)); if (ret < 0) { /* * Don't print message on connect error, because connect is used in @@ -80,11 +81,11 @@ LTTNG_HIDDEN int lttcomm_accept_unix_sock(int sock) { int new_fd; - struct sockaddr_un sun; + struct sockaddr_un s_un; socklen_t len = 0; /* Blocking call */ - new_fd = accept(sock, (struct sockaddr *) &sun, &len); + new_fd = accept(sock, (struct sockaddr *) &s_un, &len); if (new_fd < 0) { PERROR("accept"); } @@ -92,6 +93,16 @@ 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. @@ -99,7 +110,7 @@ int lttcomm_accept_unix_sock(int sock) LTTNG_HIDDEN int lttcomm_create_unix_sock(const char *pathname) { - struct sockaddr_un sun; + struct sockaddr_un s_un; int fd; int ret = -1; @@ -109,14 +120,14 @@ int lttcomm_create_unix_sock(const char *pathname) goto error; } - memset(&sun, 0, sizeof(sun)); - sun.sun_family = AF_UNIX; - strncpy(sun.sun_path, pathname, sizeof(sun.sun_path)); - sun.sun_path[sizeof(sun.sun_path) - 1] = '\0'; + memset(&s_un, 0, sizeof(s_un)); + s_un.sun_family = AF_UNIX; + strncpy(s_un.sun_path, pathname, sizeof(s_un.sun_path)); + s_un.sun_path[sizeof(s_un.sun_path) - 1] = '\0'; /* Unlink the old file if present */ (void) unlink(pathname); - ret = bind(fd, (struct sockaddr *) &sun, sizeof(sun)); + ret = bind(fd, (struct sockaddr *) &s_un, sizeof(s_un)); if (ret < 0) { PERROR("bind"); goto error; @@ -125,6 +136,11 @@ 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; } @@ -167,7 +183,7 @@ ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len) do { len_last = iov[0].iov_len; - ret = recvmsg(sock, &msg, 0); + ret = recvmsg(sock, &msg, MSG_NOSIGNAL); if (ret > 0) { iov[0].iov_base += ret; iov[0].iov_len -= ret; @@ -265,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); @@ -377,10 +396,11 @@ ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len) size_t sizeof_cred = sizeof(lttng_sock_cred); char anc_buf[CMSG_SPACE(sizeof_cred)]; lttng_sock_cred *creds; + + memset(anc_buf, 0, CMSG_SPACE(sizeof_cred) * sizeof(char)); #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; @@ -392,6 +412,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); @@ -430,6 +453,7 @@ ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len, 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); @@ -456,12 +480,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) { @@ -534,45 +567,3 @@ int lttcomm_setsockopt_creds_unix_sock(int sock) #else #error "Please implement credential support for your OS." #endif /* __linux__ */ - -/* - * Set socket reciving timeout. - */ -LTTNG_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. - */ -LTTNG_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; -}