X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fcmd-2-11.c;h=500f9ce482c1afc4bfbfd6804c7c409ab4119c47;hp=269eeb9b078a707d4f22e8995a89cc7aa73147d9;hb=ae0a823f9f7e1d3800479488a58efc2f92f27d89;hpb=1e791a74976525f287944e5dbb65208a3b9edf42 diff --git a/src/bin/lttng-relayd/cmd-2-11.c b/src/bin/lttng-relayd/cmd-2-11.c index 269eeb9b0..500f9ce48 100644 --- a/src/bin/lttng-relayd/cmd-2-11.c +++ b/src/bin/lttng-relayd/cmd-2-11.c @@ -1,18 +1,8 @@ /* - * Copyright (C) 2018 - Jonathan Rajotte + * Copyright (C) 2018 Jonathan Rajotte * - * 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 @@ -30,16 +20,19 @@ #include "utils.h" int cmd_create_session_2_11(const struct lttng_buffer_view *payload, - char *session_name, char *hostname, + char *session_name, char *hostname, char *base_path, uint32_t *live_timer, bool *snapshot, uint64_t *id_sessiond, lttng_uuid sessiond_uuid, - uint64_t *current_chunk_id) + bool *has_current_chunk, uint64_t *current_chunk_id, + time_t *creation_time, + bool *session_name_contains_creation_time) { int ret; struct lttcomm_relayd_create_session_2_11 header; - size_t header_len, received_names_size; + size_t header_len, received_names_size, offset; struct lttng_buffer_view session_name_view; struct lttng_buffer_view hostname_view; + struct lttng_buffer_view base_path_view; header_len = sizeof(header); @@ -53,11 +46,16 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload, header.session_name_len = be32toh(header.session_name_len); header.hostname_len = be32toh(header.hostname_len); + header.base_path_len = be32toh(header.base_path_len); header.live_timer = be32toh(header.live_timer); + header.current_chunk_id.value = be64toh(header.current_chunk_id.value); + header.current_chunk_id.is_set = !!header.current_chunk_id.is_set; + header.creation_time = be64toh(header.creation_time); lttng_uuid_copy(sessiond_uuid, header.sessiond_uuid); - received_names_size = header.session_name_len + header.hostname_len; + received_names_size = header.session_name_len + header.hostname_len + + header.base_path_len; if (payload->size < header_len + received_names_size) { ERR("Unexpected payload size in \"cmd_create_session_2_11\": expected >= %zu bytes, got %zu bytes", header_len + received_names_size, payload->size); @@ -70,17 +68,31 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload, ret = -ENAMETOOLONG; ERR("Length of session name (%" PRIu32 " bytes) received in create_session command exceeds maximum length (%d bytes)", header.session_name_len, LTTNG_NAME_MAX); goto error; + } else if (header.session_name_len == 0) { + ret = -EINVAL; + ERR("Illegal session name length of 0 received"); + goto error; } if (header.hostname_len > LTTNG_HOST_NAME_MAX) { ret = -ENAMETOOLONG; ERR("Length of hostname (%" PRIu32 " bytes) received in create_session command exceeds maximum length (%d bytes)", header.hostname_len, LTTNG_HOST_NAME_MAX); goto error; } + if (header.base_path_len > LTTNG_PATH_MAX) { + ret = -ENAMETOOLONG; + ERR("Length of base_path (%" PRIu32 " bytes) received in create_session command exceeds maximum length (%d bytes)", header.base_path_len, PATH_MAX); + goto error; + } - session_name_view = lttng_buffer_view_from_view(payload, header_len, + offset = header_len; + session_name_view = lttng_buffer_view_from_view(payload, offset, header.session_name_len); + offset += header.session_name_len; hostname_view = lttng_buffer_view_from_view(payload, - header_len + header.session_name_len, header.hostname_len); + offset, header.hostname_len); + offset += header.hostname_len; + base_path_view = lttng_buffer_view_from_view(payload, + offset, header.base_path_len); /* Validate that names are NULL terminated. */ if (session_name_view.data[session_name_view.size - 1] != '\0') { @@ -95,15 +107,28 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload, goto error; } + if (base_path_view.size != 0 && + base_path_view.data[base_path_view.size - 1] != '\0') { + ERR("cmd_create_session_2_11 base_path is invalid (not NULL terminated)"); + ret = -1; + goto error; + } + /* * Length and null-termination check are already performed. - * LTTNG_NAME_MAX and LTTNG_HOST_NAME_MAX max size are expected. + * LTTNG_NAME_MAX, LTTNG_HOST_NAME_MAX, and LTTNG_PATH_MAX max sizes are expected. */ strcpy(session_name, session_name_view.data); strcpy(hostname, hostname_view.data); + strcpy(base_path, base_path_view.size ? base_path_view.data : ""); *live_timer = header.live_timer; *snapshot = !!header.snapshot; + *current_chunk_id = header.current_chunk_id.value; + *has_current_chunk = header.current_chunk_id.is_set; + *creation_time = (time_t) header.creation_time; + *session_name_contains_creation_time = + header.session_name_contains_creation_time; ret = 0; @@ -141,7 +166,7 @@ int cmd_recv_stream_2_11(const struct lttng_buffer_view *payload, header.pathname_len = be32toh(header.pathname_len); header.tracefile_size = be64toh(header.tracefile_size); header.tracefile_count = be64toh(header.tracefile_count); - header.trace_archive_id = be64toh(header.trace_archive_id); + header.trace_chunk_id = be64toh(header.trace_chunk_id); received_names_size = header.channel_name_len + header.pathname_len; if (payload->size < header_len + received_names_size) { @@ -188,7 +213,7 @@ int cmd_recv_stream_2_11(const struct lttng_buffer_view *payload, goto error; } - path_name = create_output_path(pathname_view.data); + path_name = strdup(pathname_view.data); if (!path_name) { PERROR("Path name allocation"); ret = -ENOMEM; @@ -197,7 +222,7 @@ int cmd_recv_stream_2_11(const struct lttng_buffer_view *payload, *tracefile_size = header.tracefile_size; *tracefile_count = header.tracefile_count; - *trace_archive_id = header.trace_archive_id; + *trace_archive_id = header.trace_chunk_id; *ret_path_name = path_name; *ret_channel_name = channel_name; /* Move ownership to caller */