X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdbus.c;h=0ab55b85395c44808b996024a63f98db8e15cdd6;hp=405ea46cda74460f51528bed687855479dadf516;hb=3c661fadd5e0d74acc7596024db31be00c53b448;hpb=82c121a4754a9d405b07c75796e329942af2ccc5 diff --git a/src/dbus.c b/src/dbus.c index 405ea46cd..0ab55b853 100644 --- a/src/dbus.c +++ b/src/dbus.c @@ -42,6 +42,7 @@ #include "dbus-swap.h" #include "dbus-timer.h" #include "dbus-path.h" +#include "bus-errors.h" #define CONNECTIONS_MAX 52 @@ -71,6 +72,7 @@ static const char *error_to_dbus(int error); static void bus_done_api(Manager *m); static void bus_done_system(Manager *m); static void bus_done_private(Manager *m); +static void shutdown_connection(Manager *m, DBusConnection *c); static void bus_dispatch_status(DBusConnection *bus, DBusDispatchStatus status, void *data) { Manager *m = data; @@ -336,10 +338,12 @@ static DBusHandlerResult api_bus_message_filter(DBusConnection *connection, DBus dbus_error_init(&error); - /* log_debug("Got D-Bus request: %s.%s() on %s", */ - /* dbus_message_get_interface(message), */ - /* dbus_message_get_member(message), */ - /* dbus_message_get_path(message)); */ + if (dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_METHOD_CALL || + dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_SIGNAL) + log_debug("Got D-Bus request: %s.%s() on %s", + dbus_message_get_interface(message), + dbus_message_get_member(message), + dbus_message_get_path(message)); if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected")) { log_error("Warning! API D-Bus connection terminated."); @@ -355,8 +359,8 @@ static DBusHandlerResult api_bus_message_filter(DBusConnection *connection, DBus DBUS_TYPE_INVALID)) log_error("Failed to parse NameOwnerChanged message: %s", error.message); else { - if (set_remove(m->subscribed, (char*) name)) - log_debug("Subscription client vanished: %s (left: %u)", name, set_size(m->subscribed)); + if (set_remove(BUS_CONNECTION_SUBSCRIBED(m, connection), (char*) name)) + log_debug("Subscription client vanished: %s (left: %u)", name, set_size(BUS_CONNECTION_SUBSCRIBED(m, connection))); if (old_owner[0] == 0) old_owner = NULL; @@ -379,13 +383,13 @@ static DBusHandlerResult api_bus_message_filter(DBusConnection *connection, DBus log_debug("Got D-Bus activation request for %s", name); - r = manager_load_unit(m, name, NULL, &u); + r = manager_load_unit(m, name, NULL, &error, &u); if (r >= 0 && u->meta.only_by_dependency) r = -EPERM; if (r >= 0) - r = manager_add_job(m, JOB_START, u, JOB_REPLACE, true, NULL); + r = manager_add_job(m, JOB_START, u, JOB_REPLACE, true, &error, NULL); if (r < 0) { const char *id, *text; @@ -395,8 +399,8 @@ static DBusHandlerResult api_bus_message_filter(DBusConnection *connection, DBus if (!(reply = dbus_message_new_signal("/org/freedesktop/systemd1", "org.freedesktop.systemd1.Activator", "ActivationFailure"))) goto oom; - id = error_to_dbus(r); - text = strerror(-r); + id = error.name ? error.name : error_to_dbus(r); + text = bus_error(&error, r); if (!dbus_message_set_destination(reply, DBUS_SERVICE_DBUS) || !dbus_message_append_args(reply, @@ -441,10 +445,13 @@ static DBusHandlerResult system_bus_message_filter(DBusConnection *connection, D dbus_error_init(&error); - /* log_debug("Got D-Bus request: %s.%s() on %s", */ - /* dbus_message_get_interface(message), */ - /* dbus_message_get_member(message), */ - /* dbus_message_get_path(message)); */ + if (m->api_bus != m->system_bus && + (dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_METHOD_CALL || + dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_SIGNAL)) + log_debug("Got D-Bus request on system bus: %s.%s() on %s", + dbus_message_get_interface(message), + dbus_message_get_member(message), + dbus_message_get_path(message)); if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected")) { log_error("Warning! System D-Bus connection terminated."); @@ -467,22 +474,36 @@ static DBusHandlerResult system_bus_message_filter(DBusConnection *connection, D static DBusHandlerResult private_bus_message_filter(DBusConnection *connection, DBusMessage *message, void *data) { Manager *m = data; + DBusError error; assert(connection); assert(message); assert(m); - /* log_debug("Got D-Bus request: %s.%s() on %s", */ - /* dbus_message_get_interface(message), */ - /* dbus_message_get_member(message), */ - /* dbus_message_get_path(message)); */ + dbus_error_init(&error); + + if (dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_METHOD_CALL || + dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_SIGNAL) + log_debug("Got D-Bus request: %s.%s() on %s", + dbus_message_get_interface(message), + dbus_message_get_member(message), + dbus_message_get_path(message)); - if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected")) { - set_remove(m->bus_connections, connection); - set_remove(m->bus_connections_for_dispatch, connection); - dbus_connection_unref(connection); + if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected")) + shutdown_connection(m, connection); + else if (dbus_message_is_signal(message, "org.freedesktop.systemd1.Agent", "Released")) { + const char *cgroup; + + if (!dbus_message_get_args(message, &error, + DBUS_TYPE_STRING, &cgroup, + DBUS_TYPE_INVALID)) + log_error("Failed to parse Released message: %s", error.message); + else + cgroup_notify_empty(m, cgroup); } + dbus_error_free(&error); + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } @@ -496,12 +517,13 @@ unsigned bus_dispatch(Manager *m) { * dispatch any D-Bus messages, so that we won't end * up wanting to queue another message. */ - if (m->api_bus) - if (!dbus_connection_send(m->api_bus, m->queued_message, NULL)) + if (m->queued_message_connection) + if (!dbus_connection_send(m->queued_message_connection, m->queued_message, NULL)) return 0; dbus_message_unref(m->queued_message); m->queued_message = NULL; + m->queued_message_connection = NULL; } if ((c = set_first(m->bus_connections_for_dispatch))) { @@ -751,7 +773,6 @@ static void bus_new_connection( static int bus_init_system(Manager *m) { DBusError error; - char *id; int r; assert(m); @@ -793,10 +814,13 @@ static int bus_init_system(Manager *m) { goto fail; } - log_debug("Successfully connected to system D-Bus bus %s as %s", - strnull((id = dbus_connection_get_server_id(m->system_bus))), - strnull(dbus_bus_get_unique_name(m->system_bus))); - dbus_free(id); + if (m->api_bus != m->system_bus) { + char *id; + log_info("Successfully connected to system D-Bus bus %s as %s", + strnull((id = dbus_connection_get_server_id(m->system_bus))), + strnull(dbus_bus_get_unique_name(m->system_bus))); + dbus_free(id); + } return 0; @@ -809,7 +833,6 @@ fail: static int bus_init_api(Manager *m) { DBusError error; - char *id; int r; assert(m); @@ -877,17 +900,13 @@ static int bus_init_api(Manager *m) { if ((r = query_name_list(m)) < 0) goto fail; - log_debug("Successfully connected to API D-Bus bus %s as %s", - strnull((id = dbus_connection_get_server_id(m->api_bus))), - strnull(dbus_bus_get_unique_name(m->api_bus))); - dbus_free(id); - - if (!m->subscribed) - if (!(m->subscribed = set_new(string_hash_func, string_compare_func))) { - log_error("Not enough memory"); - r = -ENOMEM; - goto fail; - } + if (m->api_bus != m->system_bus) { + char *id; + log_info("Successfully connected to API D-Bus bus %s as %s", + strnull((id = dbus_connection_get_server_id(m->api_bus))), + strnull(dbus_bus_get_unique_name(m->api_bus))); + dbus_free(id); + } return 0; @@ -914,7 +933,7 @@ static int bus_init_private(Manager *m) { return 0; /* We want the private bus only when running as init */ - if (m->running_as != MANAGER_SYSTEM) + if (getpid() != 1) return 0; if (!(m->private_bus = dbus_server_listen("unix:abstract=/org/freedesktop/systemd1/private", &error))) { @@ -933,7 +952,7 @@ static int bus_init_private(Manager *m) { dbus_server_set_new_connection_function(m->private_bus, bus_new_connection, m, NULL); - log_debug("Successfully create private D-Bus server."); + log_debug("Successfully created private D-Bus server."); return 0; @@ -959,6 +978,12 @@ int bus_init(Manager *m) { return -ENOMEM; } + if (m->subscribed_data_slot < 0) + if (!dbus_pending_call_allocate_data_slot(&m->subscribed_data_slot)) { + log_error("Not enough memory"); + return -ENOMEM; + } + if ((r = bus_init_system(m)) < 0 || (r = bus_init_api(m)) < 0 || (r = bus_init_private(m)) < 0) @@ -967,7 +992,40 @@ int bus_init(Manager *m) { return 0; } -static void shutdown_connection(DBusConnection *c) { +static void shutdown_connection(Manager *m, DBusConnection *c) { + Set *s; + Job *j; + Iterator i; + + HASHMAP_FOREACH(j, m->jobs, i) + if (j->bus == c) { + free(j->bus_client); + j->bus_client = NULL; + + j->bus = NULL; + } + + set_remove(m->bus_connections, c); + set_remove(m->bus_connections_for_dispatch, c); + + if ((s = BUS_CONNECTION_SUBSCRIBED(m, c))) { + char *t; + + while ((t = set_steal_first(s))) + free(t); + + set_free(s); + } + + if (m->queued_message_connection == c) { + m->queued_message_connection = NULL; + + if (m->queued_message) { + dbus_message_unref(m->queued_message); + m->queued_message = NULL; + } + } + dbus_connection_set_dispatch_status_function(c, NULL, NULL, NULL); dbus_connection_flush(c); dbus_connection_close(c); @@ -981,20 +1039,10 @@ static void bus_done_api(Manager *m) { if (m->system_bus == m->api_bus) m->system_bus = NULL; - set_remove(m->bus_connections, m->api_bus); - shutdown_connection(m->api_bus); + shutdown_connection(m, m->api_bus); m->api_bus = NULL; } - if (m->subscribed) { - char *c; - - while ((c = set_steal_first(m->subscribed))) - free(c); - - set_free(m->subscribed); - m->subscribed = NULL; - } if (m->queued_message) { dbus_message_unref(m->queued_message); @@ -1009,8 +1057,7 @@ static void bus_done_system(Manager *m) { bus_done_api(m); if (m->system_bus) { - set_remove(m->bus_connections, m->system_bus); - shutdown_connection(m->system_bus); + shutdown_connection(m, m->system_bus); m->system_bus = NULL; } } @@ -1032,16 +1079,19 @@ void bus_done(Manager *m) { bus_done_private(m); while ((c = set_steal_first(m->bus_connections))) - shutdown_connection(c); + shutdown_connection(m, c); while ((c = set_steal_first(m->bus_connections_for_dispatch))) - shutdown_connection(c); + shutdown_connection(m, c); set_free(m->bus_connections); set_free(m->bus_connections_for_dispatch); if (m->name_data_slot >= 0) dbus_pending_call_free_data_slot(&m->name_data_slot); + + if (m->subscribed_data_slot >= 0) + dbus_pending_call_free_data_slot(&m->subscribed_data_slot); } static void query_pid_pending_cb(DBusPendingCall *pending, void *userdata) { @@ -1052,7 +1102,7 @@ static void query_pid_pending_cb(DBusPendingCall *pending, void *userdata) { dbus_error_init(&error); - assert_se(name = dbus_pending_call_get_data(pending, m->name_data_slot)); + assert_se(name = BUS_PENDING_CALL_NAME(m, pending)); assert_se(reply = dbus_pending_call_steal_reply(pending)); switch (dbus_message_get_type(reply)) { @@ -1301,13 +1351,13 @@ static const char *error_to_dbus(int error) { return DBUS_ERROR_FAILED; } -DBusHandlerResult bus_send_error_reply(Manager *m, DBusConnection *c, DBusMessage *message, DBusError *bus_error, int error) { +DBusHandlerResult bus_send_error_reply(Manager *m, DBusConnection *c, DBusMessage *message, DBusError *berror, int error) { DBusMessage *reply = NULL; const char *name, *text; - if (bus_error && dbus_error_is_set(bus_error)) { - name = bus_error->name; - text = bus_error->message; + if (berror && dbus_error_is_set(berror)) { + name = berror->name; + text = berror->message; } else { name = error_to_dbus(error); text = strerror(-error); @@ -1321,8 +1371,8 @@ DBusHandlerResult bus_send_error_reply(Manager *m, DBusConnection *c, DBusMessag dbus_message_unref(reply); - if (bus_error) - dbus_error_free(bus_error); + if (berror) + dbus_error_free(berror); return DBUS_HANDLER_RESULT_HANDLED; @@ -1330,8 +1380,8 @@ oom: if (reply) dbus_message_unref(reply); - if (bus_error) - dbus_error_free(bus_error); + if (berror) + dbus_error_free(berror); return DBUS_HANDLER_RESULT_NEED_MEMORY; } @@ -1537,3 +1587,27 @@ int bus_parse_strv(DBusMessage *m, char ***_l) { return 0; } + +bool bus_has_subscriber(Manager *m) { + Iterator i; + DBusConnection *c; + + assert(m); + + SET_FOREACH(c, m->bus_connections_for_dispatch, i) + if (bus_connection_has_subscriber(m, c)) + return true; + + SET_FOREACH(c, m->bus_connections, i) + if (bus_connection_has_subscriber(m, c)) + return true; + + return false; +} + +bool bus_connection_has_subscriber(Manager *m, DBusConnection *c) { + assert(m); + assert(c); + + return !set_isempty(BUS_CONNECTION_SUBSCRIBED(m, c)); +}