chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rtnl: order local addresses/gateways by the address itself as last resort
[elogind.git]
/
src
/
libudev
/
libudev-monitor.c
diff --git
a/src/libudev/libudev-monitor.c
b/src/libudev/libudev-monitor.c
index 0a2ab82a89b28807aa41320b45880fc176dcf269..e8d6b4a61b2a2520f5cbe9a15cfe1677c7673c4d 100644
(file)
--- a/
src/libudev/libudev-monitor.c
+++ b/
src/libudev/libudev-monitor.c
@@
-108,16
+108,22
@@
static struct udev_monitor *udev_monitor_new(struct udev *udev)
/* we consider udev running when /dev is on devtmpfs */
static bool udev_has_devtmpfs(struct udev *udev) {
/* we consider udev running when /dev is on devtmpfs */
static bool udev_has_devtmpfs(struct udev *udev) {
- union file_handle_union h = { .handle.handle_bytes = MAX_HANDLE_SZ, };
- int mount_id;
+
+ union file_handle_union h = {
+ .handle.handle_bytes = MAX_HANDLE_SZ
+ };
+
_cleanup_fclose_ FILE *f = NULL;
char line[LINE_MAX], *e;
_cleanup_fclose_ FILE *f = NULL;
char line[LINE_MAX], *e;
+ int mount_id;
int r;
r = name_to_handle_at(AT_FDCWD, "/dev", &h.handle, &mount_id, 0);
int r;
r = name_to_handle_at(AT_FDCWD, "/dev", &h.handle, &mount_id, 0);
- if (r < 0)
+ if (r < 0) {
+ if (errno != EOPNOTSUPP)
+ log_debug_errno(errno, "name_to_handle_at on /dev: %m");
return false;
return false;
-
+ }
f = fopen("/proc/self/mountinfo", "re");
if (!f)
f = fopen("/proc/self/mountinfo", "re");
if (!f)
@@
-168,7
+174,7
@@
struct udev_monitor *udev_monitor_new_from_netlink_fd(struct udev *udev, const c
* will not receive any messages.
*/
if (access("/run/udev/control", F_OK) < 0 && !udev_has_devtmpfs(udev)) {
* will not receive any messages.
*/
if (access("/run/udev/control", F_OK) < 0 && !udev_has_devtmpfs(udev)) {
-
udev_dbg(udev, "the udev service seems not to be active, disable the monitor\n
");
+
log_debug("the udev service seems not to be active, disable the monitor
");
group = UDEV_MONITOR_NONE;
} else
group = UDEV_MONITOR_UDEV;
group = UDEV_MONITOR_NONE;
} else
group = UDEV_MONITOR_UDEV;
@@
-184,7
+190,7
@@
struct udev_monitor *udev_monitor_new_from_netlink_fd(struct udev *udev, const c
if (fd < 0) {
udev_monitor->sock = socket(PF_NETLINK, SOCK_RAW|SOCK_CLOEXEC|SOCK_NONBLOCK, NETLINK_KOBJECT_UEVENT);
if (udev_monitor->sock == -1) {
if (fd < 0) {
udev_monitor->sock = socket(PF_NETLINK, SOCK_RAW|SOCK_CLOEXEC|SOCK_NONBLOCK, NETLINK_KOBJECT_UEVENT);
if (udev_monitor->sock == -1) {
-
udev_err(udev, "error getting socket: %m\n
");
+
log_debug_errno(errno, "error getting socket: %m
");
free(udev_monitor);
return NULL;
}
free(udev_monitor);
return NULL;
}
@@
-401,12
+407,15
@@
_public_ int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor)
if (err == 0)
udev_monitor->snl.nl.nl_pid = snl.nl.nl_pid;
} else {
if (err == 0)
udev_monitor->snl.nl.nl_pid = snl.nl.nl_pid;
} else {
-
udev_err(udev_monitor->udev, "bind failed: %m\n
");
+
log_debug_errno(errno, "bind failed: %m
");
return -errno;
}
/* enable receiving of sender credentials */
return -errno;
}
/* enable receiving of sender credentials */
- setsockopt(udev_monitor->sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
+ err = setsockopt(udev_monitor->sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
+ if (err < 0)
+ log_debug_errno(errno, "setting SO_PASSCRED failed: %m");
+
return 0;
}
return 0;
}
@@
-593,12
+602,12
@@
retry:
buflen = recvmsg(udev_monitor->sock, &smsg, 0);
if (buflen < 0) {
if (errno != EINTR)
buflen = recvmsg(udev_monitor->sock, &smsg, 0);
if (buflen < 0) {
if (errno != EINTR)
-
udev_dbg(udev_monitor->udev, "unable to receive message\n
");
+
log_debug("unable to receive message
");
return NULL;
}
if (buflen < 32 || (size_t)buflen >= sizeof(buf)) {
return NULL;
}
if (buflen < 32 || (size_t)buflen >= sizeof(buf)) {
-
udev_dbg(udev_monitor->udev, "invalid message length\n
");
+
log_debug("invalid message length
");
return NULL;
}
return NULL;
}
@@
-606,12
+615,12
@@
retry:
/* unicast message, check if we trust the sender */
if (udev_monitor->snl_trusted_sender.nl.nl_pid == 0 ||
snl.nl.nl_pid != udev_monitor->snl_trusted_sender.nl.nl_pid) {
/* unicast message, check if we trust the sender */
if (udev_monitor->snl_trusted_sender.nl.nl_pid == 0 ||
snl.nl.nl_pid != udev_monitor->snl_trusted_sender.nl.nl_pid) {
-
udev_dbg(udev_monitor->udev, "unicast netlink message ignored\n
");
+
log_debug("unicast netlink message ignored
");
return NULL;
}
} else if (snl.nl.nl_groups == UDEV_MONITOR_KERNEL) {
if (snl.nl.nl_pid > 0) {
return NULL;
}
} else if (snl.nl.nl_groups == UDEV_MONITOR_KERNEL) {
if (snl.nl.nl_pid > 0) {
-
udev_dbg(udev_monitor->udev, "multicast kernel netlink message from pid %d ignored\n
",
+
log_debug("multicast kernel netlink message from pid %d ignored
",
snl.nl.nl_pid);
return NULL;
}
snl.nl.nl_pid);
return NULL;
}
@@
-619,13
+628,13
@@
retry:
cmsg = CMSG_FIRSTHDR(&smsg);
if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
cmsg = CMSG_FIRSTHDR(&smsg);
if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
-
udev_dbg(udev_monitor->udev, "no sender credentials received, message ignored\n
");
+
log_debug("no sender credentials received, message ignored
");
return NULL;
}
cred = (struct ucred *)CMSG_DATA(cmsg);
if (cred->uid != 0) {
return NULL;
}
cred = (struct ucred *)CMSG_DATA(cmsg);
if (cred->uid != 0) {
-
udev_dbg(udev_monitor->udev, "sender uid=%d, message ignored\n
", cred->uid);
+
log_debug("sender uid=%d, message ignored
", cred->uid);
return NULL;
}
return NULL;
}
@@
-639,7
+648,7
@@
retry:
/* udev message needs proper version magic */
nlh = (struct udev_monitor_netlink_header *) buf;
if (nlh->magic != htonl(UDEV_MONITOR_MAGIC)) {
/* udev message needs proper version magic */
nlh = (struct udev_monitor_netlink_header *) buf;
if (nlh->magic != htonl(UDEV_MONITOR_MAGIC)) {
-
udev_err(udev_monitor->udev, "unrecognized message signature (%x != %x)\n
",
+
log_debug("unrecognized message signature (%x != %x)
",
nlh->magic, htonl(UDEV_MONITOR_MAGIC));
udev_device_unref(udev_device);
return NULL;
nlh->magic, htonl(UDEV_MONITOR_MAGIC));
udev_device_unref(udev_device);
return NULL;
@@
-657,14
+666,14
@@
retry:
/* kernel message with header */
bufpos = strlen(buf) + 1;
if ((size_t)bufpos < sizeof("a@/d") || bufpos >= buflen) {
/* kernel message with header */
bufpos = strlen(buf) + 1;
if ((size_t)bufpos < sizeof("a@/d") || bufpos >= buflen) {
-
udev_dbg(udev_monitor->udev, "invalid message length\n
");
+
log_debug("invalid message length
");
udev_device_unref(udev_device);
return NULL;
}
/* check message header */
if (strstr(buf, "@/") == NULL) {
udev_device_unref(udev_device);
return NULL;
}
/* check message header */
if (strstr(buf, "@/") == NULL) {
-
udev_dbg(udev_monitor->udev, "unrecognized message header\n
");
+
log_debug("unrecognized message header
");
udev_device_unref(udev_device);
return NULL;
}
udev_device_unref(udev_device);
return NULL;
}
@@
-685,7
+694,7
@@
retry:
}
if (udev_device_add_property_from_string_parse_finish(udev_device) < 0) {
}
if (udev_device_add_property_from_string_parse_finish(udev_device) < 0) {
-
udev_dbg(udev_monitor->udev, "missing values, invalid device\n
");
+
log_debug("missing values, invalid device
");
udev_device_unref(udev_device);
return NULL;
}
udev_device_unref(udev_device);
return NULL;
}
@@
-769,7
+778,7
@@
int udev_monitor_send_device(struct udev_monitor *udev_monitor,
smsg.msg_name = &udev_monitor->snl_destination;
smsg.msg_namelen = sizeof(struct sockaddr_nl);
count = sendmsg(udev_monitor->sock, &smsg, 0);
smsg.msg_name = &udev_monitor->snl_destination;
smsg.msg_namelen = sizeof(struct sockaddr_nl);
count = sendmsg(udev_monitor->sock, &smsg, 0);
-
udev_dbg(udev_monitor->udev, "passed %zi bytes to netlink monitor %p\n
", count, udev_monitor);
+
log_debug("passed %zi bytes to netlink monitor %p
", count, udev_monitor);
return count;
}
return count;
}