X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev-ctrl.c;h=2e15db0be0ba1e6e210cb18a3857a1043beafb41;hb=f6bb9e981aea06f1a7460868fb60f1a9ff14c504;hp=e42f631571712ce5652738727b4452cb2608d71e;hpb=3eb46ec6ddeb31d9886ebb736d1d7b3534d2f354;p=elogind.git
diff --git a/udev/lib/libudev-ctrl.c b/udev/lib/libudev-ctrl.c
index e42f63157..2e15db0be 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
@@ -32,7 +30,8 @@
#include "libudev.h"
#include "libudev-private.h"
-#define UDEV_CTRL_MAGIC "udevd-128"
+/* last known version with this wire protocol */
+#define UDEV_CTRL_MAGIC 0xdead1dea
enum udev_ctrl_msg_type {
UDEV_CTRL_UNKNOWN,
@@ -45,8 +44,9 @@ enum udev_ctrl_msg_type {
UDEV_CTRL_SET_MAX_CHILDS_RUNNING,
};
-struct ctrl_msg {
- char magic[32];
+struct udev_ctrl_msg_wire {
+ char version[16];
+ unsigned int magic;
enum udev_ctrl_msg_type type;
union {
int intval;
@@ -57,7 +57,7 @@ struct ctrl_msg {
struct udev_ctrl_msg {
int refcount;
struct udev_ctrl *uctrl;
- struct ctrl_msg ctrl_msg;
+ struct udev_ctrl_msg_wire ctrl_msg_wire;
};
struct udev_ctrl {
@@ -72,16 +72,15 @@ struct udev_ctrl *udev_ctrl_new_from_socket(struct udev *udev, const char *socke
{
struct udev_ctrl *uctrl;
- uctrl = malloc(sizeof(struct udev_ctrl));
+ uctrl = calloc(1, sizeof(struct udev_ctrl));
if (uctrl == NULL)
return NULL;
- memset(uctrl, 0x00, sizeof(struct udev_ctrl));
uctrl->refcount = 1;
uctrl->udev = udev;
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;
}
@@ -103,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;
}
@@ -146,21 +145,23 @@ 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 udev_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 udev_ctrl_msg_wire));
+ strcpy(ctrl_msg_wire.version, "udev-" VERSION);
+ ctrl_msg_wire.magic = UDEV_CTRL_MAGIC;
+ ctrl_msg_wire.type = type;
if (buf != NULL)
- util_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;
}
@@ -191,7 +192,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;
}
@@ -211,15 +212,14 @@ struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl *uctrl)
struct ucred *cred;
char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
- uctrl_msg = malloc(sizeof(struct udev_ctrl_msg));
+ uctrl_msg = calloc(1, sizeof(struct udev_ctrl_msg));
if (uctrl_msg == NULL)
return NULL;
- memset(uctrl_msg, 0x00, sizeof(struct udev_ctrl_msg));
uctrl_msg->refcount = 1;
uctrl_msg->uctrl = uctrl;
- iov.iov_base = &uctrl_msg->ctrl_msg;
- iov.iov_len = sizeof(struct udev_ctrl_msg);
+ iov.iov_base = &uctrl_msg->ctrl_msg_wire;
+ iov.iov_len = sizeof(struct udev_ctrl_msg_wire);
memset(&smsg, 0x00, sizeof(struct msghdr));
smsg.msg_iov = &iov;
@@ -229,7 +229,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);
@@ -245,12 +245,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 (uctrl_msg->ctrl_msg_wire.magic != UDEV_CTRL_MAGIC) {
+ err(uctrl->udev, "message magic 0x%08x 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);
@@ -278,42 +278,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;
}