X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=udevd.h;h=b393a28bf94ad8a55eb646a3d7b7786167450219;hb=69d2dbd66fdd52b5ebbc6545ef693fdd3f0638ec;hp=9be581d420bda0822e19d03c86a4c9a86986d728;hpb=cdc60e8afb06a0688e4b9f166625d4d0b8805e68;p=elogind.git

diff --git a/udevd.h b/udevd.h
index 9be581d42..b393a28bf 100644
--- a/udevd.h
+++ b/udevd.h
@@ -26,16 +26,27 @@
 
 #define UDEV_MAGIC			"udevd_" UDEV_VERSION
 #define EVENT_TIMEOUT_SEC		10
-#define UDEVSEND_CONNECT_RETRY		20 /* x 100 millisec */
 #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];
+};
+
+struct hotplug_msg {
 	struct list_head list;
 	pid_t pid;
-	unsigned long long seqnum;
 	long queue_time;
-	char action[ACTION_SIZE];
-	char devpath[DEVPATH_SIZE];
-	char subsystem[SUBSYSTEM_SIZE];
+	char *action;
+	char *devpath;
+	char *subsystem;
+	unsigned long long seqnum;
+	char *envp[HOTPLUG_NUM_ENVP];
+	char envbuf[];
 };