X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Frelayd%2Frelayd.c;h=22a1c44f800a4bb5302fe12d40c479a35e32e4c6;hb=bf8ac2eaec39ba99aaac4de946bbaf3dca4f5539;hp=54fe6734516589bd6c3fe432ae8aaba4eea7846b;hpb=8614e600d7a8dc653c473254fc302870d73f32ae;p=lttng-tools.git

diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c
index 54fe67345..22a1c44f8 100644
--- a/src/common/relayd/relayd.c
+++ b/src/common/relayd/relayd.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2012 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2012 David Goulet <dgoulet@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
@@ -509,7 +499,6 @@ 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);
@@ -520,32 +509,36 @@ int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_nam
 
 	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);
@@ -1268,7 +1261,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,