X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fcmd-2-2.c;h=bd18714af840626d0291382205a33bd6a4054563;hb=HEAD;hp=915b2eb64a41a84acca565cf8b5135bf786d770b;hpb=348a81dcf7b6944b10a813d93dcaf86fdb5194f6;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/cmd-2-2.c b/src/bin/lttng-relayd/cmd-2-2.c
deleted file mode 100644
index 915b2eb64..000000000
--- a/src/bin/lttng-relayd/cmd-2-2.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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
- * published by the Free Software Foundation.
- *
- * 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 <assert.h>
-
-#include <common/common.h>
-#include <common/sessiond-comm/relayd.h>
-
-#include <common/compat/endian.h>
-#include <common/compat/string.h>
-#include <lttng/constant.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(const struct lttng_buffer_view *payload,
-		char **ret_path_name, char **ret_channel_name,
-		uint64_t *tracefile_size, uint64_t *tracefile_count)
-{
-	int ret;
-	struct lttcomm_relayd_add_stream_2_2 stream_info;
-	char *path_name = NULL;
-	char *channel_name = NULL;
-	size_t len;
-
-	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. */
-	if (len == sizeof(stream_info.pathname) || len >= LTTNG_NAME_MAX) {
-		ret = -ENAMETOOLONG;
-		ERR("Path name too long");
-		goto error;
-	}
-	path_name = strdup(stream_info.pathname);
-	if (!path_name) {
-		PERROR("Path name allocation");
-		ret = -ENOMEM;
-		goto error;
-	}
-	len = lttng_strnlen(stream_info.channel_name, sizeof(stream_info.channel_name));
-	if (len == sizeof(stream_info.channel_name) || len >= DEFAULT_STREAM_NAME_LEN) {
-		ret = -ENAMETOOLONG;
-		ERR("Channel name too long");
-		goto error;
-	}
-	channel_name = strdup(stream_info.channel_name);
-	if (!channel_name) {
-		ret = -errno;
-		PERROR("Channel name allocation");
-		goto error;
-	}
-
-	*tracefile_size = be64toh(stream_info.tracefile_size);
-	*tracefile_count = be64toh(stream_info.tracefile_count);
-	*ret_path_name = path_name;
-	*ret_channel_name = channel_name;
-	return 0;
-error:
-	free(path_name);
-	free(channel_name);
-	return ret;
-}