X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsnapshot.c;h=cc1d242f21aef6b8976c45d396bbb1fcc8ecc6c1;hp=1060269f3a9e0b15232f07ec380e643fb027a18c;hb=505b2d90aa87592186ecc2a119cf67fb3f90d168;hpb=6c1c0768320135c6936c371b09731851b508c023

diff --git a/src/bin/lttng-sessiond/snapshot.c b/src/bin/lttng-sessiond/snapshot.c
index 1060269f3..cc1d242f2 100644
--- a/src/bin/lttng-sessiond/snapshot.c
+++ b/src/bin/lttng-sessiond/snapshot.c
@@ -1,21 +1,10 @@
 /*
- * Copyright (C) 2013 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <assert.h>
 #include <inttypes.h>
@@ -40,17 +29,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;
 	}
@@ -62,7 +53,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,
@@ -91,10 +85,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;
@@ -108,7 +106,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;
 		}
@@ -125,13 +124,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);
 }
 
 /*
@@ -140,7 +140,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)
@@ -155,8 +156,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);
@@ -222,7 +223,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);
 }
@@ -314,7 +315,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,