[PATCH] udevd - cleanup and better timeout handling

[elogind.git] / udevd.h

diff --git a/udevd.h b/udevd.h
index 4bccd4b81a75e14cd7c46a90c0e6ce18bc303925..e24bc28a78ccf24b91aef8fa36e7c2b8e7c8880e 100644 (file)
--- a/udevd.h
+++ b/udevd.h
@@ -4,6 +4,7 @@
  * Userspace devfs
  *
  * Copyright (C) 2004 Ling, Xiaofeng <xiaofeng.ling@intel.com>
  * Userspace devfs
  *
  * Copyright (C) 2004 Ling, Xiaofeng <xiaofeng.ling@intel.com>

+ * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>

  *
  *
  *     This program is free software; you can redistribute it and/or modify it
  *
  *
  *     This program is free software; you can redistribute it and/or modify it


@@ -23,16 +24,21 @@
 
 #include "list.h"
 
 
 #include "list.h"
 

-#define FIRST_EVENT_TIMEOUT_SEC                1
-#define EVENT_TIMEOUT_SEC              5
-#define UDEVSEND_RETRY_COUNT           50 /* x 10 millisec */
-
-#define IPC_KEY_ID                     1
-#define HOTPLUGMSGTYPE                 44
+/*
+ * 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                     "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"

 
 struct hotplug_msg {
 
 struct hotplug_msg {

-       long mtype;
+       char magic[20];

        struct list_head list;
        pid_t pid;
        int seqnum;
        struct list_head list;
        pid_t pid;
        int seqnum;