#include <glob.h>
#include <unistd.h>
#include <fcntl.h>
+#include <signal.h>
#include <libubox/blobmsg_json.h>
struct interface_proto_state proto;
struct proto_shell_handler *handler;
struct blob_attr *config;
+
+ struct uloop_process setup_task;
+ struct uloop_process teardown_task;
+ bool teardown_pending;
};
-static int run_script(const char **argv)
+static int
+run_script(const char **argv, struct uloop_process *proc)
{
- int pid, ret;
+ int pid;
if ((pid = fork()) < 0)
return -1;
exit(127);
}
- if (waitpid(pid, &ret, 0) == -1)
- ret = -1;
+ if (pid < 0)
+ return -1;
- if (ret > 0)
- return -ret;
+ proc->pid = pid;
+ uloop_process_add(proc);
return 0;
}
{
struct proto_shell_state *state;
struct proto_shell_handler *handler;
- const char *argv[5];
+ struct uloop_process *proc;
+ const char *argv[6];
+ const char *action;
char *config;
- int ret;
+ int ret, i = 0;
state = container_of(proto, struct proto_shell_state, proto);
handler = state->handler;
+ if (cmd == PROTO_CMD_SETUP) {
+ action = "setup";
+ proc = &state->setup_task;
+ } else {
+ action = "teardown";
+ proc = &state->teardown_task;
+ if (state->setup_task.pending) {
+ kill(state->setup_task.pid, SIGINT);
+ state->teardown_pending = true;
+ return 0;
+ }
+ }
+
config = blobmsg_format_json(state->config, true);
if (!config)
return -1;
- argv[0] = handler->script_name;
- argv[1] = handler->proto.name;
- argv[2] = "teardown";
- argv[3] = config;
- argv[4] = NULL;
-
- switch(cmd) {
- case PROTO_CMD_SETUP:
- argv[2] = "setup";
- /* fall through */
- case PROTO_CMD_TEARDOWN:
- ret = run_script(argv);
- break;
- }
+ argv[i++] = handler->script_name;
+ argv[i++] = handler->proto.name;
+ argv[i++] = action;
+ argv[i++] = proto->iface->name;
+ argv[i++] = config;
+ if (proto->iface->main_dev.dev)
+ argv[i++] = proto->iface->main_dev.dev->ifname;
+ argv[i] = NULL;
+ ret = run_script(argv, proc);
free(config);
return ret;
}
static void
+proto_shell_setup_cb(struct uloop_process *p, int ret)
+{
+ struct proto_shell_state *state;
+
+ state = container_of(p, struct proto_shell_state, setup_task);
+ if (state->teardown_pending) {
+ state->teardown_pending = 0;
+ proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false);
+ }
+}
+
+static void
+proto_shell_teardown_cb(struct uloop_process *p, int ret)
+{
+ struct proto_shell_state *state;
+
+ state = container_of(p, struct proto_shell_state, teardown_task);
+ state->proto.proto_event(&state->proto, IFPEV_DOWN);
+}
+
+static void
proto_shell_free(struct interface_proto_state *proto)
{
struct proto_shell_state *state;
memcpy(state->config, attr, blob_pad_len(attr));
state->proto.free = proto_shell_free;
- state->proto.handler = proto_shell_handler;
+ state->proto.cb = proto_shell_handler;
+ state->setup_task.cb = proto_shell_setup_cb;
+ state->teardown_task.cb = proto_shell_teardown_cb;
state->handler = container_of(h, struct proto_shell_handler, proto);
return &state->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, struct json_object *obj)
+proto_shell_parse_config(struct config_param_list *config, json_object *obj)
{
struct blobmsg_policy *attrs;
char *str_buf, *str_cur;
config->n_params = json_object_array_length(obj);
config->params = attrs;
for (i = 0; i < config->n_params; i++) {
- struct json_object *cur, *name, *type;
+ json_object *cur, *name, *type;
- cur = json_object_array_get_idx(obj, i);
- if (!cur || json_object_get_type(cur) != json_type_array)
+ cur = check_type(json_object_array_get_idx(obj, i), json_type_array);
+ if (!cur)
goto error;
- name = json_object_array_get_idx(cur, 0);
- if (!name || json_object_get_type(name) != json_type_string)
+ name = check_type(json_object_array_get_idx(cur, 0), json_type_string);
+ if (!name)
goto error;
- type = json_object_array_get_idx(cur, 1);
- if (!type || json_object_get_type(type) != json_type_int)
+ 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);
}
static void
-proto_shell_add_handler(const char *script, struct json_object *obj)
+proto_shell_add_handler(const char *script, json_object *obj)
{
struct proto_shell_handler *handler;
struct proto_handler *proto;
const char *name;
char *str;
- if (json_object_get_type(obj) != json_type_object)
+ if (!check_type(obj, json_type_object))
return;
- tmp = json_object_object_get(obj, "name");
- if (!tmp || json_object_get_type(tmp) != json_type_string)
+ tmp = get_field(obj, "name", json_type_string);
+ if (!tmp)
return;
name = json_object_get_string(tmp);
proto->config_params = &handler->config;
proto->attach = proto_shell_attach;
- config = json_object_object_get(obj, "config");
- if (config && json_object_get_type(config) == json_type_array)
+ tmp = get_field(obj, "no-device", json_type_boolean);
+ if (tmp && json_object_get_boolean(tmp))
+ handler->proto.flags |= PROTO_FLAG_NODEV;
+
+ config = get_field(obj, "config", json_type_array);
+ if (config)
handler->config_buf = proto_shell_parse_config(&handler->config, config);
DPRINTF("Add handler for script %s: %s\n", script, proto->name);
static void proto_shell_add_script(const char *name)
{
struct json_tokener *tok = NULL;
- struct json_object *obj;
+ json_object *obj;
static char buf[512];
char *start, *end, *cmd;
FILE *f;
projects / project / netifd.git / blobdiff