From: David Goulet <dgoulet@efficios.com>
Date: Fri, 19 Oct 2012 16:39:59 +0000 (-0400)
Subject: Fix last commit. Git code-18 pushed the wrong fix.
X-Git-Tag: v2.1.0-rc5~21
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=c890b720e435173420cac747c5701147ff7ead99;p=lttng-tools.git

Fix last commit. Git code-18 pushed the wrong fix.

Fixes #374 #382

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index d1417efd7..b1e66e755 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -522,12 +522,6 @@ static int send_consumer_relayd_socket(int domain, struct ltt_session *session,
 	int ret;
 	struct lttcomm_sock *sock = NULL;
 
-	/* Don't resend the sockets to the consumer. */
-	if (consumer->dst.net.relayd_socks_sent) {
-		ret = LTTNG_OK;
-		goto error;
-	}
-
 	/* Set the network sequence index if not set. */
 	if (consumer->net_seq_index == -1) {
 		/*
@@ -559,6 +553,13 @@ static int send_consumer_relayd_socket(int domain, struct ltt_session *session,
 		goto close_sock;
 	}
 
+	/* Flag that the corresponding socket was sent. */
+	if (relayd_uri->stype == LTTNG_STREAM_CONTROL) {
+		consumer->dst.net.control_sock_sent = 1;
+	} else if (relayd_uri->stype == LTTNG_STREAM_DATA) {
+		consumer->dst.net.data_sock_sent = 1;
+	}
+
 	ret = LTTNG_OK;
 
 	/*
@@ -572,7 +573,6 @@ close_sock:
 		lttcomm_destroy_sock(sock);
 	}
 
-error:
 	return ret;
 }
 
@@ -589,29 +589,24 @@ static int send_consumer_relayd_sockets(int domain,
 	assert(session);
 	assert(consumer);
 
-	/* Don't resend the sockets to the consumer. */
-	if (consumer->dst.net.relayd_socks_sent) {
-		ret = LTTNG_OK;
-		goto error;
-	}
-
 	/* Sending control relayd socket. */
-	ret = send_consumer_relayd_socket(domain, session,
-			&consumer->dst.net.control, consumer, fd);
-	if (ret != LTTNG_OK) {
-		goto error;
+	if (!consumer->dst.net.control_sock_sent) {
+		ret = send_consumer_relayd_socket(domain, session,
+				&consumer->dst.net.control, consumer, fd);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
 	}
 
 	/* Sending data relayd socket. */
-	ret = send_consumer_relayd_socket(domain, session,
-			&consumer->dst.net.data, consumer, fd);
-	if (ret != LTTNG_OK) {
-		goto error;
+	if (!consumer->dst.net.data_sock_sent) {
+		ret = send_consumer_relayd_socket(domain, session,
+				&consumer->dst.net.data, consumer, fd);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
 	}
 
-	/* Flag that all relayd sockets were sent to the consumer. */
-	consumer->dst.net.relayd_socks_sent = 1;
-
 error:
 	return ret;
 }
@@ -1601,10 +1596,13 @@ int cmd_set_consumer_uri(int domain, struct ltt_session *session,
 
 		/*
 		 * Don't send relayd socket if URI is NOT remote or if the relayd
-		 * sockets for the session are already sent.
+		 * socket for the session was already sent.
 		 */
 		if (uris[i].dtype == LTTNG_DST_PATH ||
-				consumer->dst.net.relayd_socks_sent) {
+				(uris[i].stype == LTTNG_STREAM_CONTROL &&
+				consumer->dst.net.control_sock_sent) ||
+				(uris[i].stype == LTTNG_STREAM_DATA &&
+				consumer->dst.net.data_sock_sent)) {
 			continue;
 		}
 
diff --git a/src/bin/lttng-sessiond/consumer.h b/src/bin/lttng-sessiond/consumer.h
index ec4ef3f31..6855068db 100644
--- a/src/bin/lttng-sessiond/consumer.h
+++ b/src/bin/lttng-sessiond/consumer.h
@@ -112,7 +112,8 @@ struct consumer_net {
 	struct lttng_uri data;
 
 	/* Flag if network sockets were sent to the consumer. */
-	unsigned int relayd_socks_sent;
+	unsigned int control_sock_sent;
+	unsigned int data_sock_sent;
 };
 
 /*