diff options
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | udev/lib/exported_symbols | 1 | ||||
| -rw-r--r-- | udev/lib/libudev-device.c | 14 | ||||
| -rw-r--r-- | udev/lib/libudev-monitor.c | 19 | ||||
| -rw-r--r-- | udev/lib/libudev-private.h | 1 | ||||
| -rw-r--r-- | udev/lib/libudev.h | 1 |
6 files changed, 37 insertions, 1 deletions
@@ -9,7 +9,7 @@ Important Note: recommend to replace a distro's udev installation with the upstream version. Requirements: - - Version 2.6.18 of the Linux kernel for reliable operation of this release of + - Version 2.6.19 of the Linux kernel for reliable operation of this release of udev. The kernel may have a requirement on udev too, see Documentation/Changes in the kernel source tree for the actual dependency. diff --git a/udev/lib/exported_symbols b/udev/lib/exported_symbols index 7b42b28f9f..620b8964a2 100644 --- a/udev/lib/exported_symbols +++ b/udev/lib/exported_symbols @@ -20,6 +20,7 @@ udev_device_get_properties udev_device_get_action udev_device_get_driver udev_device_get_devnum +udev_device_get_seqnum udev_devices_enumerate udev_monitor_new_from_socket udev_monitor_enable_receiving diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c index bec0d69af3..fd7c962d3a 100644 --- a/udev/lib/libudev-device.c +++ b/udev/lib/libudev-device.c @@ -47,6 +47,7 @@ struct udev_device { char *physdevpath; int timeout; dev_t devnum; + long long int seqnum; }; struct udev_device *device_init(struct udev *udev) @@ -360,6 +361,13 @@ const char *udev_device_get_action(struct udev_device *udev_device) return udev_device->action; } +unsigned long long int udev_device_get_seqnum(struct udev_device *udev_device) +{ + if (udev_device == NULL) + return 0; + return udev_device->seqnum; +} + int device_set_devpath(struct udev_device *udev_device, const char *devpath) { if (asprintf(&udev_device->syspath, "%s%s", udev_get_sys_path(udev_device->udev), devpath) < 0) @@ -457,6 +465,12 @@ int device_set_timeout(struct udev_device *udev_device, int timeout) return 0; } +int device_set_seqnum(struct udev_device *udev_device, unsigned long long int seqnum) +{ + udev_device->seqnum = seqnum; + return 0; +} + int device_set_devnum(struct udev_device *udev_device, dev_t devnum) { udev_device->devnum = devnum; diff --git a/udev/lib/libudev-monitor.c b/udev/lib/libudev-monitor.c index 5f63d2d401..454a646046 100644 --- a/udev/lib/libudev-monitor.c +++ b/udev/lib/libudev-monitor.c @@ -203,6 +203,8 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito char cred_msg[CMSG_SPACE(sizeof(struct ucred))]; char buf[4096]; size_t bufpos; + int maj = 0; + int min = 0; if (udev_monitor == NULL) return NULL; @@ -279,9 +281,26 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito } if (slink[0] != '\0') device_add_devlink(udev_device, slink); + } else if (strncmp(key, "DRIVER=", 7) == 0) { + device_set_driver(udev_device, &key[7]); + } else if (strncmp(key, "ACTION=", 7) == 0) { + device_set_action(udev_device, &key[7]); + } else if (strncmp(key, "MAJOR=", 6) == 0) { + maj = strtoull(&key[6], NULL, 10); + } else if (strncmp(key, "MINOR=", 6) == 0) { + min = strtoull(&key[6], NULL, 10); + } else if (strncmp(key, "DEVPATH_OLD=", 12) == 0) { + device_set_devpath_old(udev_device, &key[12]); + } else if (strncmp(key, "PHYSDEVPATH=", 12) == 0) { + device_set_physdevpath(udev_device, &key[12]); + } else if (strncmp(key, "SEQNUM=", 7) == 0) { + device_set_seqnum(udev_device, strtoull(&key[7], NULL, 10)); + } else if (strncmp(key, "TIMEOUT=", 8) == 0) { + device_set_timeout(udev_device, strtoull(&key[8], NULL, 10)); } device_add_property(udev_device, key); } + device_set_devnum(udev_device, makedev(maj, min)); return udev_device; } diff --git a/udev/lib/libudev-private.h b/udev/lib/libudev-private.h index d8bf981bb5..d626fe65ee 100644 --- a/udev/lib/libudev-private.h +++ b/udev/lib/libudev-private.h @@ -69,6 +69,7 @@ extern int device_set_physdevpath(struct udev_device *udev_device, const char *p extern int device_get_timeout(struct udev_device *udev_device); extern int device_set_timeout(struct udev_device *udev_device, int timeout); extern int device_set_devnum(struct udev_device *udev_device, dev_t devnum); +extern int device_set_seqnum(struct udev_device *udev_device, unsigned long long int seqnum); /* udev_ctrl - daemon runtime setup */ struct udev_ctrl; diff --git a/udev/lib/libudev.h b/udev/lib/libudev.h index eafd578a55..58c4ea97bb 100644 --- a/udev/lib/libudev.h +++ b/udev/lib/libudev.h @@ -61,6 +61,7 @@ extern int udev_device_get_properties(struct udev_device *udev_device, extern const char *udev_device_get_driver(struct udev_device *udev_device); extern dev_t udev_device_get_devnum(struct udev_device *udev_device); extern const char *udev_device_get_action(struct udev_device *udev_device); +extern unsigned long long int udev_device_get_seqnum(struct udev_device *udev_device); extern int udev_devices_enumerate(struct udev *udev, const char *subsystem, int (*cb)(struct udev *udev, |