X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=942e770bac92e8fc56f053c378faa8e9ad65e95e;hb=38956b501df0cc3f5041c5604039c2ec2d8efa76;hp=4b7ef62b600b3cc41f8d47f040b1f949b7b6b093;hpb=52a3011a96d63b7b75e1e643e000b55afa883447;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 4b7ef62b6..942e770ba 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -17,6 +17,7 @@
 
 #define _GNU_SOURCE
 #include <assert.h>
+#include <string.h>
 #include <inttypes.h>
 #include <urcu/list.h>
 #include <urcu/uatomic.h>
@@ -907,11 +908,21 @@ int cmd_enable_channel(struct ltt_session *session,
 	int ret;
 	struct ltt_ust_session *usess = session->ust_session;
 	struct lttng_ht *chan_ht;
+	size_t len;
 
 	assert(session);
 	assert(attr);
 	assert(domain);
 
+	len = strnlen(attr->name, sizeof(attr->name));
+
+	/* Validate channel name */
+	if (attr->name[0] == '.' ||
+		memchr(attr->name, '/', len) != NULL) {
+		ret = LTTNG_ERR_INVALID_CHANNEL_NAME;
+		goto end;
+	}
+
 	DBG("Enabling channel %s for session %s", attr->name, session->name);
 
 	rcu_read_lock();
@@ -992,6 +1003,7 @@ int cmd_enable_channel(struct ltt_session *session,
 
 error:
 	rcu_read_unlock();
+end:
 	return ret;
 }
 
@@ -1947,13 +1959,12 @@ error:
 /*
  * Command LTTNG_SET_CONSUMER_URI processed by the client thread.
  */
-int cmd_set_consumer_uri(int domain, struct ltt_session *session,
-		size_t nb_uri, struct lttng_uri *uris)
+int cmd_set_consumer_uri(struct ltt_session *session, size_t nb_uri,
+		struct lttng_uri *uris)
 {
 	int ret, i;
 	struct ltt_kernel_session *ksess = session->kernel_session;
 	struct ltt_ust_session *usess = session->ust_session;
-	struct consumer_output *consumer = NULL;
 
 	assert(session);
 	assert(uris);
@@ -1965,41 +1976,41 @@ int cmd_set_consumer_uri(int domain, struct ltt_session *session,
 		goto error;
 	}
 
-	/*
-	 * This case switch makes sure the domain session has a temporary consumer
-	 * so the URL can be set.
-	 */
-	switch (domain) {
-	case 0:
-		/* Code flow error. A session MUST always have a consumer object */
-		assert(session->consumer);
-		/*
-		 * The URL will be added to the tracing session consumer instead of a
-		 * specific domain consumer.
-		 */
-		consumer = session->consumer;
-		break;
-	case LTTNG_DOMAIN_KERNEL:
-		/* Code flow error if we don't have a kernel session here. */
-		assert(ksess);
-		assert(ksess->consumer);
-		consumer = ksess->consumer;
-		break;
-	case LTTNG_DOMAIN_UST:
-		/* Code flow error if we don't have a kernel session here. */
-		assert(usess);
-		assert(usess->consumer);
-		consumer = usess->consumer;
-		break;
-	}
-
+	/* Set the "global" consumer URIs */
 	for (i = 0; i < nb_uri; i++) {
-		ret = add_uri_to_consumer(consumer, &uris[i], domain, session->name);
+		ret = add_uri_to_consumer(session->consumer,
+				&uris[i], 0, session->name);
 		if (ret != LTTNG_OK) {
 			goto error;
 		}
 	}
 
+	/* Set UST session URIs */
+	if (session->ust_session) {
+		for (i = 0; i < nb_uri; i++) {
+			ret = add_uri_to_consumer(
+					session->ust_session->consumer,
+					&uris[i], LTTNG_DOMAIN_UST,
+					session->name);
+			if (ret != LTTNG_OK) {
+				goto error;
+			}
+		}
+	}
+
+	/* Set kernel session URIs */
+	if (session->kernel_session) {
+		for (i = 0; i < nb_uri; i++) {
+			ret = add_uri_to_consumer(
+					session->kernel_session->consumer,
+					&uris[i], LTTNG_DOMAIN_KERNEL,
+					session->name);
+			if (ret != LTTNG_OK) {
+				goto error;
+			}
+		}
+	}
+
 	/*
 	 * Make sure to set the session in output mode after we set URI since a
 	 * session can be created without URL (thus flagged in no output mode).
@@ -2007,7 +2018,9 @@ int cmd_set_consumer_uri(int domain, struct ltt_session *session,
 	session->output_traces = 1;
 	if (ksess) {
 		ksess->output_traces = 1;
-	} else if (usess) {
+	}
+
+	if (usess) {
 		usess->output_traces = 1;
 	}
 
@@ -2069,7 +2082,7 @@ int cmd_create_session_uri(char *name, struct lttng_uri *uris,
 	}
 
 	if (uris) {
-		ret = cmd_set_consumer_uri(0, session, nb_uri, uris);
+		ret = cmd_set_consumer_uri(session, nb_uri, uris);
 		if (ret != LTTNG_OK) {
 			goto consumer_error;
 		}