X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev-ctrl.c;h=75356b1d5fe16b88f3557fff8530b4de7825c429;hb=aa8734ffcb8a895fc8d66ff383cbcf8f4b78f562;hp=6d91ea4dbcca048a442f0d29547a2ab19e75f1a0;hpb=55e9959b155cefc5146f7a3d1ea73e74da91f303;p=elogind.git
diff --git a/udev/lib/libudev-ctrl.c b/udev/lib/libudev-ctrl.c
index 6d91ea4db..75356b1d5 100644
--- a/udev/lib/libudev-ctrl.c
+++ b/udev/lib/libudev-ctrl.c
@@ -17,8 +17,6 @@
* along with this program. If not, see .
*/
-#include "config.h"
-
#include
#include
#include
@@ -29,10 +27,10 @@
#include
#include
-#include "../udev.h"
#include "libudev.h"
#include "libudev-private.h"
+/* last known version with this wire protocol */
#define UDEV_CTRL_MAGIC "udevd-128"
enum udev_ctrl_msg_type {
@@ -46,7 +44,7 @@ enum udev_ctrl_msg_type {
UDEV_CTRL_SET_MAX_CHILDS_RUNNING,
};
-struct ctrl_msg {
+struct ctrl_msg_wire {
char magic[32];
enum udev_ctrl_msg_type type;
union {
@@ -58,7 +56,7 @@ struct ctrl_msg {
struct udev_ctrl_msg {
int refcount;
struct udev_ctrl *uctrl;
- struct ctrl_msg ctrl_msg;
+ struct ctrl_msg_wire ctrl_msg_wire;
};
struct udev_ctrl {
@@ -82,7 +80,7 @@ struct udev_ctrl *udev_ctrl_new_from_socket(struct udev *udev, const char *socke
uctrl->sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
if (uctrl->sock < 0) {
- err(udev, "error getting socket: %s\n", strerror(errno));
+ err(udev, "error getting socket: %m\n");
udev_ctrl_unref(uctrl);
return NULL;
}
@@ -104,7 +102,7 @@ int udev_ctrl_enable_receiving(struct udev_ctrl *uctrl)
err= bind(uctrl->sock, (struct sockaddr *)&uctrl->saddr, uctrl->addrlen);
if (err < 0) {
- err(uctrl->udev, "bind failed: %s\n", strerror(errno));
+ err(uctrl->udev, "bind failed: %m\n");
return err;
}
@@ -147,21 +145,21 @@ int udev_ctrl_get_fd(struct udev_ctrl *uctrl)
static int ctrl_send(struct udev_ctrl *uctrl, enum udev_ctrl_msg_type type, int intval, const char *buf)
{
- struct ctrl_msg ctrl_msg;
+ struct ctrl_msg_wire ctrl_msg_wire;
int err;
- memset(&ctrl_msg, 0x00, sizeof(struct ctrl_msg));
- strcpy(ctrl_msg.magic, UDEV_CTRL_MAGIC);
- ctrl_msg.type = type;
+ memset(&ctrl_msg_wire, 0x00, sizeof(struct ctrl_msg_wire));
+ strcpy(ctrl_msg_wire.magic, UDEV_CTRL_MAGIC);
+ ctrl_msg_wire.type = type;
if (buf != NULL)
- strlcpy(ctrl_msg.buf, buf, sizeof(ctrl_msg.buf));
+ util_strlcpy(ctrl_msg_wire.buf, buf, sizeof(ctrl_msg_wire.buf));
else
- ctrl_msg.intval = intval;
+ ctrl_msg_wire.intval = intval;
- err = sendto(uctrl->sock, &ctrl_msg, sizeof(ctrl_msg), 0, (struct sockaddr *)&uctrl->saddr, uctrl->addrlen);
+ err = sendto(uctrl->sock, &ctrl_msg_wire, sizeof(ctrl_msg_wire), 0, (struct sockaddr *)&uctrl->saddr, uctrl->addrlen);
if (err == -1) {
- err(uctrl->udev, "error sending message: %s\n", strerror(errno));
+ err(uctrl->udev, "error sending message: %m\n");
}
return err;
}
@@ -192,7 +190,7 @@ int udev_ctrl_send_reload_rules(struct udev_ctrl *uctrl)
int udev_ctrl_send_set_env(struct udev_ctrl *uctrl, const char *key)
{
- ctrl_send(uctrl, UDEV_CTRL_SET_ENV, 0, optarg);
+ ctrl_send(uctrl, UDEV_CTRL_SET_ENV, 0, key);
return 0;
}
@@ -219,7 +217,7 @@ struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl *uctrl)
uctrl_msg->refcount = 1;
uctrl_msg->uctrl = uctrl;
- iov.iov_base = &uctrl_msg->ctrl_msg;
+ iov.iov_base = &uctrl_msg->ctrl_msg_wire;
iov.iov_len = sizeof(struct udev_ctrl_msg);
memset(&smsg, 0x00, sizeof(struct msghdr));
@@ -230,7 +228,7 @@ struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl *uctrl)
size = recvmsg(uctrl->sock, &smsg, 0);
if (size < 0) {
- err(uctrl->udev, "unable to receive user udevd message: %s\n", strerror(errno));
+ err(uctrl->udev, "unable to receive user udevd message: %m\n");
goto err;
}
cmsg = CMSG_FIRSTHDR(&smsg);
@@ -246,12 +244,12 @@ struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl *uctrl)
goto err;
}
- if (strncmp(uctrl_msg->ctrl_msg.magic, UDEV_CTRL_MAGIC, sizeof(UDEV_CTRL_MAGIC)) != 0 ) {
- err(uctrl->udev, "message magic '%s' doesn't match, ignore it\n", uctrl_msg->ctrl_msg.magic);
+ if (strncmp(uctrl_msg->ctrl_msg_wire.magic, UDEV_CTRL_MAGIC, sizeof(UDEV_CTRL_MAGIC)) != 0 ) {
+ err(uctrl->udev, "message magic '%s' doesn't match, ignore it\n", uctrl_msg->ctrl_msg_wire.magic);
goto err;
}
- info(uctrl->udev, "created ctrl_msg %p (%i)\n", uctrl_msg, uctrl_msg->ctrl_msg.type);
+ info(uctrl->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);
@@ -279,42 +277,42 @@ void udev_ctrl_msg_unref(struct udev_ctrl_msg *ctrl_msg)
int udev_ctrl_get_set_log_level(struct udev_ctrl_msg *ctrl_msg)
{
- if (ctrl_msg->ctrl_msg.type == UDEV_CTRL_SET_LOG_LEVEL)
- return ctrl_msg->ctrl_msg.intval;
+ if (ctrl_msg->ctrl_msg_wire.type == UDEV_CTRL_SET_LOG_LEVEL)
+ return ctrl_msg->ctrl_msg_wire.intval;
return -1;
}
int udev_ctrl_get_stop_exec_queue(struct udev_ctrl_msg *ctrl_msg)
{
- if (ctrl_msg->ctrl_msg.type == UDEV_CTRL_STOP_EXEC_QUEUE)
+ if (ctrl_msg->ctrl_msg_wire.type == UDEV_CTRL_STOP_EXEC_QUEUE)
return 1;
return -1;
}
int udev_ctrl_get_start_exec_queue(struct udev_ctrl_msg *ctrl_msg)
{
- if (ctrl_msg->ctrl_msg.type == UDEV_CTRL_START_EXEC_QUEUE)
+ if (ctrl_msg->ctrl_msg_wire.type == UDEV_CTRL_START_EXEC_QUEUE)
return 1;
return -1;
}
int udev_ctrl_get_reload_rules(struct udev_ctrl_msg *ctrl_msg)
{
- if (ctrl_msg->ctrl_msg.type == UDEV_CTRL_RELOAD_RULES)
+ if (ctrl_msg->ctrl_msg_wire.type == UDEV_CTRL_RELOAD_RULES)
return 1;
return -1;
}
const char *udev_ctrl_get_set_env(struct udev_ctrl_msg *ctrl_msg)
{
- if (ctrl_msg->ctrl_msg.type == UDEV_CTRL_SET_ENV)
- return ctrl_msg->ctrl_msg.buf;
+ if (ctrl_msg->ctrl_msg_wire.type == UDEV_CTRL_SET_ENV)
+ return ctrl_msg->ctrl_msg_wire.buf;
return NULL;
}
int udev_ctrl_get_set_max_childs(struct udev_ctrl_msg *ctrl_msg)
{
- if (ctrl_msg->ctrl_msg.type == UDEV_CTRL_SET_MAX_CHILDS)
- return ctrl_msg->ctrl_msg.intval;
+ if (ctrl_msg->ctrl_msg_wire.type == UDEV_CTRL_SET_MAX_CHILDS)
+ return ctrl_msg->ctrl_msg_wire.intval;
return -1;
}