X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-shell.c;h=fdb87df4e5bc939cda34062706ca09ed2c2f9838;hp=d014b430421a822877450e496decf9a076cfe720;hb=cb0aeee156725940b4123bd828a831e96cae012f;hpb=bbfa8c18c8ae086b6fd941e950c466f25c134c17

diff --git a/proto-shell.c b/proto-shell.c
index d014b43..fdb87df 100644
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -1,9 +1,15 @@
+#define _GNU_SOURCE
+
 #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>
 
@@ -12,7 +18,6 @@
 #include "interface-ip.h"
 #include "proto.h"
 
-static LIST_HEAD(handlers);
 static int proto_fd;
 
 struct proto_shell_handler {
@@ -27,11 +32,34 @@ struct proto_shell_state {
 	struct interface_proto_state proto;
 	struct proto_shell_handler *handler;
 	struct blob_attr *config;
+
+	struct device_user l3_dev;
+
+	struct uloop_timeout setup_timeout;
+	struct uloop_process setup_task;
+	struct uloop_process teardown_task;
+	bool teardown_pending;
+	bool teardown_wait_task;
+
+	struct uloop_process proto_task;
 };
 
-static int run_script(const char **argv)
+static void
+kill_process(struct uloop_process *proc)
 {
-	int pid, ret;
+	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;
@@ -42,11 +70,11 @@ static int run_script(const char **argv)
 		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;
 }
@@ -57,38 +85,111 @@ proto_shell_handler(struct interface_proto_state *proto,
 {
 	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 && !state->teardown_wait_task) {
+			uloop_timeout_set(&state->setup_timeout, 1000);
+			kill(state->setup_task.pid, SIGTERM);
+			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 = start_process(argv, proc);
 	free(config);
 
 	return ret;
 }
 
 static void
+proto_shell_setup_timeout_cb(struct uloop_timeout *timeout)
+{
+	struct proto_shell_state *state;
+
+	state = container_of(timeout, struct proto_shell_state, setup_timeout);
+	kill(state->setup_task.pid, SIGKILL);
+}
+
+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);
+	uloop_timeout_cancel(&state->setup_timeout);
+	if (state->teardown_pending) {
+		state->teardown_pending = false;
+		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);
+
+	if (state->teardown_wait_task)
+		return;
+
+	kill_process(&state->proto_task);
+
+	if (state->l3_dev.dev)
+		device_remove_user(&state->l3_dev);
+
+	state->proto.proto_event(&state->proto, IFPEV_DOWN);
+}
+
+static void
+proto_shell_task_cb(struct uloop_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.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
 proto_shell_free(struct interface_proto_state *proto)
 {
 	struct proto_shell_state *state;
@@ -98,6 +199,269 @@ proto_shell_free(struct interface_proto_state *proto)
 	free(state);
 }
 
+static void
+proto_shell_parse_addr_list(struct interface *iface, struct blob_attr *attr,
+			    bool v6, bool external)
+{
+	struct device_addr *addr;
+	struct blob_attr *cur;
+	int rem;
+
+	blobmsg_for_each_attr(cur, attr, rem) {
+		if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING) {
+			DPRINTF("Ignore wrong address type: %d\n", blobmsg_type(cur));
+			continue;
+		}
+
+		addr = proto_parse_ip_addr_string(blobmsg_data(cur), v6, v6 ? 32 : 128);
+		if (!addr) {
+			DPRINTF("Failed to parse IP address string: %s\n", (char *) blobmsg_data(cur));
+			continue;
+		}
+
+		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;
+		}
+	}
+
+	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
+proto_shell_parse_route_list(struct interface *iface, struct blob_attr *attr,
+			     bool v6)
+{
+	struct blob_attr *cur;
+	int rem;
+
+	blobmsg_for_each_attr(cur, attr, rem) {
+		if (blobmsg_type(cur) != BLOBMSG_TYPE_TABLE) {
+			DPRINTF("Ignore wrong route type: %d\n", blobmsg_type(cur));
+			continue;
+		}
+
+		parse_route(iface, cur, v6);
+	}
+}
+
+
+enum {
+	NOTIFY_ACTION,
+	NOTIFY_COMMAND,
+	NOTIFY_SIGNAL,
+	NOTIFY_LINK_UP,
+	NOTIFY_IFNAME,
+	NOTIFY_ADDR_EXT,
+	NOTIFY_IPADDR,
+	NOTIFY_IP6ADDR,
+	NOTIFY_ROUTES,
+	NOTIFY_ROUTES6,
+	NOTIFY_DNS,
+	__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_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_IPADDR] = { .name = "ipaddr", .type = BLOBMSG_TYPE_ARRAY },
+	[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 },
+};
+
+static int
+proto_shell_update_link(struct proto_shell_state *state, struct blob_attr **tb)
+{
+	struct blob_attr *cur;
+	bool addr_ext = false;
+	bool up;
+
+	if (!tb[NOTIFY_LINK_UP])
+		return UBUS_STATUS_INVALID_ARGUMENT;
+
+	up = blobmsg_get_bool(tb[NOTIFY_LINK_UP]);
+	if (!up) {
+		state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
+		return 0;
+	}
+
+	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;
+	}
+
+	interface_ip_update_start(state->proto.iface);
+
+	if ((cur = tb[NOTIFY_ADDR_EXT]) != NULL)
+		addr_ext = blobmsg_get_bool(cur);
+
+	if ((cur = tb[NOTIFY_IPADDR]) != NULL)
+		proto_shell_parse_addr_list(state->proto.iface, cur, false, addr_ext);
+
+	if ((cur = tb[NOTIFY_IP6ADDR]) != NULL)
+		proto_shell_parse_addr_list(state->proto.iface, cur, true, addr_ext);
+
+	if ((cur = tb[NOTIFY_ROUTES]) != NULL)
+		proto_shell_parse_route_list(state->proto.iface, cur, false);
+
+	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);
+
+	interface_ip_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)
+{
+	struct blob_attr *cur;
+	char *argv[64];
+	int argc = 0;
+	int rem;
+
+	if (!tb[NOTIFY_COMMAND])
+		goto error;
+
+	blobmsg_for_each_attr(cur, tb[NOTIFY_COMMAND], rem) {
+		if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
+			goto error;
+
+		if (!blobmsg_check_attr(cur, NULL))
+			goto error;
+
+		argv[argc++] = blobmsg_data(cur);
+		if (argc == ARRAY_SIZE(argv) - 1)
+			goto error;
+	}
+	argv[argc] = NULL;
+	start_process((const char **) argv, &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.pending) {
+		kill(state->proto_task.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)
@@ -111,7 +475,12 @@ proto_shell_attach(const struct proto_handler *h, struct interface *iface,
 
 	memcpy(state->config, attr, blob_pad_len(attr));
 	state->proto.free = proto_shell_free;
+	state->proto.notify = proto_shell_notify;
 	state->proto.cb = proto_shell_handler;
+	state->setup_timeout.cb = proto_shell_setup_timeout_cb;
+	state->setup_task.cb = proto_shell_setup_cb;
+	state->teardown_task.cb = proto_shell_teardown_cb;
+	state->proto_task.cb = proto_shell_task_cb;
 	state->handler = container_of(h, struct proto_shell_handler, proto);
 
 	return &state->proto;
@@ -147,11 +516,11 @@ proto_shell_parse_config(struct config_param_list *config, json_object *obj)
 	int str_len = 0;
 	int i;
 
-	attrs = calloc(1, sizeof(*attrs));
+	config->n_params = json_object_array_length(obj);
+	attrs = calloc(1, sizeof(*attrs) * config->n_params);
 	if (!attrs)
 		return NULL;
 
-	config->n_params = json_object_array_length(obj);
 	config->params = attrs;
 	for (i = 0; i < config->n_params; i++) {
 		json_object *cur, *name, *type;
@@ -173,7 +542,7 @@ proto_shell_parse_config(struct config_param_list *config, json_object *obj)
 		if (attrs[i].type > BLOBMSG_TYPE_LAST)
 			goto error;
 
-		str_len += strlen(attrs[i].name + 1);
+		str_len += strlen(attrs[i].name) + 1;
 	}
 
 	str_buf = malloc(str_len);
@@ -230,6 +599,10 @@ proto_shell_add_handler(const char *script, json_object *obj)
 	proto->config_params = &handler->config;
 	proto->attach = proto_shell_attach;
 
+	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);