X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fclient.c;h=d83bee8e66441c8f6b9ddb08f8821ef83a468191;hp=0238538501b04117cae42280b01a57d3a3c647c3;hb=bae46a81520110e52c5af423ce712b9099fe23dd;hpb=9e620ea7b016fc3fd4e08b5d094ffa40b36b50f6

diff --git a/src/bin/lttng-sessiond/client.c b/src/bin/lttng-sessiond/client.c
index 023853850..d83bee8e6 100644
--- a/src/bin/lttng-sessiond/client.c
+++ b/src/bin/lttng-sessiond/client.c
@@ -13,7 +13,10 @@
 #include "common/dynamic-array.h"
 #include "common/payload.h"
 #include "common/payload-view.h"
+#include "common/fd-handle.h"
 #include "common/sessiond-comm/sessiond-comm.h"
+#include "common/payload.h"
+#include "common/payload-view.h"
 #include "lttng/lttng-error.h"
 #include "lttng/tracker.h"
 #include <common/compat/getenv.h>
@@ -28,6 +31,7 @@
 #include <signal.h>
 #include <stddef.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 #include "client.h"
 #include "lttng-sessiond.h"
@@ -39,6 +43,7 @@
 #include "utils.h"
 #include "manage-consumer.h"
 #include "clear.h"
+#include "agent-thread.h"
 
 static bool is_root;
 
@@ -89,7 +94,12 @@ static int setup_lttng_msg(struct command_ctx *cmd_ctx,
 		.data_size = payload_len,
 	};
 
-	lttng_dynamic_buffer_set_size(&cmd_ctx->reply_payload.buffer, 0);
+	ret = lttng_dynamic_buffer_set_size(&cmd_ctx->reply_payload.buffer, 0);
+	if (ret) {
+		goto end;
+	}
+
+	lttng_dynamic_pointer_array_clear(&cmd_ctx->reply_payload._fd_handles);
 
 	cmd_ctx->lttng_msg_size = total_msg_size;
 
@@ -124,6 +134,51 @@ end:
 	return ret;
 }
 
+static int setup_empty_lttng_msg(struct command_ctx *cmd_ctx)
+{
+	int ret;
+	const struct lttcomm_lttng_msg llm = {};
+
+	ret = lttng_dynamic_buffer_set_size(&cmd_ctx->reply_payload.buffer, 0);
+	if (ret) {
+		goto end;
+	}
+
+	/* Append place-holder reply header. */
+	ret = lttng_dynamic_buffer_append(
+			&cmd_ctx->reply_payload.buffer, &llm, sizeof(llm));
+	if (ret) {
+		goto end;
+	}
+
+	cmd_ctx->lttng_msg_size = sizeof(llm);
+end:
+	return ret;
+}
+
+static void update_lttng_msg(struct command_ctx *cmd_ctx, size_t cmd_header_len,
+		size_t payload_len)
+{
+	const size_t header_len = sizeof(struct lttcomm_lttng_msg);
+	const size_t total_msg_size = header_len + cmd_header_len + payload_len;
+	const struct lttcomm_lttng_msg llm = {
+		.cmd_type = cmd_ctx->lsm.cmd_type,
+		.pid = cmd_ctx->lsm.domain.attr.pid,
+		.cmd_header_size = cmd_header_len,
+		.data_size = payload_len,
+	};
+	struct lttcomm_lttng_msg *p_llm;
+
+	assert(cmd_ctx->reply_payload.buffer.size >= sizeof(llm));
+
+	p_llm = (typeof(p_llm)) cmd_ctx->reply_payload.buffer.data;
+
+	/* Update existing header. */
+	memcpy(p_llm, &llm, sizeof(llm));
+
+	cmd_ctx->lttng_msg_size = total_msg_size;
+}
+
 /*
  * Start the thread_manage_consumer. This must be done after a lttng-consumerd
  * exec or it will fail.
@@ -153,7 +208,7 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 		/*
 		 * Exec consumerd.
 		 */
-		if (config.verbose_consumer) {
+		if (the_config.verbose_consumer) {
 			verbosity = "--verbose";
 		} else if (lttng_opt_quiet) {
 			verbosity = "--quiet";
@@ -169,35 +224,37 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 			 * fallback on the 32-bit one,
 			 */
 			DBG3("Looking for a kernel consumer at these locations:");
-			DBG3("	1) %s", config.consumerd64_bin_path.value ? : "NULL");
+			DBG3("	1) %s", the_config.consumerd64_bin_path.value ? : "NULL");
 			DBG3("	2) %s/%s", INSTALL_BIN_PATH, DEFAULT_CONSUMERD_FILE);
-			DBG3("	3) %s", config.consumerd32_bin_path.value ? : "NULL");
-			if (stat(config.consumerd64_bin_path.value, &st) == 0) {
+			DBG3("	3) %s", the_config.consumerd32_bin_path.value ? : "NULL");
+			if (stat(the_config.consumerd64_bin_path.value, &st) == 0) {
 				DBG3("Found location #1");
-				consumer_to_use = config.consumerd64_bin_path.value;
+				consumer_to_use = the_config.consumerd64_bin_path.value;
 			} else if (stat(INSTALL_BIN_PATH "/" DEFAULT_CONSUMERD_FILE, &st) == 0) {
 				DBG3("Found location #2");
 				consumer_to_use = INSTALL_BIN_PATH "/" DEFAULT_CONSUMERD_FILE;
-			} else if (config.consumerd32_bin_path.value &&
-					stat(config.consumerd32_bin_path.value, &st) == 0) {
+			} else if (the_config.consumerd32_bin_path.value &&
+					stat(the_config.consumerd32_bin_path.value, &st) == 0) {
 				DBG3("Found location #3");
-				consumer_to_use = config.consumerd32_bin_path.value;
+				consumer_to_use = the_config.consumerd32_bin_path.value;
 			} else {
 				DBG("Could not find any valid consumerd executable");
 				ret = -EINVAL;
 				goto error;
 			}
 			DBG("Using kernel consumer at: %s",  consumer_to_use);
-			(void) execl(consumer_to_use,
-				"lttng-consumerd", verbosity, "-k",
-				"--consumerd-cmd-sock", consumer_data->cmd_unix_sock_path,
-				"--consumerd-err-sock", consumer_data->err_unix_sock_path,
-				"--group", config.tracing_group_name.value,
-				NULL);
+			(void) execl(consumer_to_use, "lttng-consumerd",
+					verbosity, "-k", "--consumerd-cmd-sock",
+					consumer_data->cmd_unix_sock_path,
+					"--consumerd-err-sock",
+					consumer_data->err_unix_sock_path,
+					"--group",
+					the_config.tracing_group_name.value,
+					NULL);
 			break;
 		case LTTNG_CONSUMER64_UST:
 		{
-			if (config.consumerd64_lib_dir.value) {
+			if (the_config.consumerd64_lib_dir.value) {
 				const char *tmp;
 				size_t tmplen;
 				char *tmpnew;
@@ -206,13 +263,13 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 				if (!tmp) {
 					tmp = "";
 				}
-				tmplen = strlen(config.consumerd64_lib_dir.value) + 1 /* : */ + strlen(tmp);
+				tmplen = strlen(the_config.consumerd64_lib_dir.value) + 1 /* : */ + strlen(tmp);
 				tmpnew = zmalloc(tmplen + 1 /* \0 */);
 				if (!tmpnew) {
 					ret = -ENOMEM;
 					goto error;
 				}
-				strcat(tmpnew, config.consumerd64_lib_dir.value);
+				strcat(tmpnew, the_config.consumerd64_lib_dir.value);
 				if (tmp[0] != '\0') {
 					strcat(tmpnew, ":");
 					strcat(tmpnew, tmp);
@@ -224,17 +281,22 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 					goto error;
 				}
 			}
-			DBG("Using 64-bit UST consumer at: %s",  config.consumerd64_bin_path.value);
-			(void) execl(config.consumerd64_bin_path.value, "lttng-consumerd", verbosity, "-u",
-					"--consumerd-cmd-sock", consumer_data->cmd_unix_sock_path,
-					"--consumerd-err-sock", consumer_data->err_unix_sock_path,
-					"--group", config.tracing_group_name.value,
+			DBG("Using 64-bit UST consumer at: %s",
+					the_config.consumerd64_bin_path.value);
+			(void) execl(the_config.consumerd64_bin_path.value,
+					"lttng-consumerd", verbosity, "-u",
+					"--consumerd-cmd-sock",
+					consumer_data->cmd_unix_sock_path,
+					"--consumerd-err-sock",
+					consumer_data->err_unix_sock_path,
+					"--group",
+					the_config.tracing_group_name.value,
 					NULL);
 			break;
 		}
 		case LTTNG_CONSUMER32_UST:
 		{
-			if (config.consumerd32_lib_dir.value) {
+			if (the_config.consumerd32_lib_dir.value) {
 				const char *tmp;
 				size_t tmplen;
 				char *tmpnew;
@@ -243,13 +305,13 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 				if (!tmp) {
 					tmp = "";
 				}
-				tmplen = strlen(config.consumerd32_lib_dir.value) + 1 /* : */ + strlen(tmp);
+				tmplen = strlen(the_config.consumerd32_lib_dir.value) + 1 /* : */ + strlen(tmp);
 				tmpnew = zmalloc(tmplen + 1 /* \0 */);
 				if (!tmpnew) {
 					ret = -ENOMEM;
 					goto error;
 				}
-				strcat(tmpnew, config.consumerd32_lib_dir.value);
+				strcat(tmpnew, the_config.consumerd32_lib_dir.value);
 				if (tmp[0] != '\0') {
 					strcat(tmpnew, ":");
 					strcat(tmpnew, tmp);
@@ -261,11 +323,16 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 					goto error;
 				}
 			}
-			DBG("Using 32-bit UST consumer at: %s",  config.consumerd32_bin_path.value);
-			(void) execl(config.consumerd32_bin_path.value, "lttng-consumerd", verbosity, "-u",
-					"--consumerd-cmd-sock", consumer_data->cmd_unix_sock_path,
-					"--consumerd-err-sock", consumer_data->err_unix_sock_path,
-					"--group", config.tracing_group_name.value,
+			DBG("Using 32-bit UST consumer at: %s",
+					the_config.consumerd32_bin_path.value);
+			(void) execl(the_config.consumerd32_bin_path.value,
+					"lttng-consumerd", verbosity, "-u",
+					"--consumerd-cmd-sock",
+					consumer_data->cmd_unix_sock_path,
+					"--consumerd-err-sock",
+					consumer_data->err_unix_sock_path,
+					"--group",
+					the_config.tracing_group_name.value,
 					NULL);
 			break;
 		}
@@ -526,15 +593,14 @@ static unsigned int lttng_sessions_count(uid_t uid, gid_t gid)
 	struct ltt_session *session;
 	const struct ltt_session_list *session_list = session_get_list();
 
-	DBG("Counting number of available session for UID %d GID %d",
-			uid, gid);
+	DBG("Counting number of available session for UID %d", uid);
 	cds_list_for_each_entry(session, &session_list->head, list) {
 		if (!session_get(session)) {
 			continue;
 		}
 		session_lock(session);
 		/* Only count the sessions the user can control. */
-		if (session_access_ok(session, uid, gid) &&
+		if (session_access_ok(session, uid) &&
 				!session->destroyed) {
 			i++;
 		}
@@ -547,18 +613,18 @@ static unsigned int lttng_sessions_count(uid_t uid, gid_t gid)
 static int receive_userspace_probe(struct command_ctx *cmd_ctx, int sock,
 		int *sock_error, struct lttng_event *event)
 {
-	int fd, ret;
+	int fd = -1, ret;
 	struct lttng_userspace_probe_location *probe_location;
-	const struct lttng_userspace_probe_location_lookup_method *lookup = NULL;
-	struct lttng_dynamic_buffer probe_location_buffer;
-	struct lttng_buffer_view buffer_view;
+	struct lttng_payload probe_location_payload;
+	struct fd_handle *handle = NULL;
 
 	/*
-	 * Create a buffer to store the serialized version of the probe
+	 * Create a payload to store the serialized version of the probe
 	 * location.
 	 */
-	lttng_dynamic_buffer_init(&probe_location_buffer);
-	ret = lttng_dynamic_buffer_set_size(&probe_location_buffer,
+	lttng_payload_init(&probe_location_payload);
+
+	ret = lttng_dynamic_buffer_set_size(&probe_location_payload.buffer,
 			cmd_ctx->lsm.u.enable.userspace_probe_location_len);
 	if (ret) {
 		ret = LTTNG_ERR_NOMEM;
@@ -568,27 +634,11 @@ static int receive_userspace_probe(struct command_ctx *cmd_ctx, int sock,
 	/*
 	 * Receive the probe location.
 	 */
-	ret = lttcomm_recv_unix_sock(sock, probe_location_buffer.data,
-			probe_location_buffer.size);
+	ret = lttcomm_recv_unix_sock(sock, probe_location_payload.buffer.data,
+			probe_location_payload.buffer.size);
 	if (ret <= 0) {
 		DBG("Nothing recv() from client var len data... continuing");
 		*sock_error = 1;
-		lttng_dynamic_buffer_reset(&probe_location_buffer);
-		ret = LTTNG_ERR_PROBE_LOCATION_INVAL;
-		goto error;
-	}
-
-	buffer_view = lttng_buffer_view_from_dynamic_buffer(
-			&probe_location_buffer, 0, probe_location_buffer.size);
-
-	/*
-	 * Extract the probe location from the serialized version.
-	 */
-	ret = lttng_userspace_probe_location_create_from_buffer(
-				&buffer_view, &probe_location);
-	if (ret < 0) {
-		WARN("Failed to create a userspace probe location from the received buffer");
-		lttng_dynamic_buffer_reset( &probe_location_buffer);
 		ret = LTTNG_ERR_PROBE_LOCATION_INVAL;
 		goto error;
 	}
@@ -605,35 +655,35 @@ static int receive_userspace_probe(struct command_ctx *cmd_ctx, int sock,
 		goto error;
 	}
 
-	/*
-	 * Set the file descriptor received from the client through the unix
-	 * socket in the probe location.
-	 */
-	lookup = lttng_userspace_probe_location_get_lookup_method(probe_location);
-	if (!lookup) {
-		ret = LTTNG_ERR_PROBE_LOCATION_INVAL;
+	handle = fd_handle_create(fd);
+	if (!handle) {
+		ret = LTTNG_ERR_NOMEM;
 		goto error;
 	}
 
-	/*
-	 * From the kernel tracer's perspective, all userspace probe event types
-	 * are all the same: a file and an offset.
-	 */
-	switch (lttng_userspace_probe_location_lookup_method_get_type(lookup)) {
-	case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_FUNCTION_ELF:
-		ret = lttng_userspace_probe_location_function_set_binary_fd(
-				probe_location, fd);
-		break;
-	case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_TRACEPOINT_SDT:
-		ret = lttng_userspace_probe_location_tracepoint_set_binary_fd(
-				probe_location, fd);
-		break;
-	default:
-		ret = LTTNG_ERR_PROBE_LOCATION_INVAL;
+	/* Transferred to the handle. */
+	fd = -1;
+
+	ret = lttng_payload_push_fd_handle(&probe_location_payload, handle);
+	if (ret) {
+		ERR("Failed to add userspace probe file descriptor to payload");
+		ret = LTTNG_ERR_NOMEM;
 		goto error;
 	}
 
-	if (ret) {
+	fd_handle_put(handle);
+	handle = NULL;
+
+	{
+		struct lttng_payload_view view = lttng_payload_view_from_payload(
+			&probe_location_payload, 0, -1);
+
+		/* Extract the probe location from the serialized version. */
+		ret = lttng_userspace_probe_location_create_from_payload(
+				&view, &probe_location);
+	}
+	if (ret < 0) {
+		WARN("Failed to create a userspace probe location from the received buffer");
 		ret = LTTNG_ERR_PROBE_LOCATION_INVAL;
 		goto error;
 	}
@@ -645,11 +695,91 @@ static int receive_userspace_probe(struct command_ctx *cmd_ctx, int sock,
 		goto error;
 	}
 
-	lttng_dynamic_buffer_reset(&probe_location_buffer);
 error:
+	if (fd >= 0) {
+		if (close(fd)) {
+			PERROR("Failed to close userspace probe location binary fd");
+		}
+	}
+
+	fd_handle_put(handle);
+	lttng_payload_reset(&probe_location_payload);
 	return ret;
 }
 
+static enum lttng_error_code receive_lttng_trigger(struct command_ctx *cmd_ctx,
+		int sock,
+		int *sock_error,
+		struct lttng_trigger **_trigger)
+{
+	int ret;
+	size_t trigger_len;
+	ssize_t sock_recv_len;
+	enum lttng_error_code ret_code;
+	struct lttng_payload trigger_payload;
+	struct lttng_trigger *trigger = NULL;
+
+	lttng_payload_init(&trigger_payload);
+	trigger_len = (size_t) cmd_ctx->lsm.u.trigger.length;
+	ret = lttng_dynamic_buffer_set_size(
+			&trigger_payload.buffer, trigger_len);
+	if (ret) {
+		ret_code = LTTNG_ERR_NOMEM;
+		goto end;
+	}
+
+	sock_recv_len = lttcomm_recv_unix_sock(
+			sock, trigger_payload.buffer.data, trigger_len);
+	if (sock_recv_len < 0 || sock_recv_len != trigger_len) {
+		ERR("Failed to receive trigger in command payload");
+		*sock_error = 1;
+		ret_code = LTTNG_ERR_INVALID_PROTOCOL;
+		goto end;
+	}
+
+	/* Receive fds, if any. */
+	if (cmd_ctx->lsm.fd_count > 0) {
+		sock_recv_len = lttcomm_recv_payload_fds_unix_sock(
+				sock, cmd_ctx->lsm.fd_count, &trigger_payload);
+		if (sock_recv_len > 0 &&
+				sock_recv_len != cmd_ctx->lsm.fd_count * sizeof(int)) {
+			ERR("Failed to receive all file descriptors for trigger in command payload: expected fd count = %u, ret = %d",
+					cmd_ctx->lsm.fd_count, (int) ret);
+			ret_code = LTTNG_ERR_INVALID_PROTOCOL;
+			*sock_error = 1;
+			goto end;
+		} else if (sock_recv_len <= 0) {
+			ERR("Failed to receive file descriptors for trigger in command payload: expected fd count = %u, ret = %d",
+					cmd_ctx->lsm.fd_count, (int) ret);
+			ret_code = LTTNG_ERR_FATAL;
+			*sock_error = 1;
+			goto end;
+		}
+	}
+
+	/* Deserialize trigger. */
+	{
+		struct lttng_payload_view view =
+				lttng_payload_view_from_payload(
+						&trigger_payload, 0, -1);
+
+		if (lttng_trigger_create_from_payload(&view, &trigger) !=
+				trigger_len) {
+			ERR("Invalid trigger received as part of command payload");
+			ret_code = LTTNG_ERR_INVALID_TRIGGER;
+			lttng_trigger_put(trigger);
+			goto end;
+		}
+	}
+
+	*_trigger = trigger;
+	ret_code = LTTNG_OK;
+
+end:
+	lttng_payload_reset(&trigger_payload);
+	return ret_code;
+}
+
 /*
  * Version of setup_lttng_msg() without command header.
  */
@@ -667,7 +797,8 @@ static int check_rotate_compatible(void)
 {
 	int ret = 1;
 
-	if (kernel_tracer_version.major != 2 || kernel_tracer_version.minor < 11) {
+	if (the_kernel_tracer_version.major != 2 ||
+			the_kernel_tracer_version.minor < 11) {
 		DBG("Kernel tracer version is not compatible with the rotation feature");
 		ret = 0;
 	}
@@ -683,6 +814,7 @@ static int check_rotate_compatible(void)
 static int send_unix_sock(int sock, struct lttng_payload_view *view)
 {
 	int ret;
+	const int fd_count = lttng_payload_view_get_fd_handle_count(view);
 
 	/* Check valid length */
 	if (view->buffer.size == 0) {
@@ -696,10 +828,11 @@ static int send_unix_sock(int sock, struct lttng_payload_view *view)
 		goto end;
 	}
 
-	if (lttng_dynamic_array_get_count(&view->_fds) > 0) {
-		ret = lttcomm_send_fds_unix_sock(sock,
-				(const int *) view->_fds.buffer.data,
-				lttng_dynamic_array_get_count(&view->_fds));
+	if (fd_count > 0) {
+		ret = lttcomm_send_payload_view_fds_unix_sock(sock, view);
+		if (ret < 0) {
+			goto end;
+		}
 	}
 
 end:
@@ -723,10 +856,13 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 		int *sock_error)
 {
 	int ret = LTTNG_OK;
-	int need_tracing_session = 1;
-	int need_domain;
+	bool need_tracing_session = true;
+	bool need_domain;
+	bool need_consumerd;
 
-	DBG("Processing client command %d", cmd_ctx->lsm.cmd_type);
+	DBG("Processing client command '%s\' (%d)",
+		lttcomm_sessiond_command_str(cmd_ctx->lsm.cmd_type),
+		cmd_ctx->lsm.cmd_type);
 
 	assert(!rcu_read_ongoing());
 
@@ -748,21 +884,31 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 	case LTTNG_SET_SESSION_SHM_PATH:
 	case LTTNG_REGENERATE_METADATA:
 	case LTTNG_REGENERATE_STATEDUMP:
-	case LTTNG_REGISTER_TRIGGER:
-	case LTTNG_UNREGISTER_TRIGGER:
 	case LTTNG_ROTATE_SESSION:
 	case LTTNG_ROTATION_GET_INFO:
 	case LTTNG_ROTATION_SET_SCHEDULE:
 	case LTTNG_SESSION_LIST_ROTATION_SCHEDULES:
 	case LTTNG_CLEAR_SESSION:
-		need_domain = 0;
+	case LTTNG_LIST_TRIGGERS:
+		need_domain = false;
+		break;
+	default:
+		need_domain = true;
+	}
+
+	/* Needs a functioning consumerd? */
+	switch (cmd_ctx->lsm.cmd_type) {
+	case LTTNG_REGISTER_TRIGGER:
+	case LTTNG_UNREGISTER_TRIGGER:
+		need_consumerd = false;
 		break;
 	default:
-		need_domain = 1;
+		need_consumerd = true;
+		break;
 	}
 
-	if (config.no_kernel && need_domain
-			&& cmd_ctx->lsm.domain.type == LTTNG_DOMAIN_KERNEL) {
+	if (the_config.no_kernel && need_domain &&
+			cmd_ctx->lsm.domain.type == LTTNG_DOMAIN_KERNEL) {
 		if (!is_root) {
 			ret = LTTNG_ERR_NEED_ROOT_SESSIOND;
 		} else {
@@ -773,13 +919,13 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 
 	/* Deny register consumer if we already have a spawned consumer. */
 	if (cmd_ctx->lsm.cmd_type == LTTNG_REGISTER_CONSUMER) {
-		pthread_mutex_lock(&kconsumer_data.pid_mutex);
-		if (kconsumer_data.pid > 0) {
+		pthread_mutex_lock(&the_kconsumer_data.pid_mutex);
+		if (the_kconsumer_data.pid > 0) {
 			ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
-			pthread_mutex_unlock(&kconsumer_data.pid_mutex);
+			pthread_mutex_unlock(&the_kconsumer_data.pid_mutex);
 			goto error;
 		}
-		pthread_mutex_unlock(&kconsumer_data.pid_mutex);
+		pthread_mutex_unlock(&the_kconsumer_data.pid_mutex);
 	}
 
 	/*
@@ -801,6 +947,8 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 	case LTTNG_DATA_PENDING:
 	case LTTNG_ROTATE_SESSION:
 	case LTTNG_ROTATION_GET_INFO:
+	case LTTNG_REGISTER_TRIGGER:
+	case LTTNG_LIST_TRIGGERS:
 		break;
 	default:
 		/* Setup lttng message with no payload */
@@ -821,7 +969,8 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 	case LTTNG_SAVE_SESSION:
 	case LTTNG_REGISTER_TRIGGER:
 	case LTTNG_UNREGISTER_TRIGGER:
-		need_tracing_session = 0;
+	case LTTNG_LIST_TRIGGERS:
+		need_tracing_session = false;
 		break;
 	default:
 		DBG("Getting session %s by name", cmd_ctx->lsm.session.name);
@@ -899,7 +1048,8 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 		}
 
 		/* Consumer is in an ERROR state. Report back to client */
-		if (uatomic_read(&kernel_consumerd_state) == CONSUMER_ERROR) {
+		if (need_consumerd && uatomic_read(&the_kernel_consumerd_state) ==
+						CONSUMER_ERROR) {
 			ret = LTTNG_ERR_NO_KERNCONSUMERD;
 			goto error;
 		}
@@ -915,25 +1065,25 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 			}
 
 			/* Start the kernel consumer daemon */
-			pthread_mutex_lock(&kconsumer_data.pid_mutex);
-			if (kconsumer_data.pid == 0 &&
+			pthread_mutex_lock(&the_kconsumer_data.pid_mutex);
+			if (the_kconsumer_data.pid == 0 &&
 					cmd_ctx->lsm.cmd_type != LTTNG_REGISTER_CONSUMER) {
-				pthread_mutex_unlock(&kconsumer_data.pid_mutex);
-				ret = start_consumerd(&kconsumer_data);
+				pthread_mutex_unlock(&the_kconsumer_data.pid_mutex);
+				ret = start_consumerd(&the_kconsumer_data);
 				if (ret < 0) {
 					ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
 					goto error;
 				}
-				uatomic_set(&kernel_consumerd_state, CONSUMER_STARTED);
+				uatomic_set(&the_kernel_consumerd_state, CONSUMER_STARTED);
 			} else {
-				pthread_mutex_unlock(&kconsumer_data.pid_mutex);
+				pthread_mutex_unlock(&the_kconsumer_data.pid_mutex);
 			}
 
 			/*
 			 * The consumer was just spawned so we need to add the socket to
 			 * the consumer output of the session if exist.
 			 */
-			ret = consumer_create_socket(&kconsumer_data,
+			ret = consumer_create_socket(&the_kconsumer_data,
 					cmd_ctx->session->kernel_session->consumer);
 			if (ret < 0) {
 				goto error;
@@ -944,14 +1094,22 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 	case LTTNG_DOMAIN_JUL:
 	case LTTNG_DOMAIN_LOG4J:
 	case LTTNG_DOMAIN_PYTHON:
+		if (!agent_tracing_is_enabled()) {
+			ret = LTTNG_ERR_AGENT_TRACING_DISABLED;
+			goto error;
+		}
+		/* Fallthrough */
 	case LTTNG_DOMAIN_UST:
 	{
 		if (!ust_app_supported()) {
 			ret = LTTNG_ERR_NO_UST;
 			goto error;
 		}
+
 		/* Consumer is in an ERROR state. Report back to client */
-		if (uatomic_read(&ust_consumerd_state) == CONSUMER_ERROR) {
+		if (need_consumerd &&
+				uatomic_read(&the_ust_consumerd_state) ==
+						CONSUMER_ERROR) {
 			ret = LTTNG_ERR_NO_USTCONSUMERD;
 			goto error;
 		}
@@ -968,58 +1126,58 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 
 			/* Start the UST consumer daemons */
 			/* 64-bit */
-			pthread_mutex_lock(&ustconsumer64_data.pid_mutex);
-			if (config.consumerd64_bin_path.value &&
-					ustconsumer64_data.pid == 0 &&
+			pthread_mutex_lock(&the_ustconsumer64_data.pid_mutex);
+			if (the_config.consumerd64_bin_path.value &&
+					the_ustconsumer64_data.pid == 0 &&
 					cmd_ctx->lsm.cmd_type != LTTNG_REGISTER_CONSUMER) {
-				pthread_mutex_unlock(&ustconsumer64_data.pid_mutex);
-				ret = start_consumerd(&ustconsumer64_data);
+				pthread_mutex_unlock(&the_ustconsumer64_data.pid_mutex);
+				ret = start_consumerd(&the_ustconsumer64_data);
 				if (ret < 0) {
 					ret = LTTNG_ERR_UST_CONSUMER64_FAIL;
-					uatomic_set(&ust_consumerd64_fd, -EINVAL);
+					uatomic_set(&the_ust_consumerd64_fd, -EINVAL);
 					goto error;
 				}
 
-				uatomic_set(&ust_consumerd64_fd, ustconsumer64_data.cmd_sock);
-				uatomic_set(&ust_consumerd_state, CONSUMER_STARTED);
+				uatomic_set(&the_ust_consumerd64_fd, the_ustconsumer64_data.cmd_sock);
+				uatomic_set(&the_ust_consumerd_state, CONSUMER_STARTED);
 			} else {
-				pthread_mutex_unlock(&ustconsumer64_data.pid_mutex);
+				pthread_mutex_unlock(&the_ustconsumer64_data.pid_mutex);
 			}
 
 			/*
 			 * Setup socket for consumer 64 bit. No need for atomic access
 			 * since it was set above and can ONLY be set in this thread.
 			 */
-			ret = consumer_create_socket(&ustconsumer64_data,
+			ret = consumer_create_socket(&the_ustconsumer64_data,
 					cmd_ctx->session->ust_session->consumer);
 			if (ret < 0) {
 				goto error;
 			}
 
 			/* 32-bit */
-			pthread_mutex_lock(&ustconsumer32_data.pid_mutex);
-			if (config.consumerd32_bin_path.value &&
-					ustconsumer32_data.pid == 0 &&
+			pthread_mutex_lock(&the_ustconsumer32_data.pid_mutex);
+			if (the_config.consumerd32_bin_path.value &&
+					the_ustconsumer32_data.pid == 0 &&
 					cmd_ctx->lsm.cmd_type != LTTNG_REGISTER_CONSUMER) {
-				pthread_mutex_unlock(&ustconsumer32_data.pid_mutex);
-				ret = start_consumerd(&ustconsumer32_data);
+				pthread_mutex_unlock(&the_ustconsumer32_data.pid_mutex);
+				ret = start_consumerd(&the_ustconsumer32_data);
 				if (ret < 0) {
 					ret = LTTNG_ERR_UST_CONSUMER32_FAIL;
-					uatomic_set(&ust_consumerd32_fd, -EINVAL);
+					uatomic_set(&the_ust_consumerd32_fd, -EINVAL);
 					goto error;
 				}
 
-				uatomic_set(&ust_consumerd32_fd, ustconsumer32_data.cmd_sock);
-				uatomic_set(&ust_consumerd_state, CONSUMER_STARTED);
+				uatomic_set(&the_ust_consumerd32_fd, the_ustconsumer32_data.cmd_sock);
+				uatomic_set(&the_ust_consumerd_state, CONSUMER_STARTED);
 			} else {
-				pthread_mutex_unlock(&ustconsumer32_data.pid_mutex);
+				pthread_mutex_unlock(&the_ustconsumer32_data.pid_mutex);
 			}
 
 			/*
 			 * Setup socket for consumer 32 bit. No need for atomic access
 			 * since it was set above and can ONLY be set in this thread.
 			 */
-			ret = consumer_create_socket(&ustconsumer32_data,
+			ret = consumer_create_socket(&the_ustconsumer32_data,
 					cmd_ctx->session->ust_session->consumer);
 			if (ret < 0) {
 				goto error;
@@ -1042,13 +1200,13 @@ skip_domain:
 		case LTTNG_DOMAIN_LOG4J:
 		case LTTNG_DOMAIN_PYTHON:
 		case LTTNG_DOMAIN_UST:
-			if (uatomic_read(&ust_consumerd_state) != CONSUMER_STARTED) {
+			if (uatomic_read(&the_ust_consumerd_state) != CONSUMER_STARTED) {
 				ret = LTTNG_ERR_NO_USTCONSUMERD;
 				goto error;
 			}
 			break;
 		case LTTNG_DOMAIN_KERNEL:
-			if (uatomic_read(&kernel_consumerd_state) != CONSUMER_STARTED) {
+			if (uatomic_read(&the_kernel_consumerd_state) != CONSUMER_STARTED) {
 				ret = LTTNG_ERR_NO_KERNCONSUMERD;
 				goto error;
 			}
@@ -1060,13 +1218,12 @@ skip_domain:
 	}
 
 	/*
-	 * Check that the UID or GID match that of the tracing session.
+	 * Check that the UID matches that of the tracing session.
 	 * The root user can interact with all sessions.
 	 */
 	if (need_tracing_session) {
 		if (!session_access_ok(cmd_ctx->session,
-				LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds),
-				LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds)) ||
+				LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds)) ||
 				cmd_ctx->session->destroyed) {
 			ret = LTTNG_ERR_EPERM;
 			goto error;
@@ -1150,7 +1307,7 @@ skip_domain:
 				cmd_ctx->lsm.domain.type,
 				cmd_ctx->lsm.u.context.channel_name,
 				ALIGNED_CONST_PTR(cmd_ctx->lsm.u.context.ctx),
-				kernel_poll_pipe[1]);
+				the_kernel_poll_pipe[1]);
 
 		cmd_ctx->lsm.u.context.ctx.u.app_ctx.provider_name = NULL;
 		cmd_ctx->lsm.u.context.ctx.u.app_ctx.ctx_name = NULL;
@@ -1209,7 +1366,7 @@ error_add_context:
 		ret = cmd_enable_channel(cmd_ctx->session,
 				ALIGNED_CONST_PTR(cmd_ctx->lsm.domain),
 				ALIGNED_CONST_PTR(cmd_ctx->lsm.u.channel.chan),
-				kernel_poll_pipe[1]);
+				the_kernel_poll_pipe[1]);
 		break;
 	}
 	case LTTNG_PROCESS_ATTR_TRACKER_ADD_INCLUDE_VALUE:
@@ -1237,9 +1394,17 @@ error_add_context:
 						.value_type;
 		struct process_attr_value *value;
 		enum lttng_error_code ret_code;
+		long login_name_max;
+
+		login_name_max = sysconf(_SC_LOGIN_NAME_MAX);
+		if (login_name_max < 0) {
+			PERROR("Failed to get _SC_LOGIN_NAME_MAX system configuration");
+			ret = LTTNG_ERR_INVALID;
+			goto error;
+		}
 
 		/* Receive remaining variable length payload if applicable. */
-		if (name_len > LOGIN_NAME_MAX) {
+		if (name_len > login_name_max) {
 			/*
 			 * POSIX mandates user and group names that are at least
 			 * 8 characters long. Note that although shadow-utils
@@ -1247,9 +1412,9 @@ error_add_context:
 			 * limit (from bits/utmp.h, UT_NAMESIZE),
 			 * LOGIN_NAME_MAX is defined to 256.
 			 */
-			ERR("Rejecting process attribute tracker value %s as the provided exceeds the maximal allowed length: argument length = %zu, maximal length = %d",
+			ERR("Rejecting process attribute tracker value %s as the provided exceeds the maximal allowed length: argument length = %zu, maximal length = %ld",
 					add_value ? "addition" : "removal",
-					name_len, LOGIN_NAME_MAX);
+					name_len, login_name_max);
 			ret = LTTNG_ERR_INVALID;
 			goto error;
 		}
@@ -1281,6 +1446,11 @@ error_add_context:
 
 		payload_view = lttng_buffer_view_from_dynamic_buffer(
 				&payload, 0, name_len);
+		if (name_len > 0 && !lttng_buffer_view_is_valid(&payload_view)) {
+			ret = LTTNG_ERR_INVALID_PROTOCOL;
+			goto error_add_remove_tracker_value;
+		}
+
 		/*
 		 * Validate the value type and domains are legal for the process
 		 * attribute tracker that is specified and convert the value to
@@ -1401,7 +1571,7 @@ error_add_context:
 	{
 		struct lttng_event *ev = NULL;
 		struct lttng_event_exclusion *exclusion = NULL;
-		struct lttng_filter_bytecode *bytecode = NULL;
+		struct lttng_bytecode *bytecode = NULL;
 		char *filter_expression = NULL;
 
 		/* Handle exclusion events and receive it from the client. */
@@ -1530,7 +1700,7 @@ error_add_context:
 				cmd_ctx->lsm.u.enable.channel_name,
 				ev,
 				filter_expression, bytecode, exclusion,
-				kernel_poll_pipe[1]);
+				the_kernel_poll_pipe[1]);
 		lttng_event_destroy(ev);
 		break;
 	}
@@ -1686,8 +1856,7 @@ error_add_context:
 	case LTTNG_DESTROY_SESSION:
 	{
 		ret = cmd_destroy_session(cmd_ctx->session,
-				notification_thread_handle,
-				sock);
+				the_notification_thread_handle, sock);
 		break;
 	}
 	case LTTNG_LIST_DOMAINS:
@@ -1739,32 +1908,34 @@ error_add_context:
 	}
 	case LTTNG_LIST_EVENTS:
 	{
-		ssize_t nb_event;
-		struct lttng_event *events = NULL;
-		struct lttcomm_event_command_header cmd_header;
-		size_t total_size;
-
-		memset(&cmd_header, 0, sizeof(cmd_header));
-		/* Extended infos are included at the end of events */
-		nb_event = cmd_list_events(cmd_ctx->lsm.domain.type,
-			cmd_ctx->session, cmd_ctx->lsm.u.list.channel_name,
-			&events, &total_size);
-
-		if (nb_event < 0) {
-			/* Return value is a negative lttng_error_code. */
-			ret = -nb_event;
-			goto error;
+		ssize_t list_ret;
+		struct lttcomm_event_command_header cmd_header = {};
+		size_t original_payload_size;
+		size_t payload_size;
+
+		ret = setup_empty_lttng_msg(cmd_ctx);
+		if (ret) {
+			ret = LTTNG_ERR_NOMEM;
+			goto setup_error;
 		}
 
-		cmd_header.nb_events = nb_event;
-		ret = setup_lttng_msg(cmd_ctx, events, total_size,
-			&cmd_header, sizeof(cmd_header));
-		free(events);
+		original_payload_size = cmd_ctx->reply_payload.buffer.size;
 
-		if (ret < 0) {
-			goto setup_error;
+		/* Extended infos are included at the end of the payload. */
+		list_ret = cmd_list_events(cmd_ctx->lsm.domain.type,
+				cmd_ctx->session,
+				cmd_ctx->lsm.u.list.channel_name,
+				&cmd_ctx->reply_payload);
+		if (list_ret < 0) {
+			/* Return value is a negative lttng_error_code. */
+			ret = -list_ret;
+			goto error;
 		}
 
+		payload_size = cmd_ctx->reply_payload.buffer.size -
+				sizeof(cmd_header) - original_payload_size;
+		update_lttng_msg(cmd_ctx, sizeof(cmd_header), payload_size);
+
 		ret = LTTNG_OK;
 		break;
 	}
@@ -1811,7 +1982,7 @@ error_add_context:
 
 		switch (cmd_ctx->lsm.domain.type) {
 		case LTTNG_DOMAIN_KERNEL:
-			cdata = &kconsumer_data;
+			cdata = &the_kconsumer_data;
 			break;
 		default:
 			ret = LTTNG_ERR_UND;
@@ -1978,14 +2149,71 @@ error_add_context:
 	}
 	case LTTNG_REGISTER_TRIGGER:
 	{
-		ret = cmd_register_trigger(cmd_ctx, *sock,
-				notification_thread_handle);
+		struct lttng_trigger *payload_trigger;
+		struct lttng_trigger *return_trigger;
+		size_t original_reply_payload_size;
+		size_t reply_payload_size;
+		const struct lttng_credentials cmd_creds = {
+			.uid = LTTNG_OPTIONAL_INIT_VALUE(cmd_ctx->creds.uid),
+			.gid = LTTNG_OPTIONAL_INIT_VALUE(cmd_ctx->creds.gid),
+		};
+
+		ret = setup_empty_lttng_msg(cmd_ctx);
+		if (ret) {
+			ret = LTTNG_ERR_NOMEM;
+			goto setup_error;
+		}
+
+		ret = receive_lttng_trigger(
+				cmd_ctx, *sock, sock_error, &payload_trigger);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
+
+		original_reply_payload_size = cmd_ctx->reply_payload.buffer.size;
+
+		ret = cmd_register_trigger(&cmd_creds, payload_trigger,
+				the_notification_thread_handle,
+				&return_trigger);
+		if (ret != LTTNG_OK) {
+			lttng_trigger_put(payload_trigger);
+			goto error;
+		}
+
+		ret = lttng_trigger_serialize(return_trigger, &cmd_ctx->reply_payload);
+		lttng_trigger_put(payload_trigger);
+		lttng_trigger_put(return_trigger);
+		if (ret) {
+			ERR("Failed to serialize trigger in reply to \"register trigger\" command");
+			ret = LTTNG_ERR_NOMEM;
+			goto error;
+		}
+
+		reply_payload_size = cmd_ctx->reply_payload.buffer.size -
+			original_reply_payload_size;
+
+		update_lttng_msg(cmd_ctx, 0, reply_payload_size);
+
+		ret = LTTNG_OK;
 		break;
 	}
 	case LTTNG_UNREGISTER_TRIGGER:
 	{
-		ret = cmd_unregister_trigger(cmd_ctx, *sock,
-				notification_thread_handle);
+		struct lttng_trigger *payload_trigger;
+		const struct lttng_credentials cmd_creds = {
+			.uid = LTTNG_OPTIONAL_INIT_VALUE(cmd_ctx->creds.uid),
+			.gid = LTTNG_OPTIONAL_INIT_VALUE(cmd_ctx->creds.gid),
+		};
+
+		ret = receive_lttng_trigger(
+				cmd_ctx, *sock, sock_error, &payload_trigger);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
+
+		ret = cmd_unregister_trigger(&cmd_creds, payload_trigger,
+				the_notification_thread_handle);
+		lttng_trigger_put(payload_trigger);
 		break;
 	}
 	case LTTNG_ROTATE_SESSION:
@@ -2057,11 +2285,9 @@ error_add_context:
 		schedule_type = (enum lttng_rotation_schedule_type) cmd_ctx->lsm.u.rotation_set_schedule.type;
 		value = cmd_ctx->lsm.u.rotation_set_schedule.value;
 
-		ret = cmd_rotation_set_schedule(cmd_ctx->session,
-				set_schedule,
-				schedule_type,
-				value,
-				notification_thread_handle);
+		ret = cmd_rotation_set_schedule(cmd_ctx->session, set_schedule,
+				schedule_type, value,
+				the_notification_thread_handle);
 		if (ret != LTTNG_OK) {
 			goto error;
 		}
@@ -2092,6 +2318,44 @@ error_add_context:
 		ret = cmd_clear_session(cmd_ctx->session, sock);
 		break;
 	}
+	case LTTNG_LIST_TRIGGERS:
+	{
+		struct lttng_triggers *return_triggers = NULL;
+		size_t original_payload_size;
+		size_t payload_size;
+
+		ret = setup_empty_lttng_msg(cmd_ctx);
+		if (ret) {
+			ret = LTTNG_ERR_NOMEM;
+			goto setup_error;
+		}
+
+		original_payload_size = cmd_ctx->reply_payload.buffer.size;
+
+		ret = cmd_list_triggers(cmd_ctx, the_notification_thread_handle,
+				&return_triggers);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
+
+		assert(return_triggers);
+		ret = lttng_triggers_serialize(
+				return_triggers, &cmd_ctx->reply_payload);
+		lttng_triggers_destroy(return_triggers);
+		if (ret) {
+			ERR("Failed to serialize triggers in reply to `list triggers` command");
+			ret = LTTNG_ERR_NOMEM;
+			goto error;
+		}
+
+		payload_size = cmd_ctx->reply_payload.buffer.size -
+			original_payload_size;
+
+		update_lttng_msg(cmd_ctx, 0, payload_size);
+
+		ret = LTTNG_OK;
+		break;
+	}
 	default:
 		ret = LTTNG_ERR_UND;
 		break;
@@ -2126,9 +2390,11 @@ static int create_client_sock(void)
 	const mode_t old_umask = umask(0);
 
 	/* Create client tool unix socket */
-	client_sock = lttcomm_create_unix_sock(config.client_unix_sock_path.value);
+	client_sock = lttcomm_create_unix_sock(
+			the_config.client_unix_sock_path.value);
 	if (client_sock < 0) {
-		ERR("Create unix sock failed: %s", config.client_unix_sock_path.value);
+		ERR("Create unix sock failed: %s",
+				the_config.client_unix_sock_path.value);
 		ret = -1;
 		goto end;
 	}
@@ -2142,10 +2408,11 @@ static int create_client_sock(void)
 	}
 
 	/* File permission MUST be 660 */
-	ret = chmod(config.client_unix_sock_path.value, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
+	ret = chmod(the_config.client_unix_sock_path.value,
+			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
 	if (ret < 0) {
 		ERR("Set file permissions failed: %s",
-				config.client_unix_sock_path.value);
+				the_config.client_unix_sock_path.value);
 		PERROR("chmod");
 		(void) lttcomm_close_unix_sock(client_sock);
 		ret = -1;
@@ -2195,7 +2462,7 @@ static void *thread_manage_clients(void *data)
 
 	rcu_register_thread();
 
-	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_CMD);
+	health_register(the_health_sessiond, HEALTH_SESSIOND_TYPE_CMD);
 
 	health_code_update();
 
@@ -2248,8 +2515,8 @@ static void *thread_manage_clients(void *data)
 			.gid = UINT32_MAX,
 		};
 		cmd_ctx.session = NULL;
-		lttng_dynamic_buffer_set_size(&cmd_ctx.reply_payload.buffer, 0);
-		lttng_dynamic_array_clear(&cmd_ctx.reply_payload._fds);
+		lttng_payload_clear(&cmd_ctx.reply_payload);
+		cmd_ctx.lttng_msg_size = 0;
 
 		DBG("Accepting client command ...");
 
@@ -2366,6 +2633,14 @@ static void *thread_manage_clients(void *data)
 			continue;
 		}
 
+		if (ret < LTTNG_OK || ret >= LTTNG_ERR_NR) {
+			WARN("Command returned an invalid status code, returning unknown error: "
+					"command type = %s (%d), ret = %d",
+					lttcomm_sessiond_command_str(cmd_ctx.lsm.cmd_type),
+					cmd_ctx.lsm.cmd_type, ret);
+			ret = LTTNG_ERR_UNK;
+		}
+
 		cmd_completion_handler = cmd_pop_completion_handler();
 		if (cmd_completion_handler) {
 			enum lttng_error_code completion_code;
@@ -2384,13 +2659,14 @@ static void *thread_manage_clients(void *data)
 					lttng_payload_view_from_payload(
 							&cmd_ctx.reply_payload,
 							0, -1);
-			const struct lttcomm_lttng_msg *llm = (typeof(
+			struct lttcomm_lttng_msg *llm = (typeof(
 					llm)) cmd_ctx.reply_payload.buffer.data;
 
-			assert(cmd_ctx.reply_payload.buffer.size >=
-			       sizeof(llm));
+			assert(cmd_ctx.reply_payload.buffer.size >= sizeof(*llm));
 			assert(cmd_ctx.lttng_msg_size == cmd_ctx.reply_payload.buffer.size);
 
+			llm->fd_count = lttng_payload_view_get_fd_handle_count(&view);
+
 			DBG("Sending response (size: %d, retcode: %s (%d))",
 					cmd_ctx.lttng_msg_size,
 					lttng_strerror(-llm->ret_code),
@@ -2424,7 +2700,7 @@ error:
 
 error_listen:
 error_create_poll:
-	unlink(config.client_unix_sock_path.value);
+	unlink(the_config.client_unix_sock_path.value);
 	ret = close(client_sock);
 	if (ret) {
 		PERROR("close");
@@ -2435,7 +2711,7 @@ error_create_poll:
 		ERR("Health error occurred in %s", __func__);
 	}
 
-	health_unregister(health_sessiond);
+	health_unregister(the_health_sessiond);
 
 	DBG("Client thread dying");
 	lttng_payload_reset(&cmd_ctx.reply_payload);