Fix: relayd: disallow 0-length session names for 2.4+ peers

[lttng-tools.git] / src / bin / lttng-relayd / session.h

diff --git a/src/bin/lttng-relayd/session.h b/src/bin/lttng-relayd/session.h
index b3d99012d2fa4369a583619858ba99ed3fc98afc..8d60ed95fe660e71c51c8af849853c566d49ea09 100644 (file)
--- a/src/bin/lttng-relayd/session.h
+++ b/src/bin/lttng-relayd/session.h
@@ -53,9 +53,17 @@ struct relay_session {
         */
        lttng_uuid sessiond_uuid;
        LTTNG_OPTIONAL(time_t) creation_time;
+       /* Must _not_ be empty for 2.4+ peers. */
        char session_name[LTTNG_NAME_MAX];
        char hostname[LTTNG_HOST_NAME_MAX];
        char base_path[LTTNG_PATH_MAX];
+       /*
+        * Session output path relative to relayd's output path.
+        * Will be empty when interacting with peers < 2.11 since their
+        * streams' path are expressed relative to the relay daemon's
+        * output path.
+        */
+       char output_path[LTTNG_PATH_MAX];
        uint32_t live_timer;
 
        /* Session in snapshot mode. */
@@ -88,6 +96,8 @@ struct relay_session {
        bool aborted;
 
        bool session_name_contains_creation_time;
+       /* Whether session has performed an explicit rotation. */
+       bool has_rotated;
 
        /* Contains ctf_trace object of that session indexed by path name. */
        struct lttng_ht *ctf_traces_ht;
@@ -145,6 +155,9 @@ void session_put(struct relay_session *session);
 int session_close(struct relay_session *session);
 int session_abort(struct relay_session *session);
 
+int session_init_output_directory_handle(struct relay_session *session,
+               struct lttng_directory_handle *handle);
+
 void print_sessions(void);
 
 #endif /* _SESSION_H */