X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsession.c;h=c4a62c986946ac09f73fe66108b060b534915ff3;hb=334dfcb7fdb6c4fabb16eea4fb25cf344c063579;hp=0997fdd6579469098f0db94eb8d31fbfc0ef183c;hpb=c35f9726a22f1d93e14589688d830efccda196f3;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/session.c b/src/bin/lttng-relayd/session.c
index 0997fdd65..c4a62c986 100644
--- a/src/bin/lttng-relayd/session.c
+++ b/src/bin/lttng-relayd/session.c
@@ -19,14 +19,16 @@
 
 #define _LGPL_SOURCE
 #include <common/common.h>
+#include <common/utils.h>
 #include <common/compat/uuid.h>
 #include <urcu/rculist.h>
 
-#include "lttng-relayd.h"
 #include "ctf-trace.h"
+#include "lttng-relayd.h"
 #include "session.h"
-#include "stream.h"
 #include "sessiond-trace-chunks.h"
+#include "stream.h"
+#include <common/defaults.h>
 
 /* Global session id used in the session creation. */
 static uint64_t last_relay_session_id;
@@ -38,8 +40,31 @@ static int session_set_anonymous_chunk(struct relay_session *session)
 	struct lttng_trace_chunk *chunk = NULL;
 	enum lttng_trace_chunk_status status;
 	struct lttng_directory_handle output_directory;
+	char *output_path;
+	bool output_path_allocated = false;
+
+	if (!opt_output_path) {
+		/* No output path defined */
+		const char *home_dir = utils_get_home_dir();
+		if (!home_dir) {
+			ERR("Home path not found."
+					" Please specify an output path using -o, --output PATH");
+			ret = -1;
+			goto end;
+		}
+		ret = asprintf(&output_path, "%s/%s", home_dir, DEFAULT_TRACE_DIR_NAME);
+		if (ret < 0) {
+			PERROR("asprintf trace dir name");
+			ret = -1;
+			goto end;
+		}
+		output_path_allocated = true;
+	} else {
+		output_path = opt_output_path;
+		output_path_allocated = false;
+	}
 
-	ret = lttng_directory_handle_init(&output_directory, opt_output_path);
+	ret = lttng_directory_handle_init(&output_directory, output_path);
 	if (ret) {
 		goto end;
 	}
@@ -65,6 +90,9 @@ static int session_set_anonymous_chunk(struct relay_session *session)
 end:
 	lttng_trace_chunk_put(chunk);
 	lttng_directory_handle_fini(&output_directory);
+	if (output_path_allocated) {
+		free(output_path);
+	}
 	return ret;
 }
 
@@ -74,7 +102,7 @@ end:
  * Return allocated session or else NULL.
  */
 struct relay_session *session_create(const char *session_name,
-		const char *hostname,
+		const char *hostname, const char *base_path,
 		uint32_t live_timer,
 		bool snapshot,
 		const lttng_uuid sessiond_uuid,
@@ -82,10 +110,27 @@ struct relay_session *session_create(const char *session_name,
 		const uint64_t *current_chunk_id,
 		const time_t *creation_time,
 		uint32_t major,
-		uint32_t minor)
+		uint32_t minor,
+		bool session_name_contains_creation_time)
 {
 	int ret;
-	struct relay_session *session;
+	struct relay_session *session = NULL;
+
+	if (session_name && strstr(session_name, ".")) {
+		ERR("Illegal character in session name: \"%s\"",
+				session_name);
+		goto error;
+	}
+	if (base_path && strstr(base_path, "../")) {
+		ERR("Invalid session base path walks up the path hierarchy: \"%s\"",
+				base_path);
+		goto error;
+	}
+	if (hostname && strstr(hostname, ".")) {
+		ERR("Invalid character in hostname: \"%s\"",
+				hostname);
+		goto error;
+	}
 
 	session = zmalloc(sizeof(*session));
 	if (!session) {
@@ -102,6 +147,17 @@ struct relay_session *session_create(const char *session_name,
 		WARN("Hostname exceeds maximal allowed length");
 		goto error;
 	}
+	if (lttng_strncpy(session->base_path, base_path,
+			sizeof(session->base_path))) {
+		WARN("Base path exceeds maximal allowed length");
+		goto error;
+	}
+	if (creation_time) {
+		LTTNG_OPTIONAL_SET(&session->creation_time, *creation_time);
+	}
+	session->session_name_contains_creation_time =
+			session_name_contains_creation_time;
+
 	session->ctf_traces_ht = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
 	if (!session->ctf_traces_ht) {
 		goto error;
@@ -161,9 +217,6 @@ struct relay_session *session_create(const char *session_name,
 	}
 
 	lttng_ht_add_unique_u64(sessions_ht, &session->session_n);
-	if (creation_time) {
-		LTTNG_OPTIONAL_SET(&session->creation_time, *creation_time);
-	}
 	return session;
 
 error:
@@ -245,6 +298,8 @@ static void destroy_session(struct relay_session *session)
 	assert(!ret);
 	lttng_trace_chunk_put(session->current_trace_chunk);
 	session->current_trace_chunk = NULL;
+	lttng_trace_chunk_put(session->pending_closure_trace_chunk);
+	session->pending_closure_trace_chunk = NULL;
 	ret = sessiond_trace_chunk_registry_session_destroyed(
 			sessiond_trace_chunk_registry, session->sessiond_uuid);
 	assert(!ret);