X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fcmd-2-11.c;h=c513130ab6fa40709a95151c885a9479cac80d87;hp=857f3594299ebe7f17ae90ecb703d73321484202;hb=6fa5fe7cc78bea0b0bba154a0f911d3df530e18f;hpb=23c8ff5013f1e8c132cab7845ca608dbed4fca7f

diff --git a/src/bin/lttng-relayd/cmd-2-11.c b/src/bin/lttng-relayd/cmd-2-11.c
index 857f35942..c513130ab 100644
--- a/src/bin/lttng-relayd/cmd-2-11.c
+++ b/src/bin/lttng-relayd/cmd-2-11.c
@@ -30,15 +30,18 @@
 #include "utils.h"
 
 int cmd_create_session_2_11(const struct lttng_buffer_view *payload,
-		char *session_name, char *hostname,
+		char *session_name, char *hostname, char *base_path,
 		uint32_t *live_timer, bool *snapshot,
-		lttng_uuid sessiond_uuid)
+		uint64_t *id_sessiond, lttng_uuid sessiond_uuid,
+		bool *has_current_chunk, uint64_t *current_chunk_id,
+		time_t *creation_time)
 {
 	int ret;
 	struct lttcomm_relayd_create_session_2_11 header;
-	size_t header_len, received_names_size;
+	size_t header_len, received_names_size, offset;
 	struct lttng_buffer_view session_name_view;
 	struct lttng_buffer_view hostname_view;
+	struct lttng_buffer_view base_path_view;
 
 	header_len = sizeof(header);
 
@@ -52,11 +55,16 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload,
 
 	header.session_name_len = be32toh(header.session_name_len);
 	header.hostname_len = be32toh(header.hostname_len);
+	header.base_path_len = be32toh(header.base_path_len);
 	header.live_timer = be32toh(header.live_timer);
+	header.current_chunk_id.value = be64toh(header.current_chunk_id.value);
+	header.current_chunk_id.is_set = !!header.current_chunk_id.is_set;
+	header.creation_time = be64toh(header.creation_time);
 
 	lttng_uuid_copy(sessiond_uuid, header.sessiond_uuid);
 
-	received_names_size = header.session_name_len + header.hostname_len;
+	received_names_size = header.session_name_len + header.hostname_len +
+				header.base_path_len;
 	if (payload->size < header_len + received_names_size) {
 		ERR("Unexpected payload size in \"cmd_create_session_2_11\": expected >= %zu bytes, got %zu bytes",
 				header_len + received_names_size, payload->size);
@@ -75,11 +83,21 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload,
 		ERR("Length of hostname (%" PRIu32 " bytes) received in create_session command exceeds maximum length (%d bytes)", header.hostname_len, LTTNG_HOST_NAME_MAX);
 		goto error;
 	}
+	if (header.base_path_len > LTTNG_PATH_MAX) {
+		ret = -ENAMETOOLONG;
+		ERR("Length of base_path (%" PRIu32 " bytes) received in create_session command exceeds maximum length (%d bytes)", header.base_path_len, PATH_MAX);
+		goto error;
+	}
 
-	session_name_view = lttng_buffer_view_from_view(payload, header_len,
+	offset = header_len;
+	session_name_view = lttng_buffer_view_from_view(payload, offset,
 			header.session_name_len);
+	offset += header.session_name_len;
 	hostname_view = lttng_buffer_view_from_view(payload,
-			header_len + header.session_name_len, header.hostname_len);
+			offset, header.hostname_len);
+	offset += header.hostname_len;
+	base_path_view = lttng_buffer_view_from_view(payload,
+			offset, header.base_path_len);
 
 	/* Validate that names are NULL terminated. */
 	if (session_name_view.data[session_name_view.size - 1] != '\0') {
@@ -94,15 +112,26 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload,
 		goto error;
 	}
 
+	if (base_path_view.size != 0 &&
+			base_path_view.data[base_path_view.size - 1] != '\0') {
+		ERR("cmd_create_session_2_11 base_path is invalid (not NULL terminated)");
+		ret = -1;
+		goto error;
+	}
+
 	/*
 	 * Length and null-termination check are already performed.
-	 * LTTNG_NAME_MAX and LTTNG_HOST_NAME_MAX max size are expected.
+	 * LTTNG_NAME_MAX, LTTNG_HOST_NAME_MAX, and LTTNG_PATH_MAX max sizes are expected.
 	 */
 	strcpy(session_name, session_name_view.data);
 	strcpy(hostname, hostname_view.data);
+	strcpy(base_path, base_path_view.size ? base_path_view.data : "");
 
 	*live_timer = header.live_timer;
 	*snapshot = !!header.snapshot;
+	*current_chunk_id = header.current_chunk_id.value;
+	*has_current_chunk = header.current_chunk_id.is_set;
+	*creation_time = (time_t) header.creation_time;
 
 	ret = 0;
 
@@ -140,7 +169,7 @@ int cmd_recv_stream_2_11(const struct lttng_buffer_view *payload,
 	header.pathname_len = be32toh(header.pathname_len);
 	header.tracefile_size = be64toh(header.tracefile_size);
 	header.tracefile_count = be64toh(header.tracefile_count);
-	header.trace_archive_id = be64toh(header.trace_archive_id);
+	header.trace_chunk_id = be64toh(header.trace_chunk_id);
 
 	received_names_size = header.channel_name_len + header.pathname_len;
 	if (payload->size < header_len + received_names_size) {
@@ -187,7 +216,7 @@ int cmd_recv_stream_2_11(const struct lttng_buffer_view *payload,
 		goto error;
 	}
 
-	path_name = create_output_path(pathname_view.data);
+	path_name = strdup(pathname_view.data);
 	if (!path_name) {
 		PERROR("Path name allocation");
 		ret = -ENOMEM;
@@ -196,7 +225,7 @@ int cmd_recv_stream_2_11(const struct lttng_buffer_view *payload,
 
 	*tracefile_size = header.tracefile_size;
 	*tracefile_count = header.tracefile_count;
-	*trace_archive_id = header.trace_archive_id;
+	*trace_archive_id = header.trace_chunk_id;
 	*ret_path_name = path_name;
 	*ret_channel_name = channel_name;
 	/* Move ownership to caller */