X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=fdc72b834158c1de4082d657affff40e93979e08;hb=bfaba83f452c53682bcdc1075e760988b9549b67;hp=6259ed089baa5f401990e90cb5034b3a048f1109;hpb=0a3fca4d597b02143affd90d50aa33409709024a;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 6259ed089..fdc72b834 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -1108,9 +1108,40 @@ int cmd_enable_channel(struct ltt_session *session,
 		break;
 	}
 	case LTTNG_DOMAIN_UST:
+	case LTTNG_DOMAIN_JUL:
+	case LTTNG_DOMAIN_LOG4J:
+	case LTTNG_DOMAIN_PYTHON:
 	{
 		struct ltt_ust_channel *uchan;
 
+		/*
+		 * FIXME
+		 *
+		 * Current agent implementation limitations force us to allow
+		 * only one channel at once in "agent" subdomains. Each
+		 * subdomain has a default channel name which must be strictly
+		 * adhered to.
+		 */
+		if (domain->type == LTTNG_DOMAIN_JUL) {
+			if (strncmp(attr->name, DEFAULT_JUL_CHANNEL_NAME,
+					LTTNG_SYMBOL_NAME_LEN)) {
+				ret = LTTNG_ERR_INVALID_CHANNEL_NAME;
+				goto error;
+			}
+		} else if (domain->type == LTTNG_DOMAIN_LOG4J) {
+			if (strncmp(attr->name, DEFAULT_LOG4J_CHANNEL_NAME,
+					LTTNG_SYMBOL_NAME_LEN)) {
+				ret = LTTNG_ERR_INVALID_CHANNEL_NAME;
+				goto error;
+			}
+		} else if (domain->type == LTTNG_DOMAIN_PYTHON) {
+			if (strncmp(attr->name, DEFAULT_PYTHON_CHANNEL_NAME,
+					LTTNG_SYMBOL_NAME_LEN)) {
+				ret = LTTNG_ERR_INVALID_CHANNEL_NAME;
+				goto error;
+			}
+		}
+
 		chan_ht = usess->domain_global.channels;
 
 		uchan = trace_ust_find_channel_by_name(chan_ht, attr->name);
@@ -1781,6 +1812,7 @@ static int _cmd_enable_event(struct ltt_session *session,
 				filter_copy = zmalloc(filter_size);
 				if (!filter_copy) {
 					ret = LTTNG_ERR_NOMEM;
+					goto error;
 				}
 				memcpy(filter_copy, filter, filter_size);
 
@@ -2313,7 +2345,7 @@ int cmd_create_session_snapshot(char *name, struct lttng_uri *uris,
 	 * Create session in no output mode with URIs set to NULL. The uris we've
 	 * received are for a default snapshot output if one.
 	 */
-	ret = cmd_create_session_uri(name, NULL, 0, creds, -1);
+	ret = cmd_create_session_uri(name, NULL, 0, creds, 0);
 	if (ret != LTTNG_OK) {
 		goto error;
 	}