X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Frelayd%2Frelayd.c;h=08bbad23bc89a15339496ff62ab944c1a699b1bc;hb=65ff8ea370bee80098fe06e4a513d7a4228c63d3;hp=78ed85558c8cf24cc1048924ce4db794e0dfeef9;hpb=6f768002890eb255a0d63984f1733b44b01c636d;p=lttng-tools.git

diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c
index 78ed85558..08bbad23b 100644
--- a/src/common/relayd/relayd.c
+++ b/src/common/relayd/relayd.c
@@ -126,8 +126,9 @@ error:
  * payload size is introduced.
  */
 static int relayd_create_session_2_11(struct lttcomm_relayd_sock *rsock,
-		char *session_name, char *hostname,
-		int session_live_timer, unsigned int snapshot)
+		const char *session_name, const char *hostname,
+		int session_live_timer, unsigned int snapshot,
+		uint64_t sessiond_session_id, const lttng_uuid sessiond_uuid)
 {
 	int ret;
 	struct lttcomm_relayd_create_session_2_11 *msg = NULL;
@@ -165,6 +166,9 @@ static int relayd_create_session_2_11(struct lttcomm_relayd_sock *rsock,
 	msg->live_timer = htobe32(session_live_timer);
 	msg->snapshot = !!snapshot;
 
+	lttng_uuid_copy(msg->sessiond_uuid, sessiond_uuid);
+	msg->session_id = htobe64(sessiond_session_id);
+
 	/* Send command */
 	ret = send_command(rsock, RELAYD_CREATE_SESSION, msg, msg_length, 0);
 	if (ret < 0) {
@@ -179,8 +183,8 @@ error:
  * support the live reading capability.
  */
 static int relayd_create_session_2_4(struct lttcomm_relayd_sock *rsock,
-		char *session_name, char *hostname, int session_live_timer,
-		unsigned int snapshot)
+		const char *session_name, const char *hostname,
+		int session_live_timer, unsigned int snapshot)
 {
 	int ret;
 	struct lttcomm_relayd_create_session_2_4 msg;
@@ -231,15 +235,18 @@ error:
  * On success, return 0 else a negative value which is either an errno error or
  * a lttng error code from the relayd.
  */
-int relayd_create_session(struct lttcomm_relayd_sock *rsock, uint64_t *session_id,
-		char *session_name, char *hostname, int session_live_timer,
-		unsigned int snapshot)
+int relayd_create_session(struct lttcomm_relayd_sock *rsock,
+		uint64_t *relayd_session_id,
+		const char *session_name, const char *hostname,
+		int session_live_timer,
+		unsigned int snapshot, uint64_t sessiond_session_id,
+		const lttng_uuid sessiond_uuid)
 {
 	int ret;
 	struct lttcomm_relayd_status_session reply;
 
 	assert(rsock);
-	assert(session_id);
+	assert(relayd_session_id);
 
 	DBG("Relayd create session");
 
@@ -253,7 +260,8 @@ int relayd_create_session(struct lttcomm_relayd_sock *rsock, uint64_t *session_i
 	} else {
 		/* From 2.11 to ... */
 		ret = relayd_create_session_2_11(rsock, session_name,
-				hostname, session_live_timer, snapshot);
+				hostname, session_live_timer, snapshot,
+				sessiond_session_id, sessiond_uuid);
 	}
 
 	if (ret < 0) {
@@ -276,7 +284,7 @@ int relayd_create_session(struct lttcomm_relayd_sock *rsock, uint64_t *session_i
 		goto error;
 	} else {
 		ret = 0;
-		*session_id = reply.session_id;
+		*relayd_session_id = reply.session_id;
 	}
 
 	DBG("Relayd session created with id %" PRIu64, reply.session_id);