chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: introduce "trusted" bus concept and encode access control in object vtables
[elogind.git]
/
src
/
libsystemd-bus
/
bus-internal.h
diff --git
a/src/libsystemd-bus/bus-internal.h
b/src/libsystemd-bus/bus-internal.h
index 2ae796191580b97db2fdc0acd24c0d85a157bd02..1be7488ab93f8067a60a8fca622f4f83ec824a56 100644
(file)
--- a/
src/libsystemd-bus/bus-internal.h
+++ b/
src/libsystemd-bus/bus-internal.h
@@
-119,11
+119,12
@@
enum bus_state {
BUS_AUTHENTICATING,
BUS_HELLO,
BUS_RUNNING,
BUS_AUTHENTICATING,
BUS_HELLO,
BUS_RUNNING,
+ BUS_CLOSING,
BUS_CLOSED
};
static inline bool BUS_IS_OPEN(enum bus_state state) {
BUS_CLOSED
};
static inline bool BUS_IS_OPEN(enum bus_state state) {
- return state > BUS_UNSET && state < BUS_CLOS
ED
;
+ return state > BUS_UNSET && state < BUS_CLOS
ING
;
}
enum bus_auth {
}
enum bus_auth {
@@
-155,10
+156,10
@@
struct sd_bus {
bool anonymous_auth:1;
bool prefer_readv:1;
bool prefer_writev:1;
bool anonymous_auth:1;
bool prefer_readv:1;
bool prefer_writev:1;
- bool processing:1;
bool match_callbacks_modified:1;
bool filter_callbacks_modified:1;
bool nodes_modified:1;
bool match_callbacks_modified:1;
bool filter_callbacks_modified:1;
bool nodes_modified:1;
+ bool trusted:1;
int use_memfd;
int use_memfd;
@@
-166,7
+167,7
@@
struct sd_bus {
size_t rbuffer_size;
sd_bus_message **rqueue;
size_t rbuffer_size;
sd_bus_message **rqueue;
- unsigned rqueue_size;
+ unsigned rqueue_size
, rqueue_allocated
;
sd_bus_message **wqueue;
unsigned wqueue_size;
sd_bus_message **wqueue;
unsigned wqueue_size;
@@
-175,6
+176,7
@@
struct sd_bus {
uint64_t serial;
char *unique_name;
uint64_t serial;
char *unique_name;
+ uint64_t unique_id;
struct bus_match_node match_callbacks;
Prioq *reply_callbacks_prioq;
struct bus_match_node match_callbacks;
Prioq *reply_callbacks_prioq;
@@
-182,8
+184,6
@@
struct sd_bus {
LIST_HEAD(struct filter_callback, filter_callbacks);
Hashmap *nodes;
LIST_HEAD(struct filter_callback, filter_callbacks);
Hashmap *nodes;
-
-
Hashmap *vtable_methods;
Hashmap *vtable_properties;
Hashmap *vtable_methods;
Hashmap *vtable_properties;
@@
-196,6
+196,7
@@
struct sd_bus {
socklen_t sockaddr_size;
char *kernel;
socklen_t sockaddr_size;
char *kernel;
+ char *machine;
sd_id128_t server_id;
sd_id128_t server_id;
@@
-214,6
+215,8
@@
struct sd_bus {
struct ucred ucred;
char label[NAME_MAX];
struct ucred ucred;
char label[NAME_MAX];
+ uint64_t creds_mask;
+
int *fds;
unsigned n_fds;
int *fds;
unsigned n_fds;
@@
-238,6
+241,7
@@
struct sd_bus {
pid_t original_pid;
uint64_t hello_flags;
pid_t original_pid;
uint64_t hello_flags;
+ uint64_t attach_flags;
uint64_t match_cookie;
uint64_t match_cookie;
@@
-246,12
+250,17
@@
struct sd_bus {
sd_event_source *time_event_source;
sd_event_source *quit_event_source;
sd_event *event;
sd_event_source *time_event_source;
sd_event_source *quit_event_source;
sd_event *event;
+
+ sd_bus_message *current;
+
+ sd_bus **default_bus_ptr;
+ pid_t tid;
};
#define BUS_DEFAULT_TIMEOUT ((usec_t) (25 * USEC_PER_SEC))
};
#define BUS_DEFAULT_TIMEOUT ((usec_t) (25 * USEC_PER_SEC))
-#define BUS_WQUEUE_MAX 1
28
-#define BUS_RQUEUE_MAX
128
+#define BUS_WQUEUE_MAX 1
024
+#define BUS_RQUEUE_MAX
64*1024
#define BUS_MESSAGE_SIZE_MAX (64*1024*1024)
#define BUS_AUTH_SIZE_MAX (64*1024)
#define BUS_MESSAGE_SIZE_MAX (64*1024*1024)
#define BUS_AUTH_SIZE_MAX (64*1024)
@@
-287,6
+296,10
@@
int bus_ensure_running(sd_bus *bus);
int bus_start_running(sd_bus *bus);
int bus_next_address(sd_bus *bus);
int bus_start_running(sd_bus *bus);
int bus_next_address(sd_bus *bus);
+int bus_seal_synthetic_message(sd_bus *b, sd_bus_message *m);
+
+int bus_rqueue_make_room(sd_bus *bus);
+
bool bus_pid_changed(sd_bus *bus);
char *bus_address_escape(const char *v);
bool bus_pid_changed(sd_bus *bus);
char *bus_address_escape(const char *v);
@@
-300,4
+313,4
@@
char *bus_address_escape(const char *v);
* bus from the callback doesn't destroy the object we are working
* on */
#define BUS_DONT_DESTROY(bus) \
* bus from the callback doesn't destroy the object we are working
* on */
#define BUS_DONT_DESTROY(bus) \
- _cleanup_bus_unref_ sd_bus *_dont_destroy_##bus = sd_bus_ref(bus)
+ _cleanup_bus_unref_
_unused_
sd_bus *_dont_destroy_##bus = sd_bus_ref(bus)