shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-24 21:34:08 +03:00
Code

bus: update kdbus.h

Browse Source
This commit is contained in:
Kay Sievers 2013-12-23 19:14:24 +01:00
parent fbadf04511
commit 98531b5762
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bus-driverd/bus-driverd.c
View File

@ -537,7 +537,7 @@ static int driver_list_queued_owners(sd_bus *bus, sd_bus_message *m, void *userd
if (!streq(name->name, arg0))
continue;
if (asprintf(&n, ":1.%llu", (unsigned long long) name->id) < 0)
if (asprintf(&n, ":1.%llu", (unsigned long long) name->owner_id) < 0)
return -ENOMEM;
r = strv_push(&owners, n);
@ -599,7 +599,7 @@ static int driver_request_name(sd_bus *bus, sd_bus_message *m, void *userdata, s
if (r < 0)
return r;
n->id = id;
n->owner_id = id;
r = ioctl(bus->input_fd, KDBUS_CMD_NAME_ACQUIRE, n);
if (r < 0) {
@ -642,7 +642,7 @@ static int driver_release_name(sd_bus *bus, sd_bus_message *m, void *userdata, s
if (r < 0)
return r;
n->id = id;
n->owner_id = id;
r = ioctl(bus->input_fd, KDBUS_CMD_NAME_RELEASE, n);
if (r < 0) {

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

@ -230,10 +230,10 @@ static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) {
KDBUS_ITEM_FOREACH(name, name_list, names) {
if ((flags & KDBUS_NAME_LIST_UNIQUE) && name->id != previous_id) {
if ((flags & KDBUS_NAME_LIST_UNIQUE) && name->owner_id != previous_id) {
char *n;
if (asprintf(&n, ":1.%llu", (unsigned long long) name->id) < 0)
if (asprintf(&n, ":1.%llu", (unsigned long long) name->owner_id) < 0)
return -ENOMEM;
r = strv_push(x, n);
@ -242,7 +242,7 @@ static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) {
return -ENOMEM;
}
previous_id = name->id;
previous_id = name->owner_id;
}
if (name->size > sizeof(*name) && service_name_is_valid(name->name)) {
@ -1023,7 +1023,7 @@ int bus_add_match_internal_kernel(
m = alloca0(sz);
m->size = sz;
m->cookie = cookie;
m->id = id;
m->owner_id = id;
item = m->items;
item->size = offsetof(struct kdbus_item, id) + sizeof(uint64_t);
@ -1111,7 +1111,7 @@ int bus_remove_match_internal_kernel(
zero(m);
m.size = offsetof(struct kdbus_cmd_match, items);
m.cookie = cookie;
m.id = id;
m.owner_id = id;
r = ioctl(bus->input_fd, KDBUS_CMD_MATCH_REMOVE, &m);
if (r < 0)

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

@ -528,7 +528,7 @@ enum kdbus_name_flags {
* struct kdbus_cmd_name - struct to describe a well-known name
* @size: The total size of the struct
* @flags: Flags for a name entry (KDBUS_NAME_*)
* @id: Privileged users may use this field to (de)register
* @owner_id: Privileged users may use this field to (de)register
* names on behalf of other peers.
* @conn_flags: The flags of the owning connection (KDBUS_HELLO_*)
* @name: The well-known name
@ -538,7 +538,7 @@ enum kdbus_name_flags {
struct kdbus_cmd_name {
__u64 size;
__u64 flags;
__u64 id;
__u64 owner_id;
__u64 conn_flags;
char name[0];
} __attribute__((aligned(8)));
@ -629,7 +629,7 @@ struct kdbus_conn_info {
/**
* struct kdbus_cmd_match - struct to add or remove matches
* @size: The total size of the struct
* @id: Privileged users may (de)register matches on behalf
* @owner_id: Privileged users may (de)register matches on behalf
* of other peers. In other cases, set to 0.
* @cookie: Userspace supplied cookie. When removing, the cookie
* identifies the match to remove.
@ -640,7 +640,7 @@ struct kdbus_conn_info {
*/
struct kdbus_cmd_match {
__u64 size;
__u64 id;
__u64 owner_id;
__u64 cookie;
struct kdbus_item items[0];
} __attribute__((aligned(8)));
@ -765,6 +765,8 @@ enum kdbus_ioctl_type {
* @EBADFD: A bus connection is in a corrupted state.
* @EBADMSG: Passed data contains a combination of conflicting or
* inconsistent types.
* @EBUSY: The user tried to say BYEBYE to a connection, but the
* connection had a non-empty message list.
* @ECONNRESET: A connection is shut down, no further operations are
* possible.
* @ECOMM: A peer does not accept the file descriptors addressed
@ -791,6 +793,8 @@ enum kdbus_ioctl_type {
* size.
* @ENOBUFS: There is no space left for the submitted data to fit
* into the receiver's pool.
* @ENOENT: The name to query information about is currently not on
* the bus.
* @ENOMEM: Out of memory.
* @ENOSYS: The requested functionality is not available.
* @ENOTCONN: The addressed peer is not an active connection.