X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Fevent-rule.c;h=fbcb7a018a0c0889b32725877e850f1d85a81549;hp=efeb765398a5c9ce807fb49899c1c4a0b74fe480;hb=683d081a7f3734fcb5c8dd4424b0aa102117d1a0;hpb=7a3dcaf60e26cbedf0363a6bd0da7116e013bc80

diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c
index efeb76539..fbcb7a018 100644
--- a/src/common/event-rule/event-rule.c
+++ b/src/common/event-rule/event-rule.c
@@ -12,6 +12,10 @@
 #include <common/payload.h>
 #include <common/payload-view.h>
 #include <lttng/event-rule/event-rule-internal.h>
+#include <lttng/event-rule/kprobe-internal.h>
+#include <lttng/event-rule/syscall-internal.h>
+#include <lttng/event-rule/tracepoint-internal.h>
+#include <lttng/event-rule/uprobe-internal.h>
 #include <stdbool.h>
 
 enum lttng_event_rule_type lttng_event_rule_get_type(
@@ -28,9 +32,12 @@ enum lttng_domain_type lttng_event_rule_get_domain_type(
 
 	switch (lttng_event_rule_get_type(event_rule)) {
 	case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
-		/* TODO */
-		domain_type = LTTNG_DOMAIN_NONE;
+	{
+		enum lttng_event_rule_status status;
+		status = lttng_event_rule_tracepoint_get_domain_type(event_rule, &domain_type);
+		assert(status == LTTNG_EVENT_RULE_STATUS_OK);
 		break;
+	}
 	case LTTNG_EVENT_RULE_TYPE_SYSCALL:
 	case LTTNG_EVENT_RULE_TYPE_KPROBE:
 	case LTTNG_EVENT_RULE_TYPE_KRETPROBE:
@@ -138,33 +145,43 @@ ssize_t lttng_event_rule_create_from_payload(
 		struct lttng_event_rule **event_rule)
 {
 	ssize_t ret, consumed = 0;
-	const struct lttng_event_rule_comm *event_rule_comm;
 	event_rule_create_from_payload_cb create_from_payload = NULL;
+	const struct lttng_event_rule_comm *event_rule_comm;
+	const struct lttng_payload_view event_rule_comm_view =
+			lttng_payload_view_from_view(
+					view, 0, sizeof(*event_rule_comm));
 
 	if (!view || !event_rule) {
 		ret = -1;
 		goto end;
 	}
 
+	if (!lttng_payload_view_is_valid(&event_rule_comm_view)) {
+		ret = -1;
+		goto end;
+	}
+
 	DBG("Deserializing event_rule from payload");
-	event_rule_comm = (const struct lttng_event_rule_comm *) view->buffer.data;
+	event_rule_comm = (const struct lttng_event_rule_comm *) event_rule_comm_view.buffer.data;
 	consumed += sizeof(*event_rule_comm);
 
 	switch ((enum lttng_event_rule_type) event_rule_comm->event_rule_type) {
 	case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
-		/* TODO */
+		create_from_payload =
+				lttng_event_rule_tracepoint_create_from_payload;
 		break;
 	case LTTNG_EVENT_RULE_TYPE_KPROBE:
-		/* TODO */
+		create_from_payload = lttng_event_rule_kprobe_create_from_payload;
 		break;
 	case LTTNG_EVENT_RULE_TYPE_KRETPROBE:
 		/* TODO */
 		break;
 	case LTTNG_EVENT_RULE_TYPE_UPROBE:
-		/* TODO */
+		create_from_payload = lttng_event_rule_uprobe_create_from_payload;
 		break;
 	case LTTNG_EVENT_RULE_TYPE_SYSCALL:
-		/* TODO */
+		create_from_payload =
+				lttng_event_rule_syscall_create_from_payload;
 		break;
 	default:
 		ERR("Attempted to create event rule of unknown type (%i)",