X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-shell.c;h=aba7298de23c5dd33b95a223125980223c745b2b;hp=b40b456987c72744c336db4ac97b38201b127234;hb=b32cffd4f0a2b904a1e3c38e5141100970f89a65;hpb=4ff6bcbee05983037f6a629b114beace5d98bdbe

diff --git a/proto-shell.c b/proto-shell.c
index b40b456..aba7298 100644
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -20,11 +20,19 @@
 
 static struct netifd_fd proto_fd;
 
+enum proto_shell_sm {
+	S_IDLE,
+	S_SETUP,
+	S_SETUP_ABORT,
+	S_TEARDOWN,
+};
+
 struct proto_shell_handler {
 	struct list_head list;
 	struct proto_handler proto;
 	struct config_param_list config;
 	char *config_buf;
+	bool init_available;
 	char script_name[];
 };
 
@@ -33,15 +41,14 @@ struct proto_shell_state {
 	struct proto_shell_handler *handler;
 	struct blob_attr *config;
 
-	struct device_user l3_dev;
-
-	struct uloop_timeout setup_timeout;
-	struct netifd_process setup_task;
-	struct netifd_process teardown_task;
-	bool teardown_pending;
-	bool teardown_wait_task;
+	struct uloop_timeout teardown_timeout;
 
+	struct netifd_process script_task;
 	struct netifd_process proto_task;
+
+	enum proto_shell_sm sm;
+	bool proto_task_killed;
+
 	int last_error;
 };
 
@@ -61,24 +68,33 @@ proto_shell_handler(struct interface_proto_state *proto,
 
 	state = container_of(proto, struct proto_shell_state, proto);
 	handler = state->handler;
+	proc = &state->script_task;
 
 	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.uloop.pending && !state->teardown_wait_task) {
-			uloop_timeout_set(&state->setup_timeout, 1000);
-			kill(state->setup_task.uloop.pid, SIGTERM);
-			state->teardown_pending = true;
+		if (state->sm == S_TEARDOWN)
+			return 0;
+
+		if (state->script_task.uloop.pending) {
+			if (state->sm != S_SETUP_ABORT) {
+				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->sm = S_SETUP_ABORT;
+			}
 			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;
 		}
+		uloop_timeout_set(&state->teardown_timeout, 5000);
 	}
 
 	config = blobmsg_format_json(state->config, true);
@@ -102,62 +118,79 @@ proto_shell_handler(struct interface_proto_state *proto,
 }
 
 static void
-proto_shell_setup_timeout_cb(struct uloop_timeout *timeout)
+proto_shell_task_finish(struct proto_shell_state *state,
+			struct netifd_process *task)
 {
-	struct proto_shell_state *state;
+	switch (state->sm) {
+	case S_IDLE:
+		if (task == &state->proto_task)
+			state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
+		/* fall through */
+	case S_SETUP:
+		if (task == &state->proto_task)
+			proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN,
+					    false);
+		break;
+
+	case S_SETUP_ABORT:
+		if (state->script_task.uloop.pending ||
+		    state->proto_task.uloop.pending)
+			break;
+
+		uloop_timeout_cancel(&state->teardown_timeout);
+		state->sm = S_IDLE;
+		proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false);
+		break;
+
+	case S_TEARDOWN:
+		if (state->script_task.uloop.pending)
+			break;
+
+		if (state->proto_task.uloop.pending) {
+			if (!state->proto_task_killed)
+				kill(state->proto_task.uloop.pid, SIGTERM);
+			break;
+		}
 
-	state = container_of(timeout, struct proto_shell_state, setup_timeout);
-	kill(state->setup_task.uloop.pid, SIGKILL);
+		uloop_timeout_cancel(&state->teardown_timeout);
+		state->sm = S_IDLE;
+		state->proto.proto_event(&state->proto, IFPEV_DOWN);
+		break;
+	}
 }
 
 static void
-proto_shell_setup_cb(struct netifd_process *p, int ret)
+proto_shell_teardown_timeout_cb(struct uloop_timeout *timeout)
 {
 	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);
-	}
+	state = container_of(timeout, struct proto_shell_state, teardown_timeout);
+
+	netifd_kill_process(&state->script_task);
+	netifd_kill_process(&state->proto_task);
+	proto_shell_task_finish(state, NULL);
 }
 
 static void
-proto_shell_teardown_cb(struct netifd_process *p, int ret)
+proto_shell_script_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);
+	state = container_of(p, struct proto_shell_state, script_task);
+	proto_shell_task_finish(state, p);
 }
 
 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 (state->sm == S_IDLE || state->sm == S_SETUP)
+		state->last_error = WEXITSTATUS(ret);
 
-	if (teardown_wait_task) {
-		proto_shell_teardown_cb(&state->teardown_task, 0);
-		return;
-	}
-
-	state->last_error = WEXITSTATUS(ret);
-	state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
-	proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false);
+	proto_shell_task_finish(state, p);
 }
 
 static void
@@ -166,52 +199,52 @@ proto_shell_free(struct interface_proto_state *proto)
 	struct proto_shell_state *state;
 
 	state = container_of(proto, struct proto_shell_state, proto);
+	netifd_kill_process(&state->script_task);
+	netifd_kill_process(&state->proto_task);
 	free(state->config);
 	free(state);
 }
 
 static void
-proto_shell_parse_addr_list(struct interface_ip_settings *ip, struct blob_attr *attr,
-			    bool v6, bool external)
+proto_shell_parse_route_list(struct interface *iface, struct blob_attr *attr,
+			     bool v6)
 {
-	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));
+		if (blobmsg_type(cur) != BLOBMSG_TYPE_TABLE) {
+			DPRINTF("Ignore wrong route type: %d\n", blobmsg_type(cur));
 			continue;
 		}
 
-		if (external)
-			addr->flags |= DEVADDR_EXTERNAL;
-
-		vlist_add(&ip->addr, &addr->node);
+		interface_ip_add_route(iface, cur, v6);
 	}
 }
 
 static void
-proto_shell_parse_route_list(struct interface *iface, struct blob_attr *attr,
-			     bool v6)
+proto_shell_parse_data(struct interface *iface, struct blob_attr *attr)
 {
 	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;
-		}
+	blobmsg_for_each_attr(cur, attr, rem)
+		interface_add_data(iface, cur);
+}
 
-		interface_ip_add_route(iface, cur, v6);
-	}
+static struct device *
+proto_shell_create_tunnel(const char *name, struct blob_attr *attr)
+{
+	struct device *dev;
+	struct blob_buf b;
+
+	memset(&b, 0, sizeof(b));
+	blob_buf_init(&b, 0);
+	blob_put(&b, 0, blobmsg_data(attr), blobmsg_data_len(attr));
+	dev = device_create(name, &tunnel_device_type, blob_data(b.head));
+	blob_buf_free(&b);
+
+	return dev;
 }
 
 enum {
@@ -224,12 +257,10 @@ enum {
 	NOTIFY_LINK_UP,
 	NOTIFY_IFNAME,
 	NOTIFY_ADDR_EXT,
-	NOTIFY_IPADDR,
-	NOTIFY_IP6ADDR,
 	NOTIFY_ROUTES,
 	NOTIFY_ROUTES6,
-	NOTIFY_DNS,
-	NOTIFY_DNS_SEARCH,
+	NOTIFY_TUNNEL,
+	NOTIFY_DATA,
 	__NOTIFY_LAST
 };
 
@@ -243,19 +274,19 @@ static const struct blobmsg_policy notify_attr[__NOTIFY_LAST] = {
 	[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 },
-	[NOTIFY_DNS_SEARCH] = { .name = "dns_search", .type = BLOBMSG_TYPE_ARRAY },
+	[NOTIFY_TUNNEL] = { .name = "tunnel", .type = BLOBMSG_TYPE_TABLE },
+	[NOTIFY_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE },
 };
 
 static int
-proto_shell_update_link(struct proto_shell_state *state, struct blob_attr **tb)
+proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data, struct blob_attr **tb)
 {
-	struct interface_ip_settings *ip;
+	struct interface *iface = state->proto.iface;
 	struct blob_attr *cur;
+	struct device *dev;
+	const char *devname;
 	int dev_create = 1;
 	bool addr_ext = false;
 	bool up;
@@ -276,26 +307,27 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr **tb)
 	}
 
 	if (!tb[NOTIFY_IFNAME]) {
-		if (!state->proto.iface->main_dev.dev)
+		if (!iface->main_dev.dev)
 			return UBUS_STATUS_INVALID_ARGUMENT;
 	} else {
-		if (state->l3_dev.dev)
-			device_remove_user(&state->l3_dev);
+		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;
+		}
 
-		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);
+		interface_set_l3_dev(iface, dev);
+		device_claim(&iface->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(ip, cur, false, addr_ext);
-
-	if ((cur = tb[NOTIFY_IP6ADDR]) != NULL)
-		proto_shell_parse_addr_list(ip, cur, true, addr_ext);
+	interface_update_start(iface);
+	proto_apply_ip_settings(iface, data, addr_ext);
 
 	if ((cur = tb[NOTIFY_ROUTES]) != NULL)
 		proto_shell_parse_route_list(state->proto.iface, cur, false);
@@ -303,16 +335,13 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr **tb)
 	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);
 
+	if ((cur = tb[NOTIFY_DATA]))
+		proto_shell_parse_data(state->proto.iface, cur);
+
 	return 0;
 }
 
@@ -378,8 +407,8 @@ proto_shell_kill_command(struct proto_shell_state *state, struct blob_attr **tb)
 		signal = SIGTERM;
 
 	if (state->proto_task.uloop.pending) {
+		state->proto_task_killed = true;
 		kill(state->proto_task.uloop.pid, signal);
-		state->teardown_wait_task = true;
 	}
 
 	return 0;
@@ -452,7 +481,7 @@ proto_shell_notify(struct interface_proto_state *proto, struct blob_attr *attr)
 
 	switch(blobmsg_get_u32(tb[NOTIFY_ACTION])) {
 	case 0:
-		return proto_shell_update_link(state, tb);
+		return proto_shell_update_link(state, attr, tb);
 	case 1:
 		return proto_shell_run_command(state, tb);
 	case 2:
@@ -483,13 +512,10 @@ proto_shell_attach(const struct proto_handler *h, struct interface *iface,
 	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->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->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.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;
@@ -615,6 +641,10 @@ proto_shell_add_handler(const char *script, json_object *obj)
 	if (tmp && json_object_get_boolean(tmp))
 		handler->proto.flags |= PROTO_FLAG_NODEV;
 
+	tmp = 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);
 	if (config)
 		handler->config_buf = proto_shell_parse_config(&handler->config, config);