X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Frelayd.h;h=25d09980e751a22f0933103d6420834981092eab;hp=9a733df1e7aaa68c5c6e252988012fca0eda6eda;hb=f86f6389a47137d2f5e8fc707916b6650fd1de00;hpb=e2acc8d25bc0073554a2f3e742e070b7034ec1d0

diff --git a/src/common/sessiond-comm/relayd.h b/src/common/sessiond-comm/relayd.h
index 9a733df1e..25d09980e 100644
--- a/src/common/sessiond-comm/relayd.h
+++ b/src/common/sessiond-comm/relayd.h
@@ -29,6 +29,11 @@
 #define RELAYD_VERSION_COMM_MAJOR             VERSION_MAJOR
 #define RELAYD_VERSION_COMM_MINOR             VERSION_MINOR
 
+#define RELAYD_COMM_LTTNG_HOST_NAME_MAX_2_4	64
+#define RELAYD_COMM_LTTNG_NAME_MAX_2_4	255
+#define RELAYD_COMM_LTTNG_PATH_MAX	4096
+#define RELAYD_COMM_DEFAULT_STREAM_NAME_LEN	264 /* 256 + 8 */
+
 /*
  * lttng-relayd communication header.
  */
@@ -64,8 +69,8 @@ struct lttcomm_relayd_status_session {
  * Used to add a stream on the relay daemon.
  */
 struct lttcomm_relayd_add_stream {
-	char channel_name[DEFAULT_STREAM_NAME_LEN];
-	char pathname[LTTNG_PATH_MAX];
+	char channel_name[RELAYD_COMM_DEFAULT_STREAM_NAME_LEN];
+	char pathname[RELAYD_COMM_LTTNG_PATH_MAX];
 } LTTNG_PACKED;
 
 /*
@@ -73,8 +78,8 @@ struct lttcomm_relayd_add_stream {
  * Protocol version 2.2
  */
 struct lttcomm_relayd_add_stream_2_2 {
-	char channel_name[DEFAULT_STREAM_NAME_LEN];
-	char pathname[LTTNG_PATH_MAX];
+	char channel_name[RELAYD_COMM_DEFAULT_STREAM_NAME_LEN];
+	char pathname[RELAYD_COMM_LTTNG_PATH_MAX];
 	uint64_t tracefile_size;
 	uint64_t tracefile_count;
 } LTTNG_PACKED;
@@ -180,12 +185,21 @@ static inline size_t lttcomm_relayd_index_len(uint32_t major, uint32_t minor)
  * Create session in 2.4 adds additionnal parameters for live reading.
  */
 struct lttcomm_relayd_create_session_2_4 {
-	char session_name[LTTNG_NAME_MAX];
-	char hostname[LTTNG_HOST_NAME_MAX];
+	char session_name[RELAYD_COMM_LTTNG_NAME_MAX_2_4];
+	char hostname[RELAYD_COMM_LTTNG_HOST_NAME_MAX_2_4];
 	uint32_t live_timer;
 	uint32_t snapshot;
 } LTTNG_PACKED;
 
+struct lttcomm_relayd_create_session_2_11 {
+	uint32_t session_name_len;
+	uint32_t hostname_len;
+	uint32_t live_timer;
+	uint8_t snapshot;
+	/* Contains the session_name and hostname */
+	char names[];
+} LTTNG_PACKED;
+
 /*
  * Used to ask the relay to reset the metadata trace file (regeneration).
  * Send the new version of the metadata (starts at 0).
@@ -197,6 +211,7 @@ struct lttcomm_relayd_reset_metadata {
 
 struct lttcomm_relayd_rotate_stream {
 	uint64_t stream_id;
+	/* Ignored for metadata streams. */
 	uint64_t rotate_at_seq_num;
 	uint64_t new_chunk_id;
 	/* Includes trailing NULL. */
@@ -216,6 +231,12 @@ struct lttcomm_relayd_rotate_pending {
 	uint64_t chunk_id;
 } LTTNG_PACKED;
 
+struct lttcomm_relayd_rotate_pending_reply {
+	struct lttcomm_relayd_generic_reply generic;
+	/* Valid values are [0, 1]. */
+	uint8_t is_pending;
+} LTTNG_PACKED;
+
 struct lttcomm_relayd_mkdir {
 	/* Includes trailing NULL */
 	uint32_t length;