X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=bb038a670b0a763afd41b1343cbbb1e919fbe1f7;hp=3b9f6708a3685e61e0a6918e94732046a9b9151f;hb=309167d2a6f59d0c8cbf64eb23ba912cdea76a34;hpb=994fa64fa6931b256e76caef3d35a9caf1a3d2a6

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 3b9f6708a..bb038a670 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -868,7 +868,7 @@ int relay_add_stream(struct lttcomm_relayd_hdr *recv_hdr,
 	 * uses its own credentials for the stream files.
 	 */
 	ret = utils_create_stream_file(stream->path_name, stream->channel_name,
-			stream->tracefile_size, 0, -1, -1);
+			stream->tracefile_size, 0, -1, -1, NULL);
 	if (ret < 0) {
 		ERR("Create output file");
 		goto end;
@@ -1187,12 +1187,8 @@ int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr,
 		goto end;
 	}
 
-	ret = sscanf(VERSION, "%10u.%10u", &reply.major, &reply.minor);
-	if (ret < 2) {
-		ERR("Error in scanning version");
-		ret = -1;
-		goto end;
-	}
+	reply.major = RELAYD_VERSION_COMM_MAJOR;
+	reply.minor = RELAYD_VERSION_COMM_MINOR;
 
 	/* Major versions must be the same */
 	if (reply.major != be32toh(msg.major)) {
@@ -1630,7 +1626,8 @@ int relay_process_data(struct relay_command *cmd, struct lttng_ht *streams_ht)
 		ret = utils_rotate_stream_file(stream->path_name,
 				stream->channel_name, stream->tracefile_size,
 				stream->tracefile_count, -1, -1,
-				stream->fd, &(stream->tracefile_count_current));
+				stream->fd, &(stream->tracefile_count_current),
+				&stream->fd);
 		if (ret < 0) {
 			ERR("Rotating output file");
 			goto end;
@@ -2114,6 +2111,9 @@ int main(int argc, char **argv)
 	/* Set up max poll set size */
 	lttng_poll_set_max_size();
 
+	/* Initialize communication library */
+	lttcomm_init();
+
 	/* Setup the dispatcher thread */
 	ret = pthread_create(&dispatcher_thread, NULL,
 			relay_thread_dispatcher, (void *) NULL);