X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Frelayd%2Frelayd.c;h=54fe6734516589bd6c3fe432ae8aaba4eea7846b;hp=49997015e3f9cb73f7fa63fa99c703dbb67a095b;hb=8614e600d7a8dc653c473254fc302870d73f32ae;hpb=ecd1a12fac39784bded85c0f06e47ace2dc98cde

diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c
index 49997015e..54fe67345 100644
--- a/src/common/relayd/relayd.c
+++ b/src/common/relayd/relayd.c
@@ -45,6 +45,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.
  */
@@ -161,7 +172,7 @@ static int relayd_create_session_2_11(struct lttcomm_relayd_sock *rsock,
 	/* The three names are sent with a '\0' delimiter between them. */
 	session_name_len = strlen(session_name) + 1;
 	hostname_len = strlen(hostname) + 1;
-	base_path_len = base_path ? strlen(base_path) + 1 : 0;
+	base_path_len = strlen(base_path) + 1;
 
 	msg_length = sizeof(*msg) + session_name_len + hostname_len + base_path_len;
 	msg = zmalloc(msg_length);
@@ -191,7 +202,7 @@ static int relayd_create_session_2_11(struct lttcomm_relayd_sock *rsock,
 		goto error;
 	}
 	dst += hostname_len;
-	if (base_path && lttng_strncpy(dst, base_path, base_path_len)) {
+	if (lttng_strncpy(dst, base_path, base_path_len)) {
 		ret = -1;
 		goto error;
 	}
@@ -491,21 +502,37 @@ error:
  * On success return 0 else return ret_code negative value.
  */
 int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_name,
-		const char *pathname, uint64_t *stream_id,
+		const char *domain_name, const char *_pathname, uint64_t *stream_id,
 		uint64_t tracefile_size, uint64_t tracefile_count,
 		struct lttng_trace_chunk *trace_chunk)
 {
 	int ret;
 	struct lttcomm_relayd_status_stream reply;
+	char pathname[RELAYD_COMM_LTTNG_PATH_MAX];
+	char *separator;
 
 	/* Code flow error. Safety net. */
 	assert(rsock);
 	assert(channel_name);
-	assert(pathname);
+	assert(domain_name);
+	assert(_pathname);
 	assert(trace_chunk);
 
 	DBG("Relayd adding stream for channel name %s", channel_name);
 
+	if (_pathname[0] == '\0') {
+		separator = "";
+	} else {
+		separator = "/";
+	}
+	ret = snprintf(pathname, RELAYD_COMM_LTTNG_PATH_MAX, "%s%s%s",
+			domain_name, separator, _pathname);
+	if (ret <= 0 || ret >= RELAYD_COMM_LTTNG_PATH_MAX) {
+		ERR("stream path too long.");
+		ret = -1;
+		goto error;
+	}
+
 	/* Compat with relayd 2.1 */
 	if (rsock->minor == 1) {
 		/* For 2.1 */
@@ -1480,6 +1507,8 @@ int relayd_trace_chunk_exists(struct lttcomm_relayd_sock *sock,
 
 	if (!relayd_supports_chunks(sock)) {
 		DBG("Refusing to check for trace chunk existence: relayd does not support chunks");
+		/* The chunk will never exist */
+		*chunk_exists = false;
 		goto end;
 	}
 
@@ -1515,3 +1544,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;
+}