Add lttng-error.h containing every API err. code

[lttng-tools.git] / src / bin / lttng-sessiond / session.c

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index d30f4ab197ec63b863433070cca01fb1f378ba12..7d0ee7d4abb82656d1f9493a58304d5e007bb7f5 100644 (file)
--- a/src/bin/lttng-sessiond/session.c
+++ b/src/bin/lttng-sessiond/session.c
@@ -45,7 +45,7 @@
 static struct ltt_session_list ltt_session_list = {
        .head = CDS_LIST_HEAD_INIT(ltt_session_list.head),
        .lock = PTHREAD_MUTEX_INITIALIZER,
-       .count = 0,
+       .next_uuid = 0,
 };
 
 /*
@@ -57,15 +57,13 @@ static struct ltt_session_list ltt_session_list = {
 static unsigned int add_session_list(struct ltt_session *ls)
 {
        cds_list_add(&ls->list, &ltt_session_list.head);
-       return ++ltt_session_list.count;
+       return ltt_session_list.next_uuid++;
 }
 
 /*
  * Delete a ltt_session structure to the global list.
  *
  * The caller MUST acquire the session list lock before.
- * The session list count CANNOT be decremented, as it is used as unique
- * identifier for the session in UST app hash table lookups.
  */
 static void del_session_list(struct ltt_session *ls)
 {
@@ -145,15 +143,19 @@ int session_destroy(struct ltt_session *session)
        /* Safety check */
        if (session == NULL) {
                ERR("Session pointer was null on session destroy");
-               return LTTCOMM_OK;
+               return LTTNG_OK;
        }
 
        DBG("Destroying session %s", session->name);
        del_session_list(session);
        pthread_mutex_destroy(&session->lock);
+
+       rcu_read_lock();
+       consumer_destroy_output(session->consumer);
+       rcu_read_unlock();
        free(session);
 
-       return LTTCOMM_OK;
+       return LTTNG_OK;
 }
 
 /*
@@ -168,32 +170,33 @@ int session_create(char *name, char *path, uid_t uid, gid_t gid)
        new_session = zmalloc(sizeof(struct ltt_session));
        if (new_session == NULL) {
                PERROR("zmalloc");
-               ret = LTTCOMM_FATAL;
+               ret = LTTNG_ERR_FATAL;
                goto error_malloc;
        }
 
        /* Define session name */
        if (name != NULL) {
                if (snprintf(new_session->name, NAME_MAX, "%s", name) < 0) {
-                       ret = LTTCOMM_FATAL;
+                       ret = LTTNG_ERR_FATAL;
                        goto error_asprintf;
                }
        } else {
                ERR("No session name given");
-               ret = LTTCOMM_FATAL;
+               ret = LTTNG_ERR_FATAL;
                goto error;
        }
 
        /* Define session system path */
        if (path != NULL) {
                if (snprintf(new_session->path, PATH_MAX, "%s", path) < 0) {
-                       ret = LTTCOMM_FATAL;
+                       ret = LTTNG_ERR_FATAL;
                        goto error_asprintf;
                }
+               new_session->start_consumer = 1;
        } else {
-               ERR("No session path given");
-               ret = LTTCOMM_FATAL;
-               goto error;
+               /* No path indicates that there is no use for a consumer. */
+               new_session->start_consumer = 0;
+               new_session->path[0] = '\0';
        }
 
        /* Init kernel session */
@@ -206,14 +209,14 @@ int session_create(char *name, char *path, uid_t uid, gid_t gid)
        new_session->uid = uid;
        new_session->gid = gid;
 
-       /* Mkdir if we have a valid path length */
+       /* Mkdir if we have a valid path and length */
        if (strlen(new_session->path) > 0) {
                ret = run_as_mkdir_recursive(new_session->path, S_IRWXU | S_IRWXG,
                                new_session->uid, new_session->gid);
                if (ret < 0) {
                        if (ret != -EEXIST) {
                                ERR("Trace directory creation error");
-                               ret = LTTCOMM_CREATE_DIR_FAIL;
+                               ret = LTTNG_ERR_CREATE_DIR_FAIL;
                                goto error;
                        }
                }
@@ -224,11 +227,15 @@ int session_create(char *name, char *path, uid_t uid, gid_t gid)
        new_session->id = add_session_list(new_session);
        session_unlock_list();
 
-       DBG("Tracing session %s created in %s with ID %u by UID %d GID %d",
-               name, path, new_session->id,
-               new_session->uid, new_session->gid);
+       /*
+        * Consumer is let to NULL since the create_session_uri command will set it
+        * up and, if valid, assign it to the session.
+        */
+
+       DBG("Tracing session %s created in %s with ID %u by UID %d GID %d", name,
+                       path, new_session->id, new_session->uid, new_session->gid);
 
-       return LTTCOMM_OK;
+       return LTTNG_OK;
 
 error:
 error_asprintf:
@@ -239,3 +246,18 @@ error_asprintf:
 error_malloc:
        return ret;
 }
+
+/*
+ * Check if the UID or GID match the session. Root user has access to all
+ * sessions.
+ */
+int session_access_ok(struct ltt_session *session, uid_t uid, gid_t gid)
+{
+       assert(session);
+
+       if (uid != session->uid && gid != session->gid && uid != 0) {
+               return 0;
+       } else {
+               return 1;
+       }
+}