The size of LTTNG_HOST_NAME_MAX changed from 64 to 256 in commit id
b867041c62b48e89c9f00430cde4c33f13a2da09.
This change result in breaking compatibility with older relayd.
Freeze size of struct used for relayd communication.
Confirmed by lttng-ivc project.
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
#define RELAYD_VERSION_COMM_MAJOR VERSION_MAJOR
#define RELAYD_VERSION_COMM_MINOR VERSION_MINOR
#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.
*/
/*
* lttng-relayd communication header.
*/
* Used to add a stream on the relay daemon.
*/
struct lttcomm_relayd_add_stream {
* 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];
* Protocol version 2.2
*/
struct lttcomm_relayd_add_stream_2_2 {
* 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;
uint64_t tracefile_size;
uint64_t tracefile_count;
} LTTNG_PACKED;
* Create session in 2.4 adds additionnal parameters for live reading.
*/
struct lttcomm_relayd_create_session_2_4 {
* 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;
uint32_t live_timer;
uint32_t snapshot;
} LTTNG_PACKED;