libudev: add udev_monitor_send_device()

[elogind.git] / udev / lib / libudev-monitor.c

diff --git a/udev/lib/libudev-monitor.c b/udev/lib/libudev-monitor.c
index e72b2066232885c6dc8addbda93b7b8b406bd7d2..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 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;
 
        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;
        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->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");
        udev_monitor->sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
        if (udev_monitor->sock == -1) {
                err(udev, "error getting socket: %m\n");


@@ -284,7 +292,7 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
                return NULL;
        }
 
                return NULL;
        }
 

-       udev_device = device_init(udev_monitor->udev);
+       udev_device = device_new(udev_monitor->udev);

        if (udev_device == NULL) {
                return NULL;
        }
        if (udev_device == NULL) {
                return NULL;
        }


@@ -304,46 +312,72 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
 
                        util_strlcpy(path, udev_get_sys_path(udev_monitor->udev), sizeof(path));
                        util_strlcat(path, &key[8], sizeof(path));
 
                        util_strlcpy(path, udev_get_sys_path(udev_monitor->udev), sizeof(path));
                        util_strlcat(path, &key[8], sizeof(path));

-                       device_set_syspath(udev_device, path);
+                       udev_device_set_syspath(udev_device, path);

                } else if (strncmp(key, "SUBSYSTEM=", 10) == 0) {
                } else if (strncmp(key, "SUBSYSTEM=", 10) == 0) {

-                       device_set_subsystem(udev_device, &key[10]);
+                       udev_device_set_subsystem(udev_device, &key[10]);

                } else if (strncmp(key, "DEVNAME=", 8) == 0) {
                } else if (strncmp(key, "DEVNAME=", 8) == 0) {

-                       device_set_devnode(udev_device, &key[8]);
+                       udev_device_set_devnode(udev_device, &key[8]);

                } else if (strncmp(key, "DEVLINKS=", 9) == 0) {
                        char *slink = &key[9];
                        char *next = strchr(slink, ' ');
 
                        while (next != NULL) {
                                next[0] = '\0';
                } else if (strncmp(key, "DEVLINKS=", 9) == 0) {
                        char *slink = &key[9];
                        char *next = strchr(slink, ' ');
 
                        while (next != NULL) {
                                next[0] = '\0';

-                               device_add_devlink(udev_device, slink);
+                               udev_device_add_devlink(udev_device, slink);

                                slink = &next[1];
                                next = strchr(slink, ' ');
                        }
                        if (slink[0] != '\0')
                                slink = &next[1];
                                next = strchr(slink, ' ');
                        }
                        if (slink[0] != '\0')

-                               device_add_devlink(udev_device, slink);
+                               udev_device_add_devlink(udev_device, slink);

                } else if (strncmp(key, "DRIVER=", 7) == 0) {
                } else if (strncmp(key, "DRIVER=", 7) == 0) {

-                       device_set_driver(udev_device, &key[7]);
+                       udev_device_set_driver(udev_device, &key[7]);

                } else if (strncmp(key, "ACTION=", 7) == 0) {
                } else if (strncmp(key, "ACTION=", 7) == 0) {

-                       device_set_action(udev_device, &key[7]);
+                       udev_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) {
                } 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]);
+                       udev_device_set_devpath_old(udev_device, &key[12]);

                } else if (strncmp(key, "PHYSDEVPATH=", 12) == 0) {
                } else if (strncmp(key, "PHYSDEVPATH=", 12) == 0) {

-                       device_set_physdevpath(udev_device, &key[12]);
+                       udev_device_set_physdevpath(udev_device, &key[12]);

                } else if (strncmp(key, "SEQNUM=", 7) == 0) {
                } else if (strncmp(key, "SEQNUM=", 7) == 0) {

-                       device_set_seqnum(udev_device, strtoull(&key[7], NULL, 10));
+                       udev_device_set_seqnum(udev_device, strtoull(&key[7], NULL, 10));

                } else if (strncmp(key, "TIMEOUT=", 8) == 0) {
                } else if (strncmp(key, "TIMEOUT=", 8) == 0) {

-                       device_set_timeout(udev_device, strtoull(&key[8], NULL, 10));
+                       udev_device_set_timeout(udev_device, strtoull(&key[8], NULL, 10));

                }
                if (strncmp(key, "PHYSDEV", 7) == 0)
                        continue;
                }
                if (strncmp(key, "PHYSDEV", 7) == 0)
                        continue;

-               device_add_property_from_string(udev_device, key);
+               udev_device_add_property_from_string(udev_device, key);

        }
        }

-       device_set_devnum(udev_device, makedev(maj, min));
+       udev_device_set_devnum(udev_device, makedev(maj, min));

 
 

-       device_set_info_loaded(udev_device);
+       udev_device_set_info_loaded(udev_device);

        return 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;
+}