X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Funix.c;h=15c31746638e8b1c811c9f00c56e106cbc12024f;hb=b5eaa66e68b22f0e4cae96db8ef0bc2d12d14ed4;hp=a87ce05ed581cc6cb1d14788956a6ca0d64cdb38;hpb=aa678e506230fdc6f9f3a6db6e8188ae3bb64e40;p=lttng-tools.git

diff --git a/src/common/unix.c b/src/common/unix.c
index a87ce05ed..15c317466 100644
--- a/src/common/unix.c
+++ b/src/common/unix.c
@@ -242,12 +242,9 @@ retry:
 		if (errno == EINTR) {
 			goto retry;
 		} else {
-			/*
-			 * Only warn about EPIPE when quiet mode is
-			 * deactivated.
-			 * We consider EPIPE as expected.
-			 */
-			if (errno != EPIPE || !lttng_opt_quiet) {
+			/* We consider EPIPE and EAGAIN as expected. */
+			if (!lttng_opt_quiet &&
+					(errno != EPIPE && errno != EAGAIN)) {
 				PERROR("recvmsg");
 			}
 			goto end;
@@ -330,12 +327,9 @@ retry:
 		if (errno == EINTR) {
 			goto retry;
 		} else {
-			/*
-			 * Only warn about EPIPE when quiet mode is
-			 * deactivated.
-			 * We consider EPIPE as expected.
-			 */
-			if (errno != EPIPE || !lttng_opt_quiet) {
+			/* We consider EPIPE and EAGAIN as expected. */
+			if (!lttng_opt_quiet &&
+					(errno != EPIPE && errno != EAGAIN)) {
 				PERROR("sendmsg");
 			}
 			goto end;
@@ -441,8 +435,14 @@ 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);
 
-	/* Account for the struct ucred cmsg in the buffer size */
-	char recv_buf[CMSG_SPACE(sizeof_fds) + CMSG_SPACE(sizeof(struct ucred))];
+#ifdef __linux__
+/* Account for the struct ucred cmsg in the buffer size */
+#define LTTNG_SOCK_RECV_FDS_BUF_SIZE CMSG_SPACE(sizeof_fds) + CMSG_SPACE(sizeof(struct ucred))
+#else
+#define LTTNG_SOCK_RECV_FDS_BUF_SIZE CMSG_SPACE(sizeof_fds)
+#endif /* __linux__ */
+
+	char recv_buf[LTTNG_SOCK_RECV_FDS_BUF_SIZE];
 	struct msghdr msg;
 	char dummy;
 
@@ -490,11 +490,6 @@ ssize_t lttcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd)
 	 * message.
 	 */
 	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
-		if (!cmsg) {
-			fprintf(stderr, "Error: Invalid control message header\n");
-			ret = -1;
-			goto end;
-		}
 		if (cmsg->cmsg_level != SOL_SOCKET) {
 			fprintf(stderr, "Error: The socket needs to be of type SOL_SOCKET\n");
 			ret = -1;
@@ -517,6 +512,7 @@ ssize_t lttcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd)
 			ret = sizeof_fds;
 			goto end;
 		}
+#ifdef __linux__
 		if (cmsg->cmsg_type == SCM_CREDENTIALS) {
 			/*
 			 * Expect credentials to be sent when expecting fds even
@@ -525,6 +521,7 @@ ssize_t lttcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd)
 			 */
 			ret = -1;
 		}
+#endif /* __linux__ */
 	}
 end:
 	return ret;