X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fcmd-2-1.c;h=32a94386f3ef8171191f15cfcbc63de3ab6b2a5f;hp=0cd9b5ab97f6a2efe338e009dbcd05791158b708;hb=7591bab11eceedc6a0d1e02fd6f85592267a63b5;hpb=d77dded285b058e4242c8a3d2233f80e725ceefc

diff --git a/src/bin/lttng-relayd/cmd-2-1.c b/src/bin/lttng-relayd/cmd-2-1.c
index 0cd9b5ab9..32a94386f 100644
--- a/src/bin/lttng-relayd/cmd-2-1.c
+++ b/src/bin/lttng-relayd/cmd-2-1.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2013 - Julien Desfossez <jdesfossez@efficios.com>
  *                      David Goulet <dgoulet@efficios.com>
+ *               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
@@ -28,14 +29,16 @@
 #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,
-		struct relay_stream *stream)
+		char **ret_path_name, char **ret_channel_name)
 {
 	int ret;
 	struct lttcomm_relayd_add_stream stream_info;
-
-	assert(conn);
-	assert(stream);
+	char *path_name = NULL;
+	char *channel_name = NULL;
 
 	ret = cmd_recv(conn->sock, &stream_info, sizeof(stream_info));
 	if (ret < 0) {
@@ -43,21 +46,25 @@ int cmd_recv_stream_2_1(struct relay_connection *conn,
 		goto error;
 	}
 
-	stream->path_name = create_output_path(stream_info.pathname);
-	if (stream->path_name == NULL) {
+	path_name = create_output_path(stream_info.pathname);
+	if (!path_name) {
 		PERROR("Path name allocation");
 		ret = -ENOMEM;
 		goto error;
 	}
 
-	stream->channel_name = strdup(stream_info.channel_name);
-	if (stream->channel_name == NULL) {
+	channel_name = strdup(stream_info.channel_name);
+	if (!channel_name) {
 		ret = -errno;
 		PERROR("Path name allocation");
 		goto error;
 	}
-	ret = 0;
 
+	*ret_path_name = path_name;
+	*ret_channel_name = channel_name;
+	return 0;
 error:
+	free(path_name);
+	free(channel_name);
 	return ret;
 }