#include <string.h>
#include <stdlib.h>
#include <stdio.h>
-#include <glob.h>
-#include <unistd.h>
-#include <fcntl.h>
#include <signal.h>
#include <arpa/inet.h>
#include <netinet/in.h>
-#include <libubox/blobmsg_json.h>
#include "netifd.h"
#include "interface.h"
#include "interface-ip.h"
#include "proto.h"
+#include "system.h"
+#include "handler.h"
-static struct netifd_fd proto_fd;
+static int proto_fd = -1;
enum proto_shell_sm {
S_IDLE,
struct proto_shell_handler {
struct list_head list;
struct proto_handler proto;
- struct config_param_list config;
char *config_buf;
+ char *script_name;
bool init_available;
- char script_name[];
+
+ struct uci_blob_param_list config;
};
struct proto_shell_dependency {
struct list_head list;
+ char *interface;
struct proto_shell_state *proto;
struct interface_user dep;
enum proto_shell_sm sm;
bool proto_task_killed;
+ bool renew_pending;
int last_error;
static void
proto_shell_update_host_dep(struct proto_shell_dependency *dep)
{
- struct interface *iface;
+ struct interface *iface = NULL;
if (dep->dep.iface)
goto out;
- iface = interface_ip_add_target_route(&dep->host, dep->v6);
+ if (dep->interface[0])
+ iface = vlist_find(&interfaces, dep->interface, iface, node);
+
+ iface = interface_ip_add_target_route(&dep->host, dep->v6, iface);
if (!iface)
goto out;
proc = &state->script_task;
if (cmd == PROTO_CMD_SETUP) {
- action = "setup";
- state->last_error = -1;
- proto_shell_clear_host_dep(state);
- } else {
- if (state->sm == S_TEARDOWN)
+ switch (state->sm) {
+ case S_IDLE:
+ action = "setup";
+ state->last_error = -1;
+ proto_shell_clear_host_dep(state);
+ state->sm = S_SETUP;
+ break;
+
+ case S_SETUP_ABORT:
+ case S_TEARDOWN:
+ case S_SETUP:
+ return 0;
+
+ default:
+ return -1;
+ }
+ } else if (cmd == PROTO_CMD_RENEW) {
+ if (!(handler->proto.flags & PROTO_FLAG_RENEW_AVAILABLE))
return 0;
if (state->script_task.uloop.pending) {
- if (state->sm != S_SETUP_ABORT) {
+ state->renew_pending = true;
+ return 0;
+ }
+
+ state->renew_pending = false;
+ action = "renew";
+ } else {
+ switch (state->sm) {
+ case S_SETUP:
+ if (state->script_task.uloop.pending) {
uloop_timeout_set(&state->teardown_timeout, 1000);
kill(state->script_task.uloop.pid, SIGTERM);
if (state->proto_task.uloop.pending)
kill(state->proto_task.uloop.pid, SIGTERM);
+ state->renew_pending = false;
state->sm = S_SETUP_ABORT;
+ return 0;
}
+ /* fall through if no script task is running */
+ case S_IDLE:
+ action = "teardown";
+ state->renew_pending = false;
+ 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);
+ break;
+
+ case S_TEARDOWN:
return 0;
- }
- action = "teardown";
- state->sm = S_TEARDOWN;
- if (state->last_error >= 0) {
- snprintf(error_buf, sizeof(error_buf), "ERROR=%d", state->last_error);
- envp[j++] = error_buf;
+ default:
+ return -1;
}
- uloop_timeout_set(&state->teardown_timeout, 5000);
}
+ D(INTERFACE, "run %s for interface '%s'\n", action, proto->iface->name);
config = blobmsg_format_json(state->config, true);
if (!config)
return -1;
{
struct proto_shell_dependency *pdep;
- if (ev != IFEV_UP)
+ if (ev != IFEV_UP && ev != IFEV_UPDATE)
return;
pdep = container_of(dep, struct proto_shell_dependency, dep);
struct proto_shell_dependency *pdep;
struct proto_shell_state *state;
- if (ev == IFEV_UP)
+ if (ev == IFEV_UP || ev == IFEV_UPDATE)
return;
pdep = container_of(dep, struct proto_shell_dependency, dep);
if (task == &state->proto_task)
proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN,
false);
+ if (task == &state->script_task && state->renew_pending)
+ proto_shell_handler(&state->proto, PROTO_CMD_RENEW,
+ false);
break;
case S_SETUP_ABORT:
struct proto_shell_state *state;
state = container_of(proto, struct proto_shell_state, proto);
+ uloop_timeout_cancel(&state->teardown_timeout);
+ proto_shell_clear_host_dep(state);
netifd_kill_process(&state->script_task);
netifd_kill_process(&state->proto_task);
free(state->config);
NOTIFY_DATA,
NOTIFY_KEEP,
NOTIFY_HOST,
+ NOTIFY_DNS,
+ NOTIFY_DNS_SEARCH,
__NOTIFY_LAST
};
[NOTIFY_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE },
[NOTIFY_KEEP] = { .name = "keep", .type = BLOBMSG_TYPE_BOOL },
[NOTIFY_HOST] = { .name = "host", .type = BLOBMSG_TYPE_STRING },
+ [NOTIFY_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
+ [NOTIFY_DNS_SEARCH] = { .name = "dns_search", .type = BLOBMSG_TYPE_ARRAY },
};
static int
bool keep = false;
bool up;
+ if (state->sm == S_TEARDOWN || state->sm == S_SETUP_ABORT)
+ return UBUS_STATUS_PERMISSION_DENIED;
+
if (!tb[NOTIFY_LINK_UP])
return UBUS_STATUS_INVALID_ARGUMENT;
dev_create = 2;
}
- if (!tb[NOTIFY_IFNAME]) {
- if (!iface->main_dev.dev)
- return UBUS_STATUS_INVALID_ARGUMENT;
- } else if (!keep || iface->state != IFS_UP) {
+ if (iface->state != IFS_UP || !iface->l3_dev.dev)
keep = false;
- devname = blobmsg_data(tb[NOTIFY_IFNAME]);
- if (tb[NOTIFY_TUNNEL]) {
- dev = proto_shell_create_tunnel(devname,
- tb[NOTIFY_TUNNEL]);
- if (!dev)
- return UBUS_STATUS_INVALID_ARGUMENT;
- } else {
- dev = device_get(devname, dev_create);
- if (!dev)
- return UBUS_STATUS_NOT_FOUND;
+
+ if (!keep) {
+ dev = iface->main_dev.dev;
+ if (tb[NOTIFY_IFNAME]) {
+ keep = false;
+ devname = blobmsg_data(tb[NOTIFY_IFNAME]);
+ if (tb[NOTIFY_TUNNEL])
+ dev = proto_shell_create_tunnel(devname, tb[NOTIFY_TUNNEL]);
+ else
+ dev = device_get(devname, dev_create);
}
+ if (!dev)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
interface_set_l3_dev(iface, dev);
- device_claim(&iface->l3_dev);
- }
+ if (device_claim(&iface->l3_dev) < 0)
+ return UBUS_STATUS_UNKNOWN_ERROR;
+
+ device_set_present(dev, true);
- if (!keep)
interface_update_start(iface);
+ }
proto_apply_ip_settings(iface, data, addr_ext);
if ((cur = tb[NOTIFY_ROUTES6]) != NULL)
proto_shell_parse_route_list(state->proto.iface, cur, true);
- interface_update_complete(state->proto.iface);
+ if ((cur = tb[NOTIFY_DNS]))
+ interface_add_dns_server_list(&iface->proto_ip, cur);
- if (!keep)
- state->proto.proto_event(&state->proto, IFPEV_UP);
- state->sm = S_IDLE;
+ if ((cur = tb[NOTIFY_DNS_SEARCH]))
+ interface_add_dns_search_list(&iface->proto_ip, cur);
if ((cur = tb[NOTIFY_DATA]))
proto_shell_parse_data(state->proto.iface, cur);
+ interface_update_complete(state->proto.iface);
+
+ if ((state->sm != S_SETUP_ABORT) && (state->sm != S_TEARDOWN)) {
+ if (!keep)
+ state->proto.proto_event(&state->proto, IFPEV_UP);
+ state->sm = S_IDLE;
+ }
+
return 0;
}
static char *argv[64];
static char *env[32];
+ if (state->sm == S_TEARDOWN || state->sm == S_SETUP_ABORT)
+ return UBUS_STATUS_PERMISSION_DENIED;
+
if (!tb[NOTIFY_COMMAND])
goto error;
signal = SIGTERM;
if (state->proto_task.uloop.pending) {
- state->proto_task_killed = true;
+ if (signal == SIGTERM || signal == SIGKILL)
+ state->proto_task_killed = true;
kill(state->proto_task.uloop.pid, signal);
}
{
struct proto_shell_dependency *dep;
struct blob_attr *host = tb[NOTIFY_HOST];
+ struct blob_attr *ifname_a = tb[NOTIFY_IFNAME];
+ const char *ifname_str = ifname_a ? blobmsg_data(ifname_a) : "";
+ char *ifname;
+
+ if (state->sm == S_TEARDOWN || state->sm == S_SETUP_ABORT)
+ return UBUS_STATUS_PERMISSION_DENIED;
if (!host)
return UBUS_STATUS_INVALID_ARGUMENT;
- dep = calloc(1, sizeof(*dep));
- if (!inet_pton(AF_INET, blobmsg_data(host), &dep->host)) {
- free(dep);
- return UBUS_STATUS_INVALID_ARGUMENT;
+ dep = calloc_a(sizeof(*dep), &ifname, strlen(ifname_str) + 1);
+ if (inet_pton(AF_INET, blobmsg_data(host), &dep->host) < 1) {
+ if (inet_pton(AF_INET6, blobmsg_data(host), &dep->host) < 1) {
+ free(dep);
+ return UBUS_STATUS_INVALID_ARGUMENT;
+ } else {
+ dep->v6 = true;
+ }
}
dep->proto = state;
+ dep->interface = strcpy(ifname, ifname_str);
+
dep->dep.cb = proto_shell_if_up_cb;
interface_add_user(&dep->dep, NULL);
list_add(&dep->list, &state->deps);
}
static int
+proto_shell_setup_failed(struct proto_shell_state *state)
+{
+ int ret = 0;
+
+ switch (state->sm) {
+ case S_IDLE:
+ state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
+ /* fall through */
+ case S_SETUP:
+ proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false);
+ break;
+ case S_SETUP_ABORT:
+ case S_TEARDOWN:
+ default:
+ ret = UBUS_STATUS_PERMISSION_DENIED;
+ break;
+ }
+ return ret;
+}
+
+static int
proto_shell_notify(struct interface_proto_state *proto, struct blob_attr *attr)
{
struct proto_shell_state *state;
return proto_shell_set_available(state, tb);
case 6:
return proto_shell_add_host_dependency(state, tb);
+ case 7:
+ return proto_shell_setup_failed(state);
default:
return UBUS_STATUS_INVALID_ARGUMENT;
}
state->proto.cb = proto_shell_handler;
state->teardown_timeout.cb = proto_shell_teardown_timeout_cb;
state->script_task.cb = proto_shell_script_cb;
- state->script_task.dir_fd = proto_fd.fd;
+ state->script_task.dir_fd = proto_fd;
state->script_task.log_prefix = iface->name;
state->proto_task.cb = proto_shell_task_cb;
- state->proto_task.dir_fd = proto_fd.fd;
+ state->proto_task.dir_fd = proto_fd;
state->proto_task.log_prefix = iface->name;
state->handler = container_of(h, struct proto_shell_handler, proto);
return NULL;
}
-static json_object *
-check_type(json_object *obj, json_type type)
-{
- if (!obj)
- return NULL;
-
- if (json_object_get_type(obj) != type)
- return NULL;
-
- return obj;
-}
-
-static inline json_object *
-get_field(json_object *obj, const char *name, json_type type)
-{
- return check_type(json_object_object_get(obj, name), type);
-}
-
-static char *
-proto_shell_parse_config(struct config_param_list *config, json_object *obj)
-{
- struct blobmsg_policy *attrs;
- char *str_buf, *str_cur;
- int str_len = 0;
- int i;
-
- config->n_params = json_object_array_length(obj);
- attrs = calloc(1, sizeof(*attrs) * config->n_params);
- if (!attrs)
- return NULL;
-
- config->params = attrs;
- for (i = 0; i < config->n_params; i++) {
- json_object *cur, *name, *type;
-
- cur = check_type(json_object_array_get_idx(obj, i), json_type_array);
- if (!cur)
- goto error;
-
- name = check_type(json_object_array_get_idx(cur, 0), json_type_string);
- if (!name)
- goto error;
-
- type = check_type(json_object_array_get_idx(cur, 1), json_type_int);
- if (!type)
- goto error;
-
- attrs[i].name = json_object_get_string(name);
- attrs[i].type = json_object_get_int(type);
- if (attrs[i].type > BLOBMSG_TYPE_LAST)
- goto error;
-
- str_len += strlen(attrs[i].name) + 1;
- }
-
- str_buf = malloc(str_len);
- if (!str_buf)
- goto error;
-
- str_cur = str_buf;
- for (i = 0; i < config->n_params; i++) {
- const char *name = attrs[i].name;
-
- attrs[i].name = str_cur;
- str_cur += sprintf(str_cur, "%s", name) + 1;
- }
-
- return str_buf;
-
-error:
- free(attrs);
- config->n_params = 0;
- return NULL;
-}
-
static void
-proto_shell_add_handler(const char *script, json_object *obj)
+proto_shell_add_handler(const char *script, const char *name, json_object *obj)
{
struct proto_shell_handler *handler;
struct proto_handler *proto;
json_object *config, *tmp;
- const char *name;
- char *str;
+ char *proto_name, *script_name;
- if (!check_type(obj, json_type_object))
- return;
-
- tmp = get_field(obj, "name", json_type_string);
- if (!tmp)
- return;
-
- name = json_object_get_string(tmp);
-
- handler = calloc(1, sizeof(*handler) +
- strlen(script) + 1 +
- strlen(name) + 1);
+ handler = calloc_a(sizeof(*handler),
+ &proto_name, strlen(name) + 1,
+ &script_name, strlen(script) + 1);
if (!handler)
return;
- strcpy(handler->script_name, script);
-
- str = handler->script_name + strlen(handler->script_name) + 1;
- strcpy(str, name);
+ handler->script_name = strcpy(script_name, script);
proto = &handler->proto;
- proto->name = str;
+ proto->name = strcpy(proto_name, name);
proto->config_params = &handler->config;
proto->attach = proto_shell_attach;
- tmp = get_field(obj, "no-device", json_type_boolean);
+ tmp = json_get_field(obj, "no-device", json_type_boolean);
if (tmp && json_object_get_boolean(tmp))
handler->proto.flags |= PROTO_FLAG_NODEV;
- tmp = get_field(obj, "available", json_type_boolean);
+ tmp = json_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);
+ tmp = json_get_field(obj, "renew-handler", json_type_boolean);
+ if (tmp && json_object_get_boolean(tmp))
+ handler->proto.flags |= PROTO_FLAG_RENEW_AVAILABLE;
+
+ config = json_get_field(obj, "config", json_type_array);
if (config)
- handler->config_buf = proto_shell_parse_config(&handler->config, config);
+ handler->config_buf = netifd_handler_parse_config(&handler->config, config);
DPRINTF("Add handler for script %s: %s\n", script, proto->name);
add_proto_handler(proto);
}
-static void proto_shell_add_script(const char *name)
+void proto_shell_init(void)
{
- struct json_tokener *tok = NULL;
- json_object *obj;
- static char buf[512];
- char *start, *cmd;
- FILE *f;
- int len;
-
-#define DUMP_SUFFIX " '' dump"
-
- cmd = alloca(strlen(name) + 1 + sizeof(DUMP_SUFFIX));
- sprintf(cmd, "%s" DUMP_SUFFIX, name);
-
- f = popen(cmd, "r");
- if (!f)
+ proto_fd = netifd_open_subdir("proto");
+ if (proto_fd < 0)
return;
- do {
- start = fgets(buf, sizeof(buf), f);
- if (!start)
- continue;
-
- 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)
- json_tokener_free(tok);
-
- pclose(f);
-}
-
-static void __init proto_shell_init(void)
-{
- glob_t g;
- int main_fd;
- int i;
-
- main_fd = open(".", O_RDONLY | O_DIRECTORY);
- if (main_fd < 0)
- return;
-
- if (chdir(main_path)) {
- perror("chdir(main path)");
- goto close_cur;
- }
-
- if (chdir("./proto"))
- goto close_cur;
-
- 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]);
-
-close_cur:
- fchdir(main_fd);
- close(main_fd);
+ netifd_init_script_handlers(proto_fd, proto_shell_add_handler);
}
projects / project / netifd.git / blobdiff