* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
#include <assert.h>
-#include <string.h>
#include <common/common.h>
#include <common/sessiond-comm/relayd.h>
#include <common/compat/endian.h>
+#include <common/compat/string.h>
+#include <lttng/constant.h>
-#include "cmd-generic.h"
+#include "cmd-2-4.h"
#include "lttng-relayd.h"
-int cmd_create_session_2_4(struct relay_connection *conn,
+int cmd_create_session_2_4(const struct lttng_buffer_view *payload,
char *session_name, char *hostname,
uint32_t *live_timer, bool *snapshot)
{
int ret;
struct lttcomm_relayd_create_session_2_4 session_info;
+ size_t len;
- ret = cmd_recv(conn->sock, &session_info, sizeof(session_info));
- if (ret < 0) {
- ERR("Unable to recv session info version 2.4");
+ if (payload->size < sizeof(session_info)) {
+ ERR("Unexpected payload size in \"cmd_create_session_2_4\": expected >= %zu bytes, got %zu bytes",
+ sizeof(session_info), payload->size);
+ ret = -1;
goto error;
}
+ memcpy(&session_info, payload->data, sizeof(session_info));
+
+ len = lttng_strnlen(session_info.session_name, sizeof(session_info.session_name));
+ /* Ensure that NULL-terminated and fits in local filename length. */
+ if (len == sizeof(session_info.session_name) || len >= LTTNG_NAME_MAX) {
+ ret = -ENAMETOOLONG;
+ ERR("Session name too long");
+ goto error;
+ }
+ strncpy(session_name, session_info.session_name, LTTNG_PATH_MAX);
+
+ len = lttng_strnlen(session_info.hostname, sizeof(session_info.hostname));
+ if (len == sizeof(session_info.hostname) || len >= LTTNG_HOST_NAME_MAX) {
+ ret = -ENAMETOOLONG;
+ ERR("Session name too long");
+ goto error;
+ }
+ strncpy(hostname, session_info.hostname, LTTNG_HOST_NAME_MAX);
- strncpy(session_name, session_info.session_name,
- sizeof(session_info.session_name));
- strncpy(hostname, session_info.hostname,
- sizeof(session_info.hostname));
*live_timer = be32toh(session_info.live_timer);
*snapshot = be32toh(session_info.snapshot);