X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Frelayd%2Frelayd.c;h=78ed85558c8cf24cc1048924ce4db794e0dfeef9;hb=2c5ff4e47394f9588ac1a0ab50e8fbdf36727cbe;hp=53ee58b2edcdc89464ceae7d610702e7ff0f4085;hpb=2f21a469eee9bc3352b439b1e64fe6bbd5088fea;p=lttng-tools.git

diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c
index 53ee58b2e..78ed85558 100644
--- a/src/common/relayd/relayd.c
+++ b/src/common/relayd/relayd.c
@@ -26,6 +26,7 @@
 #include <common/common.h>
 #include <common/defaults.h>
 #include <common/compat/endian.h>
+#include <common/compat/string.h>
 #include <common/sessiond-comm/relayd.h>
 #include <common/index/ctf-index.h>
 
@@ -348,7 +349,8 @@ error:
 
 static int relayd_add_stream_2_11(struct lttcomm_relayd_sock *rsock,
 		const char *channel_name, const char *pathname,
-		uint64_t tracefile_size, uint64_t tracefile_count)
+		uint64_t tracefile_size, uint64_t tracefile_count,
+		uint64_t trace_archive_id)
 {
 	int ret;
 	struct lttcomm_relayd_add_stream_2_11 *msg = NULL;
@@ -385,6 +387,7 @@ static int relayd_add_stream_2_11(struct lttcomm_relayd_sock *rsock,
 
 	msg->tracefile_size = htobe64(tracefile_size);
 	msg->tracefile_count = htobe64(tracefile_count);
+	msg->trace_archive_id = htobe64(trace_archive_id);
 
 	/* Send command */
 	ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) msg, msg_length, 0);
@@ -404,7 +407,8 @@ error:
  */
 int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_name,
 		const char *pathname, uint64_t *stream_id,
-		uint64_t tracefile_size, uint64_t tracefile_count)
+		uint64_t tracefile_size, uint64_t tracefile_count,
+		uint64_t trace_archive_id)
 {
 	int ret;
 	struct lttcomm_relayd_status_stream reply;
@@ -428,7 +432,8 @@ int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_nam
 	} else {
 		/* From 2.11 to ...*/
 		ret = relayd_add_stream_2_11(rsock, channel_name, pathname,
-				tracefile_size, tracefile_count);
+				tracefile_size, tracefile_count,
+				trace_archive_id);
 	}
 
 	if (ret) {
@@ -1101,7 +1106,7 @@ int relayd_rotate_stream(struct lttcomm_relayd_sock *rsock, uint64_t stream_id,
 	DBG("Sending rotate stream id %" PRIu64 " command to relayd", stream_id);
 
 	/* Account for the trailing NULL. */
-	len = strnlen(new_pathname, LTTNG_PATH_MAX) + 1;
+	len = lttng_strnlen(new_pathname, LTTNG_PATH_MAX) + 1;
 	if (len > LTTNG_PATH_MAX) {
 		ERR("Path used in relayd rotate stream command exceeds the maximal allowed length");
 		ret = -1;