Live: send the number of streams in list_sessions

[lttng-tools.git] / src / bin / lttng-relayd / live.c

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index 1bcab0a85073eb78225a98d7b15e4f2013c00115..86dc2ff7bba5ca619a888d3ba39e05ffcbf5c6ab 100644 (file)
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -583,6 +583,7 @@ int viewer_list_sessions(struct relay_command *cmd,
                send_session.id = htobe64(session->id);
                send_session.live_timer = htobe32(session->live_timer);
                send_session.clients = htobe32(session->viewer_attached);
+               send_session.streams = htobe32(session->stream_count);
 
                health_code_update();
 
@@ -1128,6 +1129,9 @@ int viewer_get_packet(struct relay_command *cmd)
        }
        health_code_update();
 
+       /* From this point on, the error label can be reached. */
+       memset(&reply, 0, sizeof(reply));
+
        rcu_read_lock();
        stream = live_find_viewer_stream_by_id(be64toh(get_packet_info.stream_id));
        if (!stream) {
@@ -1156,14 +1160,11 @@ int viewer_get_packet(struct relay_command *cmd)
                stream->read_fd = ret;
        }
 
-       memset(&reply, 0, sizeof(reply));
-
        if (!stream->ctf_trace->metadata_received ||
                        stream->ctf_trace->metadata_received >
                        stream->ctf_trace->metadata_sent) {
                reply.status = htobe32(VIEWER_GET_PACKET_ERR);
                reply.flags |= LTTNG_VIEWER_FLAG_NEW_METADATA;
-
                goto send_reply;
        }