*
* Copyright (C) 2008 Kay Sievers <kay.sievers@vrfy.org>
*
- * 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 <http://www.gnu.org/licenses/>.
+ * 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 <stdio.h>
int refcount;
int sock;
struct sockaddr_nl snl;
+ struct sockaddr_nl snl_peer;
struct sockaddr_un sun;
socklen_t addrlen;
};
+enum udev_monitor_netlink_group {
+ UDEV_MONITOR_KERNEL = 1,
+ UDEV_MONITOR_UDEV = 2,
+};
+
/**
* udev_monitor_new_from_socket:
* @udev: udev library context
* 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
**/
free(udev_monitor);
return NULL;
}
- info(udev, "monitor %p created with '%s'\n", udev_monitor, socket_path);
+ util_set_fd_cloexec(udev_monitor->sock);
+
+ 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, const char *name)
{
struct udev_monitor *udev_monitor;
+ unsigned int group;
if (udev == NULL)
return NULL;
+
+ if (name == NULL)
+ return NULL;
+ if (strcmp(name, "kernel") == 0)
+ group = UDEV_MONITOR_KERNEL;
+ else if (strcmp(name, "udev") == 0)
+ group = UDEV_MONITOR_UDEV;
+ else
+ return NULL;
+
udev_monitor = calloc(1, sizeof(struct udev_monitor));
if (udev_monitor == NULL)
return NULL;
free(udev_monitor);
return NULL;
}
+ util_set_fd_cloexec(udev_monitor->sock);
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;
}
int err;
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));
- 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);
- } else if (udev_monitor->sun.sun_family != 0) {
- 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);
+ if (udev_monitor->sun.sun_family != 0)
+ err = bind(udev_monitor->sock,
+ (struct sockaddr *)&udev_monitor->sun, udev_monitor->addrlen);
+ else if (udev_monitor->snl.nl_family != 0)
+ err = bind(udev_monitor->sock,
+ (struct sockaddr *)&udev_monitor->snl, sizeof(struct sockaddr_nl));
+ else
+ return -EINVAL;
+
+ if (err < 0) {
+ err(udev_monitor->udev, "bind failed: %m\n");
+ return err;
}
+
+ /* enable receiving of sender credentials */
+ setsockopt(udev_monitor->sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
return 0;
}
* @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.
*
**/
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);
}
* 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
**/
struct msghdr smsg;
struct iovec iov;
char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
+ struct cmsghdr *cmsg;
+ struct ucred *cred;
char buf[4096];
size_t bufpos;
int devpath_set = 0;
return NULL;
}
- if (udev_monitor->sun.sun_family != 0) {
- struct cmsghdr *cmsg = CMSG_FIRSTHDR(&smsg);
- struct ucred *cred = (struct ucred *)CMSG_DATA (cmsg);
-
- if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
- info(udev_monitor->udev, "no sender credentials received, message ignored");
- return NULL;
- }
+ cmsg = CMSG_FIRSTHDR(&smsg);
+ if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
+ info(udev_monitor->udev, "no sender credentials received, message ignored");
+ return NULL;
+ }
- if (cred->uid != 0) {
- info(udev_monitor->udev, "sender uid=%d, message ignored", cred->uid);
- return NULL;
- }
+ cred = (struct ucred *)CMSG_DATA(cmsg);
+ if (cred->uid != 0) {
+ info(udev_monitor->udev, "sender uid=%d, message ignored", cred->uid);
+ return NULL;
}
/* skip header */
} 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) {
len = udev_device_get_properties_monitor_buf(udev_device, &buf);
if (len < 32)
return -1;
- count = sendto(udev_monitor->sock,
- buf, len, 0,
- (struct sockaddr *)&udev_monitor->sun, udev_monitor->addrlen);
+ if (udev_monitor->sun.sun_family != 0)
+ count = sendto(udev_monitor->sock,
+ buf, len, 0,
+ (struct sockaddr *)&udev_monitor->sun,
+ udev_monitor->addrlen);
+ else if (udev_monitor->snl.nl_family != 0)
+ /* no destination besides the muticast group, we will always get ECONNREFUSED */
+ count = sendto(udev_monitor->sock,
+ buf, len, 0,
+ (struct sockaddr *)&udev_monitor->snl_peer,
+ sizeof(struct sockaddr_nl));
+ else
+ return -1;
+
info(udev_monitor->udev, "passed %zi bytes to monitor %p, \n", count, udev_monitor);
return count;
}
~ianmdlvl / elogind.git / blobdiff