X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-shell.c;h=fc16f76c6d8a09d4f0924fa82c0cb4264fe24037;hp=7eeff2892f676dc82f6b3cc856f40c6211a775e5;hb=43c2934a4d3f9a3e9d7fc2a4e9a32a2bef7174ba;hpb=958012387b5bd493ea5fdabe815e9f4fd4e55dc5

diff --git a/proto-shell.c b/proto-shell.c
index 7eeff28..fc16f76 100644
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -1,3 +1,5 @@
+#define _GNU_SOURCE
+
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -16,7 +18,7 @@
 #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;
@@ -34,33 +36,14 @@ struct proto_shell_state {
 	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;
-};
-
-static int
-run_script(const char **argv, struct uloop_process *proc)
-{
-	int pid;
-
-	if ((pid = fork()) < 0)
-		return -1;
-
-	if (!pid) {
-		fchdir(proto_fd);
-		execvp(argv[0], (char **) argv);
-		exit(127);
-	}
-
-	if (pid < 0)
-		return -1;
+	bool teardown_wait_task;
 
-	proc->pid = pid;
-	uloop_process_add(proc);
-
-	return 0;
-}
+	struct netifd_process proto_task;
+	int last_error;
+};
 
 static int
 proto_shell_handler(struct interface_proto_state *proto,
@@ -68,11 +51,13 @@ proto_shell_handler(struct interface_proto_state *proto,
 {
 	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;
@@ -80,15 +65,20 @@ proto_shell_handler(struct interface_proto_state *proto,
 	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) {
+		if (state->setup_task.uloop.pending && !state->teardown_wait_task) {
 			uloop_timeout_set(&state->setup_timeout, 1000);
-			kill(state->setup_task.pid, SIGINT);
+			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);
@@ -103,8 +93,9 @@ proto_shell_handler(struct interface_proto_state *proto,
 	if (proto->iface->main_dev.dev)
 		argv[i++] = proto->iface->main_dev.dev->ifname;
 	argv[i] = NULL;
+	envp[j] = NULL;
 
-	ret = run_script(argv, proc);
+	ret = netifd_start_process(argv, envp, proc);
 	free(config);
 
 	return ret;
@@ -116,11 +107,11 @@ 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);
+	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;
 
@@ -133,14 +124,40 @@ proto_shell_setup_cb(struct uloop_process *p, int ret)
 }
 
 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;
 
 	state = container_of(p, struct proto_shell_state, teardown_task);
+
+	if (state->teardown_wait_task)
+		return;
+
+	netifd_kill_process(&state->proto_task);
 	state->proto.proto_event(&state->proto, IFPEV_DOWN);
-	if (state->l3_dev.dev)
-		device_remove_user(&state->l3_dev);
+}
+
+static void
+proto_shell_task_cb(struct netifd_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.uloop.pending)
+		return;
+
+	if (teardown_wait_task) {
+		proto_shell_teardown_cb(&state->teardown_task, 0);
+		return;
+	}
+
+	state->last_error = ret;
+	state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
+	proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false);
 }
 
 static void
@@ -154,7 +171,7 @@ proto_shell_free(struct interface_proto_state *proto)
 }
 
 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;
@@ -176,70 +193,8 @@ proto_shell_parse_addr_list(struct interface *iface, struct blob_attr *attr,
 		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;
-		}
+		vlist_add(&ip->addr, &addr->node);
 	}
-
-	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
@@ -255,12 +210,16 @@ proto_shell_parse_route_list(struct interface *iface, struct blob_attr *attr,
 			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_LINK_UP,
 	NOTIFY_IFNAME,
 	NOTIFY_ADDR_EXT,
@@ -268,10 +227,17 @@ enum {
 	NOTIFY_IP6ADDR,
 	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_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 },
@@ -279,46 +245,55 @@ static const struct blobmsg_policy notify_attr[__NOTIFY_LAST] = {
 	[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 },
+	[NOTIFY_DNS_SEARCH] = { .name = "dns_search", .type = BLOBMSG_TYPE_ARRAY },
 };
 
 static int
-proto_shell_notify(struct interface_proto_state *proto, struct blob_attr *attr)
+proto_shell_update_link(struct proto_shell_state *state, struct blob_attr **tb)
 {
-	struct proto_shell_state *state;
-	struct blob_attr *tb[__NOTIFY_LAST], *cur;
+	struct interface_ip_settings *ip;
+	struct blob_attr *cur;
+	int dev_create = 1;
 	bool addr_ext = false;
 	bool up;
 
-	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_LINK_UP])
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
 	up = blobmsg_get_bool(tb[NOTIFY_LINK_UP]);
-	if (up) {
-		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;
-		}
-		state->proto.proto_event(&state->proto, IFPEV_UP);
-	} else {
+	if (!up) {
 		state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
+		return 0;
 	}
 
-	if ((cur = tb[NOTIFY_ADDR_EXT]) != NULL)
+	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);
+
+		device_add_user(&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);
+	}
+
+	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);
@@ -326,10 +301,160 @@ proto_shell_notify(struct interface_proto_state *proto, struct blob_attr *attr)
 	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(ip, cur);
+
+	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;
 }
 
-struct interface_proto_state *
+static bool
+fill_string_list(struct blob_attr *attr, char **argv, int max)
+{
+	struct blob_attr *cur;
+	int argc = 0;
+	int rem;
+
+	if (!attr)
+		goto out;
+
+	blobmsg_for_each_attr(cur, attr, rem) {
+		if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
+			return false;
+
+		if (!blobmsg_check_attr(cur, NULL))
+			return false;
+
+		argv[argc++] = blobmsg_data(cur);
+		if (argc == max - 1)
+			return false;
+	}
+
+out:
+	argv[argc] = NULL;
+	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;
+
+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.uloop.pending) {
+		kill(state->proto_task.uloop.pid, signal);
+		state->teardown_wait_task = true;
+	}
+
+	return 0;
+}
+
+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_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);
+	case 3:
+		return proto_shell_notify_error(state, tb);
+	case 4:
+		return proto_shell_block_restart(state, tb);
+	default:
+		return UBUS_STATUS_INVALID_ARGUMENT;
+	}
+}
+
+static struct interface_proto_state *
 proto_shell_attach(const struct proto_handler *h, struct interface *iface,
 		   struct blob_attr *attr)
 {
@@ -346,7 +471,14 @@ proto_shell_attach(const struct proto_handler *h, struct interface *iface,
 	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;
@@ -482,9 +614,9 @@ static void proto_shell_add_script(const char *name)
 	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"
 
@@ -496,33 +628,25 @@ static void proto_shell_add_script(const char *name)
 		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)
@@ -531,7 +655,7 @@ static void proto_shell_add_script(const char *name)
 	pclose(f);
 }
 
-void __init proto_shell_init(void)
+static void __init proto_shell_init(void)
 {
 	glob_t g;
 	int main_fd;
@@ -549,10 +673,11 @@ void __init proto_shell_init(void)
 	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]);