chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: catch up with kdbus changes
[elogind.git]
/
src
/
libsystemd-bus
/
bus-kernel.c
diff --git
a/src/libsystemd-bus/bus-kernel.c
b/src/libsystemd-bus/bus-kernel.c
index 7d514616a4d7c08bee2e8f597375947046fb422b..369eac468b21454a68e141e92042b8b874cd5467 100644
(file)
--- a/
src/libsystemd-bus/bus-kernel.c
+++ b/
src/libsystemd-bus/bus-kernel.c
@@
-636,7
+636,7
@@
static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {
case KDBUS_ITEM_PAYLOAD_OFF:
if (!h) {
case KDBUS_ITEM_PAYLOAD_OFF:
if (!h) {
- h = (struct bus_header *)((uint8_t *)
bus->kdbus_buffer
+ d->vec.offset);
+ h = (struct bus_header *)((uint8_t *)
k
+ d->vec.offset);
if (!bus_header_is_complete(h, d->vec.size))
return -EBADMSG;
if (!bus_header_is_complete(h, d->vec.size))
return -EBADMSG;
@@
-721,11
+721,11
@@
static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {
if (idx >= begin_body) {
if (!part->is_zero)
if (idx >= begin_body) {
if (!part->is_zero)
- part->data = (uint8_t *)
bus->kdbus_buffer
+ d->vec.offset;
+ part->data = (uint8_t *)
k
+ d->vec.offset;
part->size = d->vec.size;
} else {
if (!part->is_zero)
part->size = d->vec.size;
} else {
if (!part->is_zero)
- part->data = (uint8_t *)
bus->kdbus_buffer
+ d->vec.offset + (begin_body - idx);
+ part->data = (uint8_t *)
k
+ d->vec.offset + (begin_body - idx);
part->size = d->vec.size - (begin_body - idx);
}
part->size = d->vec.size - (begin_body - idx);
}