X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev-ctrl.c;h=25661cade91308b871b64976853c518e25f93d97;hb=4061ab9f4bb0bdad3858e8ef1738dc892afe9de4;hp=570e91c89e08fd51dcb8424982d03bc7aeddebba;hpb=89d080c3aedacadfb0b1022e101957998d4cdaf1;p=elogind.git

diff --git a/udev/lib/libudev-ctrl.c b/udev/lib/libudev-ctrl.c
index 570e91c89..25661cade 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>
@@ -42,6 +34,7 @@ enum udev_ctrl_msg_type {
 	UDEV_CTRL_SET_ENV,
 	UDEV_CTRL_SET_MAX_CHILDS,
 	UDEV_CTRL_SET_MAX_CHILDS_RUNNING,
+	UDEV_CTRL_SETTLE,
 };
 
 struct udev_ctrl_msg_wire {
@@ -58,6 +51,7 @@ struct udev_ctrl_msg {
 	int refcount;
 	struct udev_ctrl *uctrl;
 	struct udev_ctrl_msg_wire ctrl_msg_wire;
+	pid_t pid;
 };
 
 struct udev_ctrl {
@@ -196,6 +190,11 @@ int udev_ctrl_send_set_max_childs(struct udev_ctrl *uctrl, int count)
 	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)
 {
 	struct udev_ctrl_msg *uctrl_msg;
@@ -239,6 +238,8 @@ struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl *uctrl)
 		goto err;
 	}
 
+	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;
@@ -311,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;
+}