X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=4fcd6a4feafdf2eae0b1e4393dd69ecfd6716d5e;hp=ca7e7dac17cb4e0e52e275e043b51c749d552096;hb=dec56f6cc894de41b312354d360b6a4c09fc199d;hpb=d4519fa365bd3a9ce4ea1720805a29a000fa042c

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index ca7e7dac1..4fcd6a4fe 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -380,20 +380,24 @@ static int add_uri_to_consumer(struct consumer_output *consumer,
 	case LTTNG_DST_IPV6:
 		DBG2("Setting network URI to consumer");
 
-		consumer->type = CONSUMER_DST_NET;
-
-		if ((uri->stype == LTTNG_STREAM_CONTROL &&
+		if (consumer->type == CONSUMER_DST_NET) {
+			if ((uri->stype == LTTNG_STREAM_CONTROL &&
 				consumer->dst.net.control_isset) ||
 				(uri->stype == LTTNG_STREAM_DATA &&
 				consumer->dst.net.data_isset)) {
-			ret = LTTNG_ERR_URL_EXIST;
-			goto error;
+				ret = LTTNG_ERR_URL_EXIST;
+				goto error;
+			}
+		} else {
+			memset(&consumer->dst.net, 0, sizeof(consumer->dst.net));
 		}
 
+		consumer->type = CONSUMER_DST_NET;
+
 		/* Set URI into consumer output object */
 		ret = consumer_set_network_uri(consumer, uri);
 		if (ret < 0) {
-			ret = LTTNG_ERR_FATAL;
+			ret = -ret;
 			goto error;
 		} else if (ret == 1) {
 			/*
@@ -434,6 +438,8 @@ static int add_uri_to_consumer(struct consumer_output *consumer,
 		break;
 	}
 
+	ret = LTTNG_OK;
+
 error:
 	return ret;
 }
@@ -478,24 +484,15 @@ error:
  * On success, the relayd_sock pointer is set to the created socket.
  * Else, it's stays untouched and a lttcomm error code is returned.
  */
-static int create_connect_relayd(struct consumer_output *output,
-		const char *session_name, struct lttng_uri *uri,
-		struct lttcomm_sock **relayd_sock,
-		struct ltt_session *session)
+static int create_connect_relayd(struct lttng_uri *uri,
+		struct lttcomm_relayd_sock **relayd_sock)
 {
 	int ret;
-	struct lttcomm_sock *sock;
-	uint32_t minor;
-
-	/* Create socket object from URI */
-	sock = lttcomm_alloc_sock_from_uri(uri);
-	if (sock == NULL) {
-		ret = LTTNG_ERR_FATAL;
-		goto error;
-	}
+	struct lttcomm_relayd_sock *rsock;
 
-	ret = lttcomm_create_sock(sock);
-	if (ret < 0) {
+	rsock = lttcomm_alloc_relayd_sock(uri, RELAYD_VERSION_COMM_MAJOR,
+			RELAYD_VERSION_COMM_MINOR);
+	if (!rsock) {
 		ret = LTTNG_ERR_FATAL;
 		goto error;
 	}
@@ -506,7 +503,7 @@ static int create_connect_relayd(struct consumer_output *output,
 	 * state to be in poll execution.
 	 */
 	health_poll_entry();
-	ret = relayd_connect(sock);
+	ret = relayd_connect(rsock);
 	health_poll_exit();
 	if (ret < 0) {
 		ERR("Unable to reach lttng-relayd");
@@ -519,14 +516,11 @@ static int create_connect_relayd(struct consumer_output *output,
 		DBG3("Creating relayd stream socket from URI");
 
 		/* Check relayd version */
-		ret = relayd_version_check(sock, RELAYD_VERSION_COMM_MAJOR,
-				RELAYD_VERSION_COMM_MINOR, &minor);
+		ret = relayd_version_check(rsock);
 		if (ret < 0) {
 			ret = LTTNG_ERR_RELAYD_VERSION_FAIL;
 			goto close_sock;
 		}
-		session->major = RELAYD_VERSION_COMM_MAJOR;
-		session->minor = minor;
 	} else if (uri->stype == LTTNG_STREAM_DATA) {
 		DBG3("Creating relayd data socket from URI");
 	} else {
@@ -536,18 +530,15 @@ static int create_connect_relayd(struct consumer_output *output,
 		goto close_sock;
 	}
 
-	*relayd_sock = sock;
+	*relayd_sock = rsock;
 
 	return LTTNG_OK;
 
 close_sock:
-	if (sock) {
-		(void) relayd_close(sock);
-	}
+	/* The returned value is not useful since we are on an error path. */
+	(void) relayd_close(rsock);
 free_sock:
-	if (sock) {
-		lttcomm_destroy_sock(sock);
-	}
+	free(rsock);
 error:
 	return ret;
 }
@@ -560,14 +551,14 @@ static int send_consumer_relayd_socket(int domain, struct ltt_session *session,
 		struct consumer_socket *consumer_sock)
 {
 	int ret;
-	struct lttcomm_sock *sock = NULL;
+	struct lttcomm_relayd_sock *rsock = NULL;
 
 	/* Connect to relayd and make version check if uri is the control. */
-	ret = create_connect_relayd(consumer, session->name, relayd_uri,
-			&sock, session);
+	ret = create_connect_relayd(relayd_uri, &rsock);
 	if (ret != LTTNG_OK) {
-		goto close_sock;
+		goto error;
 	}
+	assert(rsock);
 
 	/* If the control socket is connected, network session is ready */
 	if (relayd_uri->stype == LTTNG_STREAM_CONTROL) {
@@ -587,8 +578,8 @@ static int send_consumer_relayd_socket(int domain, struct ltt_session *session,
 	}
 
 	/* Send relayd socket to consumer. */
-	ret = consumer_send_relayd_socket(consumer_sock, sock,
-			consumer, relayd_uri->stype, session->id);
+	ret = consumer_send_relayd_socket(consumer_sock, rsock, consumer,
+			relayd_uri->stype, session->id);
 	if (ret < 0) {
 		ret = LTTNG_ERR_ENABLE_CONSUMER_FAIL;
 		goto close_sock;
@@ -609,11 +600,10 @@ static int send_consumer_relayd_socket(int domain, struct ltt_session *session,
 	 */
 
 close_sock:
-	if (sock) {
-		(void) relayd_close(sock);
-		lttcomm_destroy_sock(sock);
-	}
+	(void) relayd_close(rsock);
+	free(rsock);
 
+error:
 	if (ret != LTTNG_OK) {
 		/*
 		 * On error, nullify the consumer sequence index so streams are not
@@ -621,7 +611,6 @@ close_sock:
 		 */
 		uatomic_set(&consumer->net_seq_index, -1);
 	}
-
 	return ret;
 }
 
@@ -1659,7 +1648,7 @@ int cmd_set_consumer_uri(int domain, struct ltt_session *session,
 
 	for (i = 0; i < nb_uri; i++) {
 		ret = add_uri_to_consumer(consumer, &uris[i], domain, session->name);
-		if (ret < 0) {
+		if (ret != LTTNG_OK) {
 			goto error;
 		}
 	}
@@ -1678,7 +1667,6 @@ int cmd_create_session_uri(char *name, struct lttng_uri *uris,
 		size_t nb_uri, lttng_sock_cred *creds)
 {
 	int ret;
-	char *path = NULL;
 	struct ltt_session *session;
 
 	assert(name);
@@ -1703,7 +1691,7 @@ int cmd_create_session_uri(char *name, struct lttng_uri *uris,
 	}
 
 	/* Create tracing session in the registry */
-	ret = session_create(name, path, LTTNG_SOCK_GET_UID_CRED(creds),
+	ret = session_create(name, LTTNG_SOCK_GET_UID_CRED(creds),
 			LTTNG_SOCK_GET_GID_CRED(creds));
 	if (ret != LTTNG_OK) {
 		goto session_error;
@@ -1937,6 +1925,7 @@ ssize_t cmd_list_domains(struct ltt_session *session,
 
 	if (session->ust_session != NULL) {
 		(*domains)[index].type = LTTNG_DOMAIN_UST;
+		(*domains)[index].buf_type = session->ust_session->buffer_type;
 		index++;
 	}
 
@@ -2076,9 +2065,9 @@ void cmd_list_lttng_sessions(struct lttng_session *sessions, uid_t uid,
 				(ksess && ksess->consumer->type == CONSUMER_DST_NET) ||
 				(usess && usess->consumer->type == CONSUMER_DST_NET)) {
 			ret = build_network_session_path(sessions[i].path,
-					sizeof(session[i].path), session);
+					sizeof(sessions[i].path), session);
 		} else {
-			ret = snprintf(sessions[i].path, sizeof(session[i].path), "%s",
+			ret = snprintf(sessions[i].path, sizeof(sessions[i].path), "%s",
 					session->consumer->dst.trace_path);
 		}
 		if (ret < 0) {