#include <stddef.h>
#include <string.h>
#include <unistd.h>
+#include <getopt.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/wait.h>
#include "udev.h"
#include "udevd.h"
-static int sock = -1;
static int udev_log = 0;
-int udevcontrol(int argc, char *argv[])
-{
- static struct udevd_ctrl_msg ctrl_msg;
+struct udev_ctrl;
+extern struct udev_ctrl *udev_ctrl_new_from_socket(const char *socket_path);
+extern void udev_ctrl_unref(struct udev_ctrl *uctrl);
+extern int udev_ctrl_set_log_level(struct udev_ctrl *uctrl, int priority);
+extern int udev_ctrl_stop_exec_queue(struct udev_ctrl *uctrl);
+extern int udev_ctrl_start_exec_queue(struct udev_ctrl *uctrl);
+extern int udev_ctrl_reload_rules(struct udev_ctrl *uctrl);
+extern int udev_ctrl_set_env(struct udev_ctrl *uctrl, const char *key);
+extern int udev_ctrl_set_max_childs(struct udev_ctrl *uctrl, int count);
+extern int udev_ctrl_set_max_childs_running(struct udev_ctrl *uctrl, int count);
+
+struct udev_ctrl {
+ int sock;
struct sockaddr_un saddr;
socklen_t addrlen;
+};
+
+struct udev_ctrl *udev_ctrl_new_from_socket(const char *socket_path)
+{
+ struct udev_ctrl *uctrl;
+
+ uctrl = malloc(sizeof(struct udev_ctrl));
+ if (uctrl == NULL)
+ return NULL;
+ memset(uctrl, 0x00, sizeof(struct udev_ctrl));
+
+ uctrl->sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
+ if (uctrl->sock < 0) {
+ err("error getting socket: %s\n", strerror(errno));
+ free(uctrl);
+ return NULL;
+ }
+
+ uctrl->saddr.sun_family = AF_LOCAL;
+ strcpy(uctrl->saddr.sun_path, socket_path);
+ uctrl->addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(uctrl->saddr.sun_path);
+ /* translate leading '@' to abstract namespace */
+ if (uctrl->saddr.sun_path[0] == '@')
+ uctrl->saddr.sun_path[0] = '\0';
+ return uctrl;
+}
+
+void udev_ctrl_unref(struct udev_ctrl *uctrl)
+{
+ if (uctrl == NULL)
+ return;
+ close(uctrl->sock);
+}
+
+static int ctrl_send(struct udev_ctrl *uctrl, enum udevd_ctrl_msg_type type, int intval, const char *buf)
+{
+ struct udevd_ctrl_msg ctrl_msg;
+ int err;
+
+ memset(&ctrl_msg, 0x00, sizeof(struct udevd_ctrl_msg));
+ strcpy(ctrl_msg.magic, UDEVD_CTRL_MAGIC);
+ ctrl_msg.type = type;
+
+ if (buf != NULL)
+ strlcpy(ctrl_msg.buf, buf, sizeof(ctrl_msg.buf));
+ else
+ ctrl_msg.intval = intval;
+
+ err = sendto(uctrl->sock, &ctrl_msg, sizeof(ctrl_msg), 0, (struct sockaddr *)&uctrl->saddr, uctrl->addrlen);
+ if (err == -1) {
+ err("error sending message: %s\n", strerror(errno));
+ }
+ return err;
+}
+
+int udev_ctrl_set_log_level(struct udev_ctrl *uctrl, int priority)
+{
+ ctrl_send(uctrl, UDEVD_CTRL_SET_LOG_LEVEL, priority, NULL);
+ return 0;
+}
+
+int udev_ctrl_stop_exec_queue(struct udev_ctrl *uctrl)
+{
+ ctrl_send(uctrl, UDEVD_CTRL_STOP_EXEC_QUEUE, 0, NULL);
+ return 0;
+}
+
+int udev_ctrl_start_exec_queue(struct udev_ctrl *uctrl)
+{
+ ctrl_send(uctrl, UDEVD_CTRL_START_EXEC_QUEUE, 0, NULL);
+ return 0;
+}
+
+int udev_ctrl_reload_rules(struct udev_ctrl *uctrl)
+{
+ ctrl_send(uctrl, UDEVD_CTRL_RELOAD_RULES, 0, NULL);
+ return 0;
+}
+
+int udev_ctrl_set_env(struct udev_ctrl *uctrl, const char *key)
+{
+ ctrl_send(uctrl, UDEVD_CTRL_ENV, 0, optarg);
+ return 0;
+}
+
+int udev_ctrl_set_max_childs(struct udev_ctrl *uctrl, int count)
+{
+ ctrl_send(uctrl, UDEVD_CTRL_SET_MAX_CHILDS, count, NULL);
+ return 0;
+}
+
+int udev_ctrl_set_max_childs_running(struct udev_ctrl *uctrl, int count)
+{
+ ctrl_send(uctrl, UDEVD_CTRL_SET_MAX_CHILDS_RUNNING, count, NULL);
+ return 0;
+}
+
+int udevcontrol(int argc, char *argv[])
+{
+ struct udev_ctrl *uctrl;
const char *env;
- const char *arg;
- const char *val;
- int *intval;
- int retval = 1;
+ int rc = 1;
+
+ /* compat values with '_' will be removed in a future release */
+ static const struct option options[] = {
+ { "log-priority", 1, NULL, 'l' },
+ { "log_priority", 1, NULL, 'l' + 256 },
+ { "stop-exec-queue", 0, NULL, 's' },
+ { "stop_exec_queue", 0, NULL, 's' + 256 },
+ { "start-exec-queue", 0, NULL, 'S' },
+ { "start_exec_queue", 0, NULL, 'S' + 256},
+ { "reload-rules", 0, NULL, 'R' },
+ { "reload_rules", 0, NULL, 'R' + 256},
+ { "env", 1, NULL, 'e' },
+ { "max-childs", 1, NULL, 'm' },
+ { "max_childs", 1, NULL, 'm' + 256},
+ { "max-childs-running", 1, NULL, 'M' },
+ { "max_childs_running", 1, NULL, 'M' + 256},
+ { "help", 0, NULL, 'h' },
+ {}
+ };
env = getenv("UDEV_LOG");
if (env)
logging_init("udevcontrol");
dbg("version %s\n", VERSION);
- if (argc < 2) {
- fprintf(stderr, "missing command\n\n");
+ if (getuid() != 0) {
+ fprintf(stderr, "root privileges required\n");
goto exit;
}
- 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\n", *intval);
- } else if (!strncmp(arg, "max_childs=", strlen("max_childs="))) {
+
+ uctrl = udev_ctrl_new_from_socket(UDEVD_CTRL_SOCK_PATH);
+ if (uctrl == NULL)
+ goto exit;
+
+ while (1) {
+ int option;
+ int i;
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;
+
+ option = getopt_long(argc, argv, "l:sSRe:m:M:h", options, NULL);
+ if (option == -1)
+ break;
+
+ if (option > 255) {
+ info("udevadm control expects commands without underscore, "
+ "this will stop working in a future release\n");
+ fprintf(stderr, "udevadm control expects commands without underscore, "
+ "this will stop working in a future release\n");
}
- *intval = count;
- info("send max_childs=%i\n", *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");
+
+ switch (option) {
+ case 'l':
+ case 'l' + 256:
+ i = log_priority(optarg);
+ if (i < 0) {
+ fprintf(stderr, "invalid number '%s'\n", optarg);
+ goto exit;
+ }
+ udev_ctrl_set_log_level(uctrl, log_priority(optarg));
+ break;
+ case 's':
+ case 's' + 256:
+ udev_ctrl_stop_exec_queue(uctrl);
+ break;
+ case 'S':
+ case 'S' + 256:
+ udev_ctrl_start_exec_queue(uctrl);
+ break;
+ case 'R':
+ case 'R' + 256:
+ udev_ctrl_reload_rules(uctrl);
+ break;
+ case 'e':
+ if (strchr(optarg, '=') == NULL) {
+ fprintf(stderr, "expect <KEY>=<valaue> instead of '%s'\n", optarg);
+ goto exit;
+ }
+ udev_ctrl_set_env(uctrl, optarg);
+ break;
+ case 'm':
+ case 'm' + 256:
+ i = strtoul(optarg, &endp, 0);
+ if (endp[0] != '\0' || i < 1) {
+ fprintf(stderr, "invalid number '%s'\n", optarg);
+ goto exit;
+ }
+ udev_ctrl_set_max_childs(uctrl, i);
+ break;
+ case 'M':
+ case 'M' + 256:
+ i = strtoul(optarg, &endp, 0);
+ if (endp[0] != '\0' || i < 1) {
+ fprintf(stderr, "invalid number '%s'\n", optarg);
+ goto exit;
+ }
+ udev_ctrl_set_max_childs_running(uctrl, i);
+ break;
+ break;
+ case 'h':
+ printf("Usage: udevadm control COMMAND\n"
+ " --log-priority=<level> 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=<KEY>=<value> set a global environment variable\n"
+ " --max-childs=<N> maximum number of childs\n"
+ " --max-childs-running=<N> maximum number of childs running at the same time\n"
+ " --help print this help text\n\n");
goto exit;
- }
- *intval = count;
- info("send max_childs_running=%i\n", *intval);
- } else if (!strncmp(arg, "env", strlen("env"))) {
- if (!strncmp(arg, "env=", strlen("env=")))
- val = &arg[strlen("env=")];
- else
- val = argv[2];
- if (val == NULL) {
- fprintf(stderr, "missing key\n");
+ default:
goto exit;
}
- ctrl_msg.type = UDEVD_CTRL_ENV;
- strlcpy(ctrl_msg.buf, val, sizeof(ctrl_msg.buf));
- info("send env '%s'\n", val);
- } else if (strcmp(arg, "help") == 0 || strcmp(arg, "-h") == 0) {
- printf("Usage: udevadm control COMMAND\n"
- " --log_priority=<level> 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=<KEY>=<value> set a global environment variable\n"
- " --max_childs=<N> maximum number of childs\n"
- " --max_childs_running=<N> maximum number of childs running at the same time\n"
- " --help print this help text\n\n");
- goto exit;
- } else {
- 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) {
- err("error getting socket: %s\n", strerror(errno));
- goto exit;
- }
+ /* compat stuff which will be removed in a future release */
+ if (argv[optind] != NULL) {
+ const char *arg = argv[optind];
- memset(&saddr, 0x00, sizeof(struct sockaddr_un));
- saddr.sun_family = AF_LOCAL;
- /* use abstract namespace for socket path */
- strcpy(&saddr.sun_path[1], UDEVD_CTRL_SOCK_PATH);
- addrlen = offsetof(struct sockaddr_un, sun_path) + 1 + strlen(&saddr.sun_path[1]);
+ fprintf(stderr, "udevadm control commands requires the --<command> format, "
+ "this will stop working in a future release\n");
+ err("udevadm control commands requires the --<command> format, "
+ "this will stop working in a future release\n");
- retval = sendto(sock, &ctrl_msg, sizeof(ctrl_msg), 0, (struct sockaddr *)&saddr, addrlen);
- if (retval == -1) {
- err("error sending message: %s\n", strerror(errno));
- retval = 1;
- } else {
- dbg("sent message type=0x%02x, %u bytes sent\n", ctrl_msg.type, retval);
- retval = 0;
+ if (!strncmp(arg, "log_priority=", strlen("log_priority="))) {
+ udev_ctrl_set_log_level(uctrl, log_priority(&arg[strlen("log_priority=")]));
+ } else if (!strcmp(arg, "stop_exec_queue")) {
+ udev_ctrl_stop_exec_queue(uctrl);
+ } else if (!strcmp(arg, "start_exec_queue")) {
+ udev_ctrl_start_exec_queue(uctrl);
+ } else if (!strcmp(arg, "reload_rules")) {
+ udev_ctrl_reload_rules(uctrl);
+ } else if (!strncmp(arg, "max_childs=", strlen("max_childs="))) {
+ udev_ctrl_set_max_childs(uctrl, strtoul(&arg[strlen("max_childs=")], NULL, 0));
+ } else if (!strncmp(arg, "max_childs_running=", strlen("max_childs_running="))) {
+ udev_ctrl_set_max_childs_running(uctrl, strtoul(&arg[strlen("max_childs_running=")], NULL, 0));
+ } else if (!strncmp(arg, "env", strlen("env"))) {
+ udev_ctrl_set_env(uctrl, &arg[strlen("env=")]);
+ } else {
+ fprintf(stderr, "unrecognized command '%s'\n", arg);
+ err("unrecognized command '%s'\n", arg);
+ }
}
-
- close(sock);
exit:
+ udev_ctrl_unref(uctrl);
logging_close();
- return retval;
+ return rc;
}
~ianmdlvl / elogind.git / commitdiff