X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fkdbus.h;h=4896c38dfe30d2e07b67c7f60709109e6fd100c3;hb=753e98788a9bcbd3bba2b3006672c003ae72eefa;hp=e9ffecd54b2db8d003c4fe5315a48e67a4d9463a;hpb=816a3f9ec58a695a859aa9718c245a9476d72654;p=elogind.git

diff --git a/src/libsystemd-bus/kdbus.h b/src/libsystemd-bus/kdbus.h
index e9ffecd54..4896c38df 100644
--- a/src/libsystemd-bus/kdbus.h
+++ b/src/libsystemd-bus/kdbus.h
@@ -27,44 +27,40 @@
 #define KDBUS_DST_ID_BROADCAST		(~0ULL)
 
 /**
- * struct kdbus_notify_name_change - name registry change message
- * @old_id:		Former owner of a name
- * @new_id:		New owner of a 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
+ * struct kdbus_notify_id_change - name registry change message
+ * @id:			New or former owner of the name
+ * @flags:		flags field from KDBUS_HELLO_*
  *
  * Sent from kernel to userspace when the owner or activator of
  * a well-known name changes.
  *
  * Attached to:
- *   KDBUS_ITEM_NAME_ADD
- *   KDBUS_ITEM_NAME_REMOVE
- *   KDBUS_ITEM_NAME_CHANGE
+ *   KDBUS_ITEM_ID_ADD
+ *   KDBUS_ITEM_ID_REMOVE
  */
-struct kdbus_notify_name_change {
-	__u64 old_id;
-	__u64 new_id;
-	__u64 old_flags;
-	__u64 new_flags;
-	char name[0];
+struct kdbus_notify_id_change {
+	__u64 id;
+	__u64 flags;
 };
 
 /**
- * struct kdbus_notify_id_change - name registry change message
- * @id:			New or former owner of the name
- * @flags:		flags field from KDBUS_HELLO_*
+ * struct kdbus_notify_name_change - name registry change message
+ * @old:		ID and flags of former owner of a name
+ * @new:		ID and flags of new owner of a name
+ * @name:		Well-known name
  *
  * Sent from kernel to userspace when the owner or activator of
  * a well-known name changes.
  *
  * Attached to:
- *   KDBUS_ITEM_ID_ADD
- *   KDBUS_ITEM_ID_REMOVE
+ *   KDBUS_ITEM_NAME_ADD
+ *   KDBUS_ITEM_NAME_REMOVE
+ *   KDBUS_ITEM_NAME_CHANGE
  */
-struct kdbus_notify_id_change {
-	__u64 id;
-	__u64 flags;
+struct kdbus_notify_name_change {
+	struct kdbus_notify_id_change old;
+	struct kdbus_notify_id_change new;
+	char name[0];
 };
 
 /**
@@ -121,7 +117,8 @@ struct kdbus_timestamp {
  * struct kdbus_vec - I/O vector for kdbus payload items
  * @size:		The size of the vector
  * @address:		Memory address for memory addresses
- * @offset:		Offset in the in-message payload memory
+ * @offset:		Offset in the in-message payload memory,
+ * 			relative to the message head
  *
  * Attached to:
  *   KDBUS_ITEM_PAYLOAD_VEC
@@ -197,7 +194,7 @@ struct kdbus_policy {
 /**
  * enum kdbus_item_type - item types to chain data in a list
  * @KDBUS_ITEM_PAYLOAD_VEC:	Vector to data
- * @KDBUS_ITEM_PAYLOAD_OFF:	Data at returned offset in the pool
+ * @KDBUS_ITEM_PAYLOAD_OFF:	Data at returned offset to message head
  * @KDBUS_ITEM_PAYLOAD_MEMFD:	Data as sealed memfd
  * @KDBUS_ITEM_FDS:		Attached file descriptors
  * @KDBUS_ITEM_BLOOM:		For broadcasts, carries bloom filter
@@ -518,11 +515,11 @@ struct kdbus_cmd_make {
  * @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_ACTIVATOR			= 1 <<  4,
+	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_ACTIVATOR		= 1 <<  4,
 };
 
 /**
@@ -564,7 +561,7 @@ enum kdbus_name_list_flags {
  * @offset:		The returned offset in the caller's pool buffer.
  *			The user must use KDBUS_CMD_FREE to free the
  *			allocated memory.
- * 
+ *
  * This structure is used with the KDBUS_CMD_NAME_LIST ioctl.
  */
 struct kdbus_cmd_name_list {
@@ -687,6 +684,11 @@ struct kdbus_cmd_match {
  * @KDBUS_CMD_HELLO:		By opening the bus device node a connection is
  * 				created. After a HELLO the opened connection
  * 				becomes an active peer on the bus.
+ * @KDBUS_CMD_BYEBYE:		Disconnect a connection. If the connection's
+ * 				message list is empty, the calls succeeds, and
+ * 				the handle is rendered unusable. Otherwise,
+ * 				-EAGAIN is returned without any further side-
+ * 				effects.
  * @KDBUS_CMD_MSG_SEND:		Send a message and pass data from userspace to
  * 				the kernel.
  * @KDBUS_CMD_MSG_RECV:		Receive a message from the kernel which is
@@ -748,6 +750,7 @@ enum kdbus_ioctl_type {
 	KDBUS_CMD_EP_MAKE =		_IOW (KDBUS_IOC_MAGIC, 0x20, struct kdbus_cmd_make),
 
 	KDBUS_CMD_HELLO =		_IOWR(KDBUS_IOC_MAGIC, 0x30, struct kdbus_cmd_hello),
+	KDBUS_CMD_BYEBYE =		_IO  (KDBUS_IOC_MAGIC, 0x31),
 
 	KDBUS_CMD_MSG_SEND =		_IOW (KDBUS_IOC_MAGIC, 0x40, struct kdbus_msg),
 	KDBUS_CMD_MSG_RECV =		_IOR (KDBUS_IOC_MAGIC, 0x41, __u64 *),