Store the relay protocol version in the consumer_output

[lttng-tools.git] / src / common / sessiond-comm / relayd.h

diff --git a/src/common/sessiond-comm/relayd.h b/src/common/sessiond-comm/relayd.h
index ff56d3a26fe1aff3bec9b678b020cea0da4c6de7..358123273fb20a757f3da8dbca6ba999921eb532 100644 (file)
--- a/src/common/sessiond-comm/relayd.h
+++ b/src/common/sessiond-comm/relayd.h
@@ -19,15 +19,12 @@
 #ifndef _RELAYD_COMM
 #define _RELAYD_COMM
 
-#define _GNU_SOURCE
-
 #include <limits.h>
 #include <stdint.h>
 
 #include <lttng/lttng.h>
 #include <common/defaults.h>
 #include <common/index/ctf-index.h>
-#include <config.h>
 
 #define RELAYD_VERSION_COMM_MAJOR             VERSION_MAJOR
 #define RELAYD_VERSION_COMM_MINOR             VERSION_MINOR
@@ -68,7 +65,7 @@ struct lttcomm_relayd_status_session {
  */
 struct lttcomm_relayd_add_stream {
        char channel_name[DEFAULT_STREAM_NAME_LEN];
-       char pathname[PATH_MAX];
+       char pathname[LTTNG_PATH_MAX];
 } LTTNG_PACKED;
 
 /*
@@ -77,7 +74,7 @@ struct lttcomm_relayd_add_stream {
  */
 struct lttcomm_relayd_add_stream_2_2 {
        char channel_name[DEFAULT_STREAM_NAME_LEN];
-       char pathname[PATH_MAX];
+       char pathname[LTTNG_PATH_MAX];
        uint64_t tracefile_size;
        uint64_t tracefile_count;
 } LTTNG_PACKED;
@@ -162,14 +159,16 @@ struct lttcomm_relayd_index {
        uint64_t timestamp_end;
        uint64_t events_discarded;
        uint64_t stream_id;
+       uint64_t stream_instance_id;
+       uint64_t packet_seq_num;
 } LTTNG_PACKED;
 
 /*
  * Create session in 2.4 adds additionnal parameters for live reading.
  */
 struct lttcomm_relayd_create_session_2_4 {
-       char session_name[NAME_MAX];
-       char hostname[HOST_NAME_MAX];
+       char session_name[LTTNG_NAME_MAX];
+       char hostname[LTTNG_HOST_NAME_MAX];
        uint32_t live_timer;
        uint32_t snapshot;
 } LTTNG_PACKED;