*/
#define _LGPL_SOURCE
-#include <inttypes.h>
+#include "cmd-2-11.hpp"
+#include "utils.hpp"
-#include <common/common.h>
-#include <common/sessiond-comm/relayd.h>
+#include <common/common.hpp>
+#include <common/compat/endian.hpp>
+#include <common/compat/string.hpp>
+#include <common/sessiond-comm/relayd.hpp>
-#include <common/compat/endian.h>
-#include <common/compat/string.h>
#include <lttng/constant.h>
-#include "cmd-2-11.h"
-#include "utils.h"
+#include <inttypes.h>
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;
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;
}
header.creation_time = be64toh(header.creation_time);
header.session_id = be64toh(header.session_id);
- lttng_uuid_copy(sessiond_uuid, header.sessiond_uuid);
+ 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;
}
/* 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;
}
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;
}
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;
}
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;
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;
*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;
* 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;
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;
+ char *path_name = nullptr;
+ char *channel_name = nullptr;
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);
+ header_len,
+ payload->size);
ret = -1;
goto error;
}
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;
}
}
/* 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;
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;
*ret_path_name = path_name;
*ret_channel_name = channel_name;
/* Move ownership to caller */
- path_name = NULL;
- channel_name = NULL;
+ path_name = nullptr;
+ channel_name = nullptr;
ret = 0;
error:
free(channel_name);
projects / lttng-tools.git / blobdiff