* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <assert.h>
#include <limits.h>
#include <stdio.h>
#include <unistd.h>
#include <errno.h>
-#include <common/defaults.h>
-#include <common/error.h>
+#include <common/common.h>
#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;
+ struct sockaddr_un s_un;
int fd, ret, closeret;
fd = socket(PF_UNIX, SOCK_STREAM, 0);
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
* 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;
- 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");
}
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;
+ struct sockaddr_un s_un;
int fd;
int ret = -1;
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;
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;
*
* 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;
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;
*
* 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;
/*
* Shutdown cleanly a unix socket.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
int lttcomm_close_unix_sock(int sock)
{
int ret, closeret;
*
* 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;
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;
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);
* 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];
*
* 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;
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));
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);
*
* 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);
#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) {
}
memcpy(creds, CMSG_DATA(cmptr), sizeof_cred);
-#elif (defined(__FreeBSD__) || defined(__CYGWIN__))
+#elif (defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__))
{
int peer_ret;
* 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;
}
return ret;
}
-#elif (defined(__FreeBSD__) || defined(__CYGWIN__))
-__attribute__((visibility("hidden")))
+#elif (defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__))
+LTTNG_HIDDEN
int lttcomm_setsockopt_creds_unix_sock(int sock)
{
return 0;
#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;
-}
projects / lttng-tools.git / blobdiff