Fix: honor base path for network URIs

[lttng-tools.git] / src / bin / lttng-sessiond / consumer.c

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index 9c178f5fae87346bb7d2ca4980652fe476390a32..3e23d3255b3fa3334b51d789c1d7bf8a516ecd3d 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -1075,8 +1075,8 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
                struct lttcomm_relayd_sock *rsock, struct consumer_output *consumer,
                enum lttng_stream_type type, uint64_t session_id,
                const char *session_name, const char *hostname,
-               int session_live_timer, const uint64_t *current_chunk_id,
-               time_t session_creation_time)
+               const char *base_path, int session_live_timer,
+               const uint64_t *current_chunk_id, time_t session_creation_time)
 {
        int ret;
        struct lttcomm_consumer_msg msg;
@@ -1096,7 +1096,8 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
        if (type == LTTNG_STREAM_CONTROL) {
                ret = relayd_create_session(rsock,
                                &msg.u.relayd_sock.relayd_session_id,
-                               session_name, hostname, session_live_timer,
+                               session_name, hostname, base_path,
+                               session_live_timer,
                                consumer->snapshot, session_id,
                                sessiond_uuid, current_chunk_id,
                                session_creation_time);
@@ -1698,7 +1699,7 @@ int consumer_create_trace_chunk(struct consumer_socket *socket,
        const struct lttng_directory_handle *chunk_directory_handle;
        int chunk_dirfd;
        const char *chunk_name;
-       bool chunk_name_overriden;
+       bool chunk_name_overridden;
        uint64_t chunk_id;
        time_t creation_timestamp;
        char creation_timestamp_buffer[ISO8601_STR_LEN];
@@ -1718,14 +1719,14 @@ int consumer_create_trace_chunk(struct consumer_socket *socket,
        }
 
        chunk_status = lttng_trace_chunk_get_name(chunk, &chunk_name,
-                       &chunk_name_overriden);
+                       &chunk_name_overridden);
        if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK &&
                        chunk_status != LTTNG_TRACE_CHUNK_STATUS_NONE) {
                ERR("Failed to get name of trace chunk");
                ret = -LTTNG_ERR_FATAL;
                goto error;
        }
-       if (chunk_name_overriden) {
+       if (chunk_name_overridden) {
                ret = lttng_strncpy(msg.u.create_trace_chunk.override_name,
                                chunk_name,
                                sizeof(msg.u.create_trace_chunk.override_name));