X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Funix.c;h=8d2e03a5b3f7b1ed894da2eae4dc67693b9a0d3d;hb=db4e2b3e3c9a578a456916f13506012061d919fd;hp=bee133d8d9cbf8f32c70e8d849c4371ac6e7e1fc;hpb=665886a6f89c35ccb8e6348a7798272778115e4d;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/unix.c b/src/common/sessiond-comm/unix.c
index bee133d8d..8d2e03a5b 100644
--- a/src/common/sessiond-comm/unix.c
+++ b/src/common/sessiond-comm/unix.c
@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <assert.h>
 #include <limits.h>
@@ -183,7 +182,7 @@ ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len)
 
 	do {
 		len_last = iov[0].iov_len;
-		ret = recvmsg(sock, &msg, MSG_NOSIGNAL);
+		ret = lttng_recvmsg_nosigpipe(sock, &msg);
 		if (ret > 0) {
 			iov[0].iov_base += ret;
 			iov[0].iov_len -= ret;
@@ -206,7 +205,7 @@ ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len)
  * Return the size of sent data.
  */
 LTTNG_HIDDEN
-ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len)
+ssize_t lttcomm_send_unix_sock(int sock, const void *buf, size_t len)
 {
 	struct msghdr msg;
 	struct iovec iov[1];
@@ -214,7 +213,7 @@ ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len)
 
 	memset(&msg, 0, sizeof(msg));
 
-	iov[0].iov_base = buf;
+	iov[0].iov_base = (void *) buf;
 	iov[0].iov_len = len;
 	msg.msg_iov = iov;
 	msg.msg_iovlen = 1;
@@ -525,7 +524,7 @@ ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
 	}
 
 	memcpy(creds, CMSG_DATA(cmptr), sizeof_cred);
-#elif (defined(__FreeBSD__) || defined(__CYGWIN__))
+#elif (defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__))
 	{
 		int peer_ret;
 
@@ -558,7 +557,7 @@ int lttcomm_setsockopt_creds_unix_sock(int sock)
 	}
 	return ret;
 }
-#elif (defined(__FreeBSD__) || defined(__CYGWIN__))
+#elif (defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__))
 LTTNG_HIDDEN
 int lttcomm_setsockopt_creds_unix_sock(int sock)
 {