+static int relayd_add_stream_2_1(struct lttcomm_relayd_sock *rsock,
+ const char *channel_name, const char *pathname)
+{
+ int ret;
+ struct lttcomm_relayd_add_stream msg;
+
+ memset(&msg, 0, sizeof(msg));
+ if (lttng_strncpy(msg.channel_name, channel_name,
+ sizeof(msg.channel_name))) {
+ ret = -1;
+ goto error;
+ }
+
+ if (lttng_strncpy(msg.pathname, pathname,
+ sizeof(msg.pathname))) {
+ ret = -1;
+ goto error;
+ }
+
+ /* Send command */
+ ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) &msg, sizeof(msg), 0);
+ if (ret < 0) {
+ ret = -1;
+ goto error;
+ }
+ ret = 0;
+error:
+ return ret;
+}
+
+static int relayd_add_stream_2_2(struct lttcomm_relayd_sock *rsock,
+ const char *channel_name, const char *pathname,
+ uint64_t tracefile_size, uint64_t tracefile_count)
+{
+ int ret;
+ struct lttcomm_relayd_add_stream_2_2 msg;
+
+ memset(&msg, 0, sizeof(msg));
+ /* Compat with relayd 2.2 to 2.10 */
+ if (lttng_strncpy(msg.channel_name, channel_name,
+ sizeof(msg.channel_name))) {
+ ret = -1;
+ goto error;
+ }
+ if (lttng_strncpy(msg.pathname, pathname,
+ sizeof(msg.pathname))) {
+ ret = -1;
+ goto error;
+ }
+ msg.tracefile_size = htobe64(tracefile_size);
+ msg.tracefile_count = htobe64(tracefile_count);
+
+ /* Send command */
+ ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) &msg, sizeof(msg), 0);
+ if (ret < 0) {
+ goto error;
+ }
+ ret = 0;
+error:
+ return ret;
+}
+
+static int relayd_add_stream_2_11(struct lttcomm_relayd_sock *rsock,
+ const char *channel_name, const char *pathname,
+ uint64_t tracefile_size, uint64_t tracefile_count)
+{
+ int ret;
+ struct lttcomm_relayd_add_stream_2_11 *msg = NULL;
+ size_t channel_name_len;
+ size_t pathname_len;
+ size_t msg_length;
+
+ /* The two names are sent with a '\0' delimiter between them. */
+ channel_name_len = strlen(channel_name) + 1;
+ pathname_len = strlen(pathname) + 1;
+
+ msg_length = sizeof(*msg) + channel_name_len + pathname_len;
+ msg = zmalloc(msg_length);
+ if (!msg) {
+ PERROR("zmalloc add_stream_2_11 command message");
+ ret = -1;
+ goto error;
+ }
+
+ assert(channel_name_len <= UINT32_MAX);
+ msg->channel_name_len = htobe32(channel_name_len);
+
+ assert(pathname_len <= UINT32_MAX);
+ msg->pathname_len = htobe32(pathname_len);
+
+ if (lttng_strncpy(msg->names, channel_name, channel_name_len)) {
+ ret = -1;
+ goto error;
+ }
+ if (lttng_strncpy(msg->names + channel_name_len, pathname, pathname_len)) {
+ ret = -1;
+ goto error;
+ }
+
+ msg->tracefile_size = htobe64(tracefile_size);
+ msg->tracefile_count = htobe64(tracefile_count);
+
+ /* Send command */
+ ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) msg, msg_length, 0);
+ if (ret < 0) {
+ goto error;
+ }
+ ret = 0;
+error:
+ free(msg);
+ return ret;
+}
+