X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.c;h=20baaaf7b0dfafa2cd660d492eb0162367625dbe;hb=d27c42b8fcc92f3fc776fd1b821d2572bce01c04;hp=0c29003a6267a382b204a6f277a9d0a1468ad182;hpb=ca4537d385628d3568a918409d909d3042ca7a38;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/sessiond-comm.c b/src/common/sessiond-comm/sessiond-comm.c
index 0c29003a6..20baaaf7b 100644
--- a/src/common/sessiond-comm/sessiond-comm.c
+++ b/src/common/sessiond-comm/sessiond-comm.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/un.h>
 #include <unistd.h>
 #include <errno.h>
 
@@ -412,7 +411,7 @@ ssize_t lttcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd)
 	}
 	if (cmsg->cmsg_len != CMSG_LEN(sizeof_fds)) {
 		fprintf(stderr, "Error: Received %zu bytes of ancillary data, expected %zu\n",
-				cmsg->cmsg_len, CMSG_LEN(sizeof_fds));
+				(size_t) cmsg->cmsg_len, (size_t) CMSG_LEN(sizeof_fds));
 		ret = -1;
 		goto end;
 	}
@@ -430,12 +429,14 @@ end:
 ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
 {
 	struct msghdr msg;
-	struct cmsghdr *cmptr;
 	struct iovec iov[1];
 	ssize_t ret = -1;
-	struct ucred *creds;
-	size_t sizeof_cred = sizeof(struct ucred);
+#ifdef __linux__
+	struct cmsghdr *cmptr;
+	size_t sizeof_cred = sizeof(lttng_sock_cred);
 	char anc_buf[CMSG_SPACE(sizeof_cred)];
+	lttng_sock_cred *creds;
+#endif /* __linux__ */
 
 	memset(&msg, 0, sizeof(msg));
 
@@ -444,19 +445,21 @@ ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
 	msg.msg_iov = iov;
 	msg.msg_iovlen = 1;
 
+#ifdef __linux__
 	msg.msg_control = (caddr_t) anc_buf;
 	msg.msg_controllen = CMSG_LEN(sizeof_cred);
 
 	cmptr = CMSG_FIRSTHDR(&msg);
 	cmptr->cmsg_level = SOL_SOCKET;
-	cmptr->cmsg_type = SCM_CREDENTIALS;
+	cmptr->cmsg_type = LTTNG_SOCK_CREDS;
 	cmptr->cmsg_len = CMSG_LEN(sizeof_cred);
 
-	creds = (struct ucred *) CMSG_DATA(cmptr);
+	creds = (lttng_sock_cred*) CMSG_DATA(cmptr);
 
-	creds->uid = geteuid();
-	creds->gid = getegid();
-	creds->pid = getpid();
+	LTTNG_SOCK_SET_UID_CRED(creds, geteuid());
+	LTTNG_SOCK_SET_GID_CRED(creds, getegid());
+	LTTNG_SOCK_SET_PID_CRED(creds, getpid());
+#endif /* __linux__ */
 
 	ret = sendmsg(sock, &msg, 0);
 	if (ret < 0) {
@@ -472,14 +475,16 @@ ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
  * Returns the size of received data, or negative error value.
  */
 ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
-		struct ucred *creds)
+		lttng_sock_cred *creds)
 {
 	struct msghdr msg;
-	struct cmsghdr *cmptr;
 	struct iovec iov[1];
 	ssize_t ret;
-	size_t sizeof_cred = sizeof(struct ucred);
+#ifdef __linux__
+	struct cmsghdr *cmptr;
+	size_t sizeof_cred = sizeof(lttng_sock_cred);
 	char anc_buf[CMSG_SPACE(sizeof_cred)];
+#endif	/* __linux__ */
 
 	memset(&msg, 0, sizeof(msg));
 
@@ -495,8 +500,10 @@ ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
 	msg.msg_iov = iov;
 	msg.msg_iovlen = 1;
 
+#ifdef __linux__
 	msg.msg_control = anc_buf;
 	msg.msg_controllen = sizeof(anc_buf);
+#endif /* __linux__ */
 
 	ret = recvmsg(sock, &msg, 0);
 	if (ret < 0) {
@@ -504,6 +511,7 @@ ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
 		goto end;
 	}
 
+#ifdef __linux__
 	if (msg.msg_flags & MSG_CTRUNC) {
 		fprintf(stderr, "Error: Control message truncated.\n");
 		ret = -1;
@@ -518,7 +526,7 @@ ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
 	}
 
 	if (cmptr->cmsg_level != SOL_SOCKET ||
-			cmptr->cmsg_type != SCM_CREDENTIALS) {
+			cmptr->cmsg_type != LTTNG_SOCK_CREDS) {
 		fprintf(stderr, "Didn't received any credentials\n");
 		ret = -1;
 		goto end;
@@ -526,12 +534,20 @@ ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
 
 	if (cmptr->cmsg_len != CMSG_LEN(sizeof_cred)) {
 		fprintf(stderr, "Error: Received %zu bytes of ancillary data, expected %zu\n",
-				cmptr->cmsg_len, CMSG_LEN(sizeof_cred));
+				(size_t) cmptr->cmsg_len, (size_t) CMSG_LEN(sizeof_cred));
 		ret = -1;
 		goto end;
 	}
 
 	memcpy(creds, CMSG_DATA(cmptr), sizeof_cred);
+#elif defined(__FreeBSD__)
+	ret = getpeereid(sock, &creds->uid, &creds->gid);
+	if (ret != 0) {
+		return ret;
+	}
+#else
+#error "Please implement credential support for your OS."
+#endif	/* __linux__ */
 
 end:
 	return ret;
@@ -540,6 +556,7 @@ end:
 /*
  * Set socket option to use credentials passing.
  */
+#ifdef __linux__
 int lttcomm_setsockopt_creds_unix_sock(int sock)
 {
 	int ret, on = 1;
@@ -549,6 +566,13 @@ int lttcomm_setsockopt_creds_unix_sock(int sock)
 	if (ret < 0) {
 		perror("setsockopt creds unix sock");
 	}
-
 	return ret;
 }
+#elif defined(__FreeBSD__)
+int lttcomm_setsockopt_creds_unix_sock(int sock)
+{
+	return 0;
+}
+#else
+#error "Please implement credential support for your OS."
+#endif /* __linux__ */