memcpy(buf + sizeof(header), data, size);
}
+ DBG3("Relayd sending command %d of size %" PRIu64, (int) cmd, buf_size);
ret = rsock->sock.ops->sendmsg(&rsock->sock, buf, buf_size, flags);
if (ret < 0) {
+ PERROR("Failed to send command %d of size %" PRIu64,
+ (int) cmd, buf_size);
ret = -errno;
goto error;
}
-
- DBG3("Relayd sending command %d of size %" PRIu64, cmd, buf_size);
-
error:
free(buf);
alloc_error:
int ret;
struct lttcomm_relayd_create_session_2_4 msg;
- if (strlen(session_name) >= sizeof(msg.session_name)) {
+ if (lttng_strncpy(msg.session_name, session_name,
+ sizeof(msg.session_name))) {
ret = -1;
goto error;
}
- strncpy(msg.session_name, session_name, sizeof(msg.session_name));
- if (strlen(hostname) >= sizeof(msg.hostname)) {
+ if (lttng_strncpy(msg.hostname, hostname, sizeof(msg.hostname))) {
ret = -1;
goto error;
}
- strncpy(msg.hostname, hostname, sizeof(msg.hostname));
msg.live_timer = htobe32(session_live_timer);
msg.snapshot = htobe32(snapshot);
/* Compat with relayd 2.1 */
if (rsock->minor == 1) {
memset(&msg, 0, sizeof(msg));
- if (strlen(channel_name) >= sizeof(msg.channel_name)) {
+ if (lttng_strncpy(msg.channel_name, channel_name,
+ sizeof(msg.channel_name))) {
ret = -1;
goto error;
}
- strncpy(msg.channel_name, channel_name, sizeof(msg.channel_name));
- if (strlen(pathname) >= sizeof(msg.pathname)) {
+ if (lttng_strncpy(msg.pathname, pathname,
+ sizeof(msg.pathname))) {
ret = -1;
goto error;
}
- strncpy(msg.pathname, pathname, sizeof(msg.pathname));
/* Send command */
ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) &msg, sizeof(msg), 0);
} else {
memset(&msg_2_2, 0, sizeof(msg_2_2));
/* Compat with relayd 2.2+ */
- if (strlen(channel_name) >= sizeof(msg_2_2.channel_name)) {
+ if (lttng_strncpy(msg_2_2.channel_name, channel_name,
+ sizeof(msg_2_2.channel_name))) {
ret = -1;
goto error;
}
- strncpy(msg_2_2.channel_name, channel_name, sizeof(msg_2_2.channel_name));
- if (strlen(pathname) >= sizeof(msg_2_2.pathname)) {
+ if (lttng_strncpy(msg_2_2.pathname, pathname,
+ sizeof(msg_2_2.pathname))) {
ret = -1;
goto error;
}
- strncpy(msg_2_2.pathname, pathname, sizeof(msg_2_2.pathname));
msg_2_2.tracefile_size = htobe64(tracefile_size);
msg_2_2.tracefile_count = htobe64(tracefile_count);
* If major versions are compatible, we assign minor_to_use to the
* minor version of the procotol we are going to use for this session.
*
- * Return 0 if compatible else negative value.
+ * Return 0 if the two daemons are compatible, LTTNG_ERR_RELAYD_VERSION_FAIL
+ * otherwise, or a negative value on network errors.
*/
int relayd_version_check(struct lttcomm_relayd_sock *rsock)
{
*/
if (msg.major != rsock->major) {
/* Not compatible */
- ret = -1;
+ ret = LTTNG_ERR_RELAYD_VERSION_FAIL;
DBG2("Relayd version is NOT compatible. Relayd version %u != %u (us)",
msg.major, rsock->major);
goto error;
}
/* Send command */
- ret = send_command(rsock, RELAYD_SEND_INDEX, &msg, sizeof(msg), 0);
+ ret = send_command(rsock, RELAYD_SEND_INDEX, &msg,
+ lttcomm_relayd_index_len(lttng_to_index_major(rsock->major,
+ rsock->minor),
+ lttng_to_index_minor(rsock->major, rsock->minor)),
+ 0);
if (ret < 0) {
goto error;
}