From: Jonathan Rajotte Date: Thu, 10 May 2018 15:02:25 +0000 (-0400) Subject: Use dynamic payload for the add stream realyd command X-Git-Tag: v2.11.0-rc1~186 X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=2f21a469eee9bc3352b439b1e64fe6bbd5088fea Use dynamic payload for the add stream realyd command Move away from static constant defined char array. Keep backward compatibility. Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau --- diff --git a/src/bin/lttng-relayd/cmd-2-11.c b/src/bin/lttng-relayd/cmd-2-11.c index 993062ba7..eb03999cf 100644 --- a/src/bin/lttng-relayd/cmd-2-11.c +++ b/src/bin/lttng-relayd/cmd-2-11.c @@ -27,7 +27,7 @@ #include #include "cmd-2-11.h" -#include "lttng-relayd.h" +#include "utils.h" int cmd_create_session_2_11(const struct lttng_buffer_view *payload, char *session_name, char *hostname, @@ -106,3 +106,99 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload, error: return ret; } + +/* + * cmd_recv_stream_2_11 allocates path_name and channel_name. + */ +int cmd_recv_stream_2_11(const struct lttng_buffer_view *payload, + char **ret_path_name, char **ret_channel_name, + uint64_t *tracefile_size, uint64_t *tracefile_count) +{ + int ret; + struct lttcomm_relayd_add_stream_2_11 header; + size_t header_len, received_names_size; + struct lttng_buffer_view channel_name_view; + struct lttng_buffer_view pathname_view; + char *path_name = NULL; + char *channel_name = NULL; + + header_len = sizeof(header); + + if (payload->size < header_len) { + ERR("Unexpected payload size in \"cmd_recv_stream_2_11\": expected >= %zu bytes, got %zu bytes", + header_len, payload->size); + ret = -1; + goto error; + } + memcpy(&header, payload->data, header_len); + + header.channel_name_len = be32toh(header.channel_name_len); + header.pathname_len = be32toh(header.pathname_len); + header.tracefile_size = be64toh(header.tracefile_size); + header.tracefile_count = be64toh(header.tracefile_count); + + received_names_size = header.channel_name_len + header.pathname_len; + if (payload->size < header_len + received_names_size) { + ERR("Unexpected payload size in \"cmd_recv_stream_2_11\": expected >= %zu bytes, got %zu bytes", + header_len + received_names_size, payload->size); + ret = -1; + goto error; + } + + /* Validate length against defined constant. */ + if (header.channel_name_len > DEFAULT_STREAM_NAME_LEN) { + ret = -ENAMETOOLONG; + ERR("Channel name too long"); + goto error; + } + if (header.pathname_len > LTTNG_NAME_MAX) { + ret = -ENAMETOOLONG; + ERR("Pathname too long"); + goto error; + } + + /* Validate that names are (NULL terminated. */ + channel_name_view = lttng_buffer_view_from_view(payload, header_len, + header.channel_name_len); + pathname_view = lttng_buffer_view_from_view(payload, + header_len + header.channel_name_len, header.pathname_len); + + if (channel_name_view.data[channel_name_view.size - 1] != '\0') { + ERR("cmd_recv_stream_2_11 channel_name is invalid (not NULL terminated)"); + ret = -1; + goto error; + } + + if (pathname_view.data[pathname_view.size - 1] != '\0') { + ERR("cmd_recv_stream_2_11 patname is invalid (not NULL terminated)"); + ret = -1; + goto error; + } + + channel_name = strdup(channel_name_view.data); + if (!channel_name) { + ret = -errno; + PERROR("Channel name allocation"); + goto error; + } + + path_name = create_output_path(pathname_view.data); + if (!path_name) { + PERROR("Path name allocation"); + ret = -ENOMEM; + goto error; + } + + *tracefile_size = header.tracefile_size; + *tracefile_count = header.tracefile_count; + *ret_path_name = path_name; + *ret_channel_name = channel_name; + /* Move ownership to caller */ + path_name = NULL; + channel_name = NULL; + ret = 0; +error: + free(channel_name); + free(path_name); + return ret; +} diff --git a/src/bin/lttng-relayd/cmd-2-11.h b/src/bin/lttng-relayd/cmd-2-11.h index d63195854..e17eedf3c 100644 --- a/src/bin/lttng-relayd/cmd-2-11.h +++ b/src/bin/lttng-relayd/cmd-2-11.h @@ -24,4 +24,8 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload, char *session_name, char *hostname, uint32_t *live_timer, bool *snapshot); +int cmd_recv_stream_2_11(const struct lttng_buffer_view *payload, + char **ret_path_name, char **ret_channel_name, + uint64_t *tracefile_size, uint64_t *tracefile_count); + #endif /* RELAYD_CMD_2_11_H */ diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c index 1313091b1..fcc7fc00a 100644 --- a/src/bin/lttng-relayd/main.c +++ b/src/bin/lttng-relayd/main.c @@ -1205,17 +1205,20 @@ static int relay_add_stream(const struct lttcomm_relayd_hdr *recv_hdr, goto end_no_session; } - switch (session->minor) { - case 1: /* LTTng sessiond 2.1. Allocates path_name and channel_name. */ + if (session->minor == 1) { + /* For 2.1 */ ret = cmd_recv_stream_2_1(payload, &path_name, &channel_name); - break; - case 2: /* LTTng sessiond 2.2. Allocates path_name and channel_name. */ - default: + } else if (session->minor > 1 && session->minor < 11) { + /* From 2.2 to 2.10 */ ret = cmd_recv_stream_2_2(payload, &path_name, &channel_name, &tracefile_size, &tracefile_count); - break; + } else { + /* From 2.11 to ... */ + ret = cmd_recv_stream_2_11(payload, &path_name, + &channel_name, &tracefile_size, &tracefile_count); } + if (ret < 0) { goto send_reply; } diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c index 45f965c79..53ee58b2e 100644 --- a/src/common/relayd/relayd.c +++ b/src/common/relayd/relayd.c @@ -284,6 +284,119 @@ error: return ret; } +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; +} + /* * Add stream on the relayd and assign stream handle to the stream_id argument. * @@ -294,8 +407,6 @@ int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_nam uint64_t tracefile_size, uint64_t tracefile_count) { int ret; - struct lttcomm_relayd_add_stream msg; - struct lttcomm_relayd_add_stream_2_2 msg_2_2; struct lttcomm_relayd_status_stream reply; /* Code flow error. Safety net. */ @@ -307,44 +418,22 @@ int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_nam /* Compat with relayd 2.1 */ if (rsock->minor == 1) { - 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) { - goto error; - } + /* For 2.1 */ + ret = relayd_add_stream_2_1(rsock, channel_name, pathname); + + } else if (rsock->minor > 1 && rsock->minor < 11) { + /* From 2.2 to 2.10 */ + ret = relayd_add_stream_2_2(rsock, channel_name, pathname, + tracefile_size, tracefile_count); } else { - memset(&msg_2_2, 0, sizeof(msg_2_2)); - /* Compat with relayd 2.2+ */ - if (lttng_strncpy(msg_2_2.channel_name, channel_name, - sizeof(msg_2_2.channel_name))) { - ret = -1; - goto error; - } - if (lttng_strncpy(msg_2_2.pathname, pathname, - sizeof(msg_2_2.pathname))) { - ret = -1; - goto error; - } - msg_2_2.tracefile_size = htobe64(tracefile_size); - msg_2_2.tracefile_count = htobe64(tracefile_count); + /* From 2.11 to ...*/ + ret = relayd_add_stream_2_11(rsock, channel_name, pathname, + tracefile_size, tracefile_count); + } - /* Send command */ - ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) &msg_2_2, sizeof(msg_2_2), 0); - if (ret < 0) { - goto error; - } + if (ret) { + ret = -1; + goto error; } /* Waiting for reply */ @@ -368,7 +457,7 @@ int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_nam } DBG("Relayd stream added successfully with handle %" PRIu64, - reply.handle); + reply.handle); error: return ret; diff --git a/src/common/sessiond-comm/relayd.h b/src/common/sessiond-comm/relayd.h index 25d09980e..1a58d5989 100644 --- a/src/common/sessiond-comm/relayd.h +++ b/src/common/sessiond-comm/relayd.h @@ -84,6 +84,14 @@ struct lttcomm_relayd_add_stream_2_2 { uint64_t tracefile_count; } LTTNG_PACKED; +struct lttcomm_relayd_add_stream_2_11 { + uint32_t channel_name_len; + uint32_t pathname_len; + uint64_t tracefile_size; + uint64_t tracefile_count; + char names[]; +} LTTNG_PACKED; + /* * Answer from an add stream command. */