X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fcmd-2-2.c;h=5ff6280509a2119291df7065a01af7d2d5bd1122;hb=a8cad46163850205f0dc2607e361a63b4fab3f7a;hp=4f34d8b66470ba90590e8f895f28e27f607bbc89;hpb=c1591e37fbac83d8d12519b3c15e9ba13934b25a;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/cmd-2-2.c b/src/bin/lttng-relayd/cmd-2-2.c
index 4f34d8b66..5ff628050 100644
--- 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. */