X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.c;h=071135bda6975b09abf4f4db7841454dfecdc269;hp=c9197bd8ecf9afc682f3b9e43740cf7fe0298aca;hb=ca22feea083301934d1c8511851c86fb008c0697;hpb=2f77fc4b3720dc8f75847130498c2d4aad7c03ec

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index c9197bd8e..071135bda 100644
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -48,7 +48,7 @@ int consumer_send_destroy_relayd(struct consumer_socket *sock,
 
 	/* Bail out if consumer is disabled */
 	if (!consumer->enabled) {
-		ret = LTTCOMM_OK;
+		ret = LTTNG_OK;
 		DBG3("Consumer is disabled");
 		goto error;
 	}
@@ -486,7 +486,8 @@ void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 		int channel_key,
 		uint64_t max_sb_size,
 		uint64_t mmap_len,
-		const char *name)
+		const char *name,
+		unsigned int nb_init_streams)
 {
 	assert(msg);
 
@@ -500,6 +501,7 @@ void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 	msg->u.channel.channel_key = channel_key;
 	msg->u.channel.max_sb_size = max_sb_size;
 	msg->u.channel.mmap_len = mmap_len;
+	msg->u.channel.nb_init_streams = nb_init_streams;
 }
 
 /*
@@ -517,7 +519,8 @@ void consumer_init_stream_comm_msg(struct lttcomm_consumer_msg *msg,
 		int net_index,
 		unsigned int metadata_flag,
 		const char *name,
-		const char *pathname)
+		const char *pathname,
+		unsigned int session_id)
 {
 	assert(msg);
 
@@ -535,6 +538,7 @@ void consumer_init_stream_comm_msg(struct lttcomm_consumer_msg *msg,
 	msg->u.stream.gid = gid;
 	msg->u.stream.net_index = net_index;
 	msg->u.stream.metadata_flag = metadata_flag;
+	msg->u.stream.session_id = (uint64_t) session_id;
 	strncpy(msg->u.stream.name, name, sizeof(msg->u.stream.name));
 	msg->u.stream.name[sizeof(msg->u.stream.name) - 1] = '\0';
 	strncpy(msg->u.stream.path_name, pathname,
@@ -560,9 +564,12 @@ int consumer_send_stream(int sock, struct consumer_output *dst,
 		break;
 	case CONSUMER_DST_LOCAL:
 		/* Add stream file name to stream path */
-		strncat(msg->u.stream.path_name, "/", sizeof(msg->u.stream.path_name));
+		strncat(msg->u.stream.path_name, "/",
+				sizeof(msg->u.stream.path_name) -
+				strlen(msg->u.stream.path_name) - 1);
 		strncat(msg->u.stream.path_name, msg->u.stream.name,
-				sizeof(msg->u.stream.path_name));
+				sizeof(msg->u.stream.path_name) -
+				strlen(msg->u.stream.path_name) - 1);
 		msg->u.stream.path_name[sizeof(msg->u.stream.path_name) - 1] = '\0';
 		/* Indicate that the stream is NOT network */
 		msg->u.stream.net_index = -1;
@@ -608,7 +615,7 @@ int consumer_send_relayd_socket(int consumer_sock,
 
 	/* Bail out if consumer is disabled */
 	if (!consumer->enabled) {
-		ret = LTTCOMM_OK;
+		ret = LTTNG_OK;
 		goto error;
 	}