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

diff --git a/src/common/sessiond-comm/sessiond-comm.c b/src/common/sessiond-comm/sessiond-comm.c
index 2b5c226c1..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;
@@ -263,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;
@@ -289,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;
@@ -300,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;
@@ -349,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;
 }
@@ -384,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) {
@@ -458,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;
 }
 
@@ -498,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;
 	}
 
@@ -545,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;