X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.c;h=d4455e5c84a0cd1566978700bf7beb7667f60866;hb=e9accd4fad532b481ff23af1ef2202c1b5a43c70;hp=d79dee3cafd99c1232f2458a985561fb0e7a1875;hpb=9363801e2d2069022a05e67066d8f527538946d0;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index d79dee3ca..d4455e5c8 100644
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -62,8 +62,8 @@ int consumer_socket_send(struct consumer_socket *socket, void *msg, size_t len)
 		/* The above call will print a PERROR on error. */
 		DBG("Error when sending data to consumer on sock %d", fd);
 		/*
-		 * At this point, the socket is not usable anymore thus flagging it
-		 * invalid and closing it.
+		 * At this point, the socket is not usable anymore thus closing it and
+		 * setting the file descriptor to -1 so it is not reused.
 		 */
 
 		/* This call will PERROR on error. */
@@ -106,8 +106,8 @@ int consumer_socket_recv(struct consumer_socket *socket, void *msg, size_t len)
 		/* The above call will print a PERROR on error. */
 		DBG("Error when receiving data from the consumer socket %d", fd);
 		/*
-		 * At this point, the socket is not usable anymore thus flagging it
-		 * invalid and closing it.
+		 * At this point, the socket is not usable anymore thus closing it and
+		 * setting the file descriptor to -1 so it is not reused.
 		 */
 
 		/* This call will PERROR on error. */
@@ -141,7 +141,7 @@ int consumer_recv_status_reply(struct consumer_socket *sock)
 		goto end;
 	}
 
-	if (reply.ret_code == LTTNG_OK) {
+	if (reply.ret_code == LTTCOMM_CONSUMERD_SUCCESS) {
 		/* All good. */
 		ret = 0;
 	} else {
@@ -177,13 +177,14 @@ int consumer_recv_status_channel(struct consumer_socket *sock,
 	}
 
 	/* An error is possible so don't touch the key and stream_count. */
-	if (reply.ret_code != LTTNG_OK) {
+	if (reply.ret_code != LTTCOMM_CONSUMERD_SUCCESS) {
 		ret = -1;
 		goto end;
 	}
 
 	*key = reply.key;
 	*stream_count = reply.stream_count;
+	ret = 0;
 
 end:
 	return ret;