chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] fix network device naming bug
[elogind.git]
/
udevd.h
diff --git
a/udevd.h
b/udevd.h
index 6dbee3a29587c3f13ae3ad8b5c40af5190ccff63..b393a28bf94ad8a55eb646a3d7b7786167450219 100644
(file)
--- a/
udevd.h
+++ b/
udevd.h
@@
-25,16
+25,28
@@
#include "list.h"
#define UDEV_MAGIC "udevd_" UDEV_VERSION
#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 magic[20];
+ char envbuf[HOTPLUG_BUFFER_SIZE];
+};
+
+struct hotplug_msg {
struct list_head list;
pid_t pid;
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];
+ char envbuf[];
};
};