relayd: track stdio output file descriptors

[lttng-tools.git] / src / bin / lttng-relayd / cmd-2-2.c

diff --git a/src/bin/lttng-relayd/cmd-2-2.c b/src/bin/lttng-relayd/cmd-2-2.c
index 4f34d8b66470ba90590e8f895f28e27f607bbc89..915b2eb64a41a84acca565cf8b5135bf786d770b 100644 (file)
--- a/src/bin/lttng-relayd/cmd-2-2.c
+++ b/src/bin/lttng-relayd/cmd-2-2.c
@@ -27,14 +27,13 @@
 #include <common/compat/string.h>
 #include <lttng/constant.h>
 
-#include "cmd-generic.h"
 #include "cmd-2-1.h"
 #include "utils.h"
 
 /*
  * cmd_recv_stream_2_2 allocates path_name and channel_name.
  */
-int cmd_recv_stream_2_2(struct relay_connection *conn,
+int cmd_recv_stream_2_2(const struct lttng_buffer_view *payload,
                char **ret_path_name, char **ret_channel_name,
                uint64_t *tracefile_size, uint64_t *tracefile_count)
 {
@@ -44,11 +43,13 @@ int cmd_recv_stream_2_2(struct relay_connection *conn,
        char *channel_name = NULL;
        size_t len;
 
-       ret = cmd_recv(conn->sock, &stream_info, sizeof(stream_info));
-       if (ret < 0) {
-               ERR("Unable to recv stream version 2.2");
+       if (payload->size < sizeof(stream_info)) {
+               ERR("Unexpected payload size in \"cmd_recv_stream_2_2\": expected >= %zu bytes, got %zu bytes",
+                               sizeof(stream_info), payload->size);
+               ret = -1;
                goto error;
        }
+       memcpy(&stream_info, payload->data, sizeof(stream_info));
 
        len = lttng_strnlen(stream_info.pathname, sizeof(stream_info.pathname));
        /* Ensure that NULL-terminated and fits in local filename length. */
@@ -57,7 +58,7 @@ int cmd_recv_stream_2_2(struct relay_connection *conn,
                ERR("Path name too long");
                goto error;
        }
-       path_name = create_output_path(stream_info.pathname);
+       path_name = strdup(stream_info.pathname);
        if (!path_name) {
                PERROR("Path name allocation");
                ret = -ENOMEM;