chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: detect CLONE_NEWPID namespaces, and cache results
[elogind.git]
/
src
/
dbus-path.c
diff --git
a/src/dbus-path.c
b/src/dbus-path.c
index 8d58de398c9b16b69ca514c3602478f1de4ad247..cb1d4f09cb0694f4ef47bfa794bb1c9db66e0fe3 100644
(file)
--- a/
src/dbus-path.c
+++ b/
src/dbus-path.c
@@
-1,4
+1,4
@@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8
; indent-tabs-mode: nil
-*-*/
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-37,10
+37,15
@@
BUS_UNIT_INTERFACE \
BUS_PATH_INTERFACE \
BUS_PROPERTIES_INTERFACE \
BUS_UNIT_INTERFACE \
BUS_PATH_INTERFACE \
BUS_PROPERTIES_INTERFACE \
+ BUS_PEER_INTERFACE \
BUS_INTROSPECTABLE_INTERFACE \
"</node>\n"
BUS_INTROSPECTABLE_INTERFACE \
"</node>\n"
-const char bus_path_interface[] = BUS_PATH_INTERFACE;
+#define INTERFACES_LIST \
+ BUS_UNIT_INTERFACES_LIST \
+ "org.freedesktop.systemd1.Path\0"
+
+const char bus_path_interface[] _introspect_("Path") = BUS_PATH_INTERFACE;
static int bus_path_append_paths(Manager *m, DBusMessageIter *i, const char *property, void *data) {
Path *p = data;
static int bus_path_append_paths(Manager *m, DBusMessageIter *i, const char *property, void *data) {
Path *p = data;
@@
-71,13
+76,27
@@
static int bus_path_append_paths(Manager *m, DBusMessageIter *i, const char *pro
return 0;
}
return 0;
}
+static int bus_path_append_unit(Manager *m, DBusMessageIter *i, const char *property, void *data) {
+ Unit *u = data;
+ const char *t;
+
+ assert(m);
+ assert(i);
+ assert(property);
+ assert(u);
+
+ t = u->path.unit ? u->path.unit->meta.id : "";
+
+ return dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &t) ? 0 : -ENOMEM;
+}
+
DBusHandlerResult bus_path_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
const BusProperty properties[] = {
BUS_UNIT_PROPERTIES,
DBusHandlerResult bus_path_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
const BusProperty properties[] = {
BUS_UNIT_PROPERTIES,
- { "org.freedesktop.systemd1.Path", "Unit", bus_p
roperty_append_string, "s", u->path.unit->meta.id
},
+ { "org.freedesktop.systemd1.Path", "Unit", bus_p
ath_append_unit, "s", u
},
{ "org.freedesktop.systemd1.Path", "Paths", bus_path_append_paths, "a(ss)", u },
{ NULL, NULL, NULL, NULL, NULL }
};
{ "org.freedesktop.systemd1.Path", "Paths", bus_path_append_paths, "a(ss)", u },
{ NULL, NULL, NULL, NULL, NULL }
};
- return bus_default_message_handler(u->meta.manager, c, message, INTROSPECTION, properties);
+ return bus_default_message_handler(u->meta.manager, c, message, INTROSPECTION,
INTERFACES_LIST,
properties);
}
}