X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.c;h=96615f4389adad78ac3804a9cd9c1b1dba7a763a;hp=3b224c6ff76e7414c7e140b955bdb27c16d60e8e;hb=ca2eb7f43cf00d12f563905d741a6789c3d130ee;hpb=1af0e2e4d4a770e32f4fc169122b0c338bd799f6

diff --git a/src/common/sessiond-comm/sessiond-comm.c b/src/common/sessiond-comm/sessiond-comm.c
index 3b224c6ff..96615f438 100644
--- a/src/common/sessiond-comm/sessiond-comm.c
+++ b/src/common/sessiond-comm/sessiond-comm.c
@@ -28,6 +28,7 @@
 #include <errno.h>
 
 #include <common/defaults.h>
+#include <common/error.h>
 
 #include "sessiond-comm.h"
 
@@ -115,6 +116,7 @@ static const char *lttcomm_readable_code[] = {
 	[ LTTCOMM_ERR_INDEX(CONSUMERD_SPLICE_ENOMEM) ] = "consumerd splice ENOMEM",
 	[ LTTCOMM_ERR_INDEX(CONSUMERD_SPLICE_ESPIPE) ] = "consumerd splice ESPIPE",
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_NO_EVENT) ] = "Event not found",
+	[ LTTCOMM_ERR_INDEX(LTTCOMM_NEED_ROOT_SESSIOND) ] = "A root lttng-sessiond needs to be running, and client user part of the \"tracing\" group, to interact with kernel tracing",
 };
 
 /*
@@ -140,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;
 	}
@@ -167,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;
 }
@@ -185,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;
@@ -203,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;
 	}
 
@@ -216,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;
 	}
 
@@ -235,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;
@@ -262,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;
@@ -288,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;
@@ -299,15 +309,18 @@ 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");
 	}
 
-	close(sock);
+	closeret = close(sock);
+	if (closeret) {
+		PERROR("close");
+	}
 
 	return ret;
 }
@@ -350,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;
 }
@@ -385,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) {
@@ -463,9 +482,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;
 }
 
@@ -507,7 +531,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;
 	}
 
@@ -568,7 +592,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;
 }