Fix: Relayd and sessiond version check

[lttng-tools.git] / src / bin / lttng-relayd / main.c

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 18e60d1efbbe40fb45c678adc149b4e3c366468e..bd19a323715309697ba3b3ff61c6d29a615ad379 100644 (file)
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -239,9 +239,6 @@ void cleanup(void)
        /* Close thread quit pipes */
        utils_close_pipe(thread_quit_pipe);
 
-       /* Close relay cmd pipes */
-       utils_close_pipe(relay_cmd_pipe);
-
        uri_free(control_uri);
        uri_free(data_uri);
 }
@@ -897,7 +894,10 @@ void relay_delete_session(struct relay_command *cmd, struct lttng_ht *streams_ht
                        stream = caa_container_of(node,
                                        struct relay_stream, stream_n);
                        if (stream->session == cmd->session) {
-                               close(stream->fd);
+                               ret = close(stream->fd);
+                               if (ret < 0) {
+                                       PERROR("close stream fd on delete session");
+                               }
                                ret = lttng_ht_del(streams_ht, &iter);
                                assert(!ret);
                                call_rcu(&stream->rcu_node,
@@ -1058,7 +1058,10 @@ int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr,
        if (close_stream_check(stream)) {
                int delret;
 
-               close(stream->fd);
+               delret = close(stream->fd);
+               if (delret < 0) {
+                       PERROR("close stream");
+               }
                delret = lttng_ht_del(streams_ht, &iter);
                assert(!delret);
                call_rcu(&stream->rcu_node,
@@ -1278,7 +1281,7 @@ int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr,
                struct relay_command *cmd)
 {
        int ret;
-       struct lttcomm_relayd_version reply;
+       struct lttcomm_relayd_version reply, msg;
        struct relay_session *session;
 
        if (cmd->session == NULL) {
@@ -1296,6 +1299,21 @@ int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr,
        }
        session->version_check_done = 1;
 
+       /* Get version from the other side. */
+       ret = cmd->sock->ops->recvmsg(cmd->sock, &msg, sizeof(msg), MSG_WAITALL);
+       if (ret < 0 || ret != sizeof(msg)) {
+               ret = -1;
+               ERR("Relay failed to receive the version values.");
+               goto end;
+       }
+
+       /*
+        * For now, we just ignore the received version but after 2.1 stable
+        * release, a check must be done to see if we either adapt to the other
+        * side version (which MUST be lower than us) or keep the latest data
+        * structure considering that the other side will adapt.
+        */
+
        ret = sscanf(VERSION, "%u.%u", &reply.major, &reply.minor);
        if (ret < 2) {
                ERR("Error in scanning version");
@@ -1536,9 +1554,13 @@ int relay_process_data(struct relay_command *cmd, struct lttng_ht *streams_ht)
 
        /* Check if we need to close the FD */
        if (close_stream_check(stream)) {
+               int cret;
                struct lttng_ht_iter iter;
 
-               close(stream->fd);
+               cret = close(stream->fd);
+               if (cret < 0) {
+                       PERROR("close stream process data");
+               }
                iter.iter.node = &stream->stream_n.node;
                ret = lttng_ht_del(streams_ht, &iter);
                assert(!ret);
@@ -1813,6 +1835,8 @@ error_poll_create:
 streams_ht_error:
        lttng_ht_destroy(relay_connections_ht);
 relay_connections_ht_error:
+       /* Close relay cmd pipes */
+       utils_close_pipe(relay_cmd_pipe);
        if (err) {
                DBG("Thread exited with error");
        }