X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.c;h=477bd1c644ca18a6d87bde40212e46678a3db0b1;hb=d2641a837d460c275884523d67120379711dc38c;hp=24757f702a2557de7a556afcab4d079e4763ed7f;hpb=ae8564917fa3cb3497ec17951d8ac0ee28de9c81;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/sessiond-comm.c b/src/common/sessiond-comm/sessiond-comm.c
index 24757f702..477bd1c64 100644
--- a/src/common/sessiond-comm/sessiond-comm.c
+++ b/src/common/sessiond-comm/sessiond-comm.c
@@ -29,6 +29,7 @@
 #include <errno.h>
 
 #include <common/defaults.h>
+#include <common/error.h>
 
 #include "sessiond-comm.h"
 
@@ -141,12 +142,11 @@ const char *lttcomm_get_readable_code(enum lttcomm_return_code code)
 int lttcomm_connect_unix_sock(const char *pathname)
 {
 	struct sockaddr_un sun;
-	int fd;
-	int ret;
+	int fd, ret, closeret;
 
 	fd = socket(PF_UNIX, SOCK_STREAM, 0);
 	if (fd < 0) {
-		perror("socket");
+		PERROR("socket");
 		ret = fd;
 		goto error;
 	}
@@ -168,7 +168,10 @@ int lttcomm_connect_unix_sock(const char *pathname)
 	return fd;
 
 error_connect:
-	close(fd);
+	closeret = close(fd);
+	if (closeret) {
+		PERROR("close");
+	}
 error:
 	return ret;
 }
@@ -186,7 +189,7 @@ int lttcomm_accept_unix_sock(int sock)
 	/* Blocking call */
 	new_fd = accept(sock, (struct sockaddr *) &sun, &len);
 	if (new_fd < 0) {
-		perror("accept");
+		PERROR("accept");
 	}
 
 	return new_fd;
@@ -204,7 +207,7 @@ int lttcomm_create_unix_sock(const char *pathname)
 
 	/* Create server socket */
 	if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
-		perror("socket");
+		PERROR("socket");
 		goto error;
 	}
 
@@ -217,7 +220,7 @@ int lttcomm_create_unix_sock(const char *pathname)
 	(void) unlink(pathname);
 	ret = bind(fd, (struct sockaddr *) &sun, sizeof(sun));
 	if (ret < 0) {
-		perror("bind");
+		PERROR("bind");
 		goto error;
 	}
 
@@ -236,7 +239,7 @@ int lttcomm_listen_unix_sock(int sock)
 
 	ret = listen(sock, LTTNG_SESSIOND_COMM_MAX_LISTEN);
 	if (ret < 0) {
-		perror("listen");
+		PERROR("listen");
 	}
 
 	return ret;
@@ -250,10 +253,12 @@ int lttcomm_listen_unix_sock(int sock)
  */
 ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len)
 {
-	struct msghdr msg = { 0 };
+	struct msghdr msg;
 	struct iovec iov[1];
 	ssize_t ret = -1;
 
+	memset(&msg, 0, sizeof(msg));
+
 	iov[0].iov_base = buf;
 	iov[0].iov_len = len;
 	msg.msg_iov = iov;
@@ -261,7 +266,7 @@ ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len)
 
 	ret = recvmsg(sock, &msg, MSG_WAITALL);
 	if (ret < 0) {
-		perror("recvmsg");
+		PERROR("recvmsg");
 	}
 
 	return ret;
@@ -274,10 +279,12 @@ ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len)
  */
 ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len)
 {
-	struct msghdr msg = { 0 };
+	struct msghdr msg;
 	struct iovec iov[1];
 	ssize_t ret = -1;
 
+	memset(&msg, 0, sizeof(msg));
+
 	iov[0].iov_base = buf;
 	iov[0].iov_len = len;
 	msg.msg_iov = iov;
@@ -285,7 +292,13 @@ ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len)
 
 	ret = sendmsg(sock, &msg, 0);
 	if (ret < 0) {
-		perror("sendmsg");
+		/*
+		 * Only warn about EPIPE when quiet mode is deactivated.
+		 * We consider EPIPE as expected.
+		 */
+		if (errno != EPIPE || !opt_quiet) {
+			PERROR("sendmsg");
+		}
 	}
 
 	return ret;
@@ -296,12 +309,17 @@ ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len)
  */
 int lttcomm_close_unix_sock(int sock)
 {
-	int ret;
+	int ret, closeret;
 
 	/* Shutdown receptions and transmissions */
 	ret = shutdown(sock, SHUT_RDWR);
 	if (ret < 0) {
-		perror("shutdown");
+		PERROR("shutdown");
+	}
+
+	closeret = close(sock);
+	if (closeret) {
+		PERROR("close");
 	}
 
 	return ret;
@@ -314,7 +332,7 @@ int lttcomm_close_unix_sock(int sock)
  */
 ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd)
 {
-	struct msghdr msg = { 0 };
+	struct msghdr msg;
 	struct cmsghdr *cmptr;
 	struct iovec iov[1];
 	ssize_t ret = -1;
@@ -322,6 +340,8 @@ ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd)
 	char tmp[CMSG_SPACE(sizeof_fds)];
 	char dummy = 0;
 
+	memset(&msg, 0, sizeof(msg));
+
 	if (nb_fd > LTTCOMM_MAX_SEND_FDS)
 		return -EINVAL;
 
@@ -343,7 +363,13 @@ ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd)
 
 	ret = sendmsg(sock, &msg, 0);
 	if (ret < 0) {
-		perror("sendmsg");
+		/*
+		 * Only warn about EPIPE when quiet mode is deactivated.
+		 * We consider EPIPE as expected.
+		 */
+		if (errno != EPIPE || !opt_quiet) {
+			PERROR("sendmsg");
+		}
 	}
 	return ret;
 }
@@ -363,9 +389,11 @@ ssize_t lttcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd)
 	struct cmsghdr *cmsg;
 	size_t sizeof_fds = nb_fd * sizeof(int);
 	char recv_fd[CMSG_SPACE(sizeof_fds)];
-	struct msghdr msg = { 0 };
+	struct msghdr msg;
 	char dummy;
 
+	memset(&msg, 0, sizeof(msg));
+
 	/* Prepare to receive the structures */
 	iov[0].iov_base = &dummy;
 	iov[0].iov_len = 1;
@@ -376,7 +404,7 @@ ssize_t lttcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd)
 
 	ret = recvmsg(sock, &msg, 0);
 	if (ret < 0) {
-		perror("recvmsg fds");
+		PERROR("recvmsg fds");
 		goto end;
 	}
 	if (ret != 1) {
@@ -419,7 +447,7 @@ end:
  */
 ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
 {
-	struct msghdr msg = { 0 };
+	struct msghdr msg;
 	struct cmsghdr *cmptr;
 	struct iovec iov[1];
 	ssize_t ret = -1;
@@ -427,6 +455,8 @@ ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
 	size_t sizeof_cred = sizeof(struct ucred);
 	char anc_buf[CMSG_SPACE(sizeof_cred)];
 
+	memset(&msg, 0, sizeof(msg));
+
 	iov[0].iov_base = buf;
 	iov[0].iov_len = len;
 	msg.msg_iov = iov;
@@ -448,9 +478,14 @@ ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
 
 	ret = sendmsg(sock, &msg, 0);
 	if (ret < 0) {
-		perror("sendmsg");
+		/*
+		 * Only warn about EPIPE when quiet mode is deactivated.
+		 * We consider EPIPE as expected.
+		 */
+		if (errno != EPIPE || !opt_quiet) {
+			PERROR("sendmsg");
+		}
 	}
-
 	return ret;
 }
 
@@ -462,13 +497,15 @@ ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
 ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
 		struct ucred *creds)
 {
-	struct msghdr msg = { 0 };
+	struct msghdr msg;
 	struct cmsghdr *cmptr;
 	struct iovec iov[1];
 	ssize_t ret;
 	size_t sizeof_cred = sizeof(struct ucred);
 	char anc_buf[CMSG_SPACE(sizeof_cred)];
 
+	memset(&msg, 0, sizeof(msg));
+
 	/* Not allowed */
 	if (creds == NULL) {
 		ret = -1;
@@ -486,7 +523,7 @@ ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
 
 	ret = recvmsg(sock, &msg, 0);
 	if (ret < 0) {
-		perror("recvmsg fds");
+		PERROR("recvmsg fds");
 		goto end;
 	}
 
@@ -533,7 +570,7 @@ int lttcomm_setsockopt_creds_unix_sock(int sock)
 	/* Set socket for credentials retrieval */
 	ret = setsockopt(sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
 	if (ret < 0) {
-		perror("setsockopt creds unix sock");
+		PERROR("setsockopt creds unix sock");
 	}
 
 	return ret;