From ebcf1f97de4f6b1580ae55eb56b1a3939fe6b602 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 21 Nov 2013 19:34:37 +0100 Subject: bus: rework message handlers to always take an error argument Message handler callbacks can be simplified drastically if the dispatcher automatically replies to method calls if errors are returned. Thus: add an sd_bus_error argument to all message handlers. When we dispatch a message handler and it returns negative or a set sd_bus_error we send this as message error back to the client. This means errors returned by handlers by default are given back to clients instead of rippling all the way up to the event loop, which is desirable to make things robust. As a side-effect we can now easily turn the SELinux checks into normal function calls, since the method call dispatcher will generate the right error replies automatically now. Also, make sure we always pass the error structure to all property and method handlers as last argument to follow the usual style of passing variables for return values as last argument. --- src/login/logind.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/login/logind.h') diff --git a/src/login/logind.h b/src/login/logind.h index 5c04d0a828..814964ff9d 100644 --- a/src/login/logind.h +++ b/src/login/logind.h @@ -150,11 +150,11 @@ int manager_get_session_by_pid(Manager *m, pid_t pid, Session **session); extern const sd_bus_vtable manager_vtable[]; -int match_job_removed(sd_bus *bus, sd_bus_message *message, void *userdata); -int match_unit_removed(sd_bus *bus, sd_bus_message *message, void *userdata); -int match_properties_changed(sd_bus *bus, sd_bus_message *message, void *userdata); -int match_reloading(sd_bus *bus, sd_bus_message *message, void *userdata); -int match_name_owner_changed(sd_bus *bus, sd_bus_message *message, void *userdata); +int match_job_removed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); +int match_unit_removed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); +int match_properties_changed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); +int match_reloading(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); +int match_name_owner_changed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); int bus_manager_shutdown_or_sleep_now_or_later(Manager *m, const char *unit_name, InhibitWhat w, sd_bus_error *error); -- cgit v1.2.3-54-g00ecf