use libudev code, unify logging, pass udev context around everywhere

[elogind.git] / udev / udevd.h

diff --git a/udev/udevd.h b/udev/udevd.h
index 9be34cb0cc944c376321930d7d5c7f41789de5bc..63c99516809d520c01707c05632518b2c5aba10c 100644 (file)
--- 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,40 +31,26 @@
 #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 {
-       struct list_head node;
-       pid_t pid;
-       int exitstatus;
-       time_t queue_time;
-       char *action;
-       char *devpath;
-       char *subsystem;
-       char *driver;
-       dev_t devt;
-       unsigned long long seqnum;
-       char *devpath_old;
-       char *physdevpath;
-       unsigned int timeout;
-       char *envp[UEVENT_NUM_ENVP+1];
-       char envbuf[];
-};