diff options
author | Lennart Poettering <lennart@poettering.net> | 2013-11-19 21:12:59 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2013-11-20 20:52:36 +0100 |
commit | 718db96199eb307751264e4163555662c9a389fa (patch) | |
tree | 9ec8467596ba1acba76bb6273c7797baf68c1a00 /src/core/dbus-socket.h | |
parent | hashmap: be a bit more conservative with pre-allocating hash tables and items (diff) | |
download | systemd-718db96199eb307751264e4163555662c9a389fa.tar.xz systemd-718db96199eb307751264e4163555662c9a389fa.zip |
core: convert PID 1 to libsystemd-bus
This patch converts PID 1 to libsystemd-bus and thus drops the
dependency on libdbus. The only remaining code using libdbus is a test
case that validates our bus marshalling against libdbus' marshalling,
and this dependency can be turned off.
This patch also adds a couple of things to libsystem-bus, that are
necessary to make the port work:
- Synthesizing of "Disconnected" messages when bus connections are
severed.
- Support for attaching multiple vtables for the same interface on the
same path.
This patch also fixes the SetDefaultTarget() and GetDefaultTarget() bus
calls which used an inappropriate signature.
As a side effect we will now generate PropertiesChanged messages which
carry property contents, rather than just invalidation information.
Diffstat (limited to 'src/core/dbus-socket.h')
-rw-r--r-- | src/core/dbus-socket.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/core/dbus-socket.h b/src/core/dbus-socket.h index eb035c1a94..8808fa2355 100644 --- a/src/core/dbus-socket.h +++ b/src/core/dbus-socket.h @@ -21,14 +21,11 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <dbus/dbus.h> - +#include "sd-bus.h" #include "unit.h" -DBusHandlerResult bus_socket_message_handler(Unit *u, DBusConnection *c, DBusMessage *message); +extern const sd_bus_vtable bus_socket_vtable[]; +extern const char* const bus_socket_changing_properties[]; -int bus_socket_set_property(Unit *u, const char *name, DBusMessageIter *i, UnitSetPropertiesMode mode, DBusError *error); +int bus_socket_set_property(Unit *u, const char *name, sd_bus_message *message, UnitSetPropertiesMode mode, sd_bus_error *error); int bus_socket_commit_properties(Unit *u); - -extern const char bus_socket_interface[]; -extern const char bus_socket_invalidating_properties[]; |