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

diff --git a/src/bin/lttng-relayd/cmd-2-2.c b/src/bin/lttng-relayd/cmd-2-2.c
index 4f34d8b66..c2bc1a3a3 100644
--- a/src/bin/lttng-relayd/cmd-2-2.c
+++ b/src/bin/lttng-relayd/cmd-2-2.c
@@ -1,20 +1,10 @@
 /*
- * Copyright (C) 2013 - Julien Desfossez <jdesfossez@efficios.com>
- *                      David Goulet <dgoulet@efficios.com>
- *               2015 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 Julien Desfossez <jdesfossez@efficios.com>
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -27,14 +17,14 @@
 #include <common/compat/string.h>
 #include <lttng/constant.h>
 
-#include "cmd-generic.h"
+#include "cmd-2-2.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 +34,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 +49,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;