bus: add a more comprehensive test for the bloom filter logic

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

diff --git a/src/libsystemd-bus/kdbus.h b/src/libsystemd-bus/kdbus.h
index 049c988a4781d3f04d61ac8a1ba034350a2ce542..e10a1547aa8024132926713329c5a39e4ba00725 100644 (file)
--- a/src/libsystemd-bus/kdbus.h
+++ b/src/libsystemd-bus/kdbus.h
@@ -67,17 +67,18 @@ struct kdbus_timestamp {
 
 /* Message Item Types */
 enum {
-       KDBUS_MSG_NULL,
+       _KDBUS_MSG_NULL,
 
        /* Filled in by userspace */
-       KDBUS_MSG_PAYLOAD,              /* .data, inline memory */
        KDBUS_MSG_PAYLOAD_VEC,          /* .data_vec, reference to memory area */
-       KDBUS_MSG_UNIX_FDS,             /* .data_fds of file descriptors */
+       KDBUS_MSG_PAYLOAD_MEMFD,        /* file descriptor of a special data file */
+       KDBUS_MSG_FDS,                  /* .data_fds of file descriptors */
        KDBUS_MSG_BLOOM,                /* for broadcasts, carries bloom filter blob in .data */
        KDBUS_MSG_DST_NAME,             /* destination's well-known name, in .str */
+       KDBUS_MSG_PRIORITY,             /* queue priority for message */
 
        /* Filled in by kernelspace */
-       KDBUS_MSG_SRC_NAMES     = 0x200,/* NUL separated string list with well-known names of source */
+       KDBUS_MSG_SRC_NAMES     = 0x400,/* NUL separated string list with well-known names of source */
        KDBUS_MSG_TIMESTAMP,            /* .timestamp */
        KDBUS_MSG_SRC_CREDS,            /* .creds */
        KDBUS_MSG_SRC_PID_COMM,         /* optional, in .str */
@@ -90,7 +91,7 @@ enum {
        KDBUS_MSG_SRC_AUDIT,            /* .audit */
 
        /* Special messages from kernel, consisting of one and only one of these data blocks */
-       KDBUS_MSG_NAME_ADD      = 0x400,/* .name_change */
+       KDBUS_MSG_NAME_ADD      = 0x800,/* .name_change */
        KDBUS_MSG_NAME_REMOVE,          /* .name_change */
        KDBUS_MSG_NAME_CHANGE,          /* .name_change */
        KDBUS_MSG_ID_ADD,               /* .id_change */
@@ -99,14 +100,14 @@ enum {
        KDBUS_MSG_REPLY_DEAD,           /* dito */
 };
 
-enum {
-       KDBUS_VEC_ALIGNED               = 1 <<  0,
-};
-
 struct kdbus_vec {
        __u64 address;
        __u64 size;
-       __u64 flags;
+};
+
+struct kdbus_memfd {
+       __u64 size;
+       int fd;
 };
 
 /**
@@ -137,6 +138,7 @@ struct kdbus_item {
                struct kdbus_timestamp timestamp;
 
                /* specific fields */
+               struct kdbus_memfd memfd;
                int fds[0];
                struct kdbus_manager_msg_name_change name_change;
                struct kdbus_manager_msg_id_change id_change;
@@ -149,7 +151,7 @@ enum {
 };
 
 enum {
-       KDBUS_PAYLOAD_NULL,
+       _KDBUS_PAYLOAD_NULL,
        KDBUS_PAYLOAD_DBUS1     = 0x4442757356657231ULL, /* 'DBusVer1' */
        KDBUS_PAYLOAD_GVARIANT  = 0x4756617269616e74ULL, /* 'GVariant' */
 };
@@ -180,13 +182,13 @@ struct kdbus_msg {
 };
 
 enum {
-       KDBUS_POLICY_NULL,
+       _KDBUS_POLICY_NULL,
        KDBUS_POLICY_NAME,
        KDBUS_POLICY_ACCESS,
 };
 
 enum {
-       KDBUS_POLICY_ACCESS_NULL,
+       _KDBUS_POLICY_ACCESS_NULL,
        KDBUS_POLICY_ACCESS_USER,
        KDBUS_POLICY_ACCESS_GROUP,
        KDBUS_POLICY_ACCESS_WORLD,
@@ -213,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. */
 };
 
@@ -235,7 +237,9 @@ enum {
 
 /* Items to append to struct kdbus_cmd_hello */
 enum {
-       KDBUS_HELLO_NULL,
+       _KDBUS_HELLO_NULL,
+       KDBUS_HELLO_POOL,       /* kdbus_vec, userspace supplied pool to
+                                * place received messages */
 };
 
 struct kdbus_cmd_hello {
@@ -270,7 +274,7 @@ enum {
 
 /* Items to append to kdbus_cmd_{bus,ep,ns}_make */
 enum {
-       KDBUS_MAKE_NULL,
+       _KDBUS_MAKE_NULL,
        KDBUS_MAKE_NAME,
        KDBUS_MAKE_CGROUP,      /* the cgroup hierarchy ID for which to attach
                                 * cgroup membership paths * to messages. */
@@ -342,7 +346,7 @@ struct kdbus_cmd_names {
 };
 
 enum {
-       KDBUS_NAME_INFO_ITEM_NULL,
+       _KDBUS_NAME_INFO_ITEM_NULL,
        KDBUS_NAME_INFO_ITEM_NAME,      /* userspace → kernel */
        KDBUS_NAME_INFO_ITEM_SECLABEL,  /* kernel → userspace */
        KDBUS_NAME_INFO_ITEM_AUDIT,     /* kernel → userspace */
@@ -357,7 +361,7 @@ struct kdbus_cmd_name_info {
 };
 
 enum {
-       KDBUS_MATCH_NULL,
+       _KDBUS_MATCH_NULL,
        KDBUS_MATCH_BLOOM,              /* Matches a mask blob against KDBUS_MSG_BLOOM */
        KDBUS_MATCH_SRC_NAME,           /* Matches a name string against KDBUS_MSG_SRC_NAMES */
        KDBUS_MATCH_NAME_ADD,           /* Matches a name string against KDBUS_MSG_NAME_ADD */
@@ -401,7 +405,8 @@ enum kdbus_cmd {
 
        /* kdbus ep node commands: require connected state */
        KDBUS_CMD_MSG_SEND =            _IOWR(KDBUS_IOC_MAGIC, 0x40, struct kdbus_msg),
-       KDBUS_CMD_MSG_RECV =            _IOWR(KDBUS_IOC_MAGIC, 0x41, struct kdbus_msg),
+       KDBUS_CMD_MSG_RECV =            _IOWR(KDBUS_IOC_MAGIC, 0x41, __u64 *),
+       KDBUS_CMD_MSG_RELEASE =         _IOWR(KDBUS_IOC_MAGIC, 0x42, struct kdbus_msg),
 
        KDBUS_CMD_NAME_ACQUIRE =        _IOWR(KDBUS_IOC_MAGIC, 0x50, struct kdbus_cmd_name),
        KDBUS_CMD_NAME_RELEASE =        _IOWR(KDBUS_IOC_MAGIC, 0x51, struct kdbus_cmd_name),
@@ -414,5 +419,12 @@ 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 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_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