dbus: fix unclean shut-down

[elogind.git] / src / dbus.c

diff --git a/src/dbus.c b/src/dbus.c
index 74b1c37ddaa3e6ad3acac3c93438e7ad2f2cc31b..385bf6a93720b2ef737a5e62d4c2bebfe898b438 100644 (file)
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -967,7 +967,10 @@ int bus_init(Manager *m) {
         return 0;
 }
 
-static void shutdown_connection(DBusConnection *c) {
+static void shutdown_connection(Manager *m, DBusConnection *c) {
+        set_remove(m->bus_connections, c);
+        set_remove(m->bus_connections_for_dispatch, c);
+
         dbus_connection_set_dispatch_status_function(c, NULL, NULL, NULL);
         dbus_connection_flush(c);
         dbus_connection_close(c);
@@ -981,8 +984,7 @@ 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;
         }
 
@@ -1009,8 +1011,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,10 +1033,10 @@ 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);
@@ -1201,7 +1202,6 @@ DBusHandlerResult bus_default_message_handler(Manager *m, DBusConnection *c, DBu
                 const char *interface;
                 const BusProperty *p;
                 DBusMessageIter iter, sub, sub2, sub3;
-                bool any = false;
 
                 if (!dbus_message_get_args(
                             message,
@@ -1219,7 +1219,7 @@ DBusHandlerResult bus_default_message_handler(Manager *m, DBusConnection *c, DBu
                         goto oom;
 
                 for (p = properties; p->property; p++) {
-                        if (!streq(p->interface, interface))
+                        if (interface[0] && !streq(p->interface, interface))
                                 continue;
 
                         if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, NULL, &sub2) ||
@@ -1239,8 +1239,6 @@ DBusHandlerResult bus_default_message_handler(Manager *m, DBusConnection *c, DBu
                         if (!dbus_message_iter_close_container(&sub2, &sub3) ||
                             !dbus_message_iter_close_container(&sub, &sub2))
                                 goto oom;
-
-                        any = true;
                 }
 
                 if (!dbus_message_iter_close_container(&iter, &sub))
@@ -1460,6 +1458,38 @@ int bus_property_append_int32(Manager *m, DBusMessageIter *i, const char *proper
         return 0;
 }
 
+int bus_property_append_size(Manager *m, DBusMessageIter *i, const char *property, void *data) {
+        uint64_t u;
+
+        assert(m);
+        assert(i);
+        assert(property);
+        assert(data);
+
+        u = (uint64_t) *(size_t*) data;
+
+        if (!dbus_message_iter_append_basic(i, DBUS_TYPE_UINT64, &u))
+                return -ENOMEM;
+
+        return 0;
+}
+
+int bus_property_append_ul(Manager *m, DBusMessageIter *i, const char *property, void *data) {
+        uint64_t u;
+
+        assert(m);
+        assert(i);
+        assert(property);
+        assert(data);
+
+        u = (uint64_t) *(unsigned long*) data;
+
+        if (!dbus_message_iter_append_basic(i, DBUS_TYPE_UINT64, &u))
+                return -ENOMEM;
+
+        return 0;
+}
+
 int bus_parse_strv(DBusMessage *m, char ***_l) {
         DBusMessageIter iter, sub;
         unsigned n = 0, i = 0;