X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevd.h;h=a22bc96e5d5564f013878ce4a667b07d18fc4455;hb=cf8ec631a23eae532541bfeeccce20f0d978404d;hp=9be34cb0cc944c376321930d7d5c7f41789de5bc;hpb=726687ad48bdececed1e7e44387c50e009e28208;p=elogind.git

diff --git a/udev/udevd.h b/udev/udevd.h
index 9be34cb0c..a22bc96e5 100644
--- a/udev/udevd.h
+++ b/udev/udevd.h
@@ -22,10 +22,6 @@
 #define UDEVD_PRIORITY			-4
 #define UDEV_PRIORITY			-2
 
-#define EVENT_QUEUE_DIR			".udev/queue"
-#define EVENT_FAILED_DIR		".udev/failed"
-#define EVENT_SEQNUM			".udev/uevent_seqnum"
-
 /* maximum limit of forked childs */
 #define UDEVD_MAX_CHILDS		256
 /* start to throttle forking if maximum number of running childs in our session is reached */
@@ -35,24 +31,27 @@
 #define UEVENT_BUFFER_SIZE		2048
 #define UEVENT_NUM_ENVP			32
 
-#define UDEVD_CTRL_SOCK_PATH		"/org/kernel/udev/udevd"
-#define UDEVD_CTRL_MAGIC		"udevd_" UDEV_VERSION
+#define UDEVD_CTRL_SOCK_PATH		"@" UDEV_PREFIX "/org/kernel/udev/udevd"
+#define UDEVD_CTRL_MAGIC		"udevd-128"
 
 enum udevd_ctrl_msg_type {
 	UDEVD_CTRL_UNKNOWN,
+	UDEVD_CTRL_SET_LOG_LEVEL,
 	UDEVD_CTRL_STOP_EXEC_QUEUE,
 	UDEVD_CTRL_START_EXEC_QUEUE,
-	UDEVD_CTRL_SET_LOG_LEVEL,
-	UDEVD_CTRL_SET_MAX_CHILDS,
-	UDEVD_CTRL_SET_MAX_CHILDS_RUNNING,
 	UDEVD_CTRL_RELOAD_RULES,
 	UDEVD_CTRL_ENV,
+	UDEVD_CTRL_SET_MAX_CHILDS,
+	UDEVD_CTRL_SET_MAX_CHILDS_RUNNING,
 };
 
 struct udevd_ctrl_msg {
 	char magic[32];
 	enum udevd_ctrl_msg_type type;
-	char buf[256];
+	union {
+		int intval;
+		char buf[256];
+	};
 };
 
 struct udevd_uevent_msg {