X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.h;h=31f07de8265a693ec3b2c8b0d5af677e67b527f6;hp=8b82ff9a7015ae19a85626cc644fc487bc153c21;hb=97adaace4f8f89ce175657d3ec71811715cc4dae;hpb=e964c2c05d3d6e2bdb21b3461ed7a4e85315cbc1

diff --git a/udevd.h b/udevd.h
index 8b82ff9a7..31f07de82 100644
--- a/udevd.h
+++ b/udevd.h
@@ -25,17 +25,28 @@
 #include "list.h"
 
 #define UDEV_MAGIC			"udevd_" UDEV_VERSION
-#define EVENT_TIMEOUT_SEC		5
-#define UDEVSEND_CONNECT_RETRY		20 /* x 100 millisec */
+#define EVENT_TIMEOUT_SEC		10
 #define UDEVD_SOCK_PATH			"udevd"
+#define SEND_WAIT_MAX_SECONDS		3
+#define SEND_WAIT_LOOP_PER_SECOND	10
 
-struct hotplug_msg {
+/* 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 {
 	struct list_head list;
 	pid_t pid;
-	int seqnum;
-	time_t queue_time;
-	char action[ACTION_SIZE];
-	char devpath[DEVPATH_SIZE];
-	char subsystem[SUBSYSTEM_SIZE];
+	long queue_time;
+	char *action;
+	char *devpath;
+	char *subsystem;
+	unsigned long long seqnum;
+	char *envp[HOTPLUG_NUM_ENVP+1];
+	char envbuf[];
 };