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: update for kdbus changes
[elogind.git]
/
src
/
libsystemd-bus
/
kdbus.h
diff --git
a/src/libsystemd-bus/kdbus.h
b/src/libsystemd-bus/kdbus.h
index a2eba186ca35fc31b48712c9698893503fd64e7a..3b7783e1b16874523bfe7fa3829c8b8ff43cad3c 100644
(file)
--- a/
src/libsystemd-bus/kdbus.h
+++ b/
src/libsystemd-bus/kdbus.h
@@
-21,6
+21,18
@@
#endif
#define KDBUS_IOC_MAGIC 0x95
#endif
#define KDBUS_IOC_MAGIC 0x95
+#define KDBUS_SRC_ID_KERNEL (0)
+#define KDBUS_DST_ID_WELL_KNOWN_NAME (0)
+#define KDBUS_MATCH_SRC_ID_ANY (~0ULL)
+#define KDBUS_DST_ID_BROADCAST (~0ULL)
+
+/* Common first elements in a structure which are used to iterate over
+ * a list of elements. */
+#define KDBUS_PART_HEADER \
+ struct { \
+ __u64 size; \
+ __u64 type; \
+ }
/* Message sent from kernel to userspace, when the owner or starter of
* a well-known name changes */
/* Message sent from kernel to userspace, when the owner or starter of
* a well-known name changes */
@@
-60,17
+72,26
@@
struct kdbus_timestamp {
__u64 realtime_ns;
};
__u64 realtime_ns;
};
-#define KDBUS_SRC_ID_KERNEL (0)
-#define KDBUS_DST_ID_WELL_KNOWN_NAME (0)
-#define KDBUS_MATCH_SRC_ID_ANY (~0ULL)
-#define KDBUS_DST_ID_BROADCAST (~0ULL)
+struct kdbus_vec {
+ __u64 size;
+ union {
+ __u64 address;
+ __u64 offset;
+ };
+};
+
+struct kdbus_memfd {
+ __u64 size;
+ int fd;
+};
/* Message Item Types */
enum {
/* Message Item Types */
enum {
- KDBUS_MSG_NULL,
+
_
KDBUS_MSG_NULL,
/* Filled in by userspace */
KDBUS_MSG_PAYLOAD_VEC, /* .data_vec, reference to memory area */
/* Filled in by userspace */
KDBUS_MSG_PAYLOAD_VEC, /* .data_vec, reference to memory area */
+ KDBUS_MSG_PAYLOAD_OFF, /* .data_vec, reference to memory area */
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_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 */
@@
-100,16
+121,6
@@
enum {
KDBUS_MSG_REPLY_DEAD, /* dito */
};
KDBUS_MSG_REPLY_DEAD, /* dito */
};
-struct kdbus_vec {
- __u64 address;
- __u64 size;
-};
-
-struct kdbus_memfd {
- __u64 size;
- int fd;
-};
-
/**
* struct kdbus_item - chain of data blocks
*
/**
* struct kdbus_item - chain of data blocks
*
@@
-117,8
+128,7
@@
struct kdbus_memfd {
* type: kdbus_item type of data
*/
struct kdbus_item {
* type: kdbus_item type of data
*/
struct kdbus_item {
- __u64 size;
- __u64 type;
+ KDBUS_PART_HEADER;
union {
/* inline data */
__u8 data[0];
union {
/* inline data */
__u8 data[0];
@@
-138,7
+148,7
@@
struct kdbus_item {
struct kdbus_timestamp timestamp;
/* specific fields */
struct kdbus_timestamp timestamp;
/* specific fields */
-
int
fd;
+
struct kdbus_memfd mem
fd;
int fds[0];
struct kdbus_manager_msg_name_change name_change;
struct kdbus_manager_msg_id_change id_change;
int fds[0];
struct kdbus_manager_msg_name_change name_change;
struct kdbus_manager_msg_id_change id_change;
@@
-151,7
+161,7
@@
enum {
};
enum {
};
enum {
- KDBUS_PAYLOAD_
NUL
L,
+ KDBUS_PAYLOAD_
KERNE
L,
KDBUS_PAYLOAD_DBUS1 = 0x4442757356657231ULL, /* 'DBusVer1' */
KDBUS_PAYLOAD_GVARIANT = 0x4756617269616e74ULL, /* 'GVariant' */
};
KDBUS_PAYLOAD_DBUS1 = 0x4442757356657231ULL, /* 'DBusVer1' */
KDBUS_PAYLOAD_GVARIANT = 0x4756617269616e74ULL, /* 'GVariant' */
};
@@
-182,13
+192,13
@@
struct kdbus_msg {
};
enum {
};
enum {
- KDBUS_POLICY_NULL,
+
_
KDBUS_POLICY_NULL,
KDBUS_POLICY_NAME,
KDBUS_POLICY_ACCESS,
};
enum {
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,
KDBUS_POLICY_ACCESS_USER,
KDBUS_POLICY_ACCESS_GROUP,
KDBUS_POLICY_ACCESS_WORLD,
@@
-200,23
+210,25
@@
enum {
KDBUS_POLICY_OWN = 1 << 0,
};
KDBUS_POLICY_OWN = 1 << 0,
};
+struct kdbus_policy_access {
+ __u64 type; /* USER, GROUP, WORLD */
+ __u64 bits; /* RECV, SEND, OWN */
+ __u64 id; /* uid, gid, 0 */
+};
+
+//FIXME: convert access to access[]
struct kdbus_policy {
struct kdbus_policy {
- __u64 size;
- __u64 type; /* NAME or ACCESS */
+ KDBUS_PART_HEADER;
union {
char name[0];
union {
char name[0];
- struct {
- __u32 type; /* USER, GROUP, WORLD */
- __u32 bits; /* RECV, SEND, OWN */
- __u64 id; /* uid, gid, 0 */
- } access;
+ struct kdbus_policy_access access;
};
};
};
};
+/* A series of KDBUS_POLICY_NAME, plus one or more KDBUS_POLICY_ACCESS */
struct kdbus_cmd_policy {
__u64 size;
struct kdbus_cmd_policy {
__u64 size;
- __u8 buffer[0]; /* a series of KDBUS_POLICY_NAME plus one or
- * more KDBUS_POLICY_ACCESS each. */
+ struct kdbus_policy policies[0];
};
/* Flags for struct kdbus_cmd_hello */
};
/* Flags for struct kdbus_cmd_hello */
@@
-235,13
+247,6
@@
enum {
KDBUS_HELLO_ATTACH_AUDIT = 1 << 16,
};
KDBUS_HELLO_ATTACH_AUDIT = 1 << 16,
};
-/* Items to append to struct kdbus_cmd_hello */
-enum {
- KDBUS_HELLO_NULL,
- KDBUS_HELLO_BUFFER, /* kdbus_vec, userspace supplied buffer to
- * place received messages */
-};
-
struct kdbus_cmd_hello {
__u64 size;
struct kdbus_cmd_hello {
__u64 size;
@@
-262,6
+267,7
@@
struct kdbus_cmd_hello {
__u64 id; /* id assigned to this connection */
__u64 bloom_size; /* The bloom filter size chosen by the
* bus owner */
__u64 id; /* id assigned to this connection */
__u64 bloom_size; /* The bloom filter size chosen by the
* bus owner */
+ __u64 pool_size; /* maximum size of pool buffer */
struct kdbus_item items[0];
};
struct kdbus_item items[0];
};
@@
-274,10
+280,11
@@
enum {
/* Items to append to kdbus_cmd_{bus,ep,ns}_make */
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
KDBUS_MAKE_NAME,
KDBUS_MAKE_CGROUP, /* the cgroup hierarchy ID for which to attach
- * cgroup membership paths * to messages. */
+ * cgroup membership paths to messages.
+ * FIXME: remove, use *the* hierarchy */
KDBUS_MAKE_CRED, /* allow translator services which connect
* to the bus on behalf of somebody else,
* allow specifiying the credentials of the
KDBUS_MAKE_CRED, /* allow translator services which connect
* to the bus on behalf of somebody else,
* allow specifiying the credentials of the
@@
-297,7
+304,6
@@
struct kdbus_cmd_bus_make {
* KDBUS_CMD_HELLO, later */
__u64 bloom_size; /* size of the bloom filter for this bus */
struct kdbus_item items[0];
* KDBUS_CMD_HELLO, later */
__u64 bloom_size; /* size of the bloom filter for this bus */
struct kdbus_item items[0];
-
};
struct kdbus_cmd_ep_make {
};
struct kdbus_cmd_ep_make {
@@
-332,10
+338,11
@@
enum {
KDBUS_NAME_IN_QUEUE = 1 << 16,
};
KDBUS_NAME_IN_QUEUE = 1 << 16,
};
+/* We allow (de)regestration of names of other peers */
struct kdbus_cmd_name {
__u64 size;
struct kdbus_cmd_name {
__u64 size;
- __u64
name_
flags;
- __u64 id;
/* We allow registration/deregestration of names of other peers */
+ __u64 flags;
+ __u64 id;
__u64 conn_flags;
char name[0];
};
__u64 conn_flags;
char name[0];
};
@@
-346,7
+353,7
@@
struct kdbus_cmd_names {
};
enum {
};
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 */
KDBUS_NAME_INFO_ITEM_NAME, /* userspace → kernel */
KDBUS_NAME_INFO_ITEM_SECLABEL, /* kernel → userspace */
KDBUS_NAME_INFO_ITEM_AUDIT, /* kernel → userspace */
@@
-361,7
+368,7
@@
struct kdbus_cmd_name_info {
};
enum {
};
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 */
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 */
@@
-381,7
+388,7
@@
struct kdbus_cmd_match {
struct kdbus_cmd_monitor {
__u64 id; /* We allow setting the monitor flag of other peers */
struct kdbus_cmd_monitor {
__u64 id; /* We allow setting the monitor flag of other peers */
- unsigned int enable
d;
/* A boolean to enable/disable monitoring */
+ unsigned int enable
;
/* A boolean to enable/disable monitoring */
};
/* FD states:
};
/* FD states:
@@
-394,7
+401,7
@@
struct kdbus_cmd_monitor {
* starter (via KDBUS_CMD_HELLO with KDBUS_CMD_HELLO_STARTER)
* ep owner (via KDBUS_CMD_EP_MAKE)
*/
* starter (via KDBUS_CMD_HELLO with KDBUS_CMD_HELLO_STARTER)
* ep owner (via KDBUS_CMD_EP_MAKE)
*/
-enum
kdbus_cmd
{
+enum {
/* kdbus control node commands: require unset state */
KDBUS_CMD_BUS_MAKE = _IOWR(KDBUS_IOC_MAGIC, 0x00, struct kdbus_cmd_bus_make),
KDBUS_CMD_NS_MAKE = _IOWR(KDBUS_IOC_MAGIC, 0x10, struct kdbus_cmd_ns_make),
/* kdbus control node commands: require unset state */
KDBUS_CMD_BUS_MAKE = _IOWR(KDBUS_IOC_MAGIC, 0x00, struct kdbus_cmd_bus_make),
KDBUS_CMD_NS_MAKE = _IOWR(KDBUS_IOC_MAGIC, 0x10, struct kdbus_cmd_ns_make),
@@
-405,8
+412,8
@@
enum kdbus_cmd {
/* kdbus ep node commands: require connected state */
KDBUS_CMD_MSG_SEND = _IOWR(KDBUS_IOC_MAGIC, 0x40, struct kdbus_msg),
/* 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_RELEASE = _IOWR(KDBUS_IOC_MAGIC, 0x42,
struct kdbus_msg
),
+ KDBUS_CMD_MSG_RECV = _IOWR(KDBUS_IOC_MAGIC, 0x41,
__u64
*),
+ KDBUS_CMD_MSG_RELEASE = _IOWR(KDBUS_IOC_MAGIC, 0x42,
__u64 *
),
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),
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),
@@
-420,12
+427,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: 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 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_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
};
#endif