Move hash table to common/ directory

[lttng-tools.git] / lttng-sessiond / ust-consumer.c

diff --git a/lttng-sessiond/ust-consumer.c b/lttng-sessiond/ust-consumer.c
index 866d7bd56bc199e8bed90b2e3abc1ec88f48a070..d6b80ff64f2cb134c051abe7b0c2bbd604147ddb 100644 (file)
--- a/lttng-sessiond/ust-consumer.c
+++ b/lttng-sessiond/ust-consumer.c
@@ -27,14 +27,15 @@
 #include <lttng-sessiond-comm.h>
 #include <lttng/lttng-consumer.h>
 
-#include "hashtable.h"
+#include "../common/hashtable.h"
 #include "ust-consumer.h"
 
 /*
  * Send all stream fds of UST channel to the consumer.
  */
 static int send_channel_streams(int sock,
-               struct ust_app_channel *uchan)
+               struct ust_app_channel *uchan,
+               uid_t uid, gid_t gid)
 {
        int ret, fd;
        struct lttcomm_consumer_msg lum;
@@ -84,6 +85,8 @@ static int send_channel_streams(int sock,
                 */
                lum.u.stream.output = DEFAULT_UST_CHANNEL_OUTPUT;
                lum.u.stream.mmap_len = stream->obj->memory_map_size;
+               lum.u.stream.uid = uid;
+               lum.u.stream.gid = gid;
                strncpy(lum.u.stream.path_name, stream->pathname, PATH_MAX - 1);
                lum.u.stream.path_name[PATH_MAX - 1] = '\0';
                DBG("Sending stream %d to consumer", lum.u.stream.stream_key);
@@ -124,6 +127,11 @@ int ust_consumer_send_session(int consumer_fd, struct ust_app_session *usess)
 
        DBG("Sending metadata stream fd");
 
+       if (consumer_fd < 0) {
+               ERR("Consumer has negative file descriptor");
+               return -EINVAL;
+       }
+
        if (usess->metadata->obj->shm_fd != 0) {
                int fd;
                int fds[2];
@@ -153,6 +161,8 @@ int ust_consumer_send_session(int consumer_fd, struct ust_app_session *usess)
                lum.u.stream.state = LTTNG_CONSUMER_ACTIVE_STREAM;
                lum.u.stream.output = DEFAULT_UST_CHANNEL_OUTPUT;
                lum.u.stream.mmap_len = usess->metadata->stream_obj->memory_map_size;
+               lum.u.stream.uid = usess->uid;
+               lum.u.stream.gid = usess->gid;
                strncpy(lum.u.stream.path_name, usess->metadata->pathname, PATH_MAX - 1);
                lum.u.stream.path_name[PATH_MAX - 1] = '\0';
                DBG("Sending metadata stream %d to consumer", lum.u.stream.stream_key);
@@ -176,7 +186,8 @@ int ust_consumer_send_session(int consumer_fd, struct ust_app_session *usess)
        while ((node = hashtable_iter_get_node(&iter)) != NULL) {
                uchan = caa_container_of(node, struct ust_app_channel, node);
 
-               ret = send_channel_streams(sock, uchan);
+               ret = send_channel_streams(sock, uchan, usess->uid,
+                               usess->gid);
                if (ret < 0) {
                        rcu_read_unlock();
                        goto error;