#include "session.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;
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;
+ char *output_path;
+ bool output_path_allocated = false;
- if (base_path == NULL) {
+ if (!opt_output_path) {
/* No output path defined */
- base_path = utils_get_home_dir();
- if (base_path == NULL) {
+ const char *home_dir = utils_get_home_dir();
+ if (!home_dir) {
ERR("Home path not found.\n \
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, base_path);
+ ret = lttng_directory_handle_init(&output_directory, output_path);
if (ret) {
goto end;
}
end:
lttng_trace_chunk_put(chunk);
lttng_directory_handle_fini(&output_directory);
+ if (output_path_allocated) {
+ free(output_path);
+ }
return ret;
}
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) {
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) {
}
lttng_ht_add_unique_u64(sessions_ht, &session->session_n);
- if (creation_time) {
- LTTNG_OPTIONAL_SET(&session->creation_time, *creation_time);
- }
return session;
error: