X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fkdbus.h;h=972a02df8d9246ad10f2e663ed69c180120e0666;hb=613ec4b836c6f322762b4a3e358d22a81b8d6f2c;hp=ccc65cb15a70140891674439345feb8eeb71167a;hpb=e599ba01f564161966b3b8c93cc229daf847e807;p=elogind.git diff --git a/src/libsystemd-bus/kdbus.h b/src/libsystemd-bus/kdbus.h index ccc65cb15..972a02df8 100644 --- a/src/libsystemd-bus/kdbus.h +++ b/src/libsystemd-bus/kdbus.h @@ -30,10 +30,11 @@ * struct kdbus_notify_name_change - name registry change message * @old_id: Former owner of a name * @new_id: New owner of a name - * @flags: flags from KDBUS_NAME_* + * @old_flags: flags from KDBUS_NAME_* the name entry used to have + * @new_flags: flags from KDBUS_NAME_* the name entry has now * @name: Well-known name * - * Sent from kernel to userspace when the owner or starter of + * Sent from kernel to userspace when the owner or activator of * a well-known name changes. * * Attached to: @@ -44,7 +45,8 @@ struct kdbus_notify_name_change { __u64 old_id; __u64 new_id; - __u64 flags; + __u64 old_flags; + __u64 new_flags; char name[0]; }; @@ -53,7 +55,7 @@ struct kdbus_notify_name_change { * @id: New or former owner of the name * @flags: flags field from KDBUS_HELLO_* * - * Sent from kernel to userspace when the owner or starter of + * Sent from kernel to userspace when the owner or activator of * a well-known name changes. * * Attached to: @@ -205,7 +207,6 @@ struct kdbus_policy { * @KDBUS_ITEM_POLICY_NAME: Policy in struct kdbus_policy * @KDBUS_ITEM_POLICY_ACCESS: Policy in struct kdbus_policy * @KDBUS_ITEM_NAME: Well-know name with flags - * @KDBUS_ITEM_STARTER_NAME: Well-known name for the starter * @KDBUS_ITEM_TIMESTAMP: Timestamp * @KDBUS_ITEM_CREDS: Process credential * @KDBUS_ITEM_PID_COMM: Process ID "comm" identifier @@ -242,7 +243,6 @@ enum kdbus_item_type { _KDBUS_ITEM_ATTACH_BASE = 0x600, KDBUS_ITEM_NAME = _KDBUS_ITEM_ATTACH_BASE, - KDBUS_ITEM_STARTER_NAME, KDBUS_ITEM_TIMESTAMP, KDBUS_ITEM_CREDS, KDBUS_ITEM_PID_COMM, @@ -344,7 +344,17 @@ enum kdbus_payload_type { * @cookie_reply: For kernel-generated messages, this is the cookie * the message is a reply to * @timeout_ns: For non-kernel-generated messages, this denotes the - * message timeout in nanoseconds + * message timeout in nanoseconds. A message has to be + * received with KDBUS_CMD_MSG_RECV by the destination + * connection within this time frame. For messages that + * have KDBUS_MSG_FLAGS_EXPECT_REPLY set in @flags, + * this value also denotes the timeout for the reply to + * this message. If there is no reply, or the message is + * not received in time by the other side, a + * kernel-generated message with an attached + * KDBUS_ITEM_REPLY_TIMEOUT item is sent to @src_id. + * A 0-value is only valid if KDBUS_MSG_FLAGS_EXPECT_REPLY + * is unset in @flags. * @items: A list of kdbus_items containing the message payload */ struct kdbus_msg { @@ -359,7 +369,7 @@ struct kdbus_msg { __u64 timeout_ns; }; struct kdbus_item items[0]; -}; +} __attribute__((aligned(8))); /** * enum kdbus_policy_access_type - permissions of a policy record @@ -398,18 +408,22 @@ enum kdbus_policy_type { struct kdbus_cmd_policy { __u64 size; struct kdbus_item policies[0]; -}; +} __attribute__((aligned(8))); /** * enum kdbus_hello_flags - flags for struct kdbus_cmd_hello - * @KDBUS_HELLO_STARTER: The connection registers a name for activation - * by well-know name * @KDBUS_HELLO_ACCEPT_FD: The connection allows the receiving of * any passed file descriptors + * @KDBUS_HELLO_ACTIVATOR: Special-purpose connection which registers + * a well-know name for a process to be started + * when traffic arrives + * @KDBUS_HELLO_MONITOR: Special-purpose connection to monitor + * bus traffic */ enum kdbus_hello_flags { - KDBUS_HELLO_STARTER = 1 << 0, - KDBUS_HELLO_ACCEPT_FD = 1 << 1, + KDBUS_HELLO_ACCEPT_FD = 1 << 0, + KDBUS_HELLO_ACTIVATOR = 1 << 1, + KDBUS_HELLO_MONITOR = 1 << 2, }; /** @@ -469,7 +483,7 @@ struct kdbus_cmd_hello { __u64 pool_size; __u8 id128[16]; struct kdbus_item items[0]; -}; +} __attribute__((aligned(8))); /* Flags for KDBUS_CMD_{BUS,EP,NS}_MAKE */ enum kdbus_make_flags { @@ -492,7 +506,7 @@ struct kdbus_cmd_bus_make { __u64 flags; __u64 bloom_size; struct kdbus_item items[0]; -}; +} __attribute__((aligned(8))); /** * struct kdbus_cmd_ep_make - struct to make an endpoint @@ -507,7 +521,7 @@ struct kdbus_cmd_ep_make { __u64 size; __u64 flags; struct kdbus_item items[0]; -}; +} __attribute__((aligned(8))); /** * struct kdbus_cmd_ns_make - struct to make a namespace @@ -522,7 +536,7 @@ struct kdbus_cmd_ns_make { __u64 size; __u64 flags; struct kdbus_item items[0]; -}; +} __attribute__((aligned(8))); /** * enum kdbus_name_flags - properties of a well-known name @@ -530,14 +544,14 @@ struct kdbus_cmd_ns_make { * @KDBUS_NAME_ALLOW_REPLACEMENT: Allow the replacement of the name * @KDBUS_NAME_QUEUE: Name should be queued if busy * @KDBUS_NAME_IN_QUEUE: Name is queued - * @KDBUS_NAME_STARTER: Name is owned by a starter connection + * @KDBUS_NAME_ACTIVATOR: Name is owned by a activator connection */ enum kdbus_name_flags { KDBUS_NAME_REPLACE_EXISTING = 1 << 0, KDBUS_NAME_ALLOW_REPLACEMENT = 1 << 1, KDBUS_NAME_QUEUE = 1 << 2, KDBUS_NAME_IN_QUEUE = 1 << 3, - KDBUS_NAME_STARTER = 1 << 4, + KDBUS_NAME_ACTIVATOR = 1 << 4, }; /** @@ -557,19 +571,19 @@ struct kdbus_cmd_name { __u64 id; __u64 conn_flags; char name[0]; -}; +} __attribute__((aligned(8))); /** * enum kdbus_name_list_flags - what to include into the returned list * @KDBUS_NAME_LIST_UNIQUE: All active connections * @KDBUS_NAME_LIST_NAMES: All known well-known names - * @KDBUS_NAME_LIST_STARTERS: All connections which are starter connections + * @KDBUS_NAME_LIST_ACTIVATORS: All activator connections * @KDBUS_NAME_LIST_QUEUED: All queued-up names */ enum kdbus_name_list_flags { KDBUS_NAME_LIST_UNIQUE = 1 << 0, KDBUS_NAME_LIST_NAMES = 1 << 1, - KDBUS_NAME_LIST_STARTERS = 1 << 2, + KDBUS_NAME_LIST_ACTIVATORS = 1 << 2, KDBUS_NAME_LIST_QUEUED = 1 << 3, }; @@ -585,7 +599,7 @@ enum kdbus_name_list_flags { struct kdbus_cmd_name_list { __u64 flags; __u64 offset; -}; +} __attribute__((aligned(8))); /** * struct kdbus_name_list - information returned by KDBUS_CMD_NAME_LIST @@ -623,7 +637,7 @@ struct kdbus_cmd_conn_info { __u64 id; __u64 offset; char name[0]; -}; +} __attribute__((aligned(8))); /** * struct kdbus_conn_info - information returned by KDBUS_CMD_CONN_INFO @@ -684,28 +698,7 @@ struct kdbus_cmd_match { __u64 cookie; __u64 src_id; struct kdbus_item items[0]; -}; - -/** - * enum kdbus_monitor_flags - flags for monitoring - * @KDBUS_MONITOR_ENABLE: Enable monitoring - */ -enum kdbus_monitor_flags { - KDBUS_MONITOR_ENABLE = 1 << 0, -}; - -/** - * struct kdbus_cmd_monitor - struct to enable or disable eavesdropping - * @id: Privileged users may enable or disable the monitor feature - * on behalf of other peers - * @flags: Use KDBUS_MONITOR_ENABLE to enable eavesdropping - * - * This structure is used with the KDBUS_CMD_MONITOR ioctl. - */ -struct kdbus_cmd_monitor { - __u64 id; - __u64 flags; -}; +} __attribute__((aligned(8))); /** * enum kdbus_ioctl_type - Ioctl API @@ -729,6 +722,10 @@ struct kdbus_cmd_monitor { * placed in the receiver's pool. * @KDBUS_CMD_FREE: Release the allocated memory in the receiver's * pool. + * @KDBUS_CMD_DROP: Drop and free the next queued message and all + * its ressources without actually receiveing it. + * @KDBUS_CMD_SRC: Return the sender's connection ID of the next + * queued message. * @KDBUS_CMD_NAME_ACQUIRE: Request a well-known bus name to associate with * the connection. Well-known names are used to * address a peer on the bus. @@ -744,9 +741,6 @@ struct kdbus_cmd_monitor { * @KDBUS_CMD_MATCH_ADD: Install a match which broadcast messages should * be delivered to the connection. * @KDBUS_CMD_MATCH_REMOVE: Remove a current match for broadcast messages. - * @KDBUS_CMD_MONITOR: Monitor the bus and receive all transmitted - * messages. Privileges are required for this - * operation. * @KDBUS_CMD_EP_POLICY_SET: Set the policy of an endpoint. It is used to * restrict the access for endpoints created with * KDBUS_CMD_EP_MAKE. @@ -780,13 +774,15 @@ struct kdbus_cmd_monitor { enum kdbus_ioctl_type { KDBUS_CMD_BUS_MAKE = _IOW (KDBUS_IOC_MAGIC, 0x00, struct kdbus_cmd_bus_make), KDBUS_CMD_NS_MAKE = _IOR (KDBUS_IOC_MAGIC, 0x10, struct kdbus_cmd_ns_make), - KDBUS_CMD_EP_MAKE = _IOW (KDBUS_IOC_MAGIC, 0x20, struct kdbus_cmd_ep_make), + KDBUS_CMD_HELLO = _IOWR(KDBUS_IOC_MAGIC, 0x30, struct kdbus_cmd_hello), KDBUS_CMD_MSG_SEND = _IOW (KDBUS_IOC_MAGIC, 0x40, struct kdbus_msg), KDBUS_CMD_MSG_RECV = _IOR (KDBUS_IOC_MAGIC, 0x41, __u64 *), KDBUS_CMD_FREE = _IOW (KDBUS_IOC_MAGIC, 0x42, __u64 *), + KDBUS_CMD_MSG_DROP = _IO (KDBUS_IOC_MAGIC, 0x43), + KDBUS_CMD_MSG_SRC = _IOR (KDBUS_IOC_MAGIC, 0x44, __u64 *), KDBUS_CMD_NAME_ACQUIRE = _IOWR(KDBUS_IOC_MAGIC, 0x50, struct kdbus_cmd_name), KDBUS_CMD_NAME_RELEASE = _IOW (KDBUS_IOC_MAGIC, 0x51, struct kdbus_cmd_name), @@ -796,7 +792,6 @@ enum kdbus_ioctl_type { KDBUS_CMD_MATCH_ADD = _IOW (KDBUS_IOC_MAGIC, 0x70, struct kdbus_cmd_match), KDBUS_CMD_MATCH_REMOVE = _IOW (KDBUS_IOC_MAGIC, 0x71, struct kdbus_cmd_match), - KDBUS_CMD_MONITOR = _IOW (KDBUS_IOC_MAGIC, 0x72, struct kdbus_cmd_monitor), KDBUS_CMD_EP_POLICY_SET = _IOW (KDBUS_IOC_MAGIC, 0x80, struct kdbus_cmd_policy), @@ -819,6 +814,8 @@ enum kdbus_ioctl_type { * @EBADFD: A bus connection is in a corrupted state. * @EBADMSG: Passed data contains a combination of conflicting or * inconsistent types. + * @ECONNRESET: A connection is shut down, no further operations are + * possible. * @ECOMM: A peer does not accept the file descriptors addressed * to it. * @EDESTADDRREQ: The well-known bus name is required but missing. @@ -852,11 +849,12 @@ enum kdbus_ioctl_type { * @ENOTUNIQ: A specific data type was addressed to a broadcast * address, but only direct addresses support this kind of * data. - * @ENXIO: A unique address does not exist. + * @ENXIO: A unique address does not exist, or an offset in the + * receiver's pool does not represent a queued message. * @EPERM: The policy prevented an operation. The requested * resource is owned by another entity. - * @ESHUTDOWN: The connection is currently shutting down, no further - * operations are possible. + * @ESHUTDOWN: A namespace or endpoint is currently shutting down; + * no further operations will be possible. * @ESRCH: A requested well-known bus name is not found. * @ETXTBSY: A kdbus memfd file cannot be sealed or the seal removed, * because it is shared with other processes or still