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=dd8dfac3233778743eb460183c2bc9255a138678;hp=8e9cf2d0eb5ef934272dd39e6418c95a6e939a7f;hb=1e61ff54f52c89c1ec0cffd595dc9b1980df2be4;hpb=0518da3b74a388680896747696b3644bbd3d98e5
diff --git a/udev/lib/libudev-monitor.c b/udev/lib/libudev-monitor.c
index 8e9cf2d0e..dd8dfac32 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
@@ -63,6 +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 stat statbuf;
if (udev == NULL)
return NULL;
@@ -76,16 +75,23 @@ struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char
udev_monitor->udev = udev;
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->sun.sun_path[0] == '@')
+ if (socket_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(socket_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: %s\n", strerror(errno));
+ err(udev, "error getting socket: %m\n");
free(udev_monitor);
return NULL;
}
@@ -108,7 +114,7 @@ struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev)
udev_monitor->sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
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;
}
@@ -129,14 +135,14 @@ int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor)
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: %s\n", strerror(errno));
+ 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: %s\n", strerror(errno));
+ err(udev_monitor->udev, "bind failed: %m\n");
return err;
}
/* enable receiving of the sender credentials */
@@ -238,6 +244,7 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
char buf[4096];
size_t bufpos;
+ int devpath_set = 0;
int maj = 0;
int min = 0;
@@ -286,7 +293,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;
}
@@ -302,43 +309,84 @@ 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));
+ udev_device_set_syspath(udev_device, path);
+ devpath_set = 1;
} 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, ' ');
+ char devlinks[UTIL_PATH_SIZE];
+ char *slink;
+ char *next;
+ util_strlcpy(devlinks, &key[9], sizeof(devlinks));
+ slink = devlinks;
+ 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) {
- device_set_driver(udev_device, &key[7]);
+ udev_device_set_driver(udev_device, &key[7]);
} else if (strncmp(key, "ACTION=", 7) == 0) {
- device_set_action(udev_device, &key[7]);
+ 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) {
- device_set_devpath_old(udev_device, &key[12]);
+ udev_device_set_devpath_old(udev_device, &key[12]);
} else if (strncmp(key, "PHYSDEVPATH=", 12) == 0) {
- device_set_physdevpath(udev_device, &key[12]);
+ udev_device_set_physdevpath(udev_device, &key[12]);
} else if (strncmp(key, "SEQNUM=", 7) == 0) {
- device_set_seqnum(udev_device, strtoull(&key[7], NULL, 10));
+ udev_device_set_seqnum(udev_device, strtoull(&key[7], NULL, 10));
} else if (strncmp(key, "TIMEOUT=", 8) == 0) {
- device_set_timeout(udev_device, strtoull(&key[8], NULL, 10));
+ udev_device_set_timeout(udev_device, strtoull(&key[8], NULL, 10));
}
- device_add_property_from_string(udev_device, key);
+ if (strncmp(key, "PHYSDEV", 7) == 0)
+ continue;
+ udev_device_add_property_from_string(udev_device, key);
}
- device_set_devnum(udev_device, makedev(maj, min));
-
+ if (!devpath_set) {
+ udev_device_unref(udev_device);
+ return NULL;
+ }
+ 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 += snprintf(&buf[bufpos], sizeof(buf) - bufpos, "%s=%s",
+ udev_list_entry_get_name(list_entry),
+ udev_list_entry_get_value(list_entry));
+ 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;
+}