X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flive.c;h=29217b151b582ba297b160fbf75dd2146cafd6b1;hb=6746f4f287d6322f02977977470ab737acdd27b4;hp=c60f7e4c9c4db0f3d00dff773b2c537b0cc4bd43;hpb=53efb85a242809ed5ed21e9ab40effa696ecbc6f;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index c60f7e4c9..29217b151 100644
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -43,6 +43,7 @@
 #include <common/common.h>
 #include <common/compat/poll.h>
 #include <common/compat/socket.h>
+#include <common/compat/endian.h>
 #include <common/defaults.h>
 #include <common/futex.h>
 #include <common/index/index.h>
@@ -1205,6 +1206,7 @@ static int check_index_status(struct relay_viewer_stream *vstream,
 				 */
 				index->status = htobe32(LTTNG_VIEWER_INDEX_INACTIVE);
 				index->timestamp_end = htobe64(rstream->beacon_ts_end);
+				index->stream_id = htobe64(rstream->ctf_stream_id);
 				goto index_ready;
 			} else if (rstream->total_index_received <= vstream->last_sent_index
 					&& !vstream->close_write_flag) {
@@ -1318,7 +1320,7 @@ int viewer_get_next_index(struct relay_connection *conn)
 	ret = check_index_status(vstream, rstream, ctf_trace, &viewer_index);
 	pthread_mutex_unlock(&rstream->viewer_stream_rotation_lock);
 	if (ret < 0) {
-		goto end;
+		goto end_unlock;
 	} else if (ret == 1) {
 		/*
 		 * This means the viewer index data structure has been populated by the