X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=a1eb961ee544331f961202ee2b69d36ffbe87868;hp=e0a8db9b2cc13a2b5c77407e0b14938fa565a587;hb=0dbc2034c9571ec342d382bf87231775563f8624;hpb=504521ea8462dbd9c188a59c4d04a1f5a0c4c537

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index e0a8db9b2..a1eb961ee 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -47,7 +47,7 @@
 #include "kernel-consumer.h"
 #include "lttng-sessiond.h"
 #include "utils.h"
-#include "syscall.h"
+#include "lttng-syscall.h"
 #include "agent.h"
 #include "buffer-registry.h"
 #include "notification-thread.h"
@@ -3671,10 +3671,12 @@ static
 int clear_metadata_file(int fd)
 {
 	int ret;
+	off_t lseek_ret;
 
-	ret = lseek(fd, 0, SEEK_SET);
-	if (ret < 0) {
+	lseek_ret = lseek(fd, 0, SEEK_SET);
+	if (lseek_ret < 0) {
 		PERROR("lseek");
+		ret = -1;
 		goto end;
 	}
 
@@ -4635,16 +4637,59 @@ int cmd_rotate_get_info(struct ltt_session *session,
 				rotation_id, session->name);
 		break;
 	case LTTNG_ROTATION_STATE_COMPLETED:
-		ret = lttng_strncpy(info_return->path,
+	{
+		char *current_tracing_path_reply;
+		size_t current_tracing_path_reply_len;
+
+		switch (session_get_consumer_destination_type(session)) {
+		case CONSUMER_DST_LOCAL:
+			current_tracing_path_reply =
+					info_return->location.local.absolute_path;
+			current_tracing_path_reply_len =
+					sizeof(info_return->location.local.absolute_path);
+			info_return->location_type =
+					(int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_LOCAL;
+			break;
+		case CONSUMER_DST_NET:
+			current_tracing_path_reply =
+					info_return->location.relay.relative_path;
+			current_tracing_path_reply_len =
+					sizeof(info_return->location.relay.relative_path);
+			/* Currently the only supported relay protocol. */
+			info_return->location.relay.protocol =
+					(int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_RELAY_PROTOCOL_TYPE_TCP;
+
+			ret = lttng_strncpy(info_return->location.relay.host,
+					session_get_net_consumer_hostname(session),
+					sizeof(info_return->location.relay.host));
+			if (ret) {
+				ERR("Failed to host name to rotate_get_info reply");
+				info_return->status = LTTNG_ROTATION_STATUS_ERROR;
+				ret = -LTTNG_ERR_UNK;
+				goto end;
+			}
+
+			session_get_net_consumer_ports(session,
+					&info_return->location.relay.ports.control,
+					&info_return->location.relay.ports.data);
+			info_return->location_type =
+					(int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_RELAY;
+			break;
+		default:
+			abort();
+		}
+		ret = lttng_strncpy(current_tracing_path_reply,
 				session->rotation_chunk.current_rotate_path,
-				sizeof(info_return->path));
+				current_tracing_path_reply_len);
 		if (ret) {
-			ERR("Failed to copy active tracing path to rotate_get_info reply");
+			ERR("Failed to copy current tracing path to rotate_get_info reply");
 			info_return->status = LTTNG_ROTATION_STATUS_ERROR;
 			ret = -LTTNG_ERR_UNK;
 			goto end;
 		}
+
 		break;
+	}
 	case LTTNG_ROTATION_STATE_ERROR:
 		DBG("Reporting that an error occurred during rotation %" PRIu64 " of session %s",
 				rotation_id, session->name);