X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsystemd%2Fsd-bus.h;h=52481c6fcf20c969ecb5eafdac0c7553cdcd1dc1;hb=2cba2e03524ec0922ddc70f933e8a89b7d23b4ec;hp=b3b92ad612ee794bb1cfdf50346bde303b30e8f7;hpb=62ae7570098ece0278de09d4083c7f604c19089d;p=elogind.git diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h index b3b92ad61..52481c6fc 100644 --- a/src/systemd/sd-bus.h +++ b/src/systemd/sd-bus.h @@ -72,7 +72,8 @@ enum { SD_BUS_CREDS_AUDIT_LOGIN_UID = 1ULL << 21, SD_BUS_CREDS_UNIQUE_NAME = 1ULL << 22, SD_BUS_CREDS_WELL_KNOWN_NAMES = 1ULL << 23, - _SD_BUS_CREDS_ALL = (1ULL << 24) -1, + SD_BUS_CREDS_CONNECTION_NAME = 1ULL << 24, + _SD_BUS_CREDS_ALL = (1ULL << 25) -1, }; enum { @@ -110,9 +111,10 @@ int sd_bus_set_bus_client(sd_bus *bus, int b); int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t server_id); int sd_bus_set_anonymous(sd_bus *bus, int b); int sd_bus_set_trusted(sd_bus *bus, int b); +int sd_bus_set_name(sd_bus *bus, const char *name); int sd_bus_negotiate_fds(sd_bus *bus, int b); -int sd_bus_negotiate_attach_timestamp(sd_bus *bus, int b); -int sd_bus_negotiate_attach_creds(sd_bus *bus, uint64_t creds_mask); +int sd_bus_negotiate_timestamp(sd_bus *bus, int b); +int sd_bus_negotiate_creds(sd_bus *bus, uint64_t creds_mask); int sd_bus_start(sd_bus *ret); int sd_bus_try_close(sd_bus *bus); @@ -125,6 +127,7 @@ int sd_bus_is_open(sd_bus *bus); int sd_bus_can_send(sd_bus *bus, char type); int sd_bus_get_server_id(sd_bus *bus, sd_id128_t *peer); int sd_bus_get_peer_creds(sd_bus *bus, uint64_t creds_mask, sd_bus_creds **ret); +int sd_bus_get_name(sd_bus *bus, const char **name); int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *cookie); int sd_bus_send_to(sd_bus *bus, sd_bus_message *m, const char *destination, uint64_t *cookie); @@ -136,6 +139,7 @@ int sd_bus_get_fd(sd_bus *bus); int sd_bus_get_events(sd_bus *bus); int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec); int sd_bus_process(sd_bus *bus, sd_bus_message **r); +int sd_bus_process_priority(sd_bus *bus, int64_t max_priority, sd_bus_message **r); int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec); int sd_bus_flush(sd_bus *bus); @@ -188,8 +192,9 @@ sd_bus* sd_bus_message_get_bus(sd_bus_message *m); int sd_bus_message_get_type(sd_bus_message *m, uint8_t *type); int sd_bus_message_get_cookie(sd_bus_message *m, uint64_t *cookie); int sd_bus_message_get_reply_cookie(sd_bus_message *m, uint64_t *cookie); -int sd_bus_message_get_no_reply(sd_bus_message *m); -int sd_bus_message_get_no_auto_start(sd_bus_message *m); +int sd_bus_message_get_expect_reply(sd_bus_message *m); +int sd_bus_message_get_auto_start(sd_bus_message *m); +int sd_bus_message_get_priority(sd_bus_message *m, int64_t *priority); const char *sd_bus_message_get_signature(sd_bus_message *m, int complete); const char *sd_bus_message_get_path(sd_bus_message *m); @@ -200,17 +205,20 @@ const char *sd_bus_message_get_sender(sd_bus_message *m); const sd_bus_error *sd_bus_message_get_error(sd_bus_message *m); int sd_bus_message_get_errno(sd_bus_message *m); -int sd_bus_message_get_monotonic_timestamp(sd_bus_message *m, uint64_t *usec); -int sd_bus_message_get_realtime_timestamp(sd_bus_message *m, uint64_t *usec); +int sd_bus_message_get_monotonic_usec(sd_bus_message *m, uint64_t *usec); +int sd_bus_message_get_realtime_usec(sd_bus_message *m, uint64_t *usec); +int sd_bus_message_get_seqnum(sd_bus_message *m, uint64_t* seqnum); + sd_bus_creds *sd_bus_message_get_creds(sd_bus_message *m); /* do not unref the result */ int sd_bus_message_is_signal(sd_bus_message *m, const char *interface, const char *member); int sd_bus_message_is_method_call(sd_bus_message *m, const char *interface, const char *member); int sd_bus_message_is_method_error(sd_bus_message *m, const char *name); -int sd_bus_message_set_no_reply(sd_bus_message *m, int b); -int sd_bus_message_set_no_auto_start(sd_bus_message *m, int b); +int sd_bus_message_set_expect_reply(sd_bus_message *m, int b); +int sd_bus_message_set_auto_start(sd_bus_message *m, int b); int sd_bus_message_set_destination(sd_bus_message *m, const char *destination); +int sd_bus_message_set_priority(sd_bus_message *m, int64_t priority); int sd_bus_message_append(sd_bus_message *m, const char *types, ...); int sd_bus_message_append_basic(sd_bus_message *m, char type, const void *p); @@ -279,18 +287,18 @@ int sd_bus_query_sender_creds(sd_bus_message *call, uint64_t mask, sd_bus_creds int sd_bus_creds_new_from_pid(pid_t pid, uint64_t creds_mask, sd_bus_creds **ret); sd_bus_creds *sd_bus_creds_ref(sd_bus_creds *c); sd_bus_creds *sd_bus_creds_unref(sd_bus_creds *c); -uint64_t sd_bus_creds_get_mask(sd_bus_creds *c); +uint64_t sd_bus_creds_get_mask(const sd_bus_creds *c); int sd_bus_creds_get_pid(sd_bus_creds *c, pid_t *pid); int sd_bus_creds_get_pid_starttime(sd_bus_creds *c, uint64_t *usec); int sd_bus_creds_get_tid(sd_bus_creds *c, pid_t *tid); int sd_bus_creds_get_uid(sd_bus_creds *c, uid_t *uid); int sd_bus_creds_get_gid(sd_bus_creds *c, gid_t *gid); -int sd_bus_creds_get_comm(sd_bus_creds *c, const char **r); -int sd_bus_creds_get_tid_comm(sd_bus_creds *c, const char **r); -int sd_bus_creds_get_exe(sd_bus_creds *c, const char **r); +int sd_bus_creds_get_comm(sd_bus_creds *c, const char **comm); +int sd_bus_creds_get_tid_comm(sd_bus_creds *c, const char **comm); +int sd_bus_creds_get_exe(sd_bus_creds *c, const char **exe); int sd_bus_creds_get_cmdline(sd_bus_creds *c, char ***cmdline); -int sd_bus_creds_get_cgroup(sd_bus_creds *c, const char **r); +int sd_bus_creds_get_cgroup(sd_bus_creds *c, const char **cgroup); int sd_bus_creds_get_unit(sd_bus_creds *c, const char **unit); int sd_bus_creds_get_user_unit(sd_bus_creds *c, const char **unit); int sd_bus_creds_get_slice(sd_bus_creds *c, const char **slice); @@ -300,11 +308,12 @@ int sd_bus_creds_has_effective_cap(sd_bus_creds *c, int capability); int sd_bus_creds_has_permitted_cap(sd_bus_creds *c, int capability); int sd_bus_creds_has_inheritable_cap(sd_bus_creds *c, int capability); int sd_bus_creds_has_bounding_cap(sd_bus_creds *c, int capability); -int sd_bus_creds_get_selinux_context(sd_bus_creds *c, const char **r); +int sd_bus_creds_get_selinux_context(sd_bus_creds *c, const char **context); int sd_bus_creds_get_audit_session_id(sd_bus_creds *c, uint32_t *sessionid); int sd_bus_creds_get_audit_login_uid(sd_bus_creds *c, uid_t *loginuid); int sd_bus_creds_get_unique_name(sd_bus_creds *c, const char **name); int sd_bus_creds_get_well_known_names(sd_bus_creds *c, char ***names); +int sd_bus_creds_get_connection_name(sd_bus_creds *c, const char **name); /* Error structures */