X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.h;h=1c4b1b88c22d23352f4b57098ae63c4894204890;hp=4bccd4b81a75e14cd7c46a90c0e6ce18bc303925;hb=79721e0a7770b1a5874ef96cbf93a4c6bd19e138;hpb=35b7d88c0dab4c1104c127ddd644db22307949c9

diff --git a/udevd.h b/udevd.h
index 4bccd4b81..1c4b1b88c 100644
--- a/udevd.h
+++ b/udevd.h
@@ -4,6 +4,7 @@
  * 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
@@ -23,21 +24,30 @@
 
 #include "list.h"
 
-#define FIRST_EVENT_TIMEOUT_SEC		1
-#define EVENT_TIMEOUT_SEC		5
-#define UDEVSEND_RETRY_COUNT		50 /* x 10 millisec */
+#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 IPC_KEY_ID			1
-#define HOTPLUGMSGTYPE			44
+/* environment buffer, should match the kernel's size in lib/kobject_uevent.h */
+#define HOTPLUG_BUFFER_SIZE		1024
+#define HOTPLUG_NUM_ENVP		32
 
+struct udevsend_msg {
+	char magic[20];
+	char envbuf[HOTPLUG_BUFFER_SIZE+256];
+};
 
 struct hotplug_msg {
-	long mtype;
 	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 *physdevpath;
+	char *envp[HOTPLUG_NUM_ENVP+1];
+	char envbuf[];
 };