X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsnapshot.c;h=03b830de7d32cb62a7a388bde33e19c63ce6ccfe;hp=8faf9a76a28f99f497c1b4542ed0acdfd5d5603f;hb=1f4962443f25c371e4b54e97f9eb867d67cbf88e;hpb=53efb85a242809ed5ed21e9ab40effa696ecbc6f

diff --git a/src/bin/lttng-sessiond/snapshot.c b/src/bin/lttng-sessiond/snapshot.c
index 8faf9a76a..03b830de7 100644
--- a/src/bin/lttng-sessiond/snapshot.c
+++ b/src/bin/lttng-sessiond/snapshot.c
@@ -15,7 +15,7 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <inttypes.h>
 #include <string.h>
@@ -39,17 +39,19 @@ static inline unsigned long get_next_output_id(struct snapshot *snapshot)
  *
  * Return 0 on success or else a negative value.
  */
-static int output_init(uint64_t max_size, const char *name,
+static int output_init(const struct ltt_session *session,
+		uint64_t max_size, const char *name,
 		struct lttng_uri *uris, size_t nb_uri,
 		struct consumer_output *consumer, struct snapshot_output *output,
 		struct snapshot *snapshot)
 {
 	int ret = 0, i;
 
-	assert(output);
-
 	memset(output, 0, sizeof(struct snapshot_output));
 
+	/*
+	 * max_size of -1ULL means unset. Set to default (unlimited).
+	 */
 	if (max_size == (uint64_t) -1ULL) {
 		max_size = 0;
 	}
@@ -61,7 +63,10 @@ static int output_init(uint64_t max_size, const char *name,
 	lttng_ht_node_init_ulong(&output->node, (unsigned long) output->id);
 
 	if (name && name[0] != '\0') {
-		strncpy(output->name, name, sizeof(output->name));
+		if (lttng_strncpy(output->name, name, sizeof(output->name))) {
+			ret = -LTTNG_ERR_INVALID;
+			goto error;
+		}
 	} else {
 		/* Set default name. */
 		ret = snprintf(output->name, sizeof(output->name), "%s-%" PRIu32,
@@ -90,10 +95,14 @@ static int output_init(uint64_t max_size, const char *name,
 	}
 
 	if (uris[0].dtype == LTTNG_DST_PATH) {
-		memset(output->consumer->dst.trace_path, 0,
-				sizeof(output->consumer->dst.trace_path));
-		strncpy(output->consumer->dst.trace_path, uris[0].dst.path,
-				sizeof(output->consumer->dst.trace_path));
+		memset(output->consumer->dst.session_root_path, 0,
+				sizeof(output->consumer->dst.session_root_path));
+		if (lttng_strncpy(output->consumer->dst.session_root_path,
+				uris[0].dst.path,
+				sizeof(output->consumer->dst.session_root_path))) {
+			ret = -LTTNG_ERR_INVALID;
+			goto error;
+		}
 		output->consumer->type = CONSUMER_DST_LOCAL;
 		ret = 0;
 		goto end;
@@ -107,7 +116,8 @@ static int output_init(uint64_t max_size, const char *name,
 
 	for (i = 0; i < nb_uri; i ++) {
 		/* Network URIs */
-		ret = consumer_set_network_uri(output->consumer, &uris[i]);
+		ret = consumer_set_network_uri(session, output->consumer,
+				&uris[i]);
 		if (ret < 0) {
 			goto error;
 		}
@@ -124,13 +134,14 @@ end:
  *
  * Return 0 on success or else a negative value.
  */
-int snapshot_output_init_with_uri(uint64_t max_size, const char *name,
+int snapshot_output_init_with_uri(const struct ltt_session *session,
+		uint64_t max_size, const char *name,
 		struct lttng_uri *uris, size_t nb_uri,
 		struct consumer_output *consumer, struct snapshot_output *output,
 		struct snapshot *snapshot)
 {
-	return output_init(max_size, name, uris, nb_uri, consumer, output,
-			snapshot);
+	return output_init(session, max_size, name, uris, nb_uri, consumer,
+			output, snapshot);
 }
 
 /*
@@ -139,7 +150,8 @@ int snapshot_output_init_with_uri(uint64_t max_size, const char *name,
  *
  * Return 0 on success or else a negative value.
  */
-int snapshot_output_init(uint64_t max_size, const char *name,
+int snapshot_output_init(const struct ltt_session *session,
+		uint64_t max_size, const char *name,
 		const char *ctrl_url, const char *data_url,
 		struct consumer_output *consumer, struct snapshot_output *output,
 		struct snapshot *snapshot)
@@ -154,8 +166,8 @@ int snapshot_output_init(uint64_t max_size, const char *name,
 		goto error;
 	}
 
-	ret = output_init(max_size, name, uris, nb_uri, consumer, output,
-			snapshot);
+	ret = output_init(session, max_size, name, uris, nb_uri, consumer,
+			output, snapshot);
 
 error:
 	free(uris);
@@ -221,7 +233,7 @@ void snapshot_output_destroy(struct snapshot_output *obj)
 
 	if (obj->consumer) {
 		consumer_output_send_destroy_relayd(obj->consumer);
-		consumer_destroy_output(obj->consumer);
+		consumer_output_put(obj->consumer);
 	}
 	free(obj);
 }
@@ -313,7 +325,9 @@ void snapshot_destroy(struct snapshot *obj)
 	struct lttng_ht_iter iter;
 	struct snapshot_output *output;
 
-	assert(obj);
+	if (!obj->output_ht) {
+		return;
+	}
 
 	rcu_read_lock();
 	cds_lfht_for_each_entry(obj->output_ht->ht, &iter.iter, output,