shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-28 05:57:33 +03:00
Code

libsystemd-bus: catch up with latest kdbus changes

Browse Source
This commit is contained in:
Daniel Mack 2013-12-03 01:56:13 +01:00
parent dca409bf96
commit 144e9e5890
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsystemd-bus/bus-control.c
View File

@ -182,7 +182,7 @@ _public_ int sd_bus_list_names(sd_bus *bus, char ***l) {
if (!cmd)
return -ENOMEM;
cmd->flags = KDBUS_NAME_LIST_UNIQUE_NAMES;
cmd->flags = KDBUS_NAME_LIST_UNIQUE | KDBUS_NAME_LIST_NAMES;
r = ioctl(sd_bus_get_fd(bus), KDBUS_CMD_NAME_LIST, cmd);
if (r < 0)

2
src/libsystemd-bus/bus-kernel.c
View File

@ -830,7 +830,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {
if (!m->destination) {
if (destination)
m->destination = destination;
else if (k->dst_id != KDBUS_DST_ID_WELL_KNOWN_NAME &&
else if (k->dst_id != KDBUS_DST_ID_NAME &&
k->dst_id != KDBUS_DST_ID_BROADCAST) {
snprintf(m->destination_buffer, sizeof(m->destination_buffer), ":1.%llu", (unsigned long long) k->dst_id);
m->destination = m->destination_buffer;

9
src/libsystemd-bus/kdbus.h
View File

@ -22,7 +22,7 @@
#define KDBUS_IOC_MAGIC 0x95
#define KDBUS_SRC_ID_KERNEL (0)
#define KDBUS_DST_ID_WELL_KNOWN_NAME (0)
#define KDBUS_DST_ID_NAME (0)
#define KDBUS_MATCH_SRC_ID_ANY (~0ULL)
#define KDBUS_DST_ID_BROADCAST (~0ULL)
@ -444,9 +444,10 @@ struct kdbus_cmd_name {
/* KDBUS_CMD_NAME_LIST */
enum {
KDBUS_NAME_LIST_UNIQUE_NAMES = 1 << 0,
KDBUS_NAME_LIST_STARTERS_ONLY = 1 << 1,
KDBUS_NAME_LIST_QUEUED_OWNERS = 1 << 2,
KDBUS_NAME_LIST_UNIQUE = 1 << 0,
KDBUS_NAME_LIST_NAMES = 1 << 1,
KDBUS_NAME_LIST_STARTERS = 1 << 2,
KDBUS_NAME_LIST_QUEUED = 1 << 3,
};
/**