X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=liblttng-sessiond-comm%2Flttng-sessiond-comm.c;h=ff78891aad16805243c7df4dd5768ee4dabc6421;hp=06a4b77f08c809c56c6cee4b4f45e670ffa1586a;hb=09de5c68e74f5af62744ead1516d95bb823038db;hpb=0177d773712c6d6b11e395708ae2cc686d6917a4

diff --git a/liblttng-sessiond-comm/lttng-sessiond-comm.c b/liblttng-sessiond-comm/lttng-sessiond-comm.c
index 06a4b77f0..ff78891aa 100644
--- a/liblttng-sessiond-comm/lttng-sessiond-comm.c
+++ b/liblttng-sessiond-comm/lttng-sessiond-comm.c
@@ -52,6 +52,7 @@ static const char *lttcomm_readable_code[] = {
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_SELECT_SESS) ] = "A session MUST be selected",
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_EXIST_SESS) ] = "Session name already exist",
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_CONNECT_FAIL) ] = "Unable to connect to Unix socket",
+	[ LTTCOMM_ERR_INDEX(LTTCOMM_APP_NOT_FOUND) ] = "Application not found",
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_KERN_NA) ] = "Kernel tracer not available",
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_KERN_EVENT_EXIST) ] = "Kernel event already exists",
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_KERN_SESS_FAIL) ] = "Kernel create session failed",
@@ -72,6 +73,8 @@ static const char *lttcomm_readable_code[] = {
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_KERN_NO_SESSION) ] = "No kernel session found",
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_KERN_LIST_FAIL) ] = "Listing kernel events failed",
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_UST_SESS_FAIL) ] = "UST create session failed",
+	[ LTTCOMM_ERR_INDEX(LTTCOMM_UST_CHAN_NOT_FOUND) ] = "UST channel not found",
+	[ LTTCOMM_ERR_INDEX(LTTCOMM_UST_CHAN_FAIL) ] = "UST create channel failed",
 	[ LTTCOMM_ERR_INDEX(KCONSUMERD_COMMAND_SOCK_READY) ] = "Kconsumerd command socket ready",
 	[ LTTCOMM_ERR_INDEX(KCONSUMERD_SUCCESS_RECV_FD) ] = "Kconsumerd success on receiving fds",
 	[ LTTCOMM_ERR_INDEX(KCONSUMERD_ERROR_RECV_FD) ] = "Kconsumerd error on receiving fds",
@@ -340,3 +343,65 @@ ssize_t lttcomm_send_fds_unix_sock(int sock, void *buf, int *fds, size_t nb_fd,
 
 	return ret;
 }
+
+/*
+ * Receives a single fd from socket.
+ *
+ * Returns the size of received data
+ */
+ssize_t lttcomm_recv_fds_unix_sock(int sock, void *buf, int *fds,
+		size_t nb_fd, size_t len)
+{
+	struct iovec iov[1];
+	int data_fd, i, ret = 0;
+	struct cmsghdr *cmsg;
+	char recv_fd[CMSG_SPACE(sizeof(int))];
+	struct msghdr msg = { 0 };
+	union {
+		unsigned char vc[4];
+		int vi;
+	} tmp;
+
+	/* Prepare to receive the structures */
+	iov[0].iov_base = &data_fd;
+	iov[0].iov_len = sizeof(data_fd);
+	msg.msg_iov = iov;
+	msg.msg_iovlen = 1;
+	msg.msg_control = recv_fd;
+	msg.msg_controllen = sizeof(recv_fd);
+
+	ret = recvmsg(sock, &msg, 0);
+	if (ret < 0) {
+		perror("recvmsg fds");
+		goto end;
+	}
+
+	if (ret != sizeof(data_fd)) {
+		fprintf(stderr, "Error: Received %d bytes, expected %ld",
+				ret, sizeof(data_fd));
+		goto end;
+	}
+
+	cmsg = CMSG_FIRSTHDR(&msg);
+	if (!cmsg) {
+		fprintf(stderr, "Error: Invalid control message header");
+		ret = -1;
+		goto end;
+	}
+
+	if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS) {
+		fprintf(stderr, "Didn't received any fd");
+		ret = -1;
+		goto end;
+	}
+
+	/* this is our fd */
+	for (i = 0; i < sizeof(int); i++) {
+		tmp.vc[i] = CMSG_DATA(cmsg)[i];
+	}
+
+	ret = tmp.vi;
+
+end:
+	return ret;
+}