X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fclient.c;h=00b5ec7e4ab7bb4db6a67c0c32855d2e77236162;hp=6c17ea2c1c24995a66439bcc2b3b60228c7fadcc;hb=b5ef16855f9c69315d9530730200890dbbebad24;hpb=746e08d773ef6c7bbbae1334350b8a2c46aaeb0e

diff --git a/src/bin/lttng-sessiond/client.c b/src/bin/lttng-sessiond/client.c
index 6c17ea2c1..00b5ec7e4 100644
--- a/src/bin/lttng-sessiond/client.c
+++ b/src/bin/lttng-sessiond/client.c
@@ -43,6 +43,7 @@
 #include "utils.h"
 #include "manage-consumer.h"
 #include "clear.h"
+#include "agent-thread.h"
 
 static bool is_root;
 
@@ -704,7 +705,7 @@ static enum lttng_error_code receive_lttng_trigger(struct command_ctx *cmd_ctx,
 	ssize_t sock_recv_len;
 	enum lttng_error_code ret_code;
 	struct lttng_payload trigger_payload;
-	struct lttng_trigger *trigger;
+	struct lttng_trigger *trigger = NULL;
 
 	lttng_payload_init(&trigger_payload);
 	trigger_len = (size_t) cmd_ctx->lsm.u.trigger.length;
@@ -754,6 +755,7 @@ static enum lttng_error_code receive_lttng_trigger(struct command_ctx *cmd_ctx,
 				trigger_len) {
 			ERR("Invalid trigger received as part of command payload");
 			ret_code = LTTNG_ERR_INVALID_TRIGGER;
+			lttng_trigger_put(trigger);
 			goto end;
 		}
 	}
@@ -844,7 +846,9 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 	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());
 
@@ -1076,6 +1080,11 @@ 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()) {
@@ -2608,6 +2617,11 @@ 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 = %d, ret = %d", 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;
@@ -2629,8 +2643,7 @@ static void *thread_manage_clients(void *data)
 			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);