Fix: relayd: missing session unlock on error path

[lttng-tools.git] / src / bin / lttng-relayd / cmd-2-11.cpp

diff --git a/src/bin/lttng-relayd/cmd-2-11.cpp b/src/bin/lttng-relayd/cmd-2-11.cpp
index aa97dd0f0e0ddfd3e36f7e7857876f70c80864a7..572b1836c9a2fd1c44a8887aaead21ca3cb7a179 100644 (file)
--- a/src/bin/lttng-relayd/cmd-2-11.cpp
+++ b/src/bin/lttng-relayd/cmd-2-11.cpp
@@ -21,7 +21,8 @@
 int cmd_create_session_2_11(const struct lttng_buffer_view *payload,
                char *session_name, char *hostname, char *base_path,
                uint32_t *live_timer, bool *snapshot,
-               uint64_t *id_sessiond, 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,
                bool *session_name_contains_creation_time)
@@ -50,6 +51,7 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload,
        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);
+       header.session_id = be64toh(header.session_id);
 
        lttng_uuid_copy(sessiond_uuid, header.sessiond_uuid);
 
@@ -145,6 +147,7 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload,
        *creation_time = (time_t) header.creation_time;
        *session_name_contains_creation_time =
                header.session_name_contains_creation_time;
+       *id_sessiond = header.session_id;
 
        ret = 0;