sessiond: make disable_context static

[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 eeba2a2ab50eb5466b3b5b2aecd006eccbdfb7db..d376c9ee3cc31ff7817d9a99146f88fd8e806c45 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -84,7 +84,6 @@ char *setup_channel_trace_path(struct consumer_output *consumer,
                goto error;
        } else if (ret >= LTTNG_PATH_MAX) {
                ERR("Truncation occurred while formatting channel path");
-               ret = -1;
                goto error;
        }
 
@@ -1152,9 +1151,10 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
 
        if (type == LTTNG_STREAM_CONTROL) {
                char output_path[LTTNG_PATH_MAX] = {};
+               uint64_t relayd_session_id;
 
                ret = relayd_create_session(rsock,
-                               &msg.u.relayd_sock.relayd_session_id,
+                               &relayd_session_id,
                                session_name, hostname, base_path,
                                session_live_timer,
                                consumer->snapshot, session_id,
@@ -1167,6 +1167,7 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
                        (void) relayd_close(rsock);
                        goto error;
                }
+               msg.u.relayd_sock.relayd_session_id = relayd_session_id;
                DBG("Created session on relay, output path reply: %s",
                        output_path);
        }
@@ -1189,7 +1190,7 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
        }
 
        DBG3("Sending relayd socket file descriptor to consumer");
-       ret = consumer_send_fds(consumer_sock, &rsock->sock.fd, 1);
+       ret = consumer_send_fds(consumer_sock, ALIGNED_CONST_PTR(rsock->sock.fd), 1);
        if (ret < 0) {
                goto error;
        }