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

diff --git a/udevd.h b/udevd.h
index 5fdd62d32..1c4b1b88c 100644
--- a/udevd.h
+++ b/udevd.h
@@ -26,16 +26,28 @@
 
 #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+256];
+};
+
+struct hotplug_msg {
 	struct list_head list;
 	pid_t pid;
-	int 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 *physdevpath;
+	char *envp[HOTPLUG_NUM_ENVP+1];
+	char envbuf[];
 };