Adjust the relayd protocol on version check

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

diff --git a/src/bin/lttng-sessiond/session.h b/src/bin/lttng-sessiond/session.h
index 8294a83fdc0d9852f4f91276a46ae295d251c42a..a56473783fb7d5f8f93ef11f50a40f628eaf35e5 100644 (file)
--- a/src/bin/lttng-sessiond/session.h
+++ b/src/bin/lttng-sessiond/session.h
@@ -21,7 +21,8 @@
 #include <urcu/list.h>
 
 #include "trace-kernel.h"
-#include "trace-ust.h"
+
+struct ltt_ust_session;
 
 /*
  * Tracing session list
@@ -31,19 +32,19 @@
  */
 struct ltt_session_list {
        /*
-        * This lock protects any read/write access to the list and count (which is
-        * basically the list size). All public functions in session.c acquire this
-        * lock and release it before returning. If none of those functions are
-        * used, the lock MUST be acquired in order to iterate or/and do any
-        * actions on that list.
+        * This lock protects any read/write access to the list and
+        * next_uuid. All public functions in session.c acquire this
+        * lock and release it before returning. If none of those
+        * functions are used, the lock MUST be acquired in order to
+        * iterate or/and do any actions on that list.
         */
        pthread_mutex_t lock;
 
        /*
-        * Number of element in the list. The session list lock MUST be acquired if
-        * this counter is used when iterating over the session list.
+        * Session unique ID generator. The session list lock MUST be
+        * upon update and read of this counter.
         */
-       unsigned int count;
+       unsigned int next_uuid;
 
        /* Linked list head */
        struct cds_list_head head;
@@ -70,6 +71,24 @@ struct ltt_session {
        /* UID/GID of the user owning the session */
        uid_t uid;
        gid_t gid;
+       /*
+        * Network session handle. A value of 0 means that there is no remote
+        * session established.
+        */
+       uint64_t net_handle;
+       /*
+        * This consumer is only set when the create_session_uri call is made.
+        * This contains the temporary information for a consumer output. Upon
+        * creation of the UST or kernel session, this consumer, if available, is
+        * copied into those sessions.
+        */
+       struct consumer_output *consumer;
+
+       /* Did a start command occured before the kern/ust session creation? */
+       unsigned int started;
+       /* Procotol version to use with the relayd */
+       uint32_t major;
+       uint32_t minor;
 };
 
 /* Prototypes */
@@ -84,4 +103,6 @@ void session_unlock_list(void);
 struct ltt_session *session_find_by_name(char *name);
 struct ltt_session_list *session_get_list(void);
 
+int session_access_ok(struct ltt_session *session, uid_t uid, gid_t gid);
+
 #endif /* _LTT_SESSION_H */