X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevcontrol.c;h=f6b5dd905339bd64703e180945849051586dccfb;hp=98776ccefd84f635b0b209934eac8504d096fe25;hb=c7969cdbcb1f6d39177f6cc2e28597fabe186594;hpb=8ab44e3fd0b8fd4555db973d4c2c305ca09e787d diff --git a/udevcontrol.c b/udevcontrol.c index 98776ccef..f6b5dd905 100644 --- a/udevcontrol.c +++ b/udevcontrol.c @@ -1,10 +1,5 @@ /* - * udevcontrol.c - * - * Userspace devfs - * - * Copyright (C) 2005 Kay Sievers - * + * Copyright (C) 2005-2006 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 @@ -17,14 +12,10 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ -#include -#include -#include -#include #include #include #include @@ -32,98 +23,140 @@ #include #include #include -#include +#include +#include +#include +#include #include "udev.h" -#include "udev_version.h" #include "udevd.h" -#include "udev_utils.h" -#include "logging.h" -/* global variables */ static int sock = -1; -static int log = 0; +static int udev_log = 0; -#ifdef USE_LOG -void log_message (int priority, const char *format, ...) +int udevcontrol(int argc, char *argv[], char *envp[]) { - va_list args; - - if (priority > log) - return; - - va_start(args, format); - vsyslog(priority, format, args); - va_end(args); -} -#endif - - -int main(int argc, char *argv[], char *envp[]) -{ - static struct udevd_msg usend_msg; + static struct udevd_ctrl_msg ctrl_msg; struct sockaddr_un saddr; socklen_t addrlen; const char *env; + const char *arg; + const char *val; + int *intval; int retval = 1; env = getenv("UDEV_LOG"); if (env) - log = log_priority(env); + udev_log = log_priority(env); logging_init("udevcontrol"); dbg("version %s", UDEV_VERSION); - if (argc != 2) { - info("usage: udevcontrol "); + if (argc < 2) { + fprintf(stderr, "missing command\n\n"); goto exit; } - - memset(&usend_msg, 0x00, sizeof(struct udevd_msg)); - strcpy(usend_msg.magic, UDEV_MAGIC); - - if (!strcmp(argv[1], "stop_exec_queue")) - usend_msg.type = UDEVD_STOP_EXEC_QUEUE; - else if (!strcmp(argv[1], "start_exec_queue")) - usend_msg.type = UDEVD_START_EXEC_QUEUE; - else if (!strncmp(argv[1], "log_priority=", strlen("log_priority="))) { - int *level = (int *) usend_msg.envbuf; - char *prio = &argv[1][strlen("log_priority=")]; - - usend_msg.type = UDEVD_SET_LOG_LEVEL; - *level = log_priority(prio); - dbg("send log_priority=%i", *level); + memset(&ctrl_msg, 0x00, sizeof(struct udevd_ctrl_msg)); + strcpy(ctrl_msg.magic, UDEVD_CTRL_MAGIC); + arg = argv[1]; + + /* allow instructions passed as options */ + if (strncmp(arg, "--", 2) == 0) + arg += 2; + + if (!strcmp(arg, "stop_exec_queue")) + ctrl_msg.type = UDEVD_CTRL_STOP_EXEC_QUEUE; + else if (!strcmp(arg, "start_exec_queue")) + ctrl_msg.type = UDEVD_CTRL_START_EXEC_QUEUE; + else if (!strcmp(arg, "reload_rules")) + ctrl_msg.type = UDEVD_CTRL_RELOAD_RULES; + else if (!strncmp(arg, "log_priority=", strlen("log_priority="))) { + intval = (int *) ctrl_msg.buf; + val = &arg[strlen("log_priority=")]; + ctrl_msg.type = UDEVD_CTRL_SET_LOG_LEVEL; + *intval = log_priority(val); + info("send log_priority=%i", *intval); + } else if (!strncmp(arg, "max_childs=", strlen("max_childs="))) { + char *endp; + int count; + + intval = (int *) ctrl_msg.buf; + val = &arg[strlen("max_childs=")]; + ctrl_msg.type = UDEVD_CTRL_SET_MAX_CHILDS; + count = strtoul(val, &endp, 0); + if (endp[0] != '\0' || count < 1) { + fprintf(stderr, "invalid number\n"); + goto exit; + } + *intval = count; + info("send max_childs=%i", *intval); + } else if (!strncmp(arg, "max_childs_running=", strlen("max_childs_running="))) { + char *endp; + int count; + + intval = (int *) ctrl_msg.buf; + val = &arg[strlen("max_childs_running=")]; + ctrl_msg.type = UDEVD_CTRL_SET_MAX_CHILDS_RUNNING; + count = strtoul(val, &endp, 0); + if (endp[0] != '\0' || count < 1) { + fprintf(stderr, "invalid number\n"); + goto exit; + } + *intval = count; + info("send max_childs_running=%i", *intval); + } else if (!strncmp(arg, "env", strlen("env"))) { + val = argv[2]; + if (val == NULL) { + fprintf(stderr, "missing key\n"); + goto exit; + } + ctrl_msg.type = UDEVD_CTRL_ENV; + strlcpy(ctrl_msg.buf, val, sizeof(ctrl_msg.buf)); + info("send env '%s'", val); + } else if (strcmp(arg, "help") == 0 || strcmp(arg, "-h") == 0) { + printf("Usage: udevadm control COMMAND\n" + " --log_priority= set the udev log level for the daemon\n" + " --stop_exec_queue keep udevd from executing events, queue only\n" + " --start_exec_queue execute events, flush queue\n" + " --reload_rules reloads the rules files\n" + " --env = set a global environment variable\n" + " --max_childs= maximum number of childs\n" + " --max_childs_running= maximum number of childs running at the same time\n" + " --help print this help text\n\n"); + goto exit; } else { - err("unknown command\n"); + fprintf(stderr, "unrecognized command '%s'\n", arg); + goto exit; + } + + if (getuid() != 0) { + fprintf(stderr, "root privileges required\n"); goto exit; } sock = socket(AF_LOCAL, SOCK_DGRAM, 0); if (sock == -1) { - info("error getting socket"); + err("error getting socket: %s", strerror(errno)); goto exit; } memset(&saddr, 0x00, sizeof(struct sockaddr_un)); saddr.sun_family = AF_LOCAL; /* use abstract namespace for socket path */ - strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH); - addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1; + strcpy(&saddr.sun_path[1], UDEVD_CTRL_SOCK_PATH); + addrlen = offsetof(struct sockaddr_un, sun_path) + 1 + strlen(&saddr.sun_path[1]); - - retval = sendto(sock, &usend_msg, sizeof(usend_msg), 0, (struct sockaddr *)&saddr, addrlen); + retval = sendto(sock, &ctrl_msg, sizeof(ctrl_msg), 0, (struct sockaddr *)&saddr, addrlen); if (retval == -1) { - info("error sending message (%s)", strerror(errno)); + err("error sending message: %s", strerror(errno)); retval = 1; } else { - dbg("sent message '%x' (%u bytes sent)", usend_msg.type, retval); + dbg("sent message type=0x%02x, %u bytes sent", ctrl_msg.type, retval); retval = 0; } close(sock); - exit: logging_close(); - return retval; }