picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bus: make the bus driver support the driver interface under both / and /org/freedesktop/DBus

Browse source 
Some clients apparently use the "/" path instead of
"/org/freedesktop/DBus". dbus-daemon didn't care, so we need to support
both.
This commit is contained in:
Lennart Poettering 2014-01-09 08:19:22 +08:00
parent dd9b67aa3e
commit 5b590f9764
1 changed files with 46 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/bus-driverd/bus-driverd.c
View file

@ -803,6 +803,45 @@ static const sd_bus_vtable driver_vtable[] = {
SD_BUS_VTABLE_END
};
static int find_object(
sd_bus *bus,
const char *path,
const char *interface,
void *userdata,
void **ret_found,
sd_bus_error *ret_error) {
/* We support the driver interface on exactly two different
* paths: the root and the entry point object. This is a bit
* different from the original dbus-daemon which supported it
* on any path. */
if (streq_ptr(path, "/"))
return 1;
if (streq_ptr(path, "/org/freedesktop/DBus"))
return 1;
return 0;
}
static int node_enumerator(
sd_bus *bus,
const char *path,
void *userdata,
char ***ret_nodes,
sd_bus_error *ret_error) {
char **l;
l = strv_new("/", "/org/freedesktop/DBus", NULL);
if (!l)
return -ENOMEM;
*ret_nodes = l;
return 0;
}
static int connect_bus(Context *c) {
int r;
@ -823,12 +862,18 @@ static int connect_bus(Context *c) {
return -EPERM;
}
r = sd_bus_add_object_vtable(c->bus, "/org/freedesktop/DBus", "org.freedesktop.DBus", driver_vtable, c);
r = sd_bus_add_fallback_vtable(c->bus, "/", "org.freedesktop.DBus", driver_vtable, find_object, c);
if (r < 0) {
log_error("Failed to add manager object vtable: %s", strerror(-r));
return r;
}
r = sd_bus_add_node_enumerator(c->bus, "/", node_enumerator, c);
if (r < 0) {
log_error("Failed to add node enumerator: %s", strerror(-r));
return r;
}
r = sd_bus_request_name(c->bus, "org.freedesktop.DBus", 0);
if (r < 0) {
log_error("Unable to request name: %s", strerror(-r));