Clean-up: kernel_consumer_add_stream() does not need to be public

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

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 160c19f598329ec03c6d82023ad55f09bc38db03..49adabb72336b11d0255e3a1f1d2462b0a70601a 100644 (file)
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -52,6 +52,13 @@ static char *create_channel_path(struct consumer_output *consumer,
                if (ret < 0) {
                        PERROR("snprintf kernel channel path");
                        goto error;
+               } else if (ret >= sizeof(tmp_path)) {
+                       ERR("Kernel channel path exceeds the maximal allowed length of of %zu bytes (%i bytes required) with path \"%s%s%s\"",
+                                       sizeof(tmp_path), ret,
+                                       consumer->dst.session_root_path,
+                                       consumer->chunk_path,
+                                       consumer->subdir);
+                       goto error;
                }
                pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
                if (!pathname) {
@@ -75,6 +82,12 @@ static char *create_channel_path(struct consumer_output *consumer,
                if (ret < 0) {
                        PERROR("snprintf kernel metadata path");
                        goto error;
+               } else if (ret >= sizeof(tmp_path)) {
+                       ERR("Kernel channel path exceeds the maximal allowed length of of %zu bytes (%i bytes required) with path \"%s%s\"",
+                                       sizeof(tmp_path), ret,
+                                       consumer->dst.net.base_dir,
+                                       consumer->subdir);
+                       goto error;
                }
                pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
                if (!pathname) {
@@ -132,8 +145,7 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
        }
 
        /* Prep channel message structure */
-       consumer_init_channel_comm_msg(&lkm,
-                       LTTNG_CONSUMER_ADD_CHANNEL,
+       consumer_init_add_channel_comm_msg(&lkm,
                        channel->key,
                        ksession->id,
                        pathname,
@@ -216,8 +228,7 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
        }
 
        /* Prep channel message structure */
-       consumer_init_channel_comm_msg(&lkm,
-                       LTTNG_CONSUMER_ADD_CHANNEL,
+       consumer_init_add_channel_comm_msg(&lkm,
                        session->metadata->key,
                        session->id,
                        pathname,
@@ -266,6 +277,7 @@ error:
 /*
  * Sending a single stream to the consumer with command ADD_STREAM.
  */
+static
 int kernel_consumer_add_stream(struct consumer_socket *sock,
                struct ltt_kernel_channel *channel, struct ltt_kernel_stream *stream,
                struct ltt_kernel_session *session, unsigned int monitor)
@@ -346,7 +358,7 @@ error:
  *
  * The consumer socket lock must be held by the caller.
  */
-int kernel_consumer_send_channel_stream(struct consumer_socket *sock,
+int kernel_consumer_send_channel_streams(struct consumer_socket *sock,
                struct ltt_kernel_channel *channel, struct ltt_kernel_session *session,
                unsigned int monitor)
 {
@@ -433,7 +445,7 @@ int kernel_consumer_send_session(struct consumer_socket *sock,
 
        /* Send channel and streams of it */
        cds_list_for_each_entry(chan, &session->channel_list.head, list) {
-               ret = kernel_consumer_send_channel_stream(sock, chan, session,
+               ret = kernel_consumer_send_channel_streams(sock, chan, session,
                                monitor);
                if (ret < 0) {
                        goto error;