X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fcmd-2-11.c;h=857f3594299ebe7f17ae90ecb703d73321484202;hb=23c8ff5013f1e8c132cab7845ca608dbed4fca7f;hp=eb03999cf9a4aac73b6cf0650e3bad118e3aaa14;hpb=2f21a469eee9bc3352b439b1e64fe6bbd5088fea;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 eb03999cf..857f35942 100644 --- a/src/bin/lttng-relayd/cmd-2-11.c +++ b/src/bin/lttng-relayd/cmd-2-11.c @@ -31,7 +31,8 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload, char *session_name, char *hostname, - uint32_t *live_timer, bool *snapshot) + uint32_t *live_timer, bool *snapshot, + lttng_uuid sessiond_uuid) { int ret; struct lttcomm_relayd_create_session_2_11 header; @@ -53,6 +54,8 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload, header.hostname_len = be32toh(header.hostname_len); header.live_timer = be32toh(header.live_timer); + lttng_uuid_copy(sessiond_uuid, header.sessiond_uuid); + received_names_size = header.session_name_len + header.hostname_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", @@ -112,7 +115,8 @@ error: */ 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) + uint64_t *tracefile_size, uint64_t *tracefile_count, + uint64_t *trace_archive_id) { int ret; struct lttcomm_relayd_add_stream_2_11 header; @@ -136,6 +140,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); received_names_size = header.channel_name_len + header.pathname_len; if (payload->size < header_len + received_names_size) { @@ -191,6 +196,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; *ret_path_name = path_name; *ret_channel_name = channel_name; /* Move ownership to caller */