add $name substitution

[elogind.git] / udevd.h

diff --git a/udevd.h b/udevd.h
index 4040942ac9a5af59dca1da5a2a2de832a9f939b9..9be34cb0cc944c376321930d7d5c7f41789de5bc 100644 (file)
--- a/udevd.h
+++ b/udevd.h
@@ -1,8 +1,6 @@
 /*
- * udevd.h
- *
  * Copyright (C) 2004 Ling, Xiaofeng <xiaofeng.ling@intel.com>
- * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
  *
  *     This program is free software; you can redistribute it and/or modify it
  *     under the terms of the GNU General Public License as published by the
@@ -15,50 +13,49 @@
  * 
  *     You should have received a copy of the GNU General Public License along
  *     with this program; if not, write to the Free Software Foundation, Inc.,
- *     675 Mass Ave, Cambridge, MA 02139, USA.
+ *     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
 #include "list.h"
 
-#define UDEV_MAGIC                     "udevd_" UDEV_VERSION
-#define UDEVD_SOCK_PATH                        "/org/kernel/udev/udevd"
-#define UDEVSEND_WAIT_MAX_SECONDS      3
-#define UDEVSEND_WAIT_LOOP_PER_SECOND  10
-
 #define UDEVD_PRIORITY                 -4
 #define UDEV_PRIORITY                  -2
 
-/* maximum limit of runnig childs */
-#define UDEVD_MAX_CHILDS               64
+#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 */
 #define UDEVD_MAX_CHILDS_RUNNING       16
 
-/* environment buffer, should match the kernel's size in lib/kobject_uevent.h */
-#define UEVENT_BUFFER_SIZE             1024
+/* linux/include/linux/kobject.h */
+#define UEVENT_BUFFER_SIZE             2048
 #define UEVENT_NUM_ENVP                        32
 
-enum udevd_msg_type {
-       UDEVD_UNKNOWN,
-       UDEVD_UEVENT_UDEVSEND,
-       UDEVD_UEVENT_INITSEND,
-       UDEVD_UEVENT_NETLINK,
-       UDEVD_STOP_EXEC_QUEUE,
-       UDEVD_START_EXEC_QUEUE,
-       UDEVD_SET_LOG_LEVEL,
-       UDEVD_SET_MAX_CHILDS,
-       UDEVD_RELOAD_RULES,
-};
+#define UDEVD_CTRL_SOCK_PATH           "/org/kernel/udev/udevd"
+#define UDEVD_CTRL_MAGIC               "udevd_" UDEV_VERSION
 
+enum udevd_ctrl_msg_type {
+       UDEVD_CTRL_UNKNOWN,
+       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,
+};
 
-struct udevd_msg {
+struct udevd_ctrl_msg {
        char magic[32];
-       enum udevd_msg_type type;
-       char envbuf[UEVENT_BUFFER_SIZE+512];
+       enum udevd_ctrl_msg_type type;
+       char buf[256];
 };
 
-struct uevent_msg {
-       enum udevd_msg_type type;
+struct udevd_uevent_msg {
        struct list_head node;
        pid_t pid;
        int exitstatus;
@@ -66,8 +63,10 @@ struct uevent_msg {
        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];