X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=44fb2e27cb99a1bc34feeeaaa7d7d618bcbb72f3;hp=cb4643b76f792b3555de1a65174cdf0d73410a06;hb=81164b6b222b4bafe1e3cec57c50429ab6dab30f;hpb=fd0f1e3ef290b9d70e3856676298df5afb78d8dc

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index cb4643b76..44fb2e27c 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -1106,16 +1106,19 @@ static int relay_create_session(const struct lttcomm_relayd_hdr *recv_hdr,
 
 	memset(&reply, 0, sizeof(reply));
 
-	switch (conn->minor) {
-	case 1:
-	case 2:
-	case 3:
-		break;
-	case 4: /* LTTng sessiond 2.4 */
-	default:
+	if (conn->minor < 4) {
+		/* From 2.1 to 2.3 */
+		ret = 0;
+	} else if (conn->minor >= 4 && conn->minor < 11) {
+		/* From 2.4 to 2.10 */
 		ret = cmd_create_session_2_4(payload, session_name,
 			hostname, &live_timer, &snapshot);
+	} else {
+		/* From 2.11 to ... */
+		ret = cmd_create_session_2_11(payload, session_name,
+			hostname, &live_timer, &snapshot);
 	}
+
 	if (ret < 0) {
 		goto send_reply;
 	}
@@ -1195,6 +1198,7 @@ static int relay_add_stream(const struct lttcomm_relayd_hdr *recv_hdr,
 	uint64_t stream_handle = -1ULL;
 	char *path_name = NULL, *channel_name = NULL;
 	uint64_t tracefile_size = 0, tracefile_count = 0;
+	struct relay_stream_chunk_id stream_chunk_id = { 0 };
 
 	if (!session || !conn->version_check_done) {
 		ERR("Trying to add a stream before version check");
@@ -1202,17 +1206,22 @@ static int relay_add_stream(const struct lttcomm_relayd_hdr *recv_hdr,
 		goto end_no_session;
 	}
 
-	switch (session->minor) {
-	case 1: /* LTTng sessiond 2.1. Allocates path_name and channel_name. */
+	if (session->minor == 1) {
+		/* For 2.1 */
 		ret = cmd_recv_stream_2_1(payload, &path_name,
 			&channel_name);
-		break;
-	case 2: /* LTTng sessiond 2.2. Allocates path_name and channel_name. */
-	default:
+	} else if (session->minor > 1 && session->minor < 11) {
+		/* From 2.2 to 2.10 */
 		ret = cmd_recv_stream_2_2(payload, &path_name,
 			&channel_name, &tracefile_size, &tracefile_count);
-		break;
+	} else {
+		/* From 2.11 to ... */
+		ret = cmd_recv_stream_2_11(payload, &path_name,
+			&channel_name, &tracefile_size, &tracefile_count,
+			&stream_chunk_id.value);
+		stream_chunk_id.is_set = true;
 	}
+
 	if (ret < 0) {
 		goto send_reply;
 	}
@@ -1229,7 +1238,8 @@ static int relay_add_stream(const struct lttcomm_relayd_hdr *recv_hdr,
 
 	/* We pass ownership of path_name and channel_name. */
 	stream = stream_create(trace, stream_handle, path_name,
-			channel_name, tracefile_size, tracefile_count);
+		channel_name, tracefile_size, tracefile_count,
+		&stream_chunk_id);
 	path_name = NULL;
 	channel_name = NULL;
 
@@ -2475,7 +2485,8 @@ static int relay_rotate_session_stream(const struct lttcomm_relayd_hdr *recv_hdr
 		goto end_stream_unlock;
 	}
 
-	stream->chunk_id = stream_info.new_chunk_id;
+	assert(stream->current_chunk_id.is_set);
+	stream->current_chunk_id.value = stream_info.new_chunk_id;
 
 	if (stream->is_metadata) {
 		/*
@@ -2831,7 +2842,7 @@ int relay_rotate_pending(const struct lttcomm_relayd_hdr *recv_hdr,
 			rotate_pending = true;
 			DBG("Stream %" PRIu64 " is still rotating",
 					stream->stream_handle);
-		} else if (stream->chunk_id < chunk_id) {
+		} else if (stream->current_chunk_id.value < chunk_id) {
 			/*
 			 * Stream closed on the consumer but still active on the
 			 * relay.