X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=5d2cba1d467befbde02cfcc44183304303259421;hb=bef08707d594ea79f311ff04d470436724670754;hp=687c06d42d2b7a3bff15338cec62749a3647ab4b;hpb=6151a90fe7fa3dea52c57771df9083e56de7a60b;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 687c06d42..5d2cba1d4 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -110,7 +110,7 @@ static int build_network_session_path(char *dst, size_t size,
 				tmp_urls, kdata_port, tmp_uurl, udata_port);
 	} else {
 		int dport;
-		if (kuri) {
+		if (kuri || (!kuri && !uuri)) {
 			dport = kdata_port;
 		} else {
 			/* No kernel URI, use the UST port. */
@@ -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;
 }
@@ -1642,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;
 		}
 	}
@@ -1661,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);
@@ -1686,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;
@@ -1920,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++;
 	}
 
@@ -2059,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) {