X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevd.h;h=31f07de8265a693ec3b2c8b0d5af677e67b527f6;hb=7d92b28f3971f1d80a85964c1bbde6146e411379;hp=8efe1d569c59f910e65fccf07e2bcebeff14db6e;hpb=872344c41094f636fd667b9e619f8f219d814605;p=elogind.git

diff --git a/udevd.h b/udevd.h
index 8efe1d569..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[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+1];
+	char envbuf[];
 };