libudev: test - add udev_device_get_property_value()

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

diff --git a/udev/lib/libudev-monitor.c b/udev/lib/libudev-monitor.c
index 9f139170421bc21f75956a40e62bd92cd32f3c16..e4cb80769cff4e86a792efe2a2c84d84169ccd1a 100644 (file)
--- a/udev/lib/libudev-monitor.c
+++ b/udev/lib/libudev-monitor.c
@@ -54,7 +54,7 @@ struct udev_monitor {
  * socket will be used.
  *
  * The initial refcount is 1, and needs to be decremented to
- * release the ressources of the udev monitor.
+ * release the resources of the udev monitor.
  *
  * Returns: a new udev monitor, or #NULL, in case of an error
  **/
@@ -94,7 +94,7 @@ struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char
                free(udev_monitor);
                return NULL;
        }
-       info(udev, "monitor %p created with '%s'\n", udev_monitor, socket_path);
+       dbg(udev, "monitor %p created with '%s'\n", udev_monitor, socket_path);
        return udev_monitor;
 }
 
@@ -121,7 +121,7 @@ struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev)
        udev_monitor->snl.nl_pid = getpid();
        udev_monitor->snl.nl_groups = 1;
 
-       info(udev, "monitor %p created with NETLINK_KOBJECT_UEVENT\n", udev_monitor);
+       dbg(udev, "monitor %p created with NETLINK_KOBJECT_UEVENT\n", udev_monitor);
        return udev_monitor;
 }
 
@@ -136,7 +136,7 @@ int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor)
                        err(udev_monitor->udev, "bind failed: %m\n");
                        return err;
                }
-               info(udev_monitor->udev, "monitor %p listening on netlink\n", udev_monitor);
+               dbg(udev_monitor->udev, "monitor %p listening on netlink\n", udev_monitor);
        } else if (udev_monitor->sun.sun_family != 0) {
                err = bind(udev_monitor->sock, (struct sockaddr *)&udev_monitor->sun, udev_monitor->addrlen);
                if (err < 0) {
@@ -145,7 +145,7 @@ int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor)
                }
                /* enable receiving of the sender credentials */
                setsockopt(udev_monitor->sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
-               info(udev_monitor->udev, "monitor %p listening on socket\n", udev_monitor);
+               dbg(udev_monitor->udev, "monitor %p listening on socket\n", udev_monitor);
        }
        return 0;
 }
@@ -178,7 +178,7 @@ struct udev_monitor *udev_monitor_ref(struct udev_monitor *udev_monitor)
  * @udev_monitor: udev monitor
  *
  * Drop a reference ofa udev monitor. If the refcount reaches zero,
- * the bound socket will be closed, and the ressources of the monitor
+ * the bound socket will be closed, and the resources of the monitor
  * will be released.
  *
  **/
@@ -191,7 +191,7 @@ void udev_monitor_unref(struct udev_monitor *udev_monitor)
                return;
        if (udev_monitor->sock >= 0)
                close(udev_monitor->sock);
-       info(udev_monitor->udev, "monitor %p released\n", udev_monitor);
+       dbg(udev_monitor->udev, "monitor %p released\n", udev_monitor);
        free(udev_monitor);
 }
 
@@ -233,11 +233,11 @@ int udev_monitor_get_fd(struct udev_monitor *udev_monitor)
  * device, fill in the received data, and return the device.
  *
  * Only socket connections with uid=0 are accepted. The caller
- * needs to make sure, that there is data to read from the socket,
- * the call will block until the socket becomes readable.
+ * needs to make sure that there is data to read from the socket.
+ * The call will block until the socket becomes readable.
  *
  * The initial refcount is 1, and needs to be decremented to
- * release the ressources of the udev device.
+ * release the resources of the udev device.
  *
  * Returns: a new udev device, or #NULL, in case of an error
  **/
@@ -325,6 +325,8 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
                } else if (strncmp(key, "SUBSYSTEM=", 10) == 0) {
                        udev_device_set_subsystem(udev_device, &key[10]);
                        subsystem_set = 1;
+               } else if (strncmp(key, "DEVTYPE=", 8) == 0) {
+                       udev_device_set_devtype(udev_device, &key[8]);
                } else if (strncmp(key, "DEVNAME=", 8) == 0) {
                        udev_device_set_devnode(udev_device, &key[8]);
                } else if (strncmp(key, "DEVLINKS=", 9) == 0) {
@@ -380,43 +382,15 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
 
 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;
-       size_t len;
+       const char *buf;
+       ssize_t len;
        ssize_t count;
 
-       action = udev_device_get_action(udev_device);
-       if (action == NULL)
-               return -EINVAL;
-
-       bufpos = util_strlcpy(buf, action, sizeof(buf));
-       len = util_strlcpy(&buf[bufpos], "@", sizeof(buf)-bufpos);
-       if (len >= sizeof(buf)-bufpos)
+       len = udev_device_get_properties_monitor_buf(udev_device, &buf);
+       if (len < 32)
                return -1;
-       bufpos += len;
-       len = util_strlcpy(&buf[bufpos], udev_device_get_devpath(udev_device), sizeof(buf)-bufpos);
-       if (len+1 >= sizeof(buf)-bufpos)
-               return -1;
-       bufpos += len+1;
-       udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
-               len = util_strlcpy(&buf[bufpos], udev_list_entry_get_name(list_entry), sizeof(buf)-bufpos);
-               if (len >= sizeof(buf)-bufpos)
-                       return -1;
-               bufpos += len;
-               len = util_strlcpy(&buf[bufpos], "=", sizeof(buf)-bufpos);
-               if (len >= sizeof(buf)-bufpos)
-                       return -1;
-               bufpos += len;
-               len = util_strlcpy(&buf[bufpos], udev_list_entry_get_value(list_entry), sizeof(buf)-bufpos);
-               if (len+1 >= sizeof(buf)-bufpos)
-                       return -1;
-               bufpos += len+1;
-       }
-
        count = sendto(udev_monitor->sock,
-                      &buf, bufpos, 0,
+                      buf, len, 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;