X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fcmd-2-11.cpp;h=73c3a3c513fadd563dc9052e6abfd670f08282f6;hb=3691d312bcf4dc2cc15f0ecb1f0e2fd2f34315b8;hp=aa97dd0f0e0ddfd3e36f7e7857876f70c80864a7;hpb=ac497a37018f3c253d2e50397294f58d33f7f24f;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/cmd-2-11.cpp b/src/bin/lttng-relayd/cmd-2-11.cpp
index aa97dd0f0..73c3a3c51 100644
--- a/src/bin/lttng-relayd/cmd-2-11.cpp
+++ b/src/bin/lttng-relayd/cmd-2-11.cpp
@@ -8,20 +8,21 @@
 #define _LGPL_SOURCE
 #include <inttypes.h>
 
-#include <common/common.h>
-#include <common/sessiond-comm/relayd.h>
+#include <common/common.hpp>
+#include <common/sessiond-comm/relayd.hpp>
 
-#include <common/compat/endian.h>
-#include <common/compat/string.h>
+#include <common/compat/endian.hpp>
+#include <common/compat/string.hpp>
 #include <lttng/constant.h>
 
-#include "cmd-2-11.h"
-#include "utils.h"
+#include "cmd-2-11.hpp"
+#include "utils.hpp"
 
 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,8 +51,9 @@ 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);
+	std::copy(std::begin(header.sessiond_uuid), std::end(header.sessiond_uuid), sessiond_uuid.begin());
 
 	received_names_size = header.session_name_len + header.hostname_len +
 				header.base_path_len;
@@ -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;