X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;fp=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=0f94a5f36b695b0bebc2e4b58cbf89a060a2f322;hb=fd5a50b08e891ff4bbcf7f2cd0fbd1d289e19101;hp=8bffdc406751a37b8a83369e0764bbab193d3cc6;hpb=4e53a12fd2d1fb15f8ed6db2948b27a9714c0b2f;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 8bffdc406..0f94a5f36 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -571,9 +571,9 @@ static int send_consumer_relayd_socket(int domain, struct ltt_session *session,
 
 	/* Flag that the corresponding socket was sent. */
 	if (relayd_uri->stype == LTTNG_STREAM_CONTROL) {
-		consumer->dst.net.control_sock_sent = 1;
+		consumer_sock->control_sock_sent = 1;
 	} else if (relayd_uri->stype == LTTNG_STREAM_DATA) {
-		consumer->dst.net.data_sock_sent = 1;
+		consumer_sock->data_sock_sent = 1;
 	}
 
 	ret = LTTNG_OK;
@@ -607,7 +607,7 @@ static int send_consumer_relayd_sockets(int domain,
 	assert(consumer);
 
 	/* Sending control relayd socket. */
-	if (!consumer->dst.net.control_sock_sent) {
+	if (!sock->control_sock_sent) {
 		ret = send_consumer_relayd_socket(domain, session,
 				&consumer->dst.net.control, consumer, sock);
 		if (ret != LTTNG_OK) {
@@ -616,7 +616,7 @@ static int send_consumer_relayd_sockets(int domain,
 	}
 
 	/* Sending data relayd socket. */
-	if (!consumer->dst.net.data_sock_sent) {
+	if (!sock->data_sock_sent) {
 		ret = send_consumer_relayd_socket(domain, session,
 				&consumer->dst.net.data, consumer, sock);
 		if (ret != LTTNG_OK) {
@@ -1662,15 +1662,8 @@ int cmd_set_consumer_uri(int domain, struct ltt_session *session,
 			goto error;
 		}
 
-		/*
-		 * Don't send relayd socket if URI is NOT remote or if the relayd
-		 * socket for the session was already sent.
-		 */
-		if (uris[i].dtype == LTTNG_DST_PATH ||
-				(uris[i].stype == LTTNG_STREAM_CONTROL &&
-				consumer->dst.net.control_sock_sent) ||
-				(uris[i].stype == LTTNG_STREAM_DATA &&
-				consumer->dst.net.data_sock_sent)) {
+		/* Don't send relayd socket if URI is NOT remote */
+		if (uris[i].dtype == LTTNG_DST_PATH) {
 			continue;
 		}