summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mack <daniel@zonque.org>2015-01-12 18:15:18 +0100
committerDaniel Mack <daniel@zonque.org>2015-01-12 18:15:45 +0100
commita9c8343e83ec09f80a76930573b2592f97ae4283 (patch)
tree9ccc2ed72a44ff3f4efe9292fdf5484f1c05b925
parent0c47569ac9eb365ebeb9342f47fb98d52bcc4704 (diff)
sd-bus: sync kdbus.h (API break)
Just a simple variable rename, and a dropped flag that sd-bus didn't make use of.
-rw-r--r--src/core/busname.c8
-rw-r--r--src/libsystemd/sd-bus/bus-kernel.c2
-rw-r--r--src/libsystemd/sd-bus/kdbus.h5
3 files changed, 6 insertions, 9 deletions
diff --git a/src/core/busname.c b/src/core/busname.c
index 9ab95569eb..00e56686e5 100644
--- a/src/core/busname.c
+++ b/src/core/busname.c
@@ -770,9 +770,9 @@ static int busname_peek_message(BusName *n) {
* longer than necessary. */
ps = page_size();
- start = (cmd_recv.reply.offset / ps) * ps;
- delta = cmd_recv.reply.offset - start;
- sz = PAGE_ALIGN(delta + cmd_recv.reply.msg_size);
+ start = (cmd_recv.msg.offset / ps) * ps;
+ delta = cmd_recv.msg.offset - start;
+ sz = PAGE_ALIGN(delta + cmd_recv.msg.msg_size);
p = mmap(NULL, sz, PROT_READ, MAP_SHARED, n->starter_fd, start);
if (p == MAP_FAILED) {
@@ -804,7 +804,7 @@ finish:
if (p)
(void) munmap(p, sz);
- cmd_free.offset = cmd_recv.reply.offset;
+ cmd_free.offset = cmd_recv.msg.offset;
if (ioctl(n->starter_fd, KDBUS_CMD_FREE, &cmd_free) < 0)
log_unit_warning(UNIT(n)->id, "Failed to free peeked message, ignoring: %m");
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index e84e14b03f..bd829459de 100644
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -1346,7 +1346,7 @@ int bus_kernel_read_message(sd_bus *bus, bool hint_priority, int64_t priority) {
return -errno;
}
- k = (struct kdbus_msg *)((uint8_t *)bus->kdbus_buffer + recv.reply.offset);
+ k = (struct kdbus_msg *)((uint8_t *)bus->kdbus_buffer + recv.msg.offset);
if (k->payload_type == KDBUS_PAYLOAD_DBUS) {
r = bus_kernel_make_message(bus, k);
diff --git a/src/libsystemd/sd-bus/kdbus.h b/src/libsystemd/sd-bus/kdbus.h
index e9d9c9f31b..c238d79d58 100644
--- a/src/libsystemd/sd-bus/kdbus.h
+++ b/src/libsystemd/sd-bus/kdbus.h
@@ -566,7 +566,7 @@ struct kdbus_cmd_recv {
__u64 return_flags;
__s64 priority;
__u64 dropped_msgs;
- struct kdbus_msg_info reply;
+ struct kdbus_msg_info msg;
struct kdbus_item items[0];
} __attribute__((aligned(8)));
@@ -634,15 +634,12 @@ enum kdbus_policy_type {
* a service
* @KDBUS_HELLO_MONITOR: Special-purpose connection to monitor
* bus traffic
- * @KDBUS_HELLO_UNPRIVILEGED: Don't treat this connection as privileged once
- * the bus connection was established.
*/
enum kdbus_hello_flags {
KDBUS_HELLO_ACCEPT_FD = 1ULL << 0,
KDBUS_HELLO_ACTIVATOR = 1ULL << 1,
KDBUS_HELLO_POLICY_HOLDER = 1ULL << 2,
KDBUS_HELLO_MONITOR = 1ULL << 3,
- KDBUS_HELLO_UNPRIVILEGED = 1ULL << 4,
};
/**