chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udevd: use ROOTPREFIX to create path to modules.devname
[elogind.git]
/
src
/
udev
/
udev-ctrl.c
diff --git
a/src/udev/udev-ctrl.c
b/src/udev/udev-ctrl.c
index 5556f1a77cff818cc24796a283d123d2f5ccd24e..fcb0cd48a6a1a39f8324b5ea8dbd4dfee4b95bf1 100644
(file)
--- a/
src/udev/udev-ctrl.c
+++ b/
src/udev/udev-ctrl.c
@@
-83,7
+83,7
@@
struct udev_ctrl *udev_ctrl_new_from_fd(struct udev *udev, int fd)
if (fd < 0) {
uctrl->sock = socket(AF_LOCAL, SOCK_SEQPACKET|SOCK_NONBLOCK|SOCK_CLOEXEC, 0);
if (uctrl->sock < 0) {
if (fd < 0) {
uctrl->sock = socket(AF_LOCAL, SOCK_SEQPACKET|SOCK_NONBLOCK|SOCK_CLOEXEC, 0);
if (uctrl->sock < 0) {
-
err(udev,
"error getting socket: %m\n");
+
log_error(
"error getting socket: %m\n");
udev_ctrl_unref(uctrl);
return NULL;
}
udev_ctrl_unref(uctrl);
return NULL;
}
@@
-93,8
+93,7
@@
struct udev_ctrl *udev_ctrl_new_from_fd(struct udev *udev, int fd)
}
uctrl->saddr.sun_family = AF_LOCAL;
}
uctrl->saddr.sun_family = AF_LOCAL;
- util_strscpyl(uctrl->saddr.sun_path, sizeof(uctrl->saddr.sun_path),
- udev_get_run_path(udev), "/control", NULL);
+ util_strscpy(uctrl->saddr.sun_path, sizeof(uctrl->saddr.sun_path), "/run/udev/control");
uctrl->addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(uctrl->saddr.sun_path);
return uctrl;
}
uctrl->addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(uctrl->saddr.sun_path);
return uctrl;
}
@@
-117,14
+116,14
@@
int udev_ctrl_enable_receiving(struct udev_ctrl *uctrl)
if (err < 0) {
err = -errno;
if (err < 0) {
err = -errno;
-
err(uctrl->udev,
"bind failed: %m\n");
+
log_error(
"bind failed: %m\n");
return err;
}
err = listen(uctrl->sock, 0);
if (err < 0) {
err = -errno;
return err;
}
err = listen(uctrl->sock, 0);
if (err < 0) {
err = -errno;
-
err(uctrl->udev,
"listen failed: %m\n");
+
log_error(
"listen failed: %m\n");
return err;
}
return err;
}
@@
-192,18
+191,18
@@
struct udev_ctrl_connection *udev_ctrl_get_connection(struct udev_ctrl *uctrl)
conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
if (conn->sock < 0) {
if (errno != EINTR)
conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
if (conn->sock < 0) {
if (errno != EINTR)
-
err(uctrl->udev,
"unable to receive ctrl connection: %m\n");
+
log_error(
"unable to receive ctrl connection: %m\n");
goto err;
}
/* check peer credential of connection */
slen = sizeof(ucred);
if (getsockopt(conn->sock, SOL_SOCKET, SO_PEERCRED, &ucred, &slen) < 0) {
goto err;
}
/* check peer credential of connection */
slen = sizeof(ucred);
if (getsockopt(conn->sock, SOL_SOCKET, SO_PEERCRED, &ucred, &slen) < 0) {
-
err(uctrl->udev,
"unable to receive credentials of ctrl connection: %m\n");
+
log_error(
"unable to receive credentials of ctrl connection: %m\n");
goto err;
}
if (ucred.uid > 0) {
goto err;
}
if (ucred.uid > 0) {
-
err(uctrl->udev,
"sender uid=%i, message ignored\n", ucred.uid);
+
log_error(
"sender uid=%i, message ignored\n", ucred.uid);
goto err;
}
goto err;
}
@@
-337,7
+336,6
@@
int udev_ctrl_send_exit(struct udev_ctrl *uctrl, int timeout)
struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl_connection *conn)
{
struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl_connection *conn)
{
- struct udev *udev = conn->uctrl->udev;
struct udev_ctrl_msg *uctrl_msg;
ssize_t size;
struct msghdr smsg;
struct udev_ctrl_msg *uctrl_msg;
ssize_t size;
struct msghdr smsg;
@@
-367,11
+365,11
@@
struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl_connection *conn)
continue;
goto err;
} else if (r == 0) {
continue;
goto err;
} else if (r == 0) {
-
err(udev,
"timeout waiting for ctrl message\n");
+
log_error(
"timeout waiting for ctrl message\n");
goto err;
} else {
if (!(pfd[0].revents & POLLIN)) {
goto err;
} else {
if (!(pfd[0].revents & POLLIN)) {
-
err(udev,
"ctrl connection error: %m\n");
+
log_error(
"ctrl connection error: %m\n");
goto err;
}
}
goto err;
}
}
@@
-388,28
+386,27
@@
struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl_connection *conn)
smsg.msg_controllen = sizeof(cred_msg);
size = recvmsg(conn->sock, &smsg, 0);
if (size < 0) {
smsg.msg_controllen = sizeof(cred_msg);
size = recvmsg(conn->sock, &smsg, 0);
if (size < 0) {
-
err(udev,
"unable to receive ctrl message: %m\n");
+
log_error(
"unable to receive ctrl message: %m\n");
goto err;
}
cmsg = CMSG_FIRSTHDR(&smsg);
cred = (struct ucred *) CMSG_DATA(cmsg);
if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
goto err;
}
cmsg = CMSG_FIRSTHDR(&smsg);
cred = (struct ucred *) CMSG_DATA(cmsg);
if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
-
err(udev,
"no sender credentials received, message ignored\n");
+
log_error(
"no sender credentials received, message ignored\n");
goto err;
}
if (cred->uid != 0) {
goto err;
}
if (cred->uid != 0) {
-
err(udev,
"sender uid=%i, message ignored\n", cred->uid);
+
log_error(
"sender uid=%i, message ignored\n", cred->uid);
goto err;
}
if (uctrl_msg->ctrl_msg_wire.magic != UDEV_CTRL_MAGIC) {
goto err;
}
if (uctrl_msg->ctrl_msg_wire.magic != UDEV_CTRL_MAGIC) {
-
err(udev,
"message magic 0x%08x doesn't match, ignore it\n", uctrl_msg->ctrl_msg_wire.magic);
+
log_error(
"message magic 0x%08x doesn't match, ignore it\n", uctrl_msg->ctrl_msg_wire.magic);
goto err;
}
goto err;
}
- dbg(udev, "created ctrl_msg %p (%i)\n", uctrl_msg, uctrl_msg->ctrl_msg_wire.type);
return uctrl_msg;
err:
udev_ctrl_msg_unref(uctrl_msg);
return uctrl_msg;
err:
udev_ctrl_msg_unref(uctrl_msg);
@@
-431,7
+428,6
@@
struct udev_ctrl_msg *udev_ctrl_msg_unref(struct udev_ctrl_msg *ctrl_msg)
ctrl_msg->refcount--;
if (ctrl_msg->refcount > 0)
return ctrl_msg;
ctrl_msg->refcount--;
if (ctrl_msg->refcount > 0)
return ctrl_msg;
- dbg(ctrl_msg->conn->uctrl->udev, "release ctrl_msg %p\n", ctrl_msg);
udev_ctrl_connection_unref(ctrl_msg->conn);
free(ctrl_msg);
return NULL;
udev_ctrl_connection_unref(ctrl_msg->conn);
free(ctrl_msg);
return NULL;