X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Flib%2Flibudev-monitor.c;h=b2f76c3129bf2216b333566fb53b9f12723b184a;hp=6c6f4aa7e063447d3ae9bcc276775e204e4850eb;hb=116254097ad3c07d9f7ed06042dbec7ba4f0f4fd;hpb=cb25a9585d87d8dd13d9eae66fd232e3dfdc8fac diff --git a/udev/lib/libudev-monitor.c b/udev/lib/libudev-monitor.c index 6c6f4aa7e..b2f76c312 100644 --- a/udev/lib/libudev-monitor.c +++ b/udev/lib/libudev-monitor.c @@ -3,18 +3,10 @@ * * Copyright (C) 2008 Kay Sievers * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. */ #include @@ -37,6 +29,7 @@ struct udev_monitor { int refcount; int sock; struct sockaddr_nl snl; + struct sockaddr_nl snl_peer; struct sockaddr_un sun; socklen_t addrlen; }; @@ -54,7 +47,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 **/ @@ -67,10 +60,9 @@ struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char return NULL; if (socket_path == NULL) return NULL; - udev_monitor = malloc(sizeof(struct udev_monitor)); + udev_monitor = calloc(1, sizeof(struct udev_monitor)); if (udev_monitor == NULL) return NULL; - memset(udev_monitor, 0x00, sizeof(struct udev_monitor)); udev_monitor->refcount = 1; udev_monitor->udev = udev; @@ -95,20 +87,19 @@ 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; } -struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev) +struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev, unsigned int group) { struct udev_monitor *udev_monitor; if (udev == NULL) return NULL; - udev_monitor = malloc(sizeof(struct udev_monitor)); + udev_monitor = calloc(1, sizeof(struct udev_monitor)); if (udev_monitor == NULL) return NULL; - memset(udev_monitor, 0x00, sizeof(struct udev_monitor)); udev_monitor->refcount = 1; udev_monitor->udev = udev; @@ -120,10 +111,11 @@ struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev) } udev_monitor->snl.nl_family = AF_NETLINK; - udev_monitor->snl.nl_pid = getpid(); - udev_monitor->snl.nl_groups = 1; + udev_monitor->snl.nl_groups = group; + udev_monitor->snl_peer.nl_family = AF_NETLINK; + udev_monitor->snl_peer.nl_groups = UDEV_MONITOR_UDEV; - info(udev, "monitor %p created with NETLINK_KOBJECT_UEVENT\n", udev_monitor); + dbg(udev, "monitor %p created with NETLINK_KOBJECT_UEVENT (%u)\n", udev_monitor, group); return udev_monitor; } @@ -133,21 +125,23 @@ int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor) const int on = 1; if (udev_monitor->snl.nl_family != 0) { - err = bind(udev_monitor->sock, (struct sockaddr *)&udev_monitor->snl, sizeof(struct sockaddr_nl)); + err = bind(udev_monitor->sock, + (struct sockaddr *)&udev_monitor->snl, sizeof(struct sockaddr_nl)); if (err < 0) { 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); + err = bind(udev_monitor->sock, + (struct sockaddr *)&udev_monitor->sun, udev_monitor->addrlen); if (err < 0) { err(udev_monitor->udev, "bind failed: %m\n"); return err; } /* 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; } @@ -180,7 +174,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. * **/ @@ -193,7 +187,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); } @@ -235,11 +229,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 **/ @@ -327,6 +321,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) { @@ -382,26 +378,25 @@ 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; + const char *buf; + ssize_t len; 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++; + len = udev_device_get_properties_monitor_buf(udev_device, &buf); + if (len < 32) + return -1; + if (udev_monitor->sun.sun_family != 0) { + count = sendto(udev_monitor->sock, + buf, len, 0, + (struct sockaddr *)&udev_monitor->sun, + udev_monitor->addrlen); + } else { + /* no destination besides the muticast group, we will always get -1 ECONNREFUSED */ + count = sendto(udev_monitor->sock, + buf, len, 0, + (struct sockaddr *)&udev_monitor->snl_peer, + sizeof(struct sockaddr_nl)); } - 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; }