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 bb339ae69c2985444dac78c426d8b65788068356..e10a1547aa8024132926713329c5a39e4ba00725 100644 (file)
--- a/src/libsystemd-bus/kdbus.h
+++ b/src/libsystemd-bus/kdbus.h
@@ -67,7 +67,7 @@ struct kdbus_timestamp {
 
 /* Message Item Types */
 enum {
-       KDBUS_MSG_NULL,
+       _KDBUS_MSG_NULL,
 
        /* Filled in by userspace */
        KDBUS_MSG_PAYLOAD_VEC,          /* .data_vec, reference to memory area */
@@ -138,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;
@@ -150,7 +151,7 @@ enum {
 };
 
 enum {
-       KDBUS_PAYLOAD_NULL,
+       _KDBUS_PAYLOAD_NULL,
        KDBUS_PAYLOAD_DBUS1     = 0x4442757356657231ULL, /* 'DBusVer1' */
        KDBUS_PAYLOAD_GVARIANT  = 0x4756617269616e74ULL, /* 'GVariant' */
 };
@@ -181,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,
@@ -214,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. */
 };
 
@@ -236,8 +237,8 @@ enum {
 
 /* Items to append to struct kdbus_cmd_hello */
 enum {
-       KDBUS_HELLO_NULL,
-       KDBUS_HELLO_BUFFER,     /* kdbus_vec, userspace supplied buffer to
+       _KDBUS_HELLO_NULL,
+       KDBUS_HELLO_POOL,       /* kdbus_vec, userspace supplied pool to
                                 * place received messages */
 };
 
@@ -273,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. */
@@ -345,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 */
@@ -360,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 */
@@ -404,7 +405,7 @@ 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),
@@ -419,10 +420,8 @@ 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_SIZE_SET =      _IOWR(KDBUS_IOC_MAGIC, 0x82, __u64 *),
        KDBUS_CMD_MEMFD_SEAL_GET =      _IOWR(KDBUS_IOC_MAGIC, 0x83, int *),