/*
- * 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
#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;
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. */
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;