X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fcmd-2-11.c;h=79f439c4652ead386f140bc00a1287e668159927;hb=ebb29c10d382c55529138ae70eb5a05bf3ccb9a6;hp=363e0f00022984a2b758eca59811017d80bb0e1c;hpb=84fa4db56e9fbc47bfe8e6cccd9ace585eb9e396;p=lttng-tools.git diff --git a/src/bin/lttng-relayd/cmd-2-11.c b/src/bin/lttng-relayd/cmd-2-11.c index 363e0f000..79f439c46 100644 --- a/src/bin/lttng-relayd/cmd-2-11.c +++ b/src/bin/lttng-relayd/cmd-2-11.c @@ -33,7 +33,8 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload, char *session_name, char *hostname, uint32_t *live_timer, bool *snapshot, uint64_t *id_sessiond, lttng_uuid sessiond_uuid, - bool *has_current_chunk, uint64_t *current_chunk_id) + bool *has_current_chunk, uint64_t *current_chunk_id, + time_t *creation_time) { int ret; struct lttcomm_relayd_create_session_2_11 header; @@ -56,6 +57,7 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload, 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); @@ -108,6 +110,7 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload, *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; @@ -145,7 +148,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) { @@ -192,7 +195,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; @@ -201,7 +204,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 */