diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-12-09 23:03:21 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-12-09 23:04:49 +0100 |
| commit | 6647dc6659e1e42b3cff3cf5033ea5624000e650 (patch) | |
| tree | d791130268d4f28f4126343003210c0669653625 /src/libsystemd-bus/bus-kernel.c | |
| parent | d3a485135a98184cba28992752834a1bb4769003 (diff) | |
bus: demarshal gvariant
Diffstat (limited to 'src/libsystemd-bus/bus-kernel.c')
| -rw-r--r-- | src/libsystemd-bus/bus-kernel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsystemd-bus/bus-kernel.c b/src/libsystemd-bus/bus-kernel.c index 495d7e57dc..a3afb2eba6 100644 --- a/src/libsystemd-bus/bus-kernel.c +++ b/src/libsystemd-bus/bus-kernel.c @@ -254,7 +254,7 @@ static int bus_message_setup_kmsg(sd_bus *b, sd_bus_message *m) { m->kdbus->dst_id = well_known ? 0 : m->destination ? unique : KDBUS_DST_ID_BROADCAST; - m->kdbus->payload_type = KDBUS_PAYLOAD_DBUS1; + m->kdbus->payload_type = KDBUS_PAYLOAD_DBUS; m->kdbus->cookie = m->header->serial; m->kdbus->timeout_ns = m->timeout * NSEC_PER_USEC; @@ -618,7 +618,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { assert(bus); assert(k); - assert(k->payload_type == KDBUS_PAYLOAD_DBUS1); + assert(k->payload_type == KDBUS_PAYLOAD_DBUS); KDBUS_ITEM_FOREACH(d, k, items) { size_t l; @@ -885,7 +885,7 @@ int bus_kernel_read_message(sd_bus *bus) { } k = (struct kdbus_msg *)((uint8_t *)bus->kdbus_buffer + off); - if (k->payload_type == KDBUS_PAYLOAD_DBUS1) + if (k->payload_type == KDBUS_PAYLOAD_DBUS) r = bus_kernel_make_message(bus, k); else if (k->payload_type == KDBUS_PAYLOAD_KERNEL) r = bus_kernel_translate_message(bus, k); |