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=bca7ab32b5e520f98bffbeed37d1af888ae7efd1;hp=92617e8888b3a12d583c2d920bc3824689b69eaa;hb=9925ab0451b307b5766b12134bdc178e4c89f297;hpb=11d543c1ee886ef30c3ef66d7176149d0b126fa5

diff --git a/udev/lib/libudev-monitor.c b/udev/lib/libudev-monitor.c
index 92617e888..bca7ab32b 100644
--- a/udev/lib/libudev-monitor.c
+++ b/udev/lib/libudev-monitor.c
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -29,15 +27,18 @@
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <linux/netlink.h>
 
 #include "libudev.h"
 #include "libudev-private.h"
-#include "../udev.h"
 
 struct udev_monitor {
 	struct udev *udev;
 	int refcount;
-	int socket;
+	int sock;
+	struct sockaddr_nl snl;
+	struct sockaddr_un sun;
+	socklen_t addrlen;
 };
 
 /**
@@ -60,9 +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 sockaddr_un saddr;
-	socklen_t addrlen;
-	const int on = 1;
+	struct stat statbuf;
 
 	if (udev == NULL)
 		return NULL;
@@ -75,36 +74,84 @@ struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char
 	udev_monitor->refcount = 1;
 	udev_monitor->udev = udev;
 
-	memset(&saddr, 0x00, sizeof(saddr));
-	saddr.sun_family = AF_LOCAL;
-	strcpy(saddr.sun_path, socket_path);
-	addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path);
-
-	/* translate leading '@' to abstract namespace */
-	if (saddr.sun_path[0] == '@')
-		saddr.sun_path[0] = '\0';
-
-	udev_monitor->socket = socket(AF_LOCAL, SOCK_DGRAM, 0);
-	if (udev_monitor->socket == -1) {
-		log_err(udev, "error getting socket: %s\n", strerror(errno));
+	udev_monitor->sun.sun_family = AF_LOCAL;
+	if (udev_monitor->sun.sun_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(udev_monitor->sun.sun_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");
 		free(udev_monitor);
 		return NULL;
 	}
+	info(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;
 
-	if (bind(udev_monitor->socket, (struct sockaddr *) &saddr, addrlen) < 0) {
-		log_err(udev, "bind failed: %s\n", strerror(errno));
-		close(udev_monitor->socket);
+	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;
 	}
 
-	/* enable receiving of the sender credentials */
-	setsockopt(udev_monitor->socket, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
-	log_info(udev_monitor->udev, "udev_monitor: %p created\n", udev_monitor);
+	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;
+
+	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);
+	}
+	return 0;
+}
+
 /**
  * udev_monitor_ref:
  * @udev_monitor: udev monitor
@@ -125,7 +172,7 @@ struct udev_monitor *udev_monitor_ref(struct udev_monitor *udev_monitor)
  * udev_monitor_unref:
  * @udev_monitor: udev monitor
  *
- * Drop a reference of a udev monitor. If the refcount reaches zero,
+ * Drop a reference ofa udev monitor. If the refcount reaches zero,
  * the bound socket will be closed, and the ressources of the monitor
  * will be released.
  *
@@ -137,8 +184,9 @@ void udev_monitor_unref(struct udev_monitor *udev_monitor)
 	udev_monitor->refcount--;
 	if (udev_monitor->refcount > 0)
 		return;
-	close(udev_monitor->socket);
-	log_info(udev_monitor->udev, "udev_monitor: %p released\n", udev_monitor);
+	if (udev_monitor->sock >= 0)
+		close(udev_monitor->sock);
+	info(udev_monitor->udev, "monitor %p released\n", udev_monitor);
 	free(udev_monitor);
 }
 
@@ -169,14 +217,14 @@ int udev_monitor_get_fd(struct udev_monitor *udev_monitor)
 {
 	if (udev_monitor == NULL)
 		return -1;
-	return udev_monitor->socket;
+	return udev_monitor->sock;
 }
 
 /**
- * udev_monitor_get_device:
+ * udev_monitor_receive_device:
  * @udev_monitor: udev monitor
  *
- * Retrieve data from the udev monitor socket, allocate a new udev
+ * Receive data from the udev monitor socket, allocate a new udev
  * device, fill in the received data, and return the device.
  *
  * Only socket connections with uid=0 are accepted. The caller
@@ -188,16 +236,16 @@ int udev_monitor_get_fd(struct udev_monitor *udev_monitor)
  *
  * Returns: a new udev device, or #NULL, in case of an error
  **/
-struct udev_device *udev_monitor_get_device(struct udev_monitor *udev_monitor)
+struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monitor)
 {
 	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;
+	int maj = 0;
+	int min = 0;
 
 	if (udev_monitor == NULL)
 		return NULL;
@@ -210,38 +258,41 @@ struct udev_device *udev_monitor_get_device(struct udev_monitor *udev_monitor)
 	smsg.msg_control = cred_msg;
 	smsg.msg_controllen = sizeof(cred_msg);
 
-	if (recvmsg(udev_monitor->socket, &smsg, 0) < 0) {
+	if (recvmsg(udev_monitor->sock, &smsg, 0) < 0) {
 		if (errno != EINTR)
-			log_info(udev_monitor->udev, "unable to receive message");
+			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) {
-		log_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) {
-		log_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 */
 	bufpos = strlen(buf) + 1;
 	if (bufpos < sizeof("a@/d") || bufpos >= sizeof(buf)) {
-		log_info(udev_monitor->udev, "invalid message length");
+		info(udev_monitor->udev, "invalid message length");
 		return NULL;
 	}
 
 	/* check message header */
 	if (strstr(buf, "@/") == NULL) {
-		log_info(udev_monitor->udev, "unrecognized message header");
+		info(udev_monitor->udev, "unrecognized message header");
 		return NULL;
 	}
 
-	udev_device = device_init(udev_monitor->udev);
+	udev_device = device_new(udev_monitor->udev);
 	if (udev_device == NULL) {
 		return NULL;
 	}
@@ -257,26 +308,76 @@ struct udev_device *udev_monitor_get_device(struct udev_monitor *udev_monitor)
 		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));
+			udev_device_set_syspath(udev_device, path);
 		} else if (strncmp(key, "SUBSYSTEM=", 10) == 0) {
-			device_set_subsystem(udev_device, &key[10]);
+			udev_device_set_subsystem(udev_device, &key[10]);
 		} else if (strncmp(key, "DEVNAME=", 8) == 0) {
-			device_set_devname(udev_device, &key[8]);
+			udev_device_set_devnode(udev_device, &key[8]);
 		} else if (strncmp(key, "DEVLINKS=", 9) == 0) {
 			char *slink = &key[9];
 			char *next = strchr(slink, ' ');
 
 			while (next != NULL) {
 				next[0] = '\0';
-				device_add_devlink(udev_device, slink);
+				udev_device_add_devlink(udev_device, slink);
 				slink = &next[1];
 				next = strchr(slink, ' ');
 			}
 			if (slink[0] != '\0')
-				device_add_devlink(udev_device, slink);
+				udev_device_add_devlink(udev_device, slink);
+		} else if (strncmp(key, "DRIVER=", 7) == 0) {
+			udev_device_set_driver(udev_device, &key[7]);
+		} else if (strncmp(key, "ACTION=", 7) == 0) {
+			udev_device_set_action(udev_device, &key[7]);
+		} else if (strncmp(key, "MAJOR=", 6) == 0) {
+			maj = strtoull(&key[6], NULL, 10);
+		} else if (strncmp(key, "MINOR=", 6) == 0) {
+			min = strtoull(&key[6], NULL, 10);
+		} else if (strncmp(key, "DEVPATH_OLD=", 12) == 0) {
+			udev_device_set_devpath_old(udev_device, &key[12]);
+		} else if (strncmp(key, "PHYSDEVPATH=", 12) == 0) {
+			udev_device_set_physdevpath(udev_device, &key[12]);
+		} else if (strncmp(key, "SEQNUM=", 7) == 0) {
+			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));
 		}
-		device_add_property(udev_device, key);
+		if (strncmp(key, "PHYSDEV", 7) == 0)
+			continue;
+		udev_device_add_property_from_string(udev_device, key);
 	}
+	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 += util_strlcpy(&buf[bufpos],
+				       udev_list_entry_get_name(list_entry),
+				       sizeof(buf) - bufpos);
+		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;
+}