#include <sys/stat.h>
#include <sys/socket.h>
#include <sys/types.h>
+#include <sys/sysmacros.h>
#include <linux/types.h>
#include <linux/netlink.h>
-#include <libubox/avl-cmp.h>
#include <libubox/blobmsg_json.h>
#include <libubox/json_script.h>
#include <libubox/uloop.h>
#include <json-c/json.h>
+#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
#include <stdlib.h>
#include <libgen.h>
+#include <grp.h>
#include "../procd.h"
#define HOTPLUG_WAIT 500
+struct cmd_handler;
struct cmd_queue {
struct list_head list;
struct blob_attr *msg;
struct blob_attr *data;
+ int timeout;
+
void (*handler)(struct blob_attr *msg, struct blob_attr *data);
+ void (*start)(struct blob_attr *msg, struct blob_attr *data);
+ void (*complete)(struct blob_attr *msg, struct blob_attr *data, int ret);
};
-struct cmd_interval {
- struct avl_node avl;
-
- bool cancelled;
- struct timespec start;
+struct button_timeout {
+ struct list_head list;
struct uloop_timeout timeout;
- struct uloop_process process;
-
- struct blob_attr *msg;
+ char *name;
+ int seen;
struct blob_attr *data;
};
static LIST_HEAD(cmd_queue);
-static AVL_TREE(cmd_intervals, avl_strcmp, false, NULL);
+static LIST_HEAD(button_timer);
static struct uloop_process queue_proc;
static struct uloop_timeout last_event;
-static struct blob_buf b;
+static struct blob_buf b, button_buf;
static char *rule_file;
static struct blob_buf script;
+static struct cmd_queue *current;
+
+static void queue_add(struct cmd_handler *h, struct blob_attr *msg, struct blob_attr *data);
+static void handle_button_complete(struct blob_attr *msg, struct blob_attr *data, int ret);
+
+static void button_free(struct button_timeout *b)
+{
+ uloop_timeout_cancel(&b->timeout);
+ list_del(&b->list);
+ free(b->data);
+ free(b->name);
+ free(b);
+}
+
+static void button_timeout_remove(char *button)
+{
+ struct button_timeout *b, *c;
+
+ if (!list_empty(&button_timer)) list_for_each_entry_safe(b, c, &button_timer, list) {
+ if (!strcmp(b->name, button))
+ button_free(b);
+ }
+}
static char *hotplug_msg_find_var(struct blob_attr *msg, const char *name)
{
}
}
+static void chgrp_error(const char *group, const char *target, const char *failed)
+{
+ ERROR("cannot set group %s for %s (%s: %d)\n",
+ group, target, failed, errno);
+}
+
+static void chgrp_target(struct blob_attr *bgroup, struct blob_attr *btarget)
+{
+ int ret = 0;
+ struct group *g = NULL;
+ const char *group = blobmsg_get_string(bgroup);
+ const char *target = blobmsg_get_string(btarget);
+
+ errno = 0;
+
+ g = getgrnam(group);
+ if (!g)
+ return chgrp_error(group, target, "getgrnam");
+
+ ret = chown(target, 0, g->gr_gid);
+ if (ret < 0)
+ return chgrp_error(group, target, "chown");
+}
+
static void handle_makedev(struct blob_attr *msg, struct blob_attr *data)
{
unsigned int oldumask = umask(0);
- static struct blobmsg_policy mkdev_policy[2] = {
+ static struct blobmsg_policy mkdev_policy[3] = {
+ { .type = BLOBMSG_TYPE_STRING },
{ .type = BLOBMSG_TYPE_STRING },
{ .type = BLOBMSG_TYPE_STRING },
};
- struct blob_attr *tb[2];
+ struct blob_attr *tb[3];
char *minor = hotplug_msg_find_var(msg, "MINOR");
char *major = hotplug_msg_find_var(msg, "MAJOR");
char *subsystem = hotplug_msg_find_var(msg, "SUBSYSTEM");
- blobmsg_parse_array(mkdev_policy, 2, tb, blobmsg_data(data), blobmsg_data_len(data));
+ blobmsg_parse_array(mkdev_policy, 3, tb, blobmsg_data(data), blobmsg_data_len(data));
if (tb[0] && tb[1] && minor && major && subsystem) {
mode_t m = S_IFCHR;
char *d = strdup(blobmsg_get_string(tb[0]));
mknod(blobmsg_get_string(tb[0]),
m | strtoul(blobmsg_data(tb[1]), NULL, 8),
makedev(atoi(major), atoi(minor)));
+ if (tb[2])
+ chgrp_target(tb[2], tb[0]);
}
umask(oldumask);
}
exit(-1);
}
-static void handle_set_interval_timeout(struct uloop_timeout *timeout)
+static void handle_button_start(struct blob_attr *msg, struct blob_attr *data)
{
- struct cmd_interval *interval = container_of(timeout, struct cmd_interval, timeout);
- struct blob_attr *cur;
- char *argv[8];
- int rem, fd;
- int msecs = 0;
- int i = 0;
+ char *button = hotplug_msg_find_var(msg, "BUTTON");
- blobmsg_for_each_attr(cur, interval->data, rem) {
- switch (i) {
- case 0:
- break;
- case 1:
- msecs = strtol(blobmsg_get_string(cur), NULL, 0);
- break;
- default:
- argv[i - 2] = blobmsg_data(cur);
- }
- i++;
- if (i - 2 == 7)
- break;
- }
-
- if (interval->process.pending) {
- uloop_timeout_set(&interval->timeout, msecs);
- return;
- }
-
- interval->process.pid = fork();
- if (interval->process.pid < 0) {
- perror("fork");
- } else if (interval->process.pid == 0) {
- struct timespec now;
- char elapsed[6];
-
- if (i - 2 <= 0)
- return;
-
- clock_gettime(CLOCK_MONOTONIC, &now);
- snprintf(elapsed, sizeof(elapsed), "%ld", now.tv_sec - interval->start.tv_sec);
-
- blobmsg_for_each_attr(cur, interval->msg, rem)
- setenv(blobmsg_name(cur), blobmsg_data(cur), 1);
- setenv("ACTION", "interval", 1);
- setenv("ELAPSED", elapsed, 1);
- unsetenv("SEEN");
-
- if (debug < 3) {
- fd = open("/dev/null", O_RDWR);
- if (fd > -1) {
- dup2(fd, STDIN_FILENO);
- dup2(fd, STDOUT_FILENO);
- dup2(fd, STDERR_FILENO);
- if (fd > STDERR_FILENO)
- close(fd);
- }
- }
-
- argv[i - 2] = NULL;
- execvp(argv[0], &argv[0]);
- exit(-1);
- } else {
- uloop_process_add(&interval->process);
- uloop_timeout_set(&interval->timeout, msecs);
- }
-}
-
-static void handle_set_interval_process_cb(struct uloop_process *process, int ret)
-{
- struct cmd_interval *interval = container_of(process, struct cmd_interval, process);
-
- if (interval->cancelled)
- free(interval);
-}
-
-static void handle_set_interval(struct blob_attr *msg, struct blob_attr *data)
-{
- static struct blobmsg_policy set_interval_policy[2] = {
- { .type = BLOBMSG_TYPE_STRING },
- { .type = BLOBMSG_TYPE_STRING },
- };
- struct blob_attr *tb[2];
- struct cmd_interval *interval;
- struct blob_attr *_msg, *_data;
- char *_key;
- char *name;
- int msecs;
-
- blobmsg_parse_array(set_interval_policy, 2, tb, blobmsg_data(data), blobmsg_data_len(data));
- if (!tb[0] || !tb[1])
- return;
- name = blobmsg_get_string(tb[0]);
- msecs = strtol(blobmsg_get_string(tb[1]), NULL, 0);
-
- interval = calloc_a(sizeof(struct cmd_interval),
- &_key, strlen(name) + 1,
- &_msg, blob_pad_len(msg),
- &_data, blob_pad_len(data),
- NULL);
- if (!interval)
- return;
-
- strcpy(_key, name);
- interval->avl.key = _key;
- interval->msg = _msg;
- interval->data = _data;
- clock_gettime(CLOCK_MONOTONIC, &interval->start);
- interval->timeout.cb = handle_set_interval_timeout;
- interval->process.cb = handle_set_interval_process_cb;
-
- memcpy(interval->msg, msg, blob_pad_len(msg));
- memcpy(interval->data, data, blob_pad_len(data));
-
- avl_insert(&cmd_intervals, &interval->avl);
-
- uloop_timeout_set(&interval->timeout, msecs);
-}
-
-static void handle_clear_interval(struct blob_attr *msg, struct blob_attr *data)
-{
- static struct blobmsg_policy clear_interval_policy = {
- .type = BLOBMSG_TYPE_STRING,
- };
- struct blob_attr *tb;
- struct cmd_interval *interval;
- char *name;
-
- blobmsg_parse_array(&clear_interval_policy, 1, &tb, blobmsg_data(data), blobmsg_data_len(data));
- if (!tb)
- return;
- name = blobmsg_get_string(tb);
-
- interval = avl_find_element(&cmd_intervals, name, interval, avl);
- if (interval) {
- uloop_timeout_cancel(&interval->timeout);
- avl_delete(&cmd_intervals, &interval->avl);
- if (interval->process.pending)
- interval->cancelled = true;
- else
- free(interval);
- }
+ if (button)
+ button_timeout_remove(button);
}
static void handle_firmware(struct blob_attr *msg, struct blob_attr *data)
sprintf(path, "%s/%s", dir, file);
if (stat(path, &s)) {
- ERROR("Could not find firmware %s\n", path);
+ ERROR("Could not find firmware %s: %m\n", path);
src = -1;
s.st_size = 0;
goto send_to_kernel;
src = open(path, O_RDONLY);
if (src < 0) {
- ERROR("Failed to open %s\n", path);
+ ERROR("Failed to open %s: %m\n", path);
s.st_size = 0;
goto send_to_kernel;
}
snprintf(loadpath, sizeof(loadpath), "/sys/%s/loading", dev);
load = open(loadpath, O_WRONLY);
if (!load) {
- ERROR("Failed to open %s\n", loadpath);
+ ERROR("Failed to open %s: %m\n", loadpath);
exit(-1);
}
if (write(load, "1", 1) == -1) {
- ERROR("Failed to write to %s\n", loadpath);
+ ERROR("Failed to write to %s: %m\n", loadpath);
exit(-1);
}
close(load);
snprintf(syspath, sizeof(syspath), "/sys/%s/data", dev);
fw = open(syspath, O_WRONLY);
if (fw < 0) {
- ERROR("Failed to open %s\n", syspath);
+ ERROR("Failed to open %s: %m\n", syspath);
exit(-1);
}
break;
if (write(fw, buf, len) == -1) {
- ERROR("failed to write firmware file %s/%s to %s\n", dir, file, dev);
+ ERROR("failed to write firmware file %s/%s to %s: %m\n", dir, file, dev);
break;
}
}
load = open(loadpath, O_WRONLY);
if (write(load, "0", 1) == -1)
- ERROR("failed to write to %s\n", loadpath);
+ ERROR("failed to write to %s: %m\n", loadpath);
close(load);
DEBUG(2, "Done loading %s\n", path);
exit(-1);
}
+static void handle_start_console(struct blob_attr *msg, struct blob_attr *data)
+{
+ char *dev = blobmsg_get_string(blobmsg_data(data));
+
+ DEBUG(2, "Start console request for %s\n", dev);
+
+ procd_inittab_run("respawn");
+ procd_inittab_run("askfirst");
+
+ DEBUG(2, "Done starting console for %s\n", dev);
+
+ exit(-1);
+}
+
+enum {
+ HANDLER_MKDEV = 0,
+ HANDLER_RM,
+ HANDLER_EXEC,
+ HANDLER_BUTTON,
+ HANDLER_FW,
+ HANDLER_START_CONSOLE,
+};
+
static struct cmd_handler {
char *name;
int atomic;
void (*handler)(struct blob_attr *msg, struct blob_attr *data);
+ void (*start)(struct blob_attr *msg, struct blob_attr *data);
+ void (*complete)(struct blob_attr *msg, struct blob_attr *data, int ret);
} handlers[] = {
- {
+ [HANDLER_MKDEV] = {
.name = "makedev",
.atomic = 1,
.handler = handle_makedev,
- }, {
+ },
+ [HANDLER_RM] = {
.name = "rm",
.atomic = 1,
.handler = handle_rm,
- }, {
+ },
+ [HANDLER_EXEC] = {
.name = "exec",
.handler = handle_exec,
- }, {
- .name = "set-interval",
- .atomic = 1,
- .handler = handle_set_interval,
- }, {
- .name = "clear-interval",
- .atomic = 1,
- .handler = handle_clear_interval,
- }, {
+ },
+ [HANDLER_BUTTON] = {
+ .name = "button",
+ .handler = handle_exec,
+ .start = handle_button_start,
+ .complete = handle_button_complete,
+ },
+ [HANDLER_FW] = {
.name = "load-firmware",
.handler = handle_firmware,
},
+ [HANDLER_START_CONSOLE] = {
+ .name = "start-console",
+ .handler = handle_start_console,
+ },
};
static void queue_next(void)
c->handler(c->msg, c->data);
exit(0);
}
-
+ if (c->start)
+ c->start(c->msg, c->data);
list_del(&c->list);
- free(c);
-
+ if (c->complete)
+ current = c;
+ else
+ free(c);
if (queue_proc.pid <= 0) {
queue_next();
return;
{
DEBUG(4, "Finished hotplug exec instance, pid=%d\n", (int) c->pid);
+ if (current) {
+ current->complete(current->msg, current->data, ret);
+ free(current);
+ current = NULL;
+ }
queue_next();
}
&_data, blob_pad_len(data),
NULL);
- c->msg = _msg;
- c->data = _data;
-
if (!c)
return;
+ c->msg = _msg;
+ c->data = _data;
+
memcpy(c->msg, msg, blob_pad_len(msg));
memcpy(c->data, data, blob_pad_len(data));
c->handler = h->handler;
+ c->complete = h->complete;
+ c->start = h->start;
list_add_tail(&c->list, &cmd_queue);
queue_next();
}
+static void handle_button_timeout(struct uloop_timeout *t)
+{
+ struct button_timeout *b;
+ char seen[16];
+
+ b = container_of(t, struct button_timeout, timeout);
+ blob_buf_init(&button_buf, 0);
+ blobmsg_add_string(&button_buf, "BUTTON", b->name);
+ blobmsg_add_string(&button_buf, "ACTION", "timeout");
+ snprintf(seen, sizeof(seen), "%d", b->seen);
+ blobmsg_add_string(&button_buf, "SEEN", seen);
+ queue_add(&handlers[HANDLER_EXEC], button_buf.head, b->data);
+ button_free(b);
+}
+
+static void handle_button_complete(struct blob_attr *msg, struct blob_attr *data, int ret)
+{
+ char *name = hotplug_msg_find_var(msg, "BUTTON");
+ struct button_timeout *b;
+ int timeout = ret >> 8;
+
+ if (!timeout)
+ return;
+
+ if (!name)
+ return;
+
+ b = calloc(1, sizeof(*b));
+ if (!b)
+ return;
+
+ b->data = malloc(blob_pad_len(data));
+ b->name = strdup(name);
+ b->seen = timeout;
+
+ memcpy(b->data, data, blob_pad_len(data));
+ b->timeout.cb = handle_button_timeout;
+
+ uloop_timeout_set(&b->timeout, timeout * 1000);
+ list_add(&b->list, &button_timer);
+}
+
static const char* rule_handle_var(struct json_script_ctx *ctx, const char *name, struct blob_attr *vars)
{
const char *str, *sep;
int rem, i;
if (debug > 3) {
- DEBUG(4, "Command: %s", name);
+ DEBUG(4, "Command: %s\n", name);
blobmsg_for_each_attr(cur, data, rem)
- DEBUG(4, " %s", (char *) blobmsg_data(cur));
- DEBUG(4, "\n");
+ DEBUG(4, " %s\n", (char *) blobmsg_data(cur));
- DEBUG(4, "Message:");
+ DEBUG(4, "Message:\n");
blobmsg_for_each_attr(cur, vars, rem)
- DEBUG(4, " %s=%s", blobmsg_name(cur), (char *) blobmsg_data(cur));
- DEBUG(4, "\n");
+ DEBUG(4, " %s=%s\n", blobmsg_name(cur), (char *) blobmsg_data(cur));
}
for (i = 0; i < ARRAY_SIZE(handlers); i++)
{
int i = 0;
static char buf[4096];
- int len = recv(u->fd, buf, sizeof(buf), MSG_DONTWAIT);
+ int len = recv(u->fd, buf, sizeof(buf) - 1, MSG_DONTWAIT);
void *index;
if (len < 1)
return;
+ buf[len] = '\0';
+
blob_buf_init(&b, 0);
index = blobmsg_open_table(&b, NULL);
while (i < len) {
void hotplug(char *rules)
{
- struct sockaddr_nl nls;
+ struct sockaddr_nl nls = {};
int nlbufsize = 512 * 1024;
rule_file = strdup(rules);
- memset(&nls,0,sizeof(struct sockaddr_nl));
nls.nl_family = AF_NETLINK;
nls.nl_pid = getpid();
nls.nl_groups = -1;
if ((hotplug_fd.fd = socket(PF_NETLINK, SOCK_DGRAM | SOCK_CLOEXEC, NETLINK_KOBJECT_UEVENT)) == -1) {
- ERROR("Failed to open hotplug socket: %s\n", strerror(errno));
+ ERROR("Failed to open hotplug socket: %m\n");
exit(1);
}
if (bind(hotplug_fd.fd, (void *)&nls, sizeof(struct sockaddr_nl))) {
- ERROR("Failed to bind hotplug socket: %s\n", strerror(errno));
+ ERROR("Failed to bind hotplug socket: %m\n");
exit(1);
}
if (setsockopt(hotplug_fd.fd, SOL_SOCKET, SO_RCVBUFFORCE, &nlbufsize, sizeof(nlbufsize)))
- ERROR("Failed to resize receive buffer: %s\n", strerror(errno));
+ ERROR("Failed to resize receive buffer: %m\n");
json_script_init(&jctx);
queue_proc.cb = queue_proc_cb;
projects / project / procd.git / blobdiff