Fix: off-by-one in comm proto between lttng-ctl and sessiond

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

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index 62205f4c91d0b001ce63bd772707da65135a84f5..753e842340e5f4fd882ca99a5d3e4e1c151725a6 100644 (file)
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -167,12 +167,12 @@ struct lttcomm_session_msg {
        struct lttng_domain domain;
        union {
                struct {
-                       char channel_name[NAME_MAX];
+                       char channel_name[LTTNG_SYMBOL_NAME_LEN];
                        char name[NAME_MAX];
                } disable;
                /* Event data */
                struct {
-                       char channel_name[NAME_MAX];
+                       char channel_name[LTTNG_SYMBOL_NAME_LEN];
                        struct lttng_event event;
                } enable;
                /* Create channel */
@@ -181,8 +181,8 @@ struct lttcomm_session_msg {
                } channel;
                /* Context */
                struct {
-                       char channel_name[NAME_MAX];
-                       char event_name[NAME_MAX];
+                       char channel_name[LTTNG_SYMBOL_NAME_LEN];
+                       char event_name[LTTNG_SYMBOL_NAME_LEN];
                        struct lttng_event_context ctx;
                } context;
                /* Use by register_consumer */
@@ -191,7 +191,7 @@ struct lttcomm_session_msg {
                } reg;
                /* List */
                struct {
-                       char channel_name[NAME_MAX];
+                       char channel_name[LTTNG_SYMBOL_NAME_LEN];
                } list;
                struct lttng_calibrate calibrate;
                /* Used by the set_consumer_url and used by create_session also call */
@@ -200,8 +200,8 @@ struct lttcomm_session_msg {
                        uint32_t size;
                } uri;
                struct {
-                       char channel_name[NAME_MAX];
-                       char event_name[NAME_MAX];
+                       char channel_name[LTTNG_SYMBOL_NAME_LEN];
+                       char event_name[LTTNG_SYMBOL_NAME_LEN];
                        /* Length of following bytecode */
                        uint32_t bytecode_len;
                } filter;
@@ -255,6 +255,8 @@ struct lttcomm_consumer_msg {
                        uint64_t max_sb_size; /* the subbuffer size for this channel */
                        /* shm_fd and wait_fd are sent as ancillary data */
                        uint64_t mmap_len;
+                       /* nb_init_streams is the number of streams open initially. */
+                       unsigned int nb_init_streams;
                        char name[LTTNG_SYMBOL_NAME_LEN];
                } channel;
                struct {