X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev-ctrl.c;h=caf0dc08a363e29bf415954adaf0838b6f526726;hb=86b5778857522087e74182f26f0e565adea0c699;hp=268ce2d353e09d05d6853a20ac3280246258e280;hpb=659353f5a9a52336c41cf595d933311b8dc48937;p=elogind.git

diff --git a/udev/lib/libudev-ctrl.c b/udev/lib/libudev-ctrl.c
index 268ce2d35..caf0dc08a 100644
--- a/udev/lib/libudev-ctrl.c
+++ b/udev/lib/libudev-ctrl.c
@@ -30,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,
@@ -43,8 +44,9 @@ enum udev_ctrl_msg_type {
 	UDEV_CTRL_SET_MAX_CHILDS_RUNNING,
 };
 
-struct ctrl_msg_wire {
-	char magic[32];
+struct udev_ctrl_msg_wire {
+	char version[16];
+	unsigned int magic;
 	enum udev_ctrl_msg_type type;
 	union {
 		int intval;
@@ -55,7 +57,7 @@ struct ctrl_msg_wire {
 struct udev_ctrl_msg {
 	int refcount;
 	struct udev_ctrl *uctrl;
-	struct ctrl_msg_wire ctrl_msg_wire;
+	struct udev_ctrl_msg_wire ctrl_msg_wire;
 };
 
 struct udev_ctrl {
@@ -70,10 +72,9 @@ 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;
 
@@ -144,11 +145,12 @@ 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_wire ctrl_msg_wire;
+	struct udev_ctrl_msg_wire ctrl_msg_wire;
 	int err;
 
-	memset(&ctrl_msg_wire, 0x00, sizeof(struct ctrl_msg_wire));
-	strcpy(ctrl_msg_wire.magic, UDEV_CTRL_MAGIC);
+	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)
@@ -156,7 +158,8 @@ static int ctrl_send(struct udev_ctrl *uctrl, enum udev_ctrl_msg_type type, int
 	else
 		ctrl_msg_wire.intval = intval;
 
-	err = sendto(uctrl->sock, &ctrl_msg_wire, sizeof(ctrl_msg_wire), 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: %m\n");
 	}
@@ -189,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;
 }
 
@@ -209,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_wire;
-	iov.iov_len = sizeof(struct udev_ctrl_msg);
+	iov.iov_len = sizeof(struct udev_ctrl_msg_wire);
 
 	memset(&smsg, 0x00, sizeof(struct msghdr));
 	smsg.msg_iov = &iov;
@@ -243,12 +245,12 @@ struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl *uctrl)
 		goto err;
 	}
 
-	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);
+	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_wire.type);
+	dbg(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);
@@ -270,7 +272,7 @@ void udev_ctrl_msg_unref(struct udev_ctrl_msg *ctrl_msg)
 	ctrl_msg->refcount--;
 	if (ctrl_msg->refcount > 0)
 		return;
-	info(ctrl_msg->uctrl->udev, "release ctrl_msg %p\n", ctrl_msg);
+	dbg(ctrl_msg->uctrl->udev, "release ctrl_msg %p\n", ctrl_msg);
 	free(ctrl_msg);
 }