X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fcmd-2-11.c;h=eb03999cf9a4aac73b6cf0650e3bad118e3aaa14;hp=993062ba72c20f424f7493806e7a43ead80ab965;hb=2f21a469eee9bc3352b439b1e64fe6bbd5088fea;hpb=f86f6389a47137d2f5e8fc707916b6650fd1de00

diff --git a/src/bin/lttng-relayd/cmd-2-11.c b/src/bin/lttng-relayd/cmd-2-11.c
index 993062ba7..eb03999cf 100644
--- a/src/bin/lttng-relayd/cmd-2-11.c
+++ b/src/bin/lttng-relayd/cmd-2-11.c
@@ -27,7 +27,7 @@
 #include <lttng/constant.h>
 
 #include "cmd-2-11.h"
-#include "lttng-relayd.h"
+#include "utils.h"
 
 int cmd_create_session_2_11(const struct lttng_buffer_view *payload,
 		char *session_name, char *hostname,
@@ -106,3 +106,99 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload,
 error:
 	return ret;
 }
+
+/*
+ * cmd_recv_stream_2_11 allocates path_name and channel_name.
+ */
+int cmd_recv_stream_2_11(const struct lttng_buffer_view *payload,
+		char **ret_path_name, char **ret_channel_name,
+		uint64_t *tracefile_size, uint64_t *tracefile_count)
+{
+	int ret;
+	struct lttcomm_relayd_add_stream_2_11 header;
+	size_t header_len, received_names_size;
+	struct lttng_buffer_view channel_name_view;
+	struct lttng_buffer_view pathname_view;
+	char *path_name = NULL;
+	char *channel_name = NULL;
+
+	header_len = sizeof(header);
+
+	if (payload->size < header_len) {
+		ERR("Unexpected payload size in \"cmd_recv_stream_2_11\": expected >= %zu bytes, got %zu bytes",
+				header_len, payload->size);
+		ret = -1;
+		goto error;
+	}
+	memcpy(&header, payload->data, header_len);
+
+	header.channel_name_len = be32toh(header.channel_name_len);
+	header.pathname_len = be32toh(header.pathname_len);
+	header.tracefile_size = be64toh(header.tracefile_size);
+	header.tracefile_count = be64toh(header.tracefile_count);
+
+	received_names_size = header.channel_name_len + header.pathname_len;
+	if (payload->size < header_len + received_names_size) {
+		ERR("Unexpected payload size in \"cmd_recv_stream_2_11\": expected >= %zu bytes, got %zu bytes",
+				header_len + received_names_size, payload->size);
+		ret = -1;
+		goto error;
+	}
+
+	/* Validate length against defined constant. */
+	if (header.channel_name_len > DEFAULT_STREAM_NAME_LEN) {
+		ret = -ENAMETOOLONG;
+		ERR("Channel name too long");
+		goto error;
+	}
+	if (header.pathname_len > LTTNG_NAME_MAX) {
+		ret = -ENAMETOOLONG;
+		ERR("Pathname too long");
+		goto error;
+	}
+
+	/* Validate that names are (NULL terminated. */
+	channel_name_view = lttng_buffer_view_from_view(payload, header_len,
+			    header.channel_name_len);
+	pathname_view = lttng_buffer_view_from_view(payload,
+			header_len + header.channel_name_len, header.pathname_len);
+
+	if (channel_name_view.data[channel_name_view.size - 1] != '\0') {
+		ERR("cmd_recv_stream_2_11 channel_name is invalid (not NULL terminated)");
+		ret = -1;
+		goto error;
+	}
+
+	if (pathname_view.data[pathname_view.size - 1] != '\0') {
+		ERR("cmd_recv_stream_2_11 patname is invalid (not NULL terminated)");
+		ret = -1;
+		goto error;
+	}
+
+	channel_name = strdup(channel_name_view.data);
+	if (!channel_name) {
+		ret = -errno;
+		PERROR("Channel name allocation");
+		goto error;
+	}
+
+	path_name = create_output_path(pathname_view.data);
+	if (!path_name) {
+		PERROR("Path name allocation");
+		ret = -ENOMEM;
+		goto error;
+	}
+
+	*tracefile_size = header.tracefile_size;
+	*tracefile_count = header.tracefile_count;
+	*ret_path_name = path_name;
+	*ret_channel_name = channel_name;
+	/* Move ownership to caller */
+	path_name = NULL;
+	channel_name = NULL;
+	ret = 0;
+error:
+	free(channel_name);
+	free(path_name);
+	return ret;
+}