bus: add macro for iterating through body parts of a message

[elogind.git] / src / libsystemd-bus / kdbus.h

diff --git a/src/libsystemd-bus/kdbus.h b/src/libsystemd-bus/kdbus.h
index a2eba186ca35fc31b48712c9698893503fd64e7a..20b804539b592d4175bc542ea579569a81932576 100644 (file)
--- a/src/libsystemd-bus/kdbus.h
+++ b/src/libsystemd-bus/kdbus.h
@@ -138,7 +138,7 @@ struct kdbus_item {
                struct kdbus_timestamp timestamp;
 
                /* specific fields */
-               int fd;
+               struct kdbus_memfd memfd;
                int fds[0];
                struct kdbus_manager_msg_name_change name_change;
                struct kdbus_manager_msg_id_change id_change;
@@ -215,7 +215,7 @@ struct kdbus_policy {
 
 struct kdbus_cmd_policy {
        __u64 size;
-       __u8 buffer[0];         /* a series of KDBUS_POLICY_NAME plus one or
+       __u8 data[0];           /* a series of KDBUS_POLICY_NAME plus one or
                                 * more KDBUS_POLICY_ACCESS each. */
 };
 
@@ -238,7 +238,7 @@ enum {
 /* Items to append to struct kdbus_cmd_hello */
 enum {
        KDBUS_HELLO_NULL,
-       KDBUS_HELLO_BUFFER,     /* kdbus_vec, userspace supplied buffer to
+       KDBUS_HELLO_POOL,       /* kdbus_vec, userspace supplied pool to
                                 * place received messages */
 };
 
@@ -420,12 +420,11 @@ enum kdbus_cmd {
        /* kdbus ep node commands: require ep owner state */
        KDBUS_CMD_EP_POLICY_SET =       _IOWR(KDBUS_IOC_MAGIC, 0x70, struct kdbus_cmd_policy),
 
-       /* kdbus ep node commands: */
-       KDBUS_CMD_MEMFD_NEW =           _IOWR(KDBUS_IOC_MAGIC, 0x80, int *),
-
        /* kdbus memfd commands: */
+       KDBUS_CMD_MEMFD_NEW =           _IOWR(KDBUS_IOC_MAGIC, 0x80, int *),
        KDBUS_CMD_MEMFD_SIZE_GET =      _IOWR(KDBUS_IOC_MAGIC, 0x81, __u64 *),
-       KDBUS_CMD_MEMFD_SEAL_GET =      _IOWR(KDBUS_IOC_MAGIC, 0x82, int *),
-       KDBUS_CMD_MEMFD_SEAL_SET =      _IOWR(KDBUS_IOC_MAGIC, 0x83, int),
+       KDBUS_CMD_MEMFD_SIZE_SET =      _IOWR(KDBUS_IOC_MAGIC, 0x82, __u64 *),
+       KDBUS_CMD_MEMFD_SEAL_GET =      _IOWR(KDBUS_IOC_MAGIC, 0x83, int *),
+       KDBUS_CMD_MEMFD_SEAL_SET =      _IOWR(KDBUS_IOC_MAGIC, 0x84, int),
 };
 #endif