libudev: add udev_monitor_send_device()

diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c
index 62f35188396e218da9c95d4a24c14d8d15bf653c..c27290835af255a5ccec73f2ee4ca2cf5ab6059e 100644 (file)
--- a/udev/lib/libudev-device.c
+++ b/udev/lib/libudev-device.c
@@ -913,6 +913,7 @@ int udev_device_add_property_from_string(struct udev_device *udev_device, const
 
 int udev_device_set_action(struct udev_device *udev_device, const char *action)
 {
+       udev_device_add_property(udev_device, "ACTION", action);
        udev_device->action = strdup(action);
        if (udev_device->action == NULL)
                return -ENOMEM;

diff --git a/udev/lib/libudev-monitor.c b/udev/lib/libudev-monitor.c
index fc87cba4ab6cfc7f29dfb9343437db581559512b..bca7ab32b5e520f98bffbeed37d1af888ae7efd1 100644 (file)
--- a/udev/lib/libudev-monitor.c
+++ b/udev/lib/libudev-monitor.c
@@ -61,6 +61,7 @@ struct udev_monitor {
 struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char *socket_path)
 {
        struct udev_monitor *udev_monitor;
+       struct stat statbuf;
 
        if (udev == NULL)
                return NULL;
@@ -74,13 +75,20 @@ struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char
        udev_monitor->udev = udev;
 
        udev_monitor->sun.sun_family = AF_LOCAL;
-       strcpy(udev_monitor->sun.sun_path, socket_path);
-       udev_monitor->addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(udev_monitor->sun.sun_path);
-
-       /* translate leading '@' to abstract namespace */
-       if (udev_monitor->sun.sun_path[0] == '@')
+       if (udev_monitor->sun.sun_path[0] == '@') {
+               /* translate leading '@' to abstract namespace */
+               util_strlcpy(udev_monitor->sun.sun_path, socket_path, sizeof(udev_monitor->sun.sun_path));
                udev_monitor->sun.sun_path[0] = '\0';
-
+               udev_monitor->addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(socket_path);
+       } else if (stat(udev_monitor->sun.sun_path, &statbuf) == 0 && S_ISSOCK(statbuf.st_mode)) {
+               /* existing socket file */
+               util_strlcpy(udev_monitor->sun.sun_path, socket_path, sizeof(udev_monitor->sun.sun_path));
+               udev_monitor->addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(socket_path);
+       } else {
+               /* no socket file, assume abstract namespace socket */
+               util_strlcpy(&udev_monitor->sun.sun_path[1], socket_path, sizeof(udev_monitor->sun.sun_path)-1);
+               udev_monitor->addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(socket_path)+1;
+       }
        udev_monitor->sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
        if (udev_monitor->sock == -1) {
                err(udev, "error getting socket: %m\n");
@@ -347,3 +355,29 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
        udev_device_set_info_loaded(udev_device);
        return udev_device;
 }
+
+int udev_monitor_send_device(struct udev_monitor *udev_monitor, struct udev_device *udev_device)
+{
+       const char *action;
+       struct udev_list_entry *list_entry;
+       char buf[4096];
+       size_t bufpos;
+       ssize_t count;
+
+       action = udev_device_get_action(udev_device);
+       if (action == NULL)
+               return -EINVAL;
+       bufpos = snprintf(buf, sizeof(buf), "%s@%s", action, udev_device_get_devpath(udev_device));
+       bufpos++;
+       udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
+               bufpos += util_strlcpy(&buf[bufpos],
+                                      udev_list_entry_get_name(list_entry),
+                                      sizeof(buf) - bufpos);
+               bufpos++;
+       }
+       count = sendto(udev_monitor->sock,
+                      &buf, bufpos, 0,
+                      (struct sockaddr *)&udev_monitor->sun, udev_monitor->addrlen);
+       info(udev_monitor->udev, "passed %zi bytes to monitor %p, \n", count, udev_monitor);
+       return count;
+}

diff --git a/udev/lib/libudev-private.h b/udev/lib/libudev-private.h
index 1ba022031035d6545b50584e193cccd4cf75dcc8..9969b3721492a4d6510feee2d9043a4df36f71aa 100644 (file)
--- a/udev/lib/libudev-private.h
+++ b/udev/lib/libudev-private.h
@@ -76,6 +76,9 @@ extern int udev_device_get_ignore_remove(struct udev_device *udev_device);
 extern int udev_device_set_ignore_remove(struct udev_device *udev_device, int ignore);
 extern void udev_device_set_info_loaded(struct udev_device *device);
 
+/* libudev-monitor - netlink/unix socket communication  */
+extern int udev_monitor_send_device(struct udev_monitor *udev_monitor, struct udev_device *udev_device);
+
 /* libudev-ctrl - daemon runtime setup */
 struct udev_ctrl;
 extern struct udev_ctrl *udev_ctrl_new_from_socket(struct udev *udev, const char *socket_path);