libudev: device - export properties when values are set

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

diff --git a/udev/lib/libudev-monitor.c b/udev/lib/libudev-monitor.c
index fc87cba4ab6cfc7f29dfb9343437db581559512b..382fbfac5ffbca49e1f704278672a7d81b21701c 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 (socket_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(socket_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");
@@ -236,6 +244,9 @@ 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 devpath_set = 0;
+       int subsystem_set = 0;
+       int action_set = 0;
        int maj = 0;
        int min = 0;
 
@@ -305,14 +316,20 @@ 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));
                        udev_device_set_syspath(udev_device, path);
+                       devpath_set = 1;
                } else if (strncmp(key, "SUBSYSTEM=", 10) == 0) {
                        udev_device_set_subsystem(udev_device, &key[10]);
+                       subsystem_set = 1;
                } else if (strncmp(key, "DEVNAME=", 8) == 0) {
                        udev_device_set_devnode(udev_device, &key[8]);
                } else if (strncmp(key, "DEVLINKS=", 9) == 0) {
-                       char *slink = &key[9];
-                       char *next = strchr(slink, ' ');
+                       char devlinks[UTIL_PATH_SIZE];
+                       char *slink;
+                       char *next;
 
+                       util_strlcpy(devlinks, &key[9], sizeof(devlinks));
+                       slink = devlinks;
+                       next = strchr(slink, ' ');
                        while (next != NULL) {
                                next[0] = '\0';
                                udev_device_add_devlink(udev_device, slink);
@@ -325,6 +342,7 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
                        udev_device_set_driver(udev_device, &key[7]);
                } else if (strncmp(key, "ACTION=", 7) == 0) {
                        udev_device_set_action(udev_device, &key[7]);
+                       action_set = 1;
                } else if (strncmp(key, "MAJOR=", 6) == 0) {
                        maj = strtoull(&key[6], NULL, 10);
                } else if (strncmp(key, "MINOR=", 6) == 0) {
@@ -337,13 +355,45 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
                        udev_device_set_seqnum(udev_device, strtoull(&key[7], NULL, 10));
                } else if (strncmp(key, "TIMEOUT=", 8) == 0) {
                        udev_device_set_timeout(udev_device, strtoull(&key[8], NULL, 10));
-               }
-               if (strncmp(key, "PHYSDEV", 7) == 0)
+               } else if (strncmp(key, "PHYSDEV", 7) == 0) {
+                       /* skip deprecated values */
                        continue;
-               udev_device_add_property_from_string(udev_device, key);
+               } else {
+                       udev_device_add_property_from_string(udev_device, key);
+               }
+       }
+       if (!devpath_set || !subsystem_set || !action_set) {
+               info(udev_monitor->udev, "missing values, skip\n");
+               udev_device_unref(udev_device);
+               return NULL;
        }
        udev_device_set_devnum(udev_device, makedev(maj, min));
-
        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 += snprintf(&buf[bufpos], sizeof(buf) - bufpos, "%s=%s",
+                                  udev_list_entry_get_name(list_entry),
+                                  udev_list_entry_get_value(list_entry));
+               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;
+}