X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fcmd-2-1.c;h=38381f894daad1662e10fad02550d9b5366ff623;hb=23f940ff5d6e5440b9c8bd2ede61e1761e4b51fe;hp=080dc173fc8361b117b4d335c3c2895bd075342f;hpb=246777db6078ff9dd8046d5701fc12cb34547402;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/cmd-2-1.c b/src/bin/lttng-relayd/cmd-2-1.c
index 080dc173f..38381f894 100644
--- a/src/bin/lttng-relayd/cmd-2-1.c
+++ b/src/bin/lttng-relayd/cmd-2-1.c
@@ -25,14 +25,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_1 allocates path_name and channel_name.
  */
-int cmd_recv_stream_2_1(struct relay_connection *conn,
+int cmd_recv_stream_2_1(const struct lttng_buffer_view *payload,
 		char **ret_path_name, char **ret_channel_name)
 {
 	int ret;
@@ -41,11 +40,13 @@ int cmd_recv_stream_2_1(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.1");
+	if (payload->size < sizeof(stream_info)) {
+		ERR("Unexpected payload size in \"cmd_recv_stream_2_1\": 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. */
@@ -54,7 +55,7 @@ int cmd_recv_stream_2_1(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;