relayd: Extend relayd get configuration command to check for trace format support

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

diff --git a/src/bin/lttng-relayd/main.cpp b/src/bin/lttng-relayd/main.cpp
index 318af66f787526f049faef36f9c4cf1a78425c71..e2d947cc693aa96920c2f0f0cbb6d39ffbdea6ce 100644 (file)
--- a/src/bin/lttng-relayd/main.cpp
+++ b/src/bin/lttng-relayd/main.cpp
@@ -3286,9 +3286,14 @@ static int relay_get_configuration(
        struct lttcomm_relayd_get_configuration *msg;
        struct lttcomm_relayd_get_configuration_reply reply = {};
        struct lttng_buffer_view header_view;
+       struct lttng_dynamic_buffer buffer;
+       struct lttng_dynamic_buffer extra_payload;
        uint64_t query_flags = 0;
        uint64_t result_flags = 0;
 
+       lttng_dynamic_buffer_init(&buffer);
+       lttng_dynamic_buffer_init(&extra_payload);
+
        header_view = lttng_buffer_view_from_view(payload, 0, sizeof(*msg));
        if (!lttng_buffer_view_is_valid(&header_view)) {
                ERR("Failed to receive payload of chunk close command");
@@ -3300,26 +3305,47 @@ static int relay_get_configuration(
        msg = (typeof(msg)) header_view.data;
        query_flags = be64toh(msg->query_flags);
 
-       if (query_flags) {
+       if (query_flags & ~LTTCOMM_RELAYD_CONFIGURATION_QUERY_FLAG_MASK) {
                ret = LTTNG_ERR_INVALID_PROTOCOL;
                goto reply;
        }
+
        if (opt_allow_clear) {
                result_flags |= LTTCOMM_RELAYD_CONFIGURATION_FLAG_CLEAR_ALLOWED;
        }
-       ret = 0;
+
+       if (query_flags & LTTCOMM_RELAYD_CONFIGURATION_QUERY_FLAG_SUPPORTED_TRACE_FORMAT) {
+               uint64_t supported_trace_format = 0;
+
+               supported_trace_format |= LTTCOMM_RELAYD_CONFIGURATION_TRACE_FORMAT_SUPPORTED_CTF1;
+
+               supported_trace_format = htobe64(supported_trace_format);
+
+               lttcomm_relayd_get_configuration_specialized_query_reply s_reply = {};
+               s_reply.query_flag = htobe64(
+                               LTTCOMM_RELAYD_CONFIGURATION_QUERY_FLAG_SUPPORTED_TRACE_FORMAT);
+               s_reply.payload_len = htobe64((uint64_t) sizeof(supported_trace_format));
+               lttng_dynamic_buffer_append(&extra_payload, &s_reply, sizeof(s_reply));
+               lttng_dynamic_buffer_append(&extra_payload, &supported_trace_format,
+                               sizeof(supported_trace_format));
+       }
+
 reply:
-       reply.generic.ret_code = htobe32((uint32_t) (ret == 0 ? LTTNG_OK : LTTNG_ERR_INVALID_PROTOCOL));
+       reply.generic.ret_code =
+                       htobe32((uint32_t) (ret == 0 ? LTTNG_OK : LTTNG_ERR_INVALID_PROTOCOL));
        reply.relayd_configuration_flags = htobe64(result_flags);
 
-       send_ret = conn->sock->ops->sendmsg(
-                       conn->sock, &reply, sizeof(reply), 0);
-       if (send_ret < (ssize_t) sizeof(reply)) {
-               ERR("Failed to send \"get configuration\" command reply (ret = %zd)",
-                               send_ret);
+       lttng_dynamic_buffer_append(&buffer, &reply, sizeof(reply));
+       lttng_dynamic_buffer_append_buffer(&buffer, &extra_payload);
+
+       send_ret = conn->sock->ops->sendmsg(conn->sock, buffer.data, buffer.size, 0);
+       if (send_ret < (ssize_t) buffer.size) {
+               ERR("Failed to send \"get configuration\" command reply (ret = %zd)", send_ret);
                ret = -1;
        }
 end_no_reply:
+       lttng_dynamic_buffer_reset(&extra_payload);
+       lttng_dynamic_buffer_reset(&buffer);
        return ret;
 }