X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-internal.h;h=7c922937718b27907af8d0d7e281f416834a5830;hp=1726b618418a45f76f6fc976478340e5816bdc6b;hb=758bf0c755e045f7b1dd89869d3a10b9457e9bbe;hpb=40ca29a1370379d43e44c0ed425eecc7218dcbca diff --git a/src/libsystemd-bus/bus-internal.h b/src/libsystemd-bus/bus-internal.h index 1726b6184..7c9229377 100644 --- a/src/libsystemd-bus/bus-internal.h +++ b/src/libsystemd-bus/bus-internal.h @@ -36,12 +36,13 @@ #include "bus-error.h" #include "bus-match.h" #include "bus-kernel.h" +#include "kdbus.h" struct reply_callback { sd_bus_message_handler_t callback; void *userdata; usec_t timeout; - uint64_t serial; + uint64_t cookie; unsigned prioq_idx; }; @@ -119,11 +120,12 @@ enum bus_state { BUS_AUTHENTICATING, BUS_HELLO, BUS_RUNNING, + BUS_CLOSING, BUS_CLOSED }; static inline bool BUS_IS_OPEN(enum bus_state state) { - return state > BUS_UNSET && state < BUS_CLOSED; + return state > BUS_UNSET && state < BUS_CLOSING; } enum bus_auth { @@ -146,6 +148,7 @@ struct sd_bus { enum bus_state state; int input_fd, output_fd; int message_version; + int message_endian; bool is_kernel:1; bool can_fds:1; @@ -155,10 +158,12 @@ struct sd_bus { 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 trusted:1; + bool fake_creds_valid:1; + bool manual_peer_interface:1; int use_memfd; @@ -167,14 +172,17 @@ struct sd_bus { sd_bus_message **rqueue; unsigned rqueue_size; + size_t rqueue_allocated; sd_bus_message **wqueue; unsigned wqueue_size; size_t windex; + size_t wqueue_allocated; - uint64_t serial; + uint64_t cookie; char *unique_name; + uint64_t unique_id; struct bus_match_node match_callbacks; Prioq *reply_callbacks_prioq; @@ -182,8 +190,6 @@ struct sd_bus { LIST_HEAD(struct filter_callback, filter_callbacks); Hashmap *nodes; - - Hashmap *vtable_methods; Hashmap *vtable_properties; @@ -196,6 +202,7 @@ struct sd_bus { socklen_t sockaddr_size; char *kernel; + char *machine; sd_id128_t server_id; @@ -214,13 +221,15 @@ struct sd_bus { struct ucred ucred; char label[NAME_MAX]; + uint64_t creds_mask; + int *fds; unsigned n_fds; char *exec_path; char **exec_argv; - uint64_t hello_serial; + uint64_t hello_cookie; unsigned iteration_counter; void *kdbus_buffer; @@ -238,19 +247,32 @@ struct sd_bus { pid_t original_pid; uint64_t hello_flags; + uint64_t attach_flags; uint64_t match_cookie; sd_event_source *input_io_event_source; sd_event_source *output_io_event_source; sd_event_source *time_event_source; + sd_event_source *quit_event_source; sd_event *event; + int event_priority; + + sd_bus_message *current; + + sd_bus **default_bus_ptr; + pid_t tid; + + struct kdbus_creds fake_creds; + char *fake_label; + + char *cgroup_root; }; #define BUS_DEFAULT_TIMEOUT ((usec_t) (25 * USEC_PER_SEC)) -#define BUS_WQUEUE_MAX 128 -#define BUS_RQUEUE_MAX 128 +#define BUS_WQUEUE_MAX 1024 +#define BUS_RQUEUE_MAX 64*1024 #define BUS_MESSAGE_SIZE_MAX (64*1024*1024) #define BUS_AUTH_SIZE_MAX (64*1024) @@ -265,20 +287,20 @@ struct sd_bus { #define BUS_EXEC_ARGV_MAX 256 -bool interface_name_is_valid(const char *p); -bool service_name_is_valid(const char *p); -bool member_name_is_valid(const char *p); -bool object_path_is_valid(const char *p); -char *object_path_startswith(const char *a, const char *b); +bool interface_name_is_valid(const char *p) _pure_; +bool service_name_is_valid(const char *p) _pure_; +bool member_name_is_valid(const char *p) _pure_; +bool object_path_is_valid(const char *p) _pure_; +char *object_path_startswith(const char *a, const char *b) _pure_; -bool namespace_complex_pattern(const char *pattern, const char *value); -bool path_complex_pattern(const char *pattern, const char *value); +bool namespace_complex_pattern(const char *pattern, const char *value) _pure_; +bool path_complex_pattern(const char *pattern, const char *value) _pure_; -bool namespace_simple_pattern(const char *pattern, const char *value); -bool path_simple_pattern(const char *pattern, const char *value); +bool namespace_simple_pattern(const char *pattern, const char *value) _pure_; +bool path_simple_pattern(const char *pattern, const char *value) _pure_; -int bus_message_type_from_string(const char *s, uint8_t *u); -const char *bus_message_type_to_string(uint8_t u); +int bus_message_type_from_string(const char *s, uint8_t *u) _pure_; +const char *bus_message_type_to_string(uint8_t u) _pure_; #define error_name_is_valid interface_name_is_valid @@ -286,8 +308,14 @@ int bus_ensure_running(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); + #define OBJECT_PATH_FOREACH_PREFIX(prefix, path) \ for (char *_slash = ({ strcpy((prefix), (path)); streq((prefix), "/") ? NULL : strrchr((prefix), '/'); }) ; \ _slash && !(_slash[(_slash) == (prefix)] = 0); \ @@ -297,4 +325,4 @@ bool bus_pid_changed(sd_bus *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)