Fix: relayd vs consumerd compatibility

[lttng-tools.git] / src / common / relayd / relayd.c

diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c
index acf6c38e7c54b959ad35233314801ec9c8aebf60..2adcbe415c63f16a176dba9167c247f34eb0eba3 100644 (file)
--- a/src/common/relayd/relayd.c
+++ b/src/common/relayd/relayd.c
@@ -129,16 +129,15 @@ static int relayd_create_session_2_4(struct lttcomm_relayd_sock *rsock,
        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);
 
@@ -255,16 +254,16 @@ 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 (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);
@@ -274,16 +273,16 @@ int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_nam
        } 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);
 
@@ -857,7 +856,11 @@ int relayd_send_index(struct lttcomm_relayd_sock *rsock,
        }
 
        /* 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;
        }