#include <string.h>
#include <stdlib.h>
#include <stdio.h>
-#include <unistd.h>
#include <signal.h>
#include <arpa/inet.h>
struct proto_shell_handler {
struct list_head list;
struct proto_handler proto;
- struct uci_blob_param_list config;
char *config_buf;
+ char *script_name;
bool init_available;
- char script_name[];
+ bool no_proto_task;
+
+ 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;
union if_addr host;
bool v6;
-
- char interface[];
};
struct proto_shell_state {
enum proto_shell_sm sm;
bool proto_task_killed;
+ bool renew_pending;
int last_error;
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;
if (task == &state->proto_task)
proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN,
false);
+ else if (task == &state->script_task) {
+ if (state->renew_pending)
+ proto_shell_handler(&state->proto,
+ PROTO_CMD_RENEW, false);
+ else if (!state->handler->no_proto_task &&
+ !state->proto_task.uloop.pending &&
+ state->sm == S_SETUP)
+ proto_shell_handler(&state->proto,
+ PROTO_CMD_TEARDOWN,
+ false);
+ }
break;
case S_SETUP_ABORT:
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_DNS_SEARCH]))
interface_add_dns_search_list(&iface->proto_ip, cur);
- interface_update_complete(state->proto.iface);
-
- if (!keep)
- state->proto.proto_event(&state->proto, IFPEV_UP);
- state->sm = S_IDLE;
-
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 = tb[NOTIFY_IFNAME];
- size_t ifnamelen = (ifname) ? blobmsg_data_len(ifname) : 1;
+ 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) + ifnamelen);
+ 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);
}
dep->proto = state;
- if (ifname)
- memcpy(dep->interface, blobmsg_data(ifname), ifnamelen);
- else
- dep->interface[0] = 0;
+ dep->interface = strcpy(ifname, ifname_str);
dep->dep.cb = proto_shell_if_up_cb;
interface_add_user(&dep->dep, NULL);
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);
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 0;
+ return ret;
}
static int
return NULL;
}
-static inline json_object *
-get_field(json_object *obj, const char *name, json_type type)
-{
- return json_check_type(json_object_object_get(obj, name), type);
-}
-
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;
-
- if (!json_check_type(obj, json_type_object))
- return;
-
- tmp = get_field(obj, "name", json_type_string);
- if (!tmp)
- return;
-
- name = json_object_get_string(tmp);
+ char *proto_name, *script_name;
- handler = calloc_a(sizeof(*handler) + strlen(script) + 1,
- &str, 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);
- 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, "no-proto-task", json_type_boolean);
+ handler->no_proto_task = tmp && json_object_get_boolean(tmp);
+
+ 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;
+
+ tmp = json_get_field(obj, "lasterror", json_type_boolean);
+ if (tmp && json_object_get_boolean(tmp))
+ handler->proto.flags |= PROTO_FLAG_LASTERROR;
+
+ config = json_get_field(obj, "config", json_type_array);
if (config)
handler->config_buf = netifd_handler_parse_config(&handler->config, config);
add_proto_handler(proto);
}
-static void __init proto_shell_init(void)
+void proto_shell_init(void)
{
proto_fd = netifd_open_subdir("proto");
if (proto_fd < 0)
projects / project / netifd.git / blobdiff