X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=8b78e627f88d545515fbd2125ffd7aa448e7efff;hp=0036397c3b8492ffecd51921112132479fa4caf9;hb=9e620ea7b016fc3fd4e08b5d094ffa40b36b50f6;hpb=6314496ffcf94c0ccf2fea63a215e0a84a5ee463

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 0036397c3..8b78e627f 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -7,7 +7,6 @@
  */
 
 #include "bin/lttng-sessiond/tracker.h"
-#include "common/sessiond-comm/payload.h"
 #include "lttng/lttng-error.h"
 #include "lttng/tracker.h"
 #define _LGPL_SOURCE
@@ -27,8 +26,8 @@
 #include <common/kernel-ctl/kernel-ctl.h>
 #include <common/dynamic-buffer.h>
 #include <common/buffer-view.h>
-#include <common/sessiond-comm/payload.h>
-#include <common/sessiond-comm/payload-view.h>
+#include <common/payload.h>
+#include <common/payload-view.h>
 #include <common/trace-chunk.h>
 #include <lttng/location-internal.h>
 #include <lttng/trigger/trigger-internal.h>
@@ -3186,19 +3185,19 @@ enum lttng_error_code cmd_create_session(struct command_ctx *cmd_ctx, int sock,
 	enum lttng_error_code ret_code;
 
 	lttng_dynamic_buffer_init(&payload);
-	if (cmd_ctx->lsm->u.create_session.home_dir_size >=
+	if (cmd_ctx->lsm.u.create_session.home_dir_size >=
 			LTTNG_PATH_MAX) {
 		ret_code = LTTNG_ERR_INVALID;
 		goto error;
 	}
-	if (cmd_ctx->lsm->u.create_session.session_descriptor_size >
+	if (cmd_ctx->lsm.u.create_session.session_descriptor_size >
 			LTTNG_SESSION_DESCRIPTOR_MAX_LEN) {
 		ret_code = LTTNG_ERR_INVALID;
 		goto error;
 	}
 
-	payload_size = cmd_ctx->lsm->u.create_session.home_dir_size +
-			cmd_ctx->lsm->u.create_session.session_descriptor_size;
+	payload_size = cmd_ctx->lsm.u.create_session.home_dir_size +
+			cmd_ctx->lsm.u.create_session.session_descriptor_size;
 	ret = lttng_dynamic_buffer_set_size(&payload, payload_size);
 	if (ret) {
 		ret_code = LTTNG_ERR_NOMEM;
@@ -3215,11 +3214,11 @@ enum lttng_error_code cmd_create_session(struct command_ctx *cmd_ctx, int sock,
 	home_dir_view = lttng_buffer_view_from_dynamic_buffer(
 			&payload,
 			0,
-			cmd_ctx->lsm->u.create_session.home_dir_size);
+			cmd_ctx->lsm.u.create_session.home_dir_size);
 	session_descriptor_view = lttng_buffer_view_from_dynamic_buffer(
 			&payload,
-			cmd_ctx->lsm->u.create_session.home_dir_size,
-			cmd_ctx->lsm->u.create_session.session_descriptor_size);
+			cmd_ctx->lsm.u.create_session.home_dir_size,
+			cmd_ctx->lsm.u.create_session.session_descriptor_size);
 
 	ret = lttng_session_descriptor_create_from_buffer(
 			&session_descriptor_view, &session_descriptor);
@@ -4365,7 +4364,7 @@ int cmd_register_trigger(struct command_ctx *cmd_ctx, int sock,
 	struct lttng_payload trigger_payload;
 
 	lttng_payload_init(&trigger_payload);
-	trigger_len = (size_t) cmd_ctx->lsm->u.trigger.length;
+	trigger_len = (size_t) cmd_ctx->lsm.u.trigger.length;
 	ret = lttng_dynamic_buffer_set_size(
 			&trigger_payload.buffer, trigger_len);
 	if (ret) {
@@ -4415,7 +4414,7 @@ int cmd_unregister_trigger(struct command_ctx *cmd_ctx, int sock,
 	struct lttng_payload trigger_payload;
 
 	lttng_payload_init(&trigger_payload);
-	trigger_len = (size_t) cmd_ctx->lsm->u.trigger.length;
+	trigger_len = (size_t) cmd_ctx->lsm.u.trigger.length;
 	ret = lttng_dynamic_buffer_set_size(
 			&trigger_payload.buffer, trigger_len);
 	if (ret) {