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=751f19ae9235c582b9032f181eed28a63a5bbd1e;hp=454a646046451d18f0c1f905abd16f7e8bf02fbd;hb=e0083e8e69856f1b4e1e643cebb08906775cca8a;hpb=37372bbc38d8542f482d90b26c90714429584421
diff --git a/udev/lib/libudev-monitor.c b/udev/lib/libudev-monitor.c
index 454a64604..751f19ae9 100644
--- a/udev/lib/libudev-monitor.c
+++ b/udev/lib/libudev-monitor.c
@@ -17,8 +17,6 @@
* along with this program. If not, see .
*/
-#include "config.h"
-
#include
#include
#include
@@ -29,16 +27,17 @@
#include
#include
#include
+#include
#include "libudev.h"
#include "libudev-private.h"
-#include "../udev.h"
struct udev_monitor {
struct udev *udev;
int refcount;
int sock;
- struct sockaddr_un saddr;
+ struct sockaddr_nl snl;
+ struct sockaddr_un sun;
socklen_t addrlen;
};
@@ -74,17 +73,17 @@ struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char
udev_monitor->refcount = 1;
udev_monitor->udev = udev;
- udev_monitor->saddr.sun_family = AF_LOCAL;
- strcpy(udev_monitor->saddr.sun_path, socket_path);
- udev_monitor->addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(udev_monitor->saddr.sun_path);
+ 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->saddr.sun_path[0] == '@')
- udev_monitor->saddr.sun_path[0] = '\0';
+ if (udev_monitor->sun.sun_path[0] == '@')
+ udev_monitor->sun.sun_path[0] = '\0';
udev_monitor->sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
if (udev_monitor->sock == -1) {
- err(udev, "error getting socket: %s\n", strerror(errno));
+ err(udev, "error getting socket: %m\n");
free(udev_monitor);
return NULL;
}
@@ -92,20 +91,56 @@ struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char
return udev_monitor;
}
+struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev)
+{
+ struct udev_monitor *udev_monitor;
+
+ if (udev == NULL)
+ return NULL;
+ udev_monitor = malloc(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;
+
+ udev_monitor->sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
+ if (udev_monitor->sock == -1) {
+ err(udev, "error getting socket: %m\n");
+ free(udev_monitor);
+ return NULL;
+ }
+
+ udev_monitor->snl.nl_family = AF_NETLINK;
+ udev_monitor->snl.nl_pid = getpid();
+ udev_monitor->snl.nl_groups = 1;
+
+ info(udev, "monitor %p created with NETLINK_KOBJECT_UEVENT\n", udev_monitor);
+ return udev_monitor;
+}
+
int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor)
{
int err;
const int on = 1;
- err = bind(udev_monitor->sock, (struct sockaddr *)&udev_monitor->saddr, udev_monitor->addrlen);
- if (err < 0) {
- err(udev_monitor->udev, "bind failed: %s\n", strerror(errno));
- return err;
+ 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);
}
-
- /* enable receiving of the sender credentials */
- setsockopt(udev_monitor->sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
- info(udev_monitor->udev, "monitor %p listening\n", udev_monitor);
return 0;
}
@@ -197,9 +232,7 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
{
struct udev_device *udev_device;
struct msghdr smsg;
- struct cmsghdr *cmsg;
struct iovec iov;
- struct ucred *cred;
char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
char buf[4096];
size_t bufpos;
@@ -222,17 +255,20 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
info(udev_monitor->udev, "unable to receive message");
return NULL;
}
- cmsg = CMSG_FIRSTHDR(&smsg);
- 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;
- }
+ if (udev_monitor->sun.sun_family != 0) {
+ struct cmsghdr *cmsg = CMSG_FIRSTHDR(&smsg);
+ struct ucred *cred = (struct ucred *)CMSG_DATA (cmsg);
- if (cred->uid != 0) {
- info(udev_monitor->udev, "sender uid=%d, message ignored", cred->uid);
- return NULL;
+ 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;
+ }
}
/* skip header */
@@ -248,7 +284,7 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
return NULL;
}
- udev_device = device_init(udev_monitor->udev);
+ udev_device = device_new(udev_monitor->udev);
if (udev_device == NULL) {
return NULL;
}
@@ -264,11 +300,15 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
bufpos += keylen + 1;
if (strncmp(key, "DEVPATH=", 8) == 0) {
- device_set_devpath(udev_device, &key[8]);
+ char path[UTIL_PATH_SIZE];
+
+ 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);
} else if (strncmp(key, "SUBSYSTEM=", 10) == 0) {
device_set_subsystem(udev_device, &key[10]);
} else if (strncmp(key, "DEVNAME=", 8) == 0) {
- device_set_devname(udev_device, &key[8]);
+ device_set_devnode(udev_device, &key[8]);
} else if (strncmp(key, "DEVLINKS=", 9) == 0) {
char *slink = &key[9];
char *next = strchr(slink, ' ');
@@ -298,9 +338,12 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
} else if (strncmp(key, "TIMEOUT=", 8) == 0) {
device_set_timeout(udev_device, strtoull(&key[8], NULL, 10));
}
- device_add_property(udev_device, key);
+ if (strncmp(key, "PHYSDEV", 7) == 0)
+ continue;
+ device_add_property_from_string(udev_device, key);
}
device_set_devnum(udev_device, makedev(maj, min));
+ device_set_info_loaded(udev_device);
return udev_device;
}