X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=2eb8cda253a096c89f03d0e7cfd6bd869ed675f2;hp=d6fe58cd971aa9f1f770f99860a65129c329ac76;hb=4ce514c43483ba24fd935024da5b7aca681a7e52;hpb=ba28686d644c949b91fba24738c645a62ca26286

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index d6fe58cd9..2eb8cda25 100644
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -166,7 +166,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 
 	health_code_update();
 
-	ret = lttcomm_send_unix_sock(socket->fd, &msg, sizeof(msg));
+	ret = lttcomm_send_unix_sock(*socket->fd, &msg, sizeof(msg));
 	if (ret < 0) {
 		goto error;
 	}
@@ -207,7 +207,7 @@ int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
 	assert(ua_chan);
 	assert(consumer);
 	assert(socket);
-	assert(socket->fd >= 0);
+	assert(socket->fd);
 	assert(registry);
 
 	if (!consumer->enabled) {
@@ -242,7 +242,7 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 
 	assert(ua_chan);
 	assert(socket);
-	assert(socket->fd >= 0);
+	assert(socket->fd);
 
 	msg.cmd_type = LTTNG_CONSUMER_GET_CHANNEL;
 	msg.u.get_channel.key = ua_chan->key;
@@ -257,11 +257,11 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 	}
 
 	/* First, get the channel from consumer. */
-	ret = ustctl_recv_channel_from_consumer(socket->fd, &ua_chan->obj);
+	ret = ustctl_recv_channel_from_consumer(*socket->fd, &ua_chan->obj);
 	if (ret < 0) {
 		if (ret != -EPIPE) {
 			ERR("Error recv channel from consumer %d with ret %d",
-					socket->fd, ret);
+					*socket->fd, ret);
 		} else {
 			DBG3("UST app recv channel from consumer. Consumer is dead.");
 		}
@@ -280,7 +280,7 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 		}
 
 		/* Stream object is populated by this call if successful. */
-		ret = ustctl_recv_stream_from_consumer(socket->fd, &stream->obj);
+		ret = ustctl_recv_stream_from_consumer(*socket->fd, &stream->obj);
 		if (ret < 0) {
 			free(stream);
 			if (ret == -LTTNG_UST_ERR_NOENT) {
@@ -290,7 +290,7 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 			}
 			if (ret != -EPIPE) {
 				ERR("Recv stream from consumer %d with ret %d",
-						socket->fd, ret);
+						*socket->fd, ret);
 			} else {
 				DBG3("UST app recv stream from consumer. Consumer is dead.");
 			}
@@ -337,7 +337,7 @@ int ust_consumer_destroy_channel(struct consumer_socket *socket,
 
 	assert(ua_chan);
 	assert(socket);
-	assert(socket->fd >= 0);
+	assert(socket->fd);
 
 	msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
 	msg.u.destroy_channel.key = ua_chan->key;
@@ -445,7 +445,7 @@ int ust_consumer_metadata_request(struct consumer_socket *socket)
 	health_code_update();
 
 	/* Wait for a metadata request */
-	ret = lttcomm_recv_unix_sock(socket->fd, &request, sizeof(request));
+	ret = lttcomm_recv_unix_sock(*socket->fd, &request, sizeof(request));
 	if (ret <= 0) {
 		ERR("Consumer closed the metadata socket");
 		ret = -1;