+#define _GNU_SOURCE
+
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include "interface-ip.h"
#include "proto.h"
-static int proto_fd;
+static struct netifd_fd proto_fd;
struct proto_shell_handler {
struct list_head list;
struct device_user l3_dev;
struct uloop_timeout setup_timeout;
- struct uloop_process setup_task;
- struct uloop_process teardown_task;
+ struct netifd_process setup_task;
+ struct netifd_process teardown_task;
bool teardown_pending;
-};
-
-static int
-run_script(const char **argv, struct uloop_process *proc)
-{
- int pid;
-
- if ((pid = fork()) < 0)
- return -1;
+ bool teardown_wait_task;
- if (!pid) {
- fchdir(proto_fd);
- execvp(argv[0], (char **) argv);
- exit(127);
- }
-
- if (pid < 0)
- return -1;
-
- proc->pid = pid;
- uloop_process_add(proc);
-
- return 0;
-}
+ struct netifd_process proto_task;
+};
static int
proto_shell_handler(struct interface_proto_state *proto,
{
struct proto_shell_state *state;
struct proto_shell_handler *handler;
- struct uloop_process *proc;
+ struct netifd_process *proc;
const char *argv[6];
const char *action;
char *config;
} else {
action = "teardown";
proc = &state->teardown_task;
- if (state->setup_task.pending) {
+ if (state->setup_task.uloop.pending && !state->teardown_wait_task) {
uloop_timeout_set(&state->setup_timeout, 1000);
- kill(state->setup_task.pid, SIGINT);
+ kill(state->setup_task.uloop.pid, SIGTERM);
state->teardown_pending = true;
return 0;
}
argv[i++] = proto->iface->main_dev.dev->ifname;
argv[i] = NULL;
- ret = run_script(argv, proc);
+ ret = netifd_start_process(argv, NULL, proc);
free(config);
return ret;
struct proto_shell_state *state;
state = container_of(timeout, struct proto_shell_state, setup_timeout);
- kill(state->setup_task.pid, SIGKILL);
+ kill(state->setup_task.uloop.pid, SIGKILL);
}
static void
-proto_shell_setup_cb(struct uloop_process *p, int ret)
+proto_shell_setup_cb(struct netifd_process *p, int ret)
{
struct proto_shell_state *state;
}
static void
-proto_shell_teardown_cb(struct uloop_process *p, int ret)
+proto_shell_teardown_cb(struct netifd_process *p, int ret)
{
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);
- if (state->l3_dev.dev)
- device_remove_user(&state->l3_dev);
+}
+
+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 (teardown_wait_task) {
+ proto_shell_teardown_cb(&state->teardown_task, 0);
+ return;
+ }
+
+ state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
+ proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false);
}
static void
static const struct blobmsg_policy route_attr[__ROUTE_LAST] = {
[ROUTE_TARGET] = { .name = "target", .type = BLOBMSG_TYPE_STRING },
- [ROUTE_MASK] = { .name = "mask", .type = BLOBMSG_TYPE_INT32 },
+ [ROUTE_MASK] = { .name = "mask", .type = BLOBMSG_TYPE_STRING },
[ROUTE_GATEWAY] = { .name = "gateway", .type = BLOBMSG_TYPE_STRING },
[ROUTE_DEVICE] = { .name = "device", .type = BLOBMSG_TYPE_STRING },
};
route->mask = v6 ? 128 : 32;
if ((cur = tb[ROUTE_MASK]) != NULL) {
- route->mask = blobmsg_get_u32(cur);
- if (route->mask > v6 ? 128 : 32)
+ route->mask = parse_netmask_string(blobmsg_data(cur), v6);
+ if (route->mask > (v6 ? 128 : 32))
goto error;
}
}
}
-
enum {
+ NOTIFY_ACTION,
+ NOTIFY_COMMAND,
+ NOTIFY_ENV,
+ NOTIFY_SIGNAL,
NOTIFY_LINK_UP,
NOTIFY_IFNAME,
NOTIFY_ADDR_EXT,
NOTIFY_IP6ADDR,
NOTIFY_ROUTES,
NOTIFY_ROUTES6,
+ NOTIFY_DNS,
+ NOTIFY_DNS_SEARCH,
__NOTIFY_LAST
};
static const struct blobmsg_policy notify_attr[__NOTIFY_LAST] = {
+ [NOTIFY_ACTION] = { .name = "action", .type = BLOBMSG_TYPE_INT32 },
+ [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_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 },
[NOTIFY_IP6ADDR] = { .name = "ip6addr", .type = BLOBMSG_TYPE_ARRAY },
[NOTIFY_ROUTES] = { .name = "routes", .type = BLOBMSG_TYPE_ARRAY },
[NOTIFY_ROUTES6] = { .name = "routes6", .type = BLOBMSG_TYPE_ARRAY },
+ [NOTIFY_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
+ [NOTIFY_DNS_SEARCH] = { .name = "dns_search", .type = BLOBMSG_TYPE_ARRAY },
};
static int
-proto_shell_notify(struct interface_proto_state *proto, struct blob_attr *attr)
+proto_shell_update_link(struct proto_shell_state *state, struct blob_attr **tb)
{
- struct proto_shell_state *state;
- struct blob_attr *tb[__NOTIFY_LAST], *cur;
+ struct blob_attr *cur;
bool addr_ext = false;
bool up;
- state = container_of(proto, struct proto_shell_state, proto);
-
- blobmsg_parse(notify_attr, __NOTIFY_LAST, tb, blob_data(attr), blob_len(attr));
if (!tb[NOTIFY_LINK_UP])
return UBUS_STATUS_INVALID_ARGUMENT;
up = blobmsg_get_bool(tb[NOTIFY_LINK_UP]);
- if (up) {
- if (!tb[NOTIFY_IFNAME])
- return UBUS_STATUS_INVALID_ARGUMENT;
-
- if (!state->l3_dev.dev) {
- device_add_user(&state->l3_dev,
- device_get(blobmsg_data(tb[NOTIFY_IFNAME]), true));
- device_claim(&state->l3_dev);
- state->proto.iface->l3_dev = &state->l3_dev;
- }
- state->proto.proto_event(&state->proto, IFPEV_UP);
- } else {
+ if (!up) {
state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
+ return 0;
+ }
+
+ if (!tb[NOTIFY_IFNAME]) {
+ if (!state->proto.iface->main_dev.dev)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+ } else if (!state->l3_dev.dev) {
+ device_add_user(&state->l3_dev,
+ device_get(blobmsg_data(tb[NOTIFY_IFNAME]), true));
+ device_claim(&state->l3_dev);
+ state->proto.iface->l3_dev = &state->l3_dev;
}
+ interface_ip_update_start(state->proto.iface);
+
if ((cur = tb[NOTIFY_ADDR_EXT]) != NULL)
addr_ext = blobmsg_get_bool(cur);
if ((cur = tb[NOTIFY_ROUTES6]) != NULL)
proto_shell_parse_route_list(state->proto.iface, cur, true);
+ if ((cur = tb[NOTIFY_DNS]) != NULL)
+ interface_add_dns_server_list(state->proto.iface, cur);
+
+ if ((cur = tb[NOTIFY_DNS_SEARCH]) != NULL)
+ interface_add_dns_search_list(state->proto.iface, cur);
+
+ interface_ip_update_complete(state->proto.iface);
+
+ state->proto.proto_event(&state->proto, IFPEV_UP);
+
+ return 0;
+}
+
+static bool
+fill_string_list(struct blob_attr *attr, char **argv, int max)
+{
+ struct blob_attr *cur;
+ int argc = 0;
+ int rem;
+
+ if (!attr)
+ goto out;
+
+ blobmsg_for_each_attr(cur, attr, rem) {
+ if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
+ return false;
+
+ if (!blobmsg_check_attr(cur, NULL))
+ return false;
+
+ argv[argc++] = blobmsg_data(cur);
+ if (argc == max - 1)
+ return false;
+ }
+
+out:
+ argv[argc] = NULL;
+ return true;
+}
+
+static int
+proto_shell_run_command(struct proto_shell_state *state, struct blob_attr **tb)
+{
+ char *argv[64];
+ char *env[32];
+
+ if (!tb[NOTIFY_COMMAND])
+ goto error;
+
+ if (!fill_string_list(tb[NOTIFY_COMMAND], argv, ARRAY_SIZE(argv)))
+ goto error;
+
+ if (!fill_string_list(tb[NOTIFY_ENV], env, ARRAY_SIZE(env)))
+ goto error;
+
+ netifd_start_process((const char **) argv, (char **) env, &state->proto_task);
+
+ return 0;
+
+error:
+ return UBUS_STATUS_INVALID_ARGUMENT;
+}
+
+static int
+proto_shell_kill_command(struct proto_shell_state *state, struct blob_attr **tb)
+{
+ unsigned int signal = ~0;
+
+ if (tb[NOTIFY_SIGNAL])
+ signal = blobmsg_get_u32(tb[NOTIFY_SIGNAL]);
+
+ if (signal > 31)
+ signal = SIGTERM;
+
+ if (state->proto_task.uloop.pending) {
+ kill(state->proto_task.uloop.pid, signal);
+ state->teardown_wait_task = true;
+ }
+
return 0;
}
+static int
+proto_shell_notify(struct interface_proto_state *proto, struct blob_attr *attr)
+{
+ struct proto_shell_state *state;
+ struct blob_attr *tb[__NOTIFY_LAST];
+
+ state = container_of(proto, struct proto_shell_state, proto);
+
+ blobmsg_parse(notify_attr, __NOTIFY_LAST, tb, blob_data(attr), blob_len(attr));
+ if (!tb[NOTIFY_ACTION])
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ switch(blobmsg_get_u32(tb[NOTIFY_ACTION])) {
+ case 0:
+ return proto_shell_update_link(state, tb);
+ case 1:
+ return proto_shell_run_command(state, tb);
+ case 2:
+ return proto_shell_kill_command(state, tb);
+ default:
+ return UBUS_STATUS_INVALID_ARGUMENT;
+ }
+}
+
struct interface_proto_state *
proto_shell_attach(const struct proto_handler *h, struct interface *iface,
struct blob_attr *attr)
state->proto.cb = proto_shell_handler;
state->setup_timeout.cb = proto_shell_setup_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;
state->teardown_task.cb = proto_shell_teardown_cb;
+ state->teardown_task.dir_fd = proto_fd.fd;
+ state->teardown_task.log_prefix = iface->name;
+ state->proto_task.cb = proto_shell_task_cb;
+ state->proto_task.dir_fd = proto_fd.fd;
+ state->proto_task.log_prefix = iface->name;
state->handler = container_of(h, struct proto_shell_handler, proto);
return &state->proto;
if (chdir("./proto"))
goto close_cur;
- proto_fd = open(".", O_RDONLY | O_DIRECTORY);
- if (proto_fd < 0)
+ proto_fd.fd = open(".", O_RDONLY | O_DIRECTORY);
+ if (proto_fd.fd < 0)
goto close_cur;
+ netifd_fd_add(&proto_fd);
glob("./*.sh", 0, NULL, &g);
for (i = 0; i < g.gl_pathc; i++)
proto_shell_add_script(g.gl_pathv[i]);
projects / project / netifd.git / blobdiff