#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"
/* Global session id used in the session creation. */
static uint64_t last_relay_session_id;
struct lttng_trace_chunk *chunk = NULL;
enum lttng_trace_chunk_status status;
struct lttng_directory_handle output_directory;
+ const char *base_path = opt_output_path;
+
+ if (base_path == NULL) {
+ /* No output path defined */
+ base_path = utils_get_home_dir();
+ if (base_path == NULL) {
+ ERR("Home path not found.\n \
+ Please specify an output path using -o, --output PATH");
+ ret = -1;
+ goto end;
+ }
+ }
- ret = lttng_directory_handle_init(&output_directory, opt_output_path);
+ ret = lttng_directory_handle_init(&output_directory, base_path);
if (ret) {
goto 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,
uint32_t minor)
{
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) {
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;
+ }
+
session->ctf_traces_ht = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
if (!session->ctf_traces_ht) {
goto error;
ret = session_delete(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);
- lttng_trace_chunk_put(session->current_trace_chunk);
- session->current_trace_chunk = NULL;
call_rcu(&session->rcu_node, rcu_destroy_session);
}