X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Flib%2Flibudev-ctrl.c;h=80ab0370e237dba6e108b8d0d72e838eba044630;hp=7d37074fef898c0b8eabf163d931dac43a81b819;hb=540f46698dd5a3bed767fa1c761ead1c9e41ed2e;hpb=38f27948cdafd8a4b90a6b4f1f54b89891983506

diff --git a/udev/lib/libudev-ctrl.c b/udev/lib/libudev-ctrl.c
index 7d37074fe..80ab0370e 100644
--- a/udev/lib/libudev-ctrl.c
+++ b/udev/lib/libudev-ctrl.c
@@ -3,18 +3,10 @@
  *
  * Copyright (C) 2008 Kay Sievers <kay.sievers@vrfy.org>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  */
 
 #include <errno.h>
@@ -30,7 +22,8 @@
 #include "libudev.h"
 #include "libudev-private.h"
 
-#define UDEV_CTRL_MAGIC				"udevd-128"
+/* wire protocol magic must match */
+#define UDEV_CTRL_MAGIC				0xdead1dea
 
 enum udev_ctrl_msg_type {
 	UDEV_CTRL_UNKNOWN,
@@ -41,10 +34,12 @@ enum udev_ctrl_msg_type {
 	UDEV_CTRL_SET_ENV,
 	UDEV_CTRL_SET_MAX_CHILDS,
 	UDEV_CTRL_SET_MAX_CHILDS_RUNNING,
+	UDEV_CTRL_SETTLE,
 };
 
-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 +50,8 @@ 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;
+	pid_t pid;
 };
 
 struct udev_ctrl {
@@ -70,16 +66,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;
 	}
@@ -101,7 +96,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;
 	}
 
@@ -144,11 +139,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,47 +152,47 @@ 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: %s\n", strerror(errno));
+		err(uctrl->udev, "error sending message: %m\n");
 	}
 	return err;
 }
 
 int udev_ctrl_send_set_log_level(struct udev_ctrl *uctrl, int priority)
 {
-	ctrl_send(uctrl, UDEV_CTRL_SET_LOG_LEVEL, priority, NULL);
-	return 0;
+	return ctrl_send(uctrl, UDEV_CTRL_SET_LOG_LEVEL, priority, NULL);
 }
 
 int udev_ctrl_send_stop_exec_queue(struct udev_ctrl *uctrl)
 {
-	ctrl_send(uctrl, UDEV_CTRL_STOP_EXEC_QUEUE, 0, NULL);
-	return 0;
+	return ctrl_send(uctrl, UDEV_CTRL_STOP_EXEC_QUEUE, 0, NULL);
 }
 
 int udev_ctrl_send_start_exec_queue(struct udev_ctrl *uctrl)
 {
-	ctrl_send(uctrl, UDEV_CTRL_START_EXEC_QUEUE, 0, NULL);
-	return 0;
+	return ctrl_send(uctrl, UDEV_CTRL_START_EXEC_QUEUE, 0, NULL);
 }
 
 int udev_ctrl_send_reload_rules(struct udev_ctrl *uctrl)
 {
-	ctrl_send(uctrl, UDEV_CTRL_RELOAD_RULES, 0, NULL);
-	return 0;
+	return ctrl_send(uctrl, UDEV_CTRL_RELOAD_RULES, 0, NULL);
 }
 
 int udev_ctrl_send_set_env(struct udev_ctrl *uctrl, const char *key)
 {
-	ctrl_send(uctrl, UDEV_CTRL_SET_ENV, 0, optarg);
-	return 0;
+	return ctrl_send(uctrl, UDEV_CTRL_SET_ENV, 0, key);
 }
 
 int udev_ctrl_send_set_max_childs(struct udev_ctrl *uctrl, int count)
 {
-	ctrl_send(uctrl, UDEV_CTRL_SET_MAX_CHILDS, count, NULL);
-	return 0;
+	return ctrl_send(uctrl, UDEV_CTRL_SET_MAX_CHILDS, count, NULL);
+}
+
+int udev_ctrl_send_settle(struct udev_ctrl *uctrl)
+{
+	return ctrl_send(uctrl, UDEV_CTRL_SETTLE, 0, NULL);
 }
 
 struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl *uctrl)
@@ -209,15 +205,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;
@@ -227,7 +222,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);
@@ -243,12 +238,14 @@ 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);
+	uctrl_msg->pid = cred->pid;
+
+	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 +267,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);
 }
 
@@ -315,3 +312,10 @@ int udev_ctrl_get_set_max_childs(struct udev_ctrl_msg *ctrl_msg)
 		return ctrl_msg->ctrl_msg_wire.intval;
 	return -1;
 }
+
+pid_t udev_ctrl_get_settle(struct udev_ctrl_msg *ctrl_msg)
+{
+	if (ctrl_msg->ctrl_msg_wire.type == UDEV_CTRL_SETTLE)
+		return ctrl_msg->pid;
+	return -1;
+}