X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Frelayd%2Frelayd.c;h=90312b5896f829c5d4c85be4fa7c1b4409d463d4;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=54fe6734516589bd6c3fe432ae8aaba4eea7846b;hpb=8614e600d7a8dc653c473254fc302870d73f32ae;p=lttng-tools.git diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c index 54fe67345..90312b589 100644 --- a/src/common/relayd/relayd.c +++ b/src/common/relayd/relayd.c @@ -1,22 +1,11 @@ /* - * Copyright (C) 2012 - David Goulet + * Copyright (C) 2012 David Goulet * - * 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 #include #include #include @@ -182,13 +171,13 @@ static int relayd_create_session_2_11(struct lttcomm_relayd_sock *rsock, goto error; } - assert(session_name_len <= UINT32_MAX); + LTTNG_ASSERT(session_name_len <= UINT32_MAX); msg->session_name_len = htobe32(session_name_len); - assert(hostname_len <= UINT32_MAX); + LTTNG_ASSERT(hostname_len <= UINT32_MAX); msg->hostname_len = htobe32(hostname_len); - assert(base_path_len <= UINT32_MAX); + LTTNG_ASSERT(base_path_len <= UINT32_MAX); msg->base_path_len = htobe32(base_path_len); dst = msg->names; @@ -333,8 +322,8 @@ int relayd_create_session(struct lttcomm_relayd_sock *rsock, int ret; struct lttcomm_relayd_create_session_reply_2_11 reply = {}; - assert(rsock); - assert(relayd_session_id); + LTTNG_ASSERT(rsock); + LTTNG_ASSERT(relayd_session_id); DBG("Relayd create session"); @@ -462,10 +451,10 @@ static int relayd_add_stream_2_11(struct lttcomm_relayd_sock *rsock, goto error; } - assert(channel_name_len <= UINT32_MAX); + LTTNG_ASSERT(channel_name_len <= UINT32_MAX); msg->channel_name_len = htobe32(channel_name_len); - assert(pathname_len <= UINT32_MAX); + LTTNG_ASSERT(pathname_len <= UINT32_MAX); msg->pathname_len = htobe32(pathname_len); if (lttng_strncpy(msg->names, channel_name, channel_name_len)) { @@ -509,46 +498,49 @@ int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_nam int ret; struct lttcomm_relayd_status_stream reply; char pathname[RELAYD_COMM_LTTNG_PATH_MAX]; - char *separator; /* Code flow error. Safety net. */ - assert(rsock); - assert(channel_name); - assert(domain_name); - assert(_pathname); - assert(trace_chunk); + LTTNG_ASSERT(rsock); + LTTNG_ASSERT(channel_name); + LTTNG_ASSERT(domain_name); + LTTNG_ASSERT(_pathname); + LTTNG_ASSERT(trace_chunk); DBG("Relayd adding stream for channel name %s", channel_name); - if (_pathname[0] == '\0') { - separator = ""; - } else { - separator = "/"; - } - ret = snprintf(pathname, RELAYD_COMM_LTTNG_PATH_MAX, "%s%s%s", - domain_name, separator, _pathname); - if (ret <= 0 || ret >= RELAYD_COMM_LTTNG_PATH_MAX) { - ERR("stream path too long."); - ret = -1; - goto error; - } - /* Compat with relayd 2.1 */ if (rsock->minor == 1) { /* For 2.1 */ - ret = relayd_add_stream_2_1(rsock, channel_name, pathname); + ret = relayd_add_stream_2_1(rsock, channel_name, _pathname); } else if (rsock->minor > 1 && rsock->minor < 11) { /* From 2.2 to 2.10 */ - ret = relayd_add_stream_2_2(rsock, channel_name, pathname, + ret = relayd_add_stream_2_2(rsock, channel_name, _pathname, tracefile_size, tracefile_count); } else { + const char *separator; enum lttng_trace_chunk_status chunk_status; uint64_t chunk_id; + if (_pathname[0] == '\0') { + separator = ""; + } else { + separator = "/"; + } + + ret = snprintf(pathname, RELAYD_COMM_LTTNG_PATH_MAX, "%s%s%s", + domain_name, separator, _pathname); + if (ret <= 0 || ret >= RELAYD_COMM_LTTNG_PATH_MAX) { + ERR("Failed to format stream path: %s", + ret <= 0 ? "formatting error" : + "path exceeds maximal allowed length"); + ret = -1; + goto error; + } + chunk_status = lttng_trace_chunk_get_id(trace_chunk, &chunk_id); - assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK); + LTTNG_ASSERT(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK); /* From 2.11 to ...*/ ret = relayd_add_stream_2_11(rsock, channel_name, pathname, @@ -599,7 +591,7 @@ int relayd_streams_sent(struct lttcomm_relayd_sock *rsock) struct lttcomm_relayd_generic_reply reply; /* Code flow error. Safety net. */ - assert(rsock); + LTTNG_ASSERT(rsock); DBG("Relayd sending streams sent."); @@ -655,7 +647,7 @@ int relayd_version_check(struct lttcomm_relayd_sock *rsock) struct lttcomm_relayd_version msg; /* Code flow error. Safety net. */ - assert(rsock); + LTTNG_ASSERT(rsock); DBG("Relayd version check for major.minor %u.%u", rsock->major, rsock->minor); @@ -723,7 +715,7 @@ int relayd_send_metadata(struct lttcomm_relayd_sock *rsock, size_t len) int ret; /* Code flow error. Safety net. */ - assert(rsock); + LTTNG_ASSERT(rsock); DBG("Relayd sending metadata of size %zu", len); @@ -751,7 +743,7 @@ error: int relayd_connect(struct lttcomm_relayd_sock *rsock) { /* Code flow error. Safety net. */ - assert(rsock); + LTTNG_ASSERT(rsock); if (!rsock->sock.ops) { /* @@ -783,7 +775,7 @@ int relayd_close(struct lttcomm_relayd_sock *rsock) int ret; /* Code flow error. Safety net. */ - assert(rsock); + LTTNG_ASSERT(rsock); /* An invalid fd is fine, return success. */ if (rsock->sock.fd < 0) { @@ -817,8 +809,8 @@ int relayd_send_data_hdr(struct lttcomm_relayd_sock *rsock, int ret; /* Code flow error. Safety net. */ - assert(rsock); - assert(hdr); + LTTNG_ASSERT(rsock); + LTTNG_ASSERT(hdr); if (rsock->sock.fd < 0) { return -ECONNRESET; @@ -858,7 +850,7 @@ int relayd_send_close_stream(struct lttcomm_relayd_sock *rsock, uint64_t stream_ struct lttcomm_relayd_generic_reply reply; /* Code flow error. Safety net. */ - assert(rsock); + LTTNG_ASSERT(rsock); DBG("Relayd closing stream id %" PRIu64, stream_id); @@ -908,7 +900,7 @@ int relayd_data_pending(struct lttcomm_relayd_sock *rsock, uint64_t stream_id, struct lttcomm_relayd_generic_reply reply; /* Code flow error. Safety net. */ - assert(rsock); + LTTNG_ASSERT(rsock); DBG("Relayd data pending for stream id %" PRIu64, stream_id); @@ -957,7 +949,7 @@ int relayd_quiescent_control(struct lttcomm_relayd_sock *rsock, struct lttcomm_relayd_generic_reply reply; /* Code flow error. Safety net. */ - assert(rsock); + LTTNG_ASSERT(rsock); DBG("Relayd checking quiescent control state"); @@ -1002,7 +994,7 @@ int relayd_begin_data_pending(struct lttcomm_relayd_sock *rsock, uint64_t id) struct lttcomm_relayd_generic_reply reply; /* Code flow error. Safety net. */ - assert(rsock); + LTTNG_ASSERT(rsock); DBG("Relayd begin data pending"); @@ -1050,7 +1042,7 @@ int relayd_end_data_pending(struct lttcomm_relayd_sock *rsock, uint64_t id, struct lttcomm_relayd_generic_reply reply; /* Code flow error. Safety net. */ - assert(rsock); + LTTNG_ASSERT(rsock); DBG("Relayd end data pending"); @@ -1097,7 +1089,7 @@ int relayd_send_index(struct lttcomm_relayd_sock *rsock, struct lttcomm_relayd_generic_reply reply; /* Code flow error. Safety net. */ - assert(rsock); + LTTNG_ASSERT(rsock); if (rsock->minor < 4) { DBG("Not sending indexes before protocol 2.4"); @@ -1166,7 +1158,7 @@ int relayd_reset_metadata(struct lttcomm_relayd_sock *rsock, struct lttcomm_relayd_generic_reply reply; /* Code flow error. Safety net. */ - assert(rsock); + LTTNG_ASSERT(rsock); /* Should have been prevented by the sessiond. */ if (rsock->minor < 8) { @@ -1236,7 +1228,7 @@ int relayd_rotate_streams(struct lttcomm_relayd_sock *sock, lttng_dynamic_buffer_init(&payload); /* Code flow error. Safety net. */ - assert(sock); + LTTNG_ASSERT(sock); if (new_chunk_id) { ret = snprintf(new_chunk_id_buf, sizeof(new_chunk_id_buf), @@ -1268,7 +1260,7 @@ int relayd_rotate_streams(struct lttcomm_relayd_sock *sock, position->rotate_at_seq_num), }; - DBG("Rotate stream %" PRIu64 "at sequence number %" PRIu64, + DBG("Rotate stream %" PRIu64 " at sequence number %" PRIu64, position->stream_id, position->rotate_at_seq_num); ret = lttng_dynamic_buffer_append(&payload, &comm_position,