X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Frelayd%2Frelayd.c;h=1f98ac4c09e81452dd6df0a75f84477b650ca07e;hb=d7b377ed1acd4043bde353d99122e0e56fa4e975;hp=228b35cb26b4414854a6218bded70003905df28b;hpb=5da88b0f58d7f838068037ea449ddfb25d3e85ad;p=lttng-tools.git

diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c
index 228b35cb2..1f98ac4c0 100644
--- a/src/common/relayd/relayd.c
+++ b/src/common/relayd/relayd.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2012 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2012 David Goulet <dgoulet@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -45,6 +35,17 @@ bool relayd_supports_chunks(const struct lttcomm_relayd_sock *sock)
 	return false;
 }
 
+static
+bool relayd_supports_get_configuration(const struct lttcomm_relayd_sock *sock)
+{
+	if (sock->major > 2) {
+		return true;
+	} else if (sock->major == 2 && sock->minor >= 12) {
+		return true;
+	}
+	return false;
+}
+
 /*
  * Send command. Fill up the header and append the data.
  */
@@ -498,7 +499,7 @@ int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_nam
 	int ret;
 	struct lttcomm_relayd_status_stream reply;
 	char pathname[RELAYD_COMM_LTTNG_PATH_MAX];
-	char *separator;
+	const char *separator;
 
 	/* Code flow error. Safety net. */
 	assert(rsock);
@@ -1257,7 +1258,7 @@ int relayd_rotate_streams(struct lttcomm_relayd_sock *sock,
 					position->rotate_at_seq_num),
 		};
 
-		DBG("Rotate stream %" PRIu64 "at sequence number %" PRIu64,
+		DBG("Rotate stream %" PRIu64 " at sequence number %" PRIu64,
 				position->stream_id,
 				position->rotate_at_seq_num);
 		ret = lttng_dynamic_buffer_append(&payload, &comm_position,
@@ -1533,3 +1534,54 @@ int relayd_trace_chunk_exists(struct lttcomm_relayd_sock *sock,
 end:
 	return ret;
 }
+
+int relayd_get_configuration(struct lttcomm_relayd_sock *sock,
+		uint64_t query_flags,
+		uint64_t *result_flags)
+{
+	int ret = 0;
+	struct lttcomm_relayd_get_configuration msg = (typeof(msg)) {
+		.query_flags = htobe64(query_flags),
+	};
+	struct lttcomm_relayd_get_configuration_reply reply = {};
+
+	if (!relayd_supports_get_configuration(sock)) {
+		DBG("Refusing to get relayd configuration (unsupported by relayd)");
+		if (query_flags) {
+			ret = -1;
+			goto end;
+		}
+		*result_flags = 0;
+		goto end;
+	}
+
+	ret = send_command(sock, RELAYD_GET_CONFIGURATION, &msg, sizeof(msg),
+			0);
+	if (ret < 0) {
+		ERR("Failed to send get configuration command to relay daemon");
+		goto end;
+	}
+
+	ret = recv_reply(sock, &reply, sizeof(reply));
+	if (ret < 0) {
+		ERR("Failed to receive relay daemon get configuration command reply");
+		goto end;
+	}
+
+	reply.generic.ret_code = be32toh(reply.generic.ret_code);
+	if (reply.generic.ret_code != LTTNG_OK) {
+		ret = -1;
+		ERR("Relayd get configuration replied error %d",
+				reply.generic.ret_code);
+	} else {
+		reply.relayd_configuration_flags =
+			be64toh(reply.relayd_configuration_flags);
+		ret = 0;
+		DBG("Relayd successfully got configuration: query_flags = %" PRIu64
+				", results_flags = %" PRIu64, query_flags,
+				reply.relayd_configuration_flags);
+		*result_flags = reply.relayd_configuration_flags;
+	}
+end:
+	return ret;
+}