relayd: rename stream prev_seq to prev_data_seq

[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 6f50afc6cc6b1e2d2b48687cbf325521700b2392..9efab8a73d8e3b4932122d3d425a8d588d286e0d 100644 (file)
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -358,7 +358,7 @@ int make_viewer_streams(struct relay_session *session,
                                        }
                                } else {
                                        if (!stream->closed ||
-                                               !(((int64_t) (stream->prev_seq - stream->last_net_seq_num)) >= 0)) {
+                                               !(((int64_t) (stream->prev_data_seq - stream->last_net_seq_num)) >= 0)) {
 
                                                (*nb_total)++;
                                        }
@@ -835,6 +835,11 @@ int viewer_list_sessions(struct relay_connection *conn)
 
                health_code_update();
 
+               if (session->connection_closed) {
+                       /* Skip closed session */
+                       continue;
+               }
+
                if (count >= buf_count) {
                        struct lttng_viewer_session *newbuf;
                        uint32_t new_buf_count = buf_count << 1;
@@ -1089,7 +1094,7 @@ int viewer_attach_session(struct relay_connection *conn)
        if (closed) {
                send_streams = 0;
                response.streams_count = 0;
-               response.status = htobe32(LTTNG_VIEWER_NEW_STREAMS_HUP);
+               response.status = htobe32(LTTNG_VIEWER_ATTACH_UNK);
                goto send_reply;
        }