[PATCH] export udev_log flag to the environment

[elogind.git] / udevd.h

diff --git a/udevd.h b/udevd.h
index e24bc28a78ccf24b91aef8fa36e7c2b8e7c8880e..b393a28bf94ad8a55eb646a3d7b7786167450219 100644 (file)
--- a/udevd.h
+++ b/udevd.h
@@ -24,26 +24,29 @@
 
 #include "list.h"
 
-/*
- * FIXME: udev_root is post compile configurable and may also be
- * mounted over at any time and /var/run/ and /tmp/ is unusable,
- * cause it's cleaned at system startup, long _after_ udevd is
- * already running. Should we use udev_init_config()?
- */
+#define UDEV_MAGIC                     "udevd_" UDEV_VERSION
+#define EVENT_TIMEOUT_SEC              10
+#define UDEVD_SOCK_PATH                        "udevd"
+#define SEND_WAIT_MAX_SECONDS          3
+#define SEND_WAIT_LOOP_PER_SECOND      10
 
-#define UDEV_MAGIC                     "udev_" UDEV_VERSION
-#define EVENT_TIMEOUT_SEC              5
-#define UDEVSEND_CONNECT_RETRY         20 /* x 100 millisec */
-#define UDEVD_SOCKET                   UDEV_ROOT ".udevd.socket"
-#define UDEVD_LOCK                     UDEV_ROOT ".udevd.pid"
+/* environment buffer, should match the kernel's size in lib/kobject_uevent.h */
+#define HOTPLUG_BUFFER_SIZE            1024
+#define HOTPLUG_NUM_ENVP               32
 
-struct hotplug_msg {
+struct udevsend_msg {
        char magic[20];
+       char envbuf[HOTPLUG_BUFFER_SIZE];
+};
+
+struct hotplug_msg {
        struct list_head list;
        pid_t pid;
-       int seqnum;
-       time_t queue_time;
-       char action[8];
-       char devpath[128];
-       char subsystem[16];
+       long queue_time;
+       char *action;
+       char *devpath;
+       char *subsystem;
+       unsigned long long seqnum;
+       char *envp[HOTPLUG_NUM_ENVP];
+       char envbuf[];
 };