Fix: relayd: session id is ignored by 2.11+ create session command

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

diff --git a/src/bin/lttng-relayd/cmd-2-11.c b/src/bin/lttng-relayd/cmd-2-11.c
index 4b6f39120db0b84cd1170880c27750d854436877..2545af45b4a5442e0a38518df26e9fecda773c8b 100644 (file)
--- a/src/bin/lttng-relayd/cmd-2-11.c
+++ b/src/bin/lttng-relayd/cmd-2-11.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2018 - Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
+ * Copyright (C) 2018 Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -61,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);
 
@@ -139,6 +130,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;