X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fclient.c;h=faf5d579fde6fbb7affa61267babdce675f6d844;hp=8a2ef85b7345c33d89cd2914134bd075a71b4e9e;hb=fbc9f37df245d544a7705ba576297df791220b44;hpb=d7b377ed1acd4043bde353d99122e0e56fa4e975

diff --git a/src/bin/lttng-sessiond/client.c b/src/bin/lttng-sessiond/client.c
index 8a2ef85b7..faf5d579f 100644
--- a/src/bin/lttng-sessiond/client.c
+++ b/src/bin/lttng-sessiond/client.c
@@ -31,6 +31,7 @@
 #include <signal.h>
 #include <stddef.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 #include "client.h"
 #include "lttng-sessiond.h"
@@ -800,6 +801,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 	case LTTNG_ROTATION_SET_SCHEDULE:
 	case LTTNG_SESSION_LIST_ROTATION_SCHEDULES:
 	case LTTNG_CLEAR_SESSION:
+	case LTTNG_LIST_TRIGGERS:
 		need_domain = 0;
 		break;
 	default:
@@ -846,6 +848,7 @@ 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_LIST_TRIGGERS:
 		break;
 	default:
 		/* Setup lttng message with no payload */
@@ -866,6 +869,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 	case LTTNG_SAVE_SESSION:
 	case LTTNG_REGISTER_TRIGGER:
 	case LTTNG_UNREGISTER_TRIGGER:
+	case LTTNG_LIST_TRIGGERS:
 		need_tracing_session = 0;
 		break;
 	default:
@@ -1281,9 +1285,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
@@ -1291,9 +1303,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;
 		}
@@ -1325,6 +1337,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
@@ -2024,8 +2041,41 @@ error_add_context:
 	}
 	case LTTNG_REGISTER_TRIGGER:
 	{
+		struct lttng_trigger *return_trigger;
+		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_register_trigger(cmd_ctx, *sock,
-				notification_thread_handle);
+				notification_thread_handle, &return_trigger);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
+
+		ret = lttng_trigger_serialize(return_trigger, &cmd_ctx->reply_payload);
+		if (ret) {
+			ERR("Failed to serialize trigger in reply to \"register trigger\" command");
+			ret = LTTNG_ERR_NOMEM;
+			lttng_trigger_destroy(return_trigger);
+			goto error;
+		}
+
+		lttng_trigger_destroy(return_trigger);
+		return_trigger = NULL;
+
+		payload_size = cmd_ctx->reply_payload.buffer.size -
+			original_payload_size;
+
+		update_lttng_msg(cmd_ctx, 0, payload_size);
+
+		ret = LTTNG_OK;
 		break;
 	}
 	case LTTNG_UNREGISTER_TRIGGER:
@@ -2138,6 +2188,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,
+				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;