X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-kernel.c;h=a3afb2eba68fb0bb21a40e96e273207b32c1a23f;hb=6647dc6659e1e42b3cff3cf5033ea5624000e650;hp=495d7e57dc596b97ac5cf77b2ed9384ea8329f93;hpb=5e16c2575b2edf8f3ca18432a087027662c2621b;p=elogind.git diff --git a/src/libsystemd-bus/bus-kernel.c b/src/libsystemd-bus/bus-kernel.c index 495d7e57d..a3afb2eba 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);