X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.c;h=3286d3eac2353ce1eca276ef9df679b5d903c776;hb=6684bfa4a76f566ff024d4f2159f59f2e783d8c2;hp=11319f333e84f34d30a75132d981444d136f7e24;hpb=15d5a1ad0908a8f56feba473a82deb615d076edf;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/sessiond-comm.c b/src/common/sessiond-comm/sessiond-comm.c
index 11319f333..3286d3eac 100644
--- a/src/common/sessiond-comm/sessiond-comm.c
+++ b/src/common/sessiond-comm/sessiond-comm.c
@@ -123,6 +123,9 @@ static const char *lttcomm_readable_code[] = {
 	[ LTTCOMM_ERR_INDEX(CONSUMERD_SPLICE_ESPIPE) ] = "consumerd splice ESPIPE",
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_NO_EVENT) ] = "Event not found",
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_INVALID) ] = "Invalid parameter",
+	[ LTTCOMM_ERR_INDEX(LTTCOMM_NO_USTCONSUMERD) ] = "No UST consumer detected",
+	[ LTTCOMM_ERR_INDEX(LTTCOMM_NO_KERNCONSUMERD) ] = "No kernel consumer detected",
+	[ LTTCOMM_ERR_INDEX(LTTCOMM_EVENT_EXIST_LOGLEVEL) ] = "Event already enabled with different loglevel",
 };
 
 /*
@@ -452,6 +455,89 @@ end:
 	return ret;
 }
 
+ssize_t lttcomm_send_string(int sock, char *str, size_t len)
+{
+	ssize_t slen, ret = -1;
+
+	if (!str) {
+		goto end;
+	}
+
+	/* Send string len first */
+	slen = lttcomm_send_unix_sock(sock, &len, sizeof(len));
+
+	if (slen != sizeof(len)) {
+		fprintf(stderr,
+			"Unexpected sent size. Expected %zu got %zu\n",
+			sizeof(len), slen);
+		ret = -1;
+		goto end;
+	}
+
+	/* Send the actual string */
+	slen = lttcomm_send_unix_sock(sock, str, len);
+	if (slen != len) {
+		fprintf(stderr,
+			"Unexpected sent size. Expected %zu got %zu\n",
+			len, slen);
+		ret = -1;
+		goto end;
+	}
+
+	ret = slen;
+
+end:
+	return ret;
+}
+
+/*
+ * Allocate and return the received string.
+ * Return NULL on error.
+ * Caller is responsible of freeing the allocated string.
+ */
+char *lttcomm_recv_string(int sock)
+{
+	ssize_t rlen;
+	size_t len;
+	char *ret;
+
+	/* Get the string len first */
+	rlen = lttcomm_recv_unix_sock(sock, &len, sizeof(len));
+
+	if (rlen != sizeof(len)) {
+		fprintf(stderr,
+			"Unexpected received size. Expected %zu got %zu\n",
+			sizeof(len), rlen);
+		ret = NULL;
+		goto end;
+	}
+
+	/* Account for the NULL byte */
+	ret = malloc(len + 1);
+	if (!ret) {
+		ret = NULL;
+		goto end;
+	}
+
+	/* Get the actual string */
+	rlen = lttcomm_recv_unix_sock(sock, ret, len);
+	if (rlen != len) {
+		fprintf(stderr,
+			"Unexpected received size. Expected %zu got %zu\n",
+			len, rlen);
+		free(ret);
+		ret = NULL;
+		goto end;
+	}
+
+	/* Set terminating NULL byte */
+	ret[len] = '\0';
+
+end:
+	return ret;
+}
+
+
 /*
  * Send a message with credentials over a unix socket.
  *
@@ -580,7 +666,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__)
+#elif (defined(__FreeBSD__) || defined(__CYGWIN__))
 	{
 		int peer_ret;
 
@@ -612,7 +698,7 @@ int lttcomm_setsockopt_creds_unix_sock(int sock)
 	}
 	return ret;
 }
-#elif defined(__FreeBSD__)
+#elif (defined(__FreeBSD__) || defined(__CYGWIN__))
 int lttcomm_setsockopt_creds_unix_sock(int sock)
 {
 	return 0;