static struct netifd_fd proto_fd;
+enum proto_shell_sm {
+ S_IDLE,
+ S_SETUP,
+ S_SETUP_ABORT,
+ S_TEARDOWN,
+};
+
struct proto_shell_handler {
struct list_head list;
struct proto_handler proto;
struct config_param_list config;
char *config_buf;
+ bool init_available;
char script_name[];
};
struct device_user l3_dev;
- struct uloop_timeout setup_timeout;
+ struct uloop_timeout teardown_timeout;
+
struct netifd_process setup_task;
struct netifd_process teardown_task;
- bool teardown_pending;
- bool teardown_wait_task;
-
struct netifd_process proto_task;
+
+ enum proto_shell_sm sm;
+ bool proto_task_killed;
+
int last_error;
};
proc = &state->setup_task;
state->last_error = -1;
} else {
- action = "teardown";
- proc = &state->teardown_task;
- if (state->setup_task.uloop.pending && !state->teardown_wait_task) {
- uloop_timeout_set(&state->setup_timeout, 1000);
- kill(state->setup_task.uloop.pid, SIGTERM);
- state->teardown_pending = true;
+ if (state->sm == S_TEARDOWN)
+ return 0;
+
+ if (state->setup_task.uloop.pending) {
+ if (state->sm != S_SETUP_ABORT) {
+ uloop_timeout_set(&state->teardown_timeout, 1000);
+ kill(state->setup_task.uloop.pid, SIGTERM);
+ if (state->proto_task.uloop.pending)
+ kill(state->proto_task.uloop.pid, SIGTERM);
+ state->sm = S_SETUP_ABORT;
+ }
return 0;
}
+
+ action = "teardown";
+ proc = &state->teardown_task;
+ state->sm = S_TEARDOWN;
if (state->last_error >= 0) {
snprintf(error_buf, sizeof(error_buf), "ERROR=%d", state->last_error);
envp[j++] = error_buf;
}
+ uloop_timeout_set(&state->teardown_timeout, 5000);
}
config = blobmsg_format_json(state->config, true);
}
static void
-proto_shell_setup_timeout_cb(struct uloop_timeout *timeout)
+proto_shell_task_finish(struct proto_shell_state *state,
+ struct netifd_process *task)
+{
+ switch (state->sm) {
+ case S_IDLE:
+ if (task == &state->proto_task)
+ state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
+ /* fall through */
+ case S_SETUP:
+ if (task == &state->proto_task)
+ proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN,
+ false);
+ break;
+
+ case S_SETUP_ABORT:
+ if (state->setup_task.uloop.pending ||
+ state->proto_task.uloop.pending)
+ break;
+
+ uloop_timeout_cancel(&state->teardown_timeout);
+ state->sm = S_IDLE;
+ proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false);
+ break;
+
+ case S_TEARDOWN:
+ if (state->teardown_task.uloop.pending)
+ break;
+
+ if (state->proto_task.uloop.pending) {
+ if (!state->proto_task_killed)
+ kill(state->proto_task.uloop.pid, SIGTERM);
+ break;
+ }
+
+ uloop_timeout_cancel(&state->teardown_timeout);
+ state->sm = S_IDLE;
+ state->proto.proto_event(&state->proto, IFPEV_DOWN);
+ break;
+ }
+}
+
+static void
+proto_shell_teardown_timeout_cb(struct uloop_timeout *timeout)
{
struct proto_shell_state *state;
- state = container_of(timeout, struct proto_shell_state, setup_timeout);
- kill(state->setup_task.uloop.pid, SIGKILL);
+ state = container_of(timeout, struct proto_shell_state, teardown_timeout);
+
+ netifd_kill_process(&state->setup_task);
+ netifd_kill_process(&state->proto_task);
+ netifd_kill_process(&state->teardown_task);
+ proto_shell_task_finish(state, NULL);
}
static void
struct proto_shell_state *state;
state = container_of(p, struct proto_shell_state, setup_task);
- uloop_timeout_cancel(&state->setup_timeout);
- if (state->teardown_pending) {
- state->teardown_pending = false;
- proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false);
- }
+ proto_shell_task_finish(state, p);
}
static void
struct proto_shell_state *state;
state = container_of(p, struct proto_shell_state, teardown_task);
-
- if (state->teardown_wait_task)
- return;
-
- netifd_kill_process(&state->proto_task);
- state->proto.proto_event(&state->proto, IFPEV_DOWN);
+ proto_shell_task_finish(state, p);
}
static void
proto_shell_task_cb(struct netifd_process *p, int ret)
{
struct proto_shell_state *state;
- bool teardown_wait_task;
state = container_of(p, struct proto_shell_state, proto_task);
- teardown_wait_task = state->teardown_wait_task;
- state->teardown_wait_task = false;
- if (state->teardown_pending || state->teardown_task.uloop.pending)
- return;
+ if (state->sm == S_IDLE || state->sm == S_SETUP)
+ state->last_error = WEXITSTATUS(ret);
- if (teardown_wait_task) {
- proto_shell_teardown_cb(&state->teardown_task, 0);
- return;
- }
-
- state->last_error = ret;
- state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
- proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false);
+ proto_shell_task_finish(state, p);
}
static void
enum {
NOTIFY_ACTION,
+ NOTIFY_ERROR,
NOTIFY_COMMAND,
NOTIFY_ENV,
NOTIFY_SIGNAL,
+ NOTIFY_AVAILABLE,
NOTIFY_LINK_UP,
NOTIFY_IFNAME,
NOTIFY_ADDR_EXT,
static const struct blobmsg_policy notify_attr[__NOTIFY_LAST] = {
[NOTIFY_ACTION] = { .name = "action", .type = BLOBMSG_TYPE_INT32 },
+ [NOTIFY_ERROR] = { .name = "error", .type = BLOBMSG_TYPE_ARRAY },
[NOTIFY_COMMAND] = { .name = "command", .type = BLOBMSG_TYPE_ARRAY },
[NOTIFY_ENV] = { .name = "env", .type = BLOBMSG_TYPE_ARRAY },
[NOTIFY_SIGNAL] = { .name = "signal", .type = BLOBMSG_TYPE_INT32 },
+ [NOTIFY_AVAILABLE] = { .name = "available", .type = BLOBMSG_TYPE_BOOL },
[NOTIFY_LINK_UP] = { .name = "link-up", .type = BLOBMSG_TYPE_BOOL },
[NOTIFY_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
[NOTIFY_ADDR_EXT] = { .name = "address-external", .type = BLOBMSG_TYPE_BOOL },
signal = SIGTERM;
if (state->proto_task.uloop.pending) {
+ state->proto_task_killed = true;
kill(state->proto_task.uloop.pid, signal);
- state->teardown_wait_task = true;
}
return 0;
}
static int
+proto_shell_notify_error(struct proto_shell_state *state, struct blob_attr **tb)
+{
+ struct blob_attr *cur;
+ char *data[16];
+ int n_data = 0;
+ int rem;
+
+ if (!tb[NOTIFY_ERROR])
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ blobmsg_for_each_attr(cur, tb[NOTIFY_ERROR], rem) {
+ if (n_data + 1 == ARRAY_SIZE(data))
+ goto error;
+
+ if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
+ goto error;
+
+ if (!blobmsg_check_attr(cur, NULL))
+ goto error;
+
+ data[n_data++] = blobmsg_data(cur);
+ }
+
+ if (!n_data)
+ goto error;
+
+ interface_add_error(state->proto.iface, state->handler->proto.name,
+ data[0], (const char **) &data[1], n_data - 1);
+
+ return 0;
+
+error:
+ return UBUS_STATUS_INVALID_ARGUMENT;
+}
+
+static int
+proto_shell_block_restart(struct proto_shell_state *state, struct blob_attr **tb)
+{
+ state->proto.iface->autostart = false;
+ return 0;
+}
+
+static int
+proto_shell_set_available(struct proto_shell_state *state, struct blob_attr **tb)
+{
+ if (!tb[NOTIFY_AVAILABLE])
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ interface_set_available(state->proto.iface, blobmsg_get_bool(tb[NOTIFY_AVAILABLE]));
+ return 0;
+}
+
+static int
proto_shell_notify(struct interface_proto_state *proto, struct blob_attr *attr)
{
struct proto_shell_state *state;
return proto_shell_run_command(state, tb);
case 2:
return proto_shell_kill_command(state, tb);
+ case 3:
+ return proto_shell_notify_error(state, tb);
+ case 4:
+ return proto_shell_block_restart(state, tb);
+ case 5:
+ return proto_shell_set_available(state, tb);
default:
return UBUS_STATUS_INVALID_ARGUMENT;
}
state->proto.free = proto_shell_free;
state->proto.notify = proto_shell_notify;
state->proto.cb = proto_shell_handler;
- state->setup_timeout.cb = proto_shell_setup_timeout_cb;
+ state->teardown_timeout.cb = proto_shell_teardown_timeout_cb;
state->setup_task.cb = proto_shell_setup_cb;
state->setup_task.dir_fd = proto_fd.fd;
state->setup_task.log_prefix = iface->name;
if (tmp && json_object_get_boolean(tmp))
handler->proto.flags |= PROTO_FLAG_NODEV;
+ tmp = get_field(obj, "available", json_type_boolean);
+ if (tmp && json_object_get_boolean(tmp))
+ handler->proto.flags |= PROTO_FLAG_INIT_AVAILABLE;
+
config = get_field(obj, "config", json_type_array);
if (config)
handler->config_buf = proto_shell_parse_config(&handler->config, config);
projects / project / netifd.git / blobdiff