summaryrefslogtreecommitdiff
path: root/src/bus-proxyd/driver.c
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2015-02-04 16:21:27 +0100
committerDavid Herrmann <dh.herrmann@gmail.com>2015-02-05 16:52:42 +0100
commitb2086f601b313939db160aa028e66649ba81bd01 (patch)
treeabe651754fd54848fafae97e63856cd05eb829c3 /src/bus-proxyd/driver.c
parenta97dcc12e486ecff531809802930a26c4da827f2 (diff)
bus: sync with kdbus (ABI break)
Diffstat (limited to 'src/bus-proxyd/driver.c')
-rw-r--r--src/bus-proxyd/driver.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/bus-proxyd/driver.c b/src/bus-proxyd/driver.c
index 6a72d181fe..23911c6a3c 100644
--- a/src/bus-proxyd/driver.c
+++ b/src/bus-proxyd/driver.c
@@ -327,9 +327,8 @@ int bus_proxy_process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m, SharedPoli
return synthetic_reply_return_strv(m, names);
} else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus", "ListQueuedOwners")) {
- struct kdbus_cmd_name_list cmd = {};
- struct kdbus_name_list *name_list;
- struct kdbus_name_info *name;
+ struct kdbus_cmd_list cmd = {};
+ struct kdbus_info *name_list, *name;
_cleanup_strv_free_ char **owners = NULL;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
char *arg0;
@@ -350,14 +349,14 @@ int bus_proxy_process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m, SharedPoli
if (r < 0)
return synthetic_reply_method_errno(m, r, NULL);
- cmd.flags = KDBUS_NAME_LIST_QUEUED;
- r = ioctl(a->input_fd, KDBUS_CMD_NAME_LIST, &cmd);
+ cmd.flags = KDBUS_LIST_QUEUED;
+ r = ioctl(a->input_fd, KDBUS_CMD_LIST, &cmd);
if (r < 0)
return synthetic_reply_method_errno(m, -errno, NULL);
- name_list = (struct kdbus_name_list *) ((uint8_t *) a->kdbus_buffer + cmd.offset);
+ name_list = (struct kdbus_info *) ((uint8_t *) a->kdbus_buffer + cmd.offset);
- KDBUS_ITEM_FOREACH(name, name_list, names) {
+ KDBUS_FOREACH(name, name_list, cmd.list_size) {
const char *entry_name = NULL;
struct kdbus_item *item;
char *n;
@@ -369,7 +368,7 @@ int bus_proxy_process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m, SharedPoli
if (!streq_ptr(entry_name, arg0))
continue;
- if (asprintf(&n, ":1.%llu", (unsigned long long) name->owner_id) < 0) {
+ if (asprintf(&n, ":1.%llu", (unsigned long long) name->id) < 0) {
err = -ENOMEM;
break;
}