#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 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_process setup_task;
- struct uloop_process teardown_task;
+ struct netifd_process setup_task;
+ struct netifd_process teardown_task;
bool teardown_pending;
bool teardown_wait_task;
- struct uloop_process proto_task;
+ struct netifd_process proto_task;
+ int last_error;
};
-static void
-kill_process(struct uloop_process *proc)
-{
- if (!proc->pending)
- return;
-
- kill(proc->pid, SIGTERM);
- uloop_process_delete(proc);
-}
-
-static int
-start_process(const char **argv, struct uloop_process *proc)
-{
- int pid;
-
- kill_process(proc);
-
- if ((pid = fork()) < 0)
- return -1;
-
- 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;
-}
-
static int
proto_shell_handler(struct interface_proto_state *proto,
enum interface_proto_cmd cmd, bool force)
{
struct proto_shell_state *state;
struct proto_shell_handler *handler;
- struct uloop_process *proc;
- const char *argv[6];
+ struct netifd_process *proc;
+ static char error_buf[32];
+ const char *argv[7];
+ char *envp[2];
const char *action;
char *config;
- int ret, i = 0;
+ int ret, i = 0, j = 0;
state = container_of(proto, struct proto_shell_state, proto);
handler = state->handler;
if (cmd == PROTO_CMD_SETUP) {
action = "setup";
proc = &state->setup_task;
+ state->last_error = -1;
} else {
action = "teardown";
proc = &state->teardown_task;
- if (state->setup_task.pending && !state->teardown_wait_task) {
+ if (state->setup_task.uloop.pending && !state->teardown_wait_task) {
uloop_timeout_set(&state->setup_timeout, 1000);
- kill(state->setup_task.pid, SIGTERM);
+ kill(state->setup_task.uloop.pid, SIGTERM);
state->teardown_pending = true;
return 0;
}
+ if (state->last_error >= 0) {
+ snprintf(error_buf, sizeof(error_buf), "ERROR=%d", state->last_error);
+ envp[j++] = error_buf;
+ }
}
config = blobmsg_format_json(state->config, true);
if (proto->iface->main_dev.dev)
argv[i++] = proto->iface->main_dev.dev->ifname;
argv[i] = NULL;
+ envp[j] = NULL;
- ret = start_process(argv, proc);
+ ret = netifd_start_process(argv, envp, 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;
if (state->teardown_wait_task)
return;
- kill_process(&state->proto_task);
-
- if (state->l3_dev.dev)
- device_remove_user(&state->l3_dev);
-
+ netifd_kill_process(&state->proto_task);
state->proto.proto_event(&state->proto, IFPEV_DOWN);
}
static void
-proto_shell_task_cb(struct uloop_process *p, int ret)
+proto_shell_task_cb(struct netifd_process *p, int ret)
{
struct proto_shell_state *state;
bool teardown_wait_task;
teardown_wait_task = state->teardown_wait_task;
state->teardown_wait_task = false;
- if (state->teardown_pending || state->teardown_task.pending)
+ if (state->teardown_pending || state->teardown_task.uloop.pending)
return;
if (teardown_wait_task) {
return;
}
+ state->last_error = WEXITSTATUS(ret);
state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false);
}
}
static void
-proto_shell_parse_addr_list(struct interface *iface, struct blob_attr *attr,
+proto_shell_parse_addr_list(struct interface_ip_settings *ip, struct blob_attr *attr,
bool v6, bool external)
{
struct device_addr *addr;
if (external)
addr->flags |= DEVADDR_EXTERNAL;
- vlist_add(&iface->proto_addr, &addr->node);
- }
-}
-
-enum {
- ROUTE_TARGET,
- ROUTE_MASK,
- ROUTE_GATEWAY,
- ROUTE_DEVICE,
- __ROUTE_LAST
-};
-
-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_GATEWAY] = { .name = "gateway", .type = BLOBMSG_TYPE_STRING },
- [ROUTE_DEVICE] = { .name = "device", .type = BLOBMSG_TYPE_STRING },
-};
-
-static void
-parse_route(struct interface *iface, struct blob_attr *attr, bool v6)
-{
- struct blob_attr *tb[__ROUTE_LAST], *cur;
- struct device_route *route;
- int af = v6 ? AF_INET6 : AF_INET;
-
- blobmsg_parse(route_attr, __ROUTE_LAST, tb, blobmsg_data(attr), blobmsg_data_len(attr));
-
- if (!tb[ROUTE_GATEWAY] && !tb[ROUTE_DEVICE])
- return;
-
- route = calloc(1, sizeof(*route));
- if (!route)
- return;
-
- route->mask = v6 ? 128 : 32;
- if ((cur = tb[ROUTE_MASK]) != NULL) {
- route->mask = blobmsg_get_u32(cur);
- if (route->mask > v6 ? 128 : 32)
- goto error;
- }
-
- if ((cur = tb[ROUTE_TARGET]) != NULL) {
- if (!inet_pton(af, blobmsg_data(cur), &route->addr)) {
- DPRINTF("Failed to parse route target: %s\n", (char *) blobmsg_data(cur));
- goto error;
- }
- }
-
- if ((cur = tb[ROUTE_GATEWAY]) != NULL) {
- if (!inet_pton(af, blobmsg_data(cur), &route->nexthop)) {
- DPRINTF("Failed to parse route gateway: %s\n", (char *) blobmsg_data(cur));
- goto error;
- }
+ vlist_add(&ip->addr, &addr->node);
}
-
- if ((cur = tb[ROUTE_DEVICE]) != NULL)
- route->device = device_get(blobmsg_data(cur), true);
-
- vlist_add(&iface->proto_route, &route->node);
- return;
-
-error:
- free(route);
}
static void
continue;
}
- parse_route(iface, cur, v6);
+ interface_ip_add_route(iface, cur, v6);
}
}
-
enum {
NOTIFY_ACTION,
+ NOTIFY_ERROR,
NOTIFY_COMMAND,
+ NOTIFY_ENV,
NOTIFY_SIGNAL,
+ NOTIFY_AVAILABLE,
NOTIFY_LINK_UP,
NOTIFY_IFNAME,
NOTIFY_ADDR_EXT,
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_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 },
[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_update_link(struct proto_shell_state *state, struct blob_attr **tb)
{
+ struct interface_ip_settings *ip;
struct blob_attr *cur;
+ int dev_create = 1;
bool addr_ext = false;
bool up;
return 0;
}
- if (!tb[NOTIFY_IFNAME])
- return UBUS_STATUS_INVALID_ARGUMENT;
+ if ((cur = tb[NOTIFY_ADDR_EXT]) != NULL) {
+ addr_ext = blobmsg_get_bool(cur);
+ if (addr_ext)
+ dev_create = 2;
+ }
+
+ if (!tb[NOTIFY_IFNAME]) {
+ if (!state->proto.iface->main_dev.dev)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+ } else {
+ if (state->l3_dev.dev)
+ device_remove_user(&state->l3_dev);
- if (!state->l3_dev.dev) {
device_add_user(&state->l3_dev,
- device_get(blobmsg_data(tb[NOTIFY_IFNAME]), true));
- device_claim(&state->l3_dev);
+ device_get(blobmsg_data(tb[NOTIFY_IFNAME]), dev_create));
state->proto.iface->l3_dev = &state->l3_dev;
+ device_claim(&state->l3_dev);
}
- interface_ip_update_start(state->proto.iface);
-
- if ((cur = tb[NOTIFY_ADDR_EXT]) != NULL)
- addr_ext = blobmsg_get_bool(cur);
+ ip = &state->proto.iface->proto_ip;
+ interface_update_start(state->proto.iface);
if ((cur = tb[NOTIFY_IPADDR]) != NULL)
- proto_shell_parse_addr_list(state->proto.iface, cur, false, addr_ext);
+ proto_shell_parse_addr_list(ip, cur, false, addr_ext);
if ((cur = tb[NOTIFY_IP6ADDR]) != NULL)
- proto_shell_parse_addr_list(state->proto.iface, cur, true, addr_ext);
+ proto_shell_parse_addr_list(ip, cur, true, addr_ext);
if ((cur = tb[NOTIFY_ROUTES]) != NULL)
proto_shell_parse_route_list(state->proto.iface, cur, false);
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);
+ interface_add_dns_server_list(ip, cur);
- interface_ip_update_complete(state->proto.iface);
+ if ((cur = tb[NOTIFY_DNS_SEARCH]) != NULL)
+ interface_add_dns_search_list(ip, cur);
+
+ interface_update_complete(state->proto.iface);
state->proto.proto_event(&state->proto, IFPEV_UP);
return 0;
}
-static int
-proto_shell_run_command(struct proto_shell_state *state, struct blob_attr **tb)
+static bool
+fill_string_list(struct blob_attr *attr, char **argv, int max)
{
struct blob_attr *cur;
- char *argv[64];
int argc = 0;
int rem;
- if (!tb[NOTIFY_COMMAND])
- goto error;
+ if (!attr)
+ goto out;
- blobmsg_for_each_attr(cur, tb[NOTIFY_COMMAND], rem) {
+ blobmsg_for_each_attr(cur, attr, rem) {
if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
- goto error;
+ return false;
if (!blobmsg_check_attr(cur, NULL))
- goto error;
+ return false;
argv[argc++] = blobmsg_data(cur);
- if (argc == ARRAY_SIZE(argv) - 1)
- goto error;
+ if (argc == max - 1)
+ return false;
}
+
+out:
argv[argc] = NULL;
- start_process((const char **) argv, &state->proto_task);
+ return true;
+}
+
+static int
+proto_shell_run_command(struct proto_shell_state *state, struct blob_attr **tb)
+{
+ static char *argv[64];
+ static 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;
if (signal > 31)
signal = SIGTERM;
- if (state->proto_task.pending) {
- kill(state->proto_task.pid, signal);
+ if (state->proto_task.uloop.pending) {
+ kill(state->proto_task.uloop.pid, signal);
state->teardown_wait_task = true;
}
}
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;
}
}
-struct interface_proto_state *
+static 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 (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);
struct json_tokener *tok = NULL;
json_object *obj;
static char buf[512];
- char *start, *end, *cmd;
+ char *start, *cmd;
FILE *f;
- int buflen, len;
+ int len;
#define DUMP_SUFFIX " '' dump"
return;
do {
- buflen = fread(buf, 1, sizeof(buf) - 1, f);
- if (buflen <= 0)
+ start = fgets(buf, sizeof(buf), f);
+ if (!start)
continue;
- start = buf;
- len = buflen;
- do {
- end = memchr(start, '\n', len);
- if (end)
- len = end - start;
-
- if (!tok)
- tok = json_tokener_new();
-
- obj = json_tokener_parse_ex(tok, start, len);
- if (!is_error(obj)) {
- proto_shell_add_handler(name, obj);
- json_object_put(obj);
- json_tokener_free(tok);
- tok = NULL;
- }
-
- if (end) {
- start = end + 1;
- len = buflen - (start - buf);
- }
- } while (len > 0);
+ len = strlen(start);
+
+ if (!tok)
+ tok = json_tokener_new();
+
+ obj = json_tokener_parse_ex(tok, start, len);
+ if (!is_error(obj)) {
+ proto_shell_add_handler(name, obj);
+ json_object_put(obj);
+ json_tokener_free(tok);
+ tok = NULL;
+ } else if (start[len - 1] == '\n') {
+ json_tokener_free(tok);
+ tok = NULL;
+ }
} while (!feof(f) && !ferror(f));
if (tok)
pclose(f);
}
-void __init proto_shell_init(void)
+static void __init proto_shell_init(void)
{
glob_t g;
int main_fd;
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