/* 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;
}
/*
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;
if (ret < 0) {
if (ret != -EEXIST) {
ERR("Trace directory creation error");
- ret = LTTCOMM_CREATE_DIR_FAIL;
+ ret = LTTNG_ERR_CREATE_DIR_FAIL;
goto error;
}
}
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:
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;
+ }
+}