X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-internal.h;h=feafed0876f63d5ea593ac463d738dd3524cde5d;hb=638866cbea2d95b3f65f3abc4ada240a94e64c3a;hp=c25a208aea35ed59f5a76160d84329788ef6cd80;hpb=94bbf1ba6d2c8f3c64879c7f1af114ca25edeb8f;p=elogind.git diff --git a/src/libsystemd-bus/bus-internal.h b/src/libsystemd-bus/bus-internal.h index c25a208ae..feafed087 100644 --- a/src/libsystemd-bus/bus-internal.h +++ b/src/libsystemd-bus/bus-internal.h @@ -32,9 +32,10 @@ #include "sd-bus.h" #include "bus-error.h" +#include "bus-match.h" struct reply_callback { - sd_message_handler_t callback; + sd_bus_message_handler_t callback; void *userdata; usec_t timeout; uint64_t serial; @@ -42,14 +43,14 @@ struct reply_callback { }; struct filter_callback { - sd_message_handler_t callback; + sd_bus_message_handler_t callback; void *userdata; LIST_FIELDS(struct filter_callback, callbacks); }; struct object_callback { - sd_message_handler_t callback; + sd_bus_message_handler_t callback; void *userdata; char *path; @@ -64,16 +65,26 @@ enum bus_state { BUS_RUNNING }; +enum bus_auth { + _BUS_AUTH_INVALID, + BUS_AUTH_EXTERNAL, + BUS_AUTH_ANONYMOUS +}; + struct sd_bus { unsigned n_ref; enum bus_state state; - int fd; + int input_fd, output_fd; int message_version; bool negotiate_fds:1; bool can_fds:1; bool bus_client:1; bool ucred_valid:1; + bool is_server:1; + bool anonymous_auth:1; + bool prefer_readv:1; + bool prefer_writev:1; void *rbuffer; size_t rbuffer_size; @@ -89,6 +100,7 @@ struct sd_bus { char *unique_name; + struct bus_match_node match_callbacks; Prioq *reply_callbacks_prioq; Hashmap *reply_callbacks; LIST_HEAD(struct filter_callback, filter_callbacks); @@ -102,17 +114,18 @@ struct sd_bus { } sockaddr; socklen_t sockaddr_size; - sd_id128_t peer; + sd_id128_t server_id; char *address; unsigned address_index; int last_connect_error; + enum bus_auth auth; + size_t auth_rbegin; struct iovec auth_iovec[3]; unsigned auth_index; - size_t auth_size; - char *auth_uid; + char *auth_buffer; usec_t auth_timeout; struct ucred ucred; @@ -123,6 +136,8 @@ struct sd_bus { char *exec_path; char **exec_argv; + + uint64_t hello_serial; }; static inline void bus_unrefp(sd_bus **b) { @@ -155,6 +170,14 @@ 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 namespace_complex_pattern(const char *pattern, const char *value); +bool path_complex_pattern(const char *pattern, const char *value); + +bool namespace_simple_pattern(const char *pattern, const char *value); +bool path_simple_pattern(const char *pattern, const char *value); + +int bus_message_type_from_string(const char *s, uint8_t *u); + #define error_name_is_valid interface_name_is_valid int bus_ensure_running(sd_bus *bus);