X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fcmd-2-11.cpp;fp=src%2Fbin%2Flttng-relayd%2Fcmd-2-11.cpp;h=8b6a99723ef81ecf9add19e64e5901a55c9486c9;hp=73c3a3c513fadd563dc9052e6abfd670f08282f6;hb=28ab034a2c3582d07d3423d2d746731f87d3969f;hpb=52e345b9ac912d033c2a2c25a170a01cf209839d diff --git a/src/bin/lttng-relayd/cmd-2-11.cpp b/src/bin/lttng-relayd/cmd-2-11.cpp index 73c3a3c51..8b6a99723 100644 --- a/src/bin/lttng-relayd/cmd-2-11.cpp +++ b/src/bin/lttng-relayd/cmd-2-11.cpp @@ -6,26 +6,30 @@ */ #define _LGPL_SOURCE -#include +#include "cmd-2-11.hpp" +#include "utils.hpp" #include -#include - #include #include +#include + #include -#include "cmd-2-11.hpp" -#include "utils.hpp" +#include int cmd_create_session_2_11(const struct lttng_buffer_view *payload, - char *session_name, char *hostname, char *base_path, - uint32_t *live_timer, bool *snapshot, - uint64_t *id_sessiond, - lttng_uuid& sessiond_uuid, - bool *has_current_chunk, uint64_t *current_chunk_id, - time_t *creation_time, - bool *session_name_contains_creation_time) + char *session_name, + char *hostname, + char *base_path, + uint32_t *live_timer, + bool *snapshot, + uint64_t *id_sessiond, + lttng_uuid& sessiond_uuid, + bool *has_current_chunk, + uint64_t *current_chunk_id, + time_t *creation_time, + bool *session_name_contains_creation_time) { int ret; struct lttcomm_relayd_create_session_2_11 header; @@ -38,7 +42,8 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload, if (payload->size < header_len) { ERR("Unexpected payload size in \"cmd_create_session_2_11\": expected >= %zu bytes, got %zu bytes", - header_len, payload->size); + header_len, + payload->size); ret = -1; goto error; } @@ -53,13 +58,15 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload, header.creation_time = be64toh(header.creation_time); header.session_id = be64toh(header.session_id); - std::copy(std::begin(header.sessiond_uuid), std::end(header.sessiond_uuid), sessiond_uuid.begin()); + std::copy(std::begin(header.sessiond_uuid), + std::end(header.sessiond_uuid), + sessiond_uuid.begin()); - received_names_size = header.session_name_len + header.hostname_len + - header.base_path_len; + received_names_size = header.session_name_len + header.hostname_len + header.base_path_len; if (payload->size < header_len + received_names_size) { ERR("Unexpected payload size in \"cmd_create_session_2_11\": expected >= %zu bytes, got %zu bytes", - header_len + received_names_size, payload->size); + header_len + received_names_size, + payload->size); ret = -1; goto error; } @@ -67,7 +74,10 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload, /* Validate length against defined constant. */ if (header.session_name_len > LTTNG_NAME_MAX) { ret = -ENAMETOOLONG; - ERR("Length of session name (%" PRIu32 " bytes) received in create_session command exceeds maximum length (%d bytes)", header.session_name_len, LTTNG_NAME_MAX); + ERR("Length of session name (%" PRIu32 + " bytes) received in create_session command exceeds maximum length (%d bytes)", + header.session_name_len, + LTTNG_NAME_MAX); goto error; } else if (header.session_name_len == 0) { ret = -EINVAL; @@ -76,18 +86,23 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload, } if (header.hostname_len > LTTNG_HOST_NAME_MAX) { ret = -ENAMETOOLONG; - ERR("Length of hostname (%" PRIu32 " bytes) received in create_session command exceeds maximum length (%d bytes)", header.hostname_len, LTTNG_HOST_NAME_MAX); + ERR("Length of hostname (%" PRIu32 + " bytes) received in create_session command exceeds maximum length (%d bytes)", + header.hostname_len, + LTTNG_HOST_NAME_MAX); goto error; } if (header.base_path_len > LTTNG_PATH_MAX) { ret = -ENAMETOOLONG; - ERR("Length of base_path (%" PRIu32 " bytes) received in create_session command exceeds maximum length (%d bytes)", header.base_path_len, PATH_MAX); + ERR("Length of base_path (%" PRIu32 + " bytes) received in create_session command exceeds maximum length (%d bytes)", + header.base_path_len, + PATH_MAX); goto error; } offset = header_len; - session_name_view = lttng_buffer_view_from_view(payload, offset, - header.session_name_len); + session_name_view = lttng_buffer_view_from_view(payload, offset, header.session_name_len); if (!lttng_buffer_view_is_valid(&session_name_view)) { ERR("Invalid payload in \"cmd_create_session_2_11\": buffer too short to contain session name"); ret = -1; @@ -95,8 +110,7 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload, } offset += header.session_name_len; - hostname_view = lttng_buffer_view_from_view(payload, - offset, header.hostname_len); + hostname_view = lttng_buffer_view_from_view(payload, offset, header.hostname_len); if (!lttng_buffer_view_is_valid(&hostname_view)) { ERR("Invalid payload in \"cmd_create_session_2_11\": buffer too short to contain hostname"); ret = -1; @@ -104,8 +118,7 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload, } offset += header.hostname_len; - base_path_view = lttng_buffer_view_from_view(payload, - offset, header.base_path_len); + base_path_view = lttng_buffer_view_from_view(payload, offset, header.base_path_len); if (header.base_path_len > 0 && !lttng_buffer_view_is_valid(&base_path_view)) { ERR("Invalid payload in \"cmd_create_session_2_11\": buffer too short to contain base path"); ret = -1; @@ -125,8 +138,7 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload, goto error; } - if (base_path_view.size != 0 && - base_path_view.data[base_path_view.size - 1] != '\0') { + if (base_path_view.size != 0 && base_path_view.data[base_path_view.size - 1] != '\0') { ERR("cmd_create_session_2_11 base_path is invalid (not NULL terminated)"); ret = -1; goto error; @@ -145,8 +157,7 @@ int cmd_create_session_2_11(const struct lttng_buffer_view *payload, *current_chunk_id = header.current_chunk_id.value; *has_current_chunk = header.current_chunk_id.is_set; *creation_time = (time_t) header.creation_time; - *session_name_contains_creation_time = - header.session_name_contains_creation_time; + *session_name_contains_creation_time = header.session_name_contains_creation_time; *id_sessiond = header.session_id; ret = 0; @@ -159,9 +170,11 @@ error: * 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, - uint64_t *trace_archive_id) + char **ret_path_name, + char **ret_channel_name, + uint64_t *tracefile_size, + uint64_t *tracefile_count, + uint64_t *trace_archive_id) { int ret; struct lttcomm_relayd_add_stream_2_11 header; @@ -175,7 +188,8 @@ int cmd_recv_stream_2_11(const struct lttng_buffer_view *payload, 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); + header_len, + payload->size); ret = -1; goto error; } @@ -190,7 +204,8 @@ int cmd_recv_stream_2_11(const struct lttng_buffer_view *payload, 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); + header_len + received_names_size, + payload->size); ret = -1; goto error; } @@ -208,8 +223,8 @@ int cmd_recv_stream_2_11(const struct lttng_buffer_view *payload, } /* Validate that names are (NULL terminated. */ - channel_name_view = lttng_buffer_view_from_view(payload, header_len, - header.channel_name_len); + channel_name_view = + lttng_buffer_view_from_view(payload, header_len, header.channel_name_len); if (!lttng_buffer_view_is_valid(&channel_name_view)) { ERR("Invalid payload received in \"cmd_recv_stream_2_11\": buffer too short for channel name"); ret = -1; @@ -222,8 +237,8 @@ int cmd_recv_stream_2_11(const struct lttng_buffer_view *payload, goto error; } - pathname_view = lttng_buffer_view_from_view(payload, - header_len + header.channel_name_len, header.pathname_len); + pathname_view = lttng_buffer_view_from_view( + payload, header_len + header.channel_name_len, header.pathname_len); if (!lttng_buffer_view_is_valid(&pathname_view)) { ERR("Invalid payload received in \"cmd_recv_stream_2_11\": buffer too short for path name"); ret = -1;