diff options
| author | Daniel Mack <daniel@zonque.org> | 2014-11-04 12:08:36 +0100 |
|---|---|---|
| committer | Daniel Mack <daniel@zonque.org> | 2014-11-04 12:44:53 +0100 |
| commit | 635f9f0d95d1cc460f2c59a8fe26ecc358420544 (patch) | |
| tree | 4f3c144e16fed80a51f29746cff4d6257bd15818 /src/libsystemd/sd-bus/bus-kernel.c | |
| parent | dfb05a1cf5479e6949d2413a633431c64d006ff2 (diff) | |
sd-bus: sync kdbus.h (ABI break)
Catch up with some changes in kdbus.h:
* KDBUS_{ITEM,ATTACH}_CONN_NAME were renamed to
KDBUS_{ITEM,ATTACH}_CONN_DESCRIPTION, so the term 'name' is not
overloaded as much.
* The item types were re-ordered a little so they are lined up to the
order of the corresponding KDBUS_ATTACH flags
* A new item type KDBUS_ITEM_OWNED_NAME was introduced, designated to
store a struct kdbus_name in item->name. KDBUS_ITEM_NAME soley
stores data in item->str now
* Some kerneldoc fixes
Diffstat (limited to 'src/libsystemd/sd-bus/bus-kernel.c')
| -rw-r--r-- | src/libsystemd/sd-bus/bus-kernel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index ceb145457f..e01b34e397 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/sd-bus/bus-kernel.c @@ -588,7 +588,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { destination = d->str; break; - case KDBUS_ITEM_NAME: + case KDBUS_ITEM_OWNED_NAME: if (!service_name_is_valid(d->name.name)) return -EBADMSG; @@ -597,7 +597,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { goto fail; break; - case KDBUS_ITEM_CONN_NAME: + case KDBUS_ITEM_CONN_DESCRIPTION: m->creds.conn_name = d->str; m->creds.mask |= SD_BUS_CREDS_CONNECTION_NAME & bus->creds_mask; break; @@ -727,7 +727,7 @@ int bus_kernel_take_fd(sd_bus *b) { item = hello->items; item->size = offsetof(struct kdbus_item, str) + m + 1; - item->type = KDBUS_ITEM_CONN_NAME; + item->type = KDBUS_ITEM_CONN_DESCRIPTION; memcpy(item->str, name, m + 1); item = KDBUS_ITEM_NEXT(item); @@ -1256,7 +1256,7 @@ int kdbus_translate_attach_flags(uint64_t mask, uint64_t *kdbus_mask) { m |= KDBUS_ATTACH_NAMES; if (mask & SD_BUS_CREDS_CONNECTION_NAME) - m |= KDBUS_ATTACH_CONN_NAME; + m |= KDBUS_ATTACH_CONN_DESCRIPTION; *kdbus_mask = m; return 0; |