chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: put correct user object paths in introspection data
[elogind.git]
/
src
/
login
/
logind-session.h
diff --git
a/src/login/logind-session.h
b/src/login/logind-session.h
index 60597c23625cdeb2e222125c5f081d26c22263e4..f175a8995ee4e29509626bacfe21ab130e874fc6 100644
(file)
--- a/
src/login/logind-session.h
+++ b/
src/login/logind-session.h
@@
-28,12
+28,15
@@
typedef enum KillWho KillWho;
#include "util.h"
#include "logind.h"
#include "logind-seat.h"
#include "util.h"
#include "logind.h"
#include "logind-seat.h"
+#include "logind-session-device.h"
#include "logind-user.h"
#include "logind-user.h"
+#include "login-shared.h"
typedef enum SessionState {
typedef enum SessionState {
+ SESSION_OPENING, /* Session scope is being created */
SESSION_ONLINE, /* Logged in */
SESSION_ACTIVE, /* Logged in and in the fg */
SESSION_ONLINE, /* Logged in */
SESSION_ACTIVE, /* Logged in and in the fg */
- SESSION_CLOSING, /* Logged out, but
processes still remain
*/
+ SESSION_CLOSING, /* Logged out, but
scope is still there
*/
_SESSION_STATE_MAX,
_SESSION_STATE_INVALID = -1
} SessionState;
_SESSION_STATE_MAX,
_SESSION_STATE_INVALID = -1
} SessionState;
@@
-81,9
+84,10
@@
struct Session {
bool remote;
char *remote_user;
char *remote_host;
bool remote;
char *remote_user;
char *remote_host;
-
char *service;
char *service;
- char *slice;
+
+ char *scope;
+ char *scope_job;
int vtnr;
Seat *seat;
int vtnr;
Seat *seat;
@@
-94,15
+98,17
@@
struct Session {
int fifo_fd;
char *fifo_path;
int fifo_fd;
char *fifo_path;
- char *cgroup_path;
- char **controllers, **reset_controllers;
-
bool idle_hint;
dual_timestamp idle_hint_timestamp;
bool idle_hint;
dual_timestamp idle_hint_timestamp;
- bool kill_processes;
bool in_gc_queue:1;
bool started:1;
bool in_gc_queue:1;
bool started:1;
+ bool closing:1;
+
+ DBusMessage *create_message;
+
+ char *controller;
+ Hashmap *devices;
LIST_FIELDS(Session, sessions_by_user);
LIST_FIELDS(Session, sessions_by_seat);
LIST_FIELDS(Session, sessions_by_user);
LIST_FIELDS(Session, sessions_by_seat);
@@
-123,6
+129,7
@@
int session_create_fifo(Session *s);
void session_remove_fifo(Session *s);
int session_start(Session *s);
int session_stop(Session *s);
void session_remove_fifo(Session *s);
int session_start(Session *s);
int session_stop(Session *s);
+int session_finalize(Session *s);
int session_save(Session *s);
int session_load(Session *s);
int session_kill(Session *s, KillWho who, int signo);
int session_save(Session *s);
int session_load(Session *s);
int session_kill(Session *s, KillWho who, int signo);
@@
-138,6
+145,8
@@
int session_send_changed(Session *s, const char *properties);
int session_send_lock(Session *s, bool lock);
int session_send_lock_all(Manager *m, bool lock);
int session_send_lock(Session *s, bool lock);
int session_send_lock_all(Manager *m, bool lock);
+int session_send_create_reply(Session *s, DBusError *error);
+
const char* session_state_to_string(SessionState t) _const_;
SessionState session_state_from_string(const char *s) _pure_;
const char* session_state_to_string(SessionState t) _const_;
SessionState session_state_from_string(const char *s) _pure_;
@@
-149,3
+158,7
@@
SessionClass session_class_from_string(const char *s) _pure_;
const char *kill_who_to_string(KillWho k) _const_;
KillWho kill_who_from_string(const char *s) _pure_;
const char *kill_who_to_string(KillWho k) _const_;
KillWho kill_who_from_string(const char *s) _pure_;
+
+bool session_is_controller(Session *s, const char *sender);
+int session_set_controller(Session *s, const char *sender, bool force);
+void session_drop_controller(Session *s);