X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=3b67923b9cae45ce088b02853c19d7b0e31799bc;hb=de044b7a0613db6d16151ac9f7b7be404c0bb493;hp=3e532ad60067c6db4a454eb2d4d6b3ab890a6d7e;hpb=9d035200e9006c4d4cf6951c54641e06c0bdf2bc;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 3e532ad60..3b67923b9 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -73,6 +73,33 @@ static int connected;
 int lttng_opt_quiet;
 int lttng_opt_verbose;
 
+/*
+ * Compare two URL destination.
+ *
+ * Return 0 is equal else is not equal.
+ */
+static int compare_destination(struct lttng_uri *ctrl, struct lttng_uri *data)
+{
+	int ret;
+
+	assert(ctrl);
+	assert(data);
+
+	switch (ctrl->dtype) {
+	case LTTNG_DST_IPV4:
+		ret = strncmp(ctrl->dst.ipv4, data->dst.ipv4, sizeof(ctrl->dst.ipv4));
+		break;
+	case LTTNG_DST_IPV6:
+		ret = strncmp(ctrl->dst.ipv6, data->dst.ipv6, sizeof(ctrl->dst.ipv6));
+		break;
+	default:
+		ret = -1;
+		break;
+	}
+
+	return ret;
+}
+
 static void set_default_url_attr(struct lttng_uri *uri,
 		enum lttng_stream_type stype)
 {
@@ -158,6 +185,8 @@ static ssize_t parse_str_urls_to_uri(const char *ctrl_url, const char *data_url,
 	}
 
 	if (data_url) {
+		int ret;
+
 		/* We have to parse the data URL in this case */
 		size_data = uri_parse(data_url, &data_uris);
 		if (size_data < 1) {
@@ -169,6 +198,12 @@ static ssize_t parse_str_urls_to_uri(const char *ctrl_url, const char *data_url,
 		}
 
 		set_default_url_attr(&data_uris[0], LTTNG_STREAM_DATA);
+
+		ret = compare_destination(&ctrl_uris[0], &data_uris[0]);
+		if (ret != 0) {
+			ERR("Control and data destination mismatch");
+			goto error;
+		}
 	}
 
 	/* Compute total size */
@@ -636,9 +671,7 @@ end:
  */
 void lttng_destroy_handle(struct lttng_handle *handle)
 {
-	if (handle) {
-		free(handle);
-	}
+	free(handle);
 }
 
 /*
@@ -1362,6 +1395,8 @@ void lttng_channel_set_default_attr(struct lttng_domain *domain,
 		attr->subbuf_size = default_get_kernel_channel_subbuf_size();
 		attr->num_subbuf = DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM;
 		attr->output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
+		attr->tracefile_size = DEFAULT_KERNEL_CHANNEL_TRACEFILE_SIZE;
+		attr->tracefile_count = DEFAULT_KERNEL_CHANNEL_TRACEFILE_COUNT;
 		break;
 	case LTTNG_DOMAIN_UST:
 #if 0
@@ -1376,6 +1411,8 @@ void lttng_channel_set_default_attr(struct lttng_domain *domain,
 		attr->subbuf_size = default_get_ust_channel_subbuf_size();
 		attr->num_subbuf = DEFAULT_UST_CHANNEL_SUBBUF_NUM;
 		attr->output = DEFAULT_UST_CHANNEL_OUTPUT;
+		attr->tracefile_size = DEFAULT_UST_CHANNEL_TRACEFILE_SIZE;
+		attr->tracefile_count = DEFAULT_UST_CHANNEL_TRACEFILE_COUNT;
 		break;
 	default:
 		/* Default behavior: leave set to 0. */
@@ -1457,47 +1494,19 @@ int lttng_set_consumer_url(struct lttng_handle *handle,
 }
 
 /*
- * Enable consumer for a session and domain.
- *
- * Return 0 on success, else a negative value.
+ * [OBSELETE]
  */
 int lttng_enable_consumer(struct lttng_handle *handle)
 {
-	struct lttcomm_session_msg lsm;
-
-	if (handle == NULL) {
-		return -LTTNG_ERR_INVALID;
-	}
-
-	lsm.cmd_type = LTTNG_ENABLE_CONSUMER;
-
-	copy_string(lsm.session.name, handle->session_name,
-			sizeof(lsm.session.name));
-	copy_lttng_domain(&lsm.domain, &handle->domain);
-
-	return ask_sessiond(&lsm, NULL);
+	return -ENOSYS;
 }
 
 /*
- * Disable consumer for a session and domain.
- *
- * Return 0 on success, else a negative value.
+ * [OBSELETE]
  */
 int lttng_disable_consumer(struct lttng_handle *handle)
 {
-	struct lttcomm_session_msg lsm;
-
-	if (handle == NULL) {
-		return -LTTNG_ERR_INVALID;
-	}
-
-	lsm.cmd_type = LTTNG_DISABLE_CONSUMER;
-
-	copy_string(lsm.session.name, handle->session_name,
-			sizeof(lsm.session.name));
-	copy_lttng_domain(&lsm.domain, &handle->domain);
-
-	return ask_sessiond(&lsm, NULL);
+	return -ENOSYS;
 }
 
 /*
@@ -1619,7 +1628,7 @@ int _lttng_create_session_ext(const char *name, const char *url,
 	struct lttcomm_session_msg lsm;
 	struct lttng_uri *uris = NULL;
 
-	if (name == NULL || datetime == NULL) {
+	if (name == NULL || datetime == NULL || url == NULL) {
 		return -LTTNG_ERR_INVALID;
 	}