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=75356b1d5fe16b88f3557fff8530b4de7825c429;hpb=6a95b1e7d6290293061e551eac679aee9ea21611;p=elogind.git diff --git a/udev/lib/libudev-ctrl.c b/udev/lib/libudev-ctrl.c index 75356b1d5..25661cade 100644 --- a/udev/lib/libudev-ctrl.c +++ b/udev/lib/libudev-ctrl.c @@ -3,18 +3,10 @@ * * Copyright (C) 2008 Kay Sievers * - * 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 . + * 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 @@ -31,7 +23,7 @@ #include "libudev-private.h" /* last known version with this wire protocol */ -#define UDEV_CTRL_MAGIC "udevd-128" +#define UDEV_CTRL_MAGIC 0xdead1dea enum udev_ctrl_msg_type { UDEV_CTRL_UNKNOWN, @@ -42,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; @@ -56,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 { @@ -71,10 +66,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; @@ -145,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) @@ -157,7 +152,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"); } @@ -166,38 +162,37 @@ static int ctrl_send(struct udev_ctrl *uctrl, enum udev_ctrl_msg_type type, int 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, key); - 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) @@ -210,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; @@ -244,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); @@ -271,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); } @@ -316,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; +}