X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-shell.c;h=8bbc36e6f4ef7d5da2af6304756c73001ef9b633;hp=6312d9ec3d2b0f7a05efd20f85d7a8c5b42e1d21;hb=2bc475db30ab2716e1dd430f8eb982ba6e886b74;hpb=bfe5db1ea8018aaa940dc6e991110fac62b85516

diff --git a/proto-shell.c b/proto-shell.c
index 6312d9e..8bbc36e 100644
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -30,8 +30,9 @@
 #include "interface.h"
 #include "interface-ip.h"
 #include "proto.h"
+#include "system.h"
 
-static struct netifd_fd proto_fd;
+static int proto_fd = -1;
 
 enum proto_shell_sm {
 	S_IDLE,
@@ -49,6 +50,18 @@ struct proto_shell_handler {
 	char script_name[];
 };
 
+struct proto_shell_dependency {
+	struct list_head list;
+
+	struct proto_shell_state *proto;
+	struct interface_user dep;
+
+	union if_addr host;
+	bool v6;
+
+	char interface[];
+};
+
 struct proto_shell_state {
 	struct interface_proto_state proto;
 	struct proto_shell_handler *handler;
@@ -63,8 +76,69 @@ struct proto_shell_state {
 	bool proto_task_killed;
 
 	int last_error;
+
+	struct list_head deps;
 };
 
+static void
+proto_shell_check_dependencies(struct proto_shell_state *state)
+{
+	struct proto_shell_dependency *dep;
+	bool available = true;
+
+	list_for_each_entry(dep, &state->deps, list) {
+		if (dep->dep.iface)
+			continue;
+
+		available = false;
+		break;
+	}
+
+	interface_set_available(state->proto.iface, available);
+}
+
+static void
+proto_shell_if_up_cb(struct interface_user *dep, struct interface *iface,
+		     enum interface_event ev);
+static void
+proto_shell_if_down_cb(struct interface_user *dep, struct interface *iface,
+		       enum interface_event ev);
+
+static void
+proto_shell_update_host_dep(struct proto_shell_dependency *dep)
+{
+	struct interface *iface = NULL;
+
+	if (dep->dep.iface)
+		goto out;
+
+	if (dep->interface[0])
+		iface = vlist_find(&interfaces, dep->interface, iface, node);
+
+	iface = interface_ip_add_target_route(&dep->host, dep->v6, iface);
+	if (!iface)
+		goto out;
+
+	interface_remove_user(&dep->dep);
+	dep->dep.cb = proto_shell_if_down_cb;
+	interface_add_user(&dep->dep, iface);
+
+out:
+	proto_shell_check_dependencies(dep->proto);
+}
+
+static void
+proto_shell_clear_host_dep(struct proto_shell_state *state)
+{
+	struct proto_shell_dependency *dep, *tmp;
+
+	list_for_each_entry_safe(dep, tmp, &state->deps, list) {
+		interface_remove_user(&dep->dep);
+		list_del(&dep->list);
+		free(dep);
+	}
+}
+
 static int
 proto_shell_handler(struct interface_proto_state *proto,
 		    enum interface_proto_cmd cmd, bool force)
@@ -86,6 +160,7 @@ proto_shell_handler(struct interface_proto_state *proto,
 	if (cmd == PROTO_CMD_SETUP) {
 		action = "setup";
 		state->last_error = -1;
+		proto_shell_clear_host_dep(state);
 	} else {
 		if (state->sm == S_TEARDOWN)
 			return 0;
@@ -131,6 +206,41 @@ proto_shell_handler(struct interface_proto_state *proto,
 }
 
 static void
+proto_shell_if_up_cb(struct interface_user *dep, struct interface *iface,
+		     enum interface_event ev)
+{
+	struct proto_shell_dependency *pdep;
+
+	if (ev != IFEV_UP)
+		return;
+
+	pdep = container_of(dep, struct proto_shell_dependency, dep);
+	proto_shell_update_host_dep(pdep);
+}
+
+static void
+proto_shell_if_down_cb(struct interface_user *dep, struct interface *iface,
+		       enum interface_event ev)
+{
+	struct proto_shell_dependency *pdep;
+	struct proto_shell_state *state;
+
+	if (ev == IFEV_UP)
+		return;
+
+	pdep = container_of(dep, struct proto_shell_dependency, dep);
+	interface_remove_user(dep);
+	dep->cb = proto_shell_if_up_cb;
+	interface_add_user(dep, NULL);
+
+	state = pdep->proto;
+	if (state->sm == S_IDLE) {
+		state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
+		proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false);
+	}
+}
+
+static void
 proto_shell_task_finish(struct proto_shell_state *state,
 			struct netifd_process *task)
 {
@@ -212,6 +322,8 @@ proto_shell_free(struct interface_proto_state *proto)
 	struct proto_shell_state *state;
 
 	state = container_of(proto, struct proto_shell_state, proto);
+	uloop_timeout_cancel(&state->teardown_timeout);
+	proto_shell_clear_host_dep(state);
 	netifd_kill_process(&state->script_task);
 	netifd_kill_process(&state->proto_task);
 	free(state->config);
@@ -275,6 +387,9 @@ enum {
 	NOTIFY_TUNNEL,
 	NOTIFY_DATA,
 	NOTIFY_KEEP,
+	NOTIFY_HOST,
+	NOTIFY_DNS,
+	NOTIFY_DNS_SEARCH,
 	__NOTIFY_LAST
 };
 
@@ -293,6 +408,9 @@ static const struct blobmsg_policy notify_attr[__NOTIFY_LAST] = {
 	[NOTIFY_TUNNEL] = { .name = "tunnel", .type = BLOBMSG_TYPE_TABLE },
 	[NOTIFY_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE },
 	[NOTIFY_KEEP] = { .name = "keep", .type = BLOBMSG_TYPE_BOOL },
+	[NOTIFY_HOST] = { .name = "host", .type = BLOBMSG_TYPE_STRING },
+	[NOTIFY_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
+	[NOTIFY_DNS_SEARCH] = { .name = "dns_search", .type = BLOBMSG_TYPE_ARRAY },
 };
 
 static int
@@ -344,6 +462,7 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
 
 		interface_set_l3_dev(iface, dev);
 		device_claim(&iface->l3_dev);
+		device_set_present(dev, true);
 	}
 
 	if (!keep)
@@ -357,6 +476,12 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
 	if ((cur = tb[NOTIFY_ROUTES6]) != NULL)
 		proto_shell_parse_route_list(state->proto.iface, cur, true);
 
+	if ((cur = tb[NOTIFY_DNS]))
+		interface_add_dns_server_list(&iface->proto_ip, cur);
+
+	if ((cur = tb[NOTIFY_DNS_SEARCH]))
+		interface_add_dns_search_list(&iface->proto_ip, cur);
+
 	interface_update_complete(state->proto.iface);
 
 	if (!keep)
@@ -492,6 +617,59 @@ proto_shell_set_available(struct proto_shell_state *state, struct blob_attr **tb
 }
 
 static int
+proto_shell_add_host_dependency(struct proto_shell_state *state, struct blob_attr **tb)
+{
+	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;
+
+	if (!host)
+		return UBUS_STATUS_INVALID_ARGUMENT;
+
+	dep = calloc(1, sizeof(*dep) + ifnamelen);
+	if (inet_pton(AF_INET, blobmsg_data(host), &dep->host) < 1) {
+		if (inet_pton(AF_INET6, blobmsg_data(host), &dep->host) < 1) {
+			free(dep);
+			return UBUS_STATUS_INVALID_ARGUMENT;
+		} else {
+			dep->v6 = true;
+		}
+	}
+
+	dep->proto = state;
+	if (ifname)
+		memcpy(dep->interface, blobmsg_data(ifname), ifnamelen);
+	else
+		dep->interface[0] = 0;
+
+	dep->dep.cb = proto_shell_if_up_cb;
+	interface_add_user(&dep->dep, NULL);
+	list_add(&dep->list, &state->deps);
+	proto_shell_update_host_dep(dep);
+	if (!dep->dep.iface)
+		return UBUS_STATUS_NOT_FOUND;
+
+	return 0;
+}
+
+static int
+proto_shell_setup_failed(struct proto_shell_state *state)
+{
+	switch (state->sm) {
+	case S_IDLE:
+		state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
+		/* fall through */
+	case S_SETUP:
+		proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false);
+		break;
+	default:
+		break;
+	}
+	return 0;
+}
+
+static int
 proto_shell_notify(struct interface_proto_state *proto, struct blob_attr *attr)
 {
 	struct proto_shell_state *state;
@@ -516,6 +694,10 @@ proto_shell_notify(struct interface_proto_state *proto, struct blob_attr *attr)
 		return proto_shell_block_restart(state, tb);
 	case 5:
 		return proto_shell_set_available(state, tb);
+	case 6:
+		return proto_shell_add_host_dependency(state, tb);
+	case 7:
+		return proto_shell_setup_failed(state);
 	default:
 		return UBUS_STATUS_INVALID_ARGUMENT;
 	}
@@ -528,6 +710,8 @@ proto_shell_attach(const struct proto_handler *h, struct interface *iface,
 	struct proto_shell_state *state;
 
 	state = calloc(1, sizeof(*state));
+	INIT_LIST_HEAD(&state->deps);
+
 	state->config = malloc(blob_pad_len(attr));
 	if (!state->config)
 		goto error;
@@ -538,10 +722,10 @@ proto_shell_attach(const struct proto_handler *h, struct interface *iface,
 	state->proto.cb = proto_shell_handler;
 	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.dir_fd = proto_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.dir_fd = proto_fd;
 	state->proto_task.log_prefix = iface->name;
 	state->handler = container_of(h, struct proto_shell_handler, proto);
 
@@ -645,15 +829,12 @@ proto_shell_add_handler(const char *script, json_object *obj)
 
 	name = json_object_get_string(tmp);
 
-	handler = calloc(1, sizeof(*handler) +
-			 strlen(script) + 1 +
-			 strlen(name) + 1);
+	handler = calloc_a(sizeof(*handler) + strlen(script) + 1,
+			   &str, strlen(name) + 1);
 	if (!handler)
 		return;
 
 	strcpy(handler->script_name, script);
-
-	str = handler->script_name + strlen(handler->script_name) + 1;
 	strcpy(str, name);
 
 	proto = &handler->proto;
@@ -741,11 +922,11 @@ static void __init proto_shell_init(void)
 	if (chdir("./proto"))
 		goto close_cur;
 
-	proto_fd.fd = open(".", O_RDONLY | O_DIRECTORY);
-	if (proto_fd.fd < 0)
+	proto_fd = open(".", O_RDONLY | O_DIRECTORY);
+	if (proto_fd < 0)
 		goto close_cur;
 
-	netifd_fd_add(&proto_fd);
+	system_fd_set_cloexec(proto_fd);
 	glob("./*.sh", 0, NULL, &g);
 	for (i = 0; i < g.gl_pathc; i++)
 		proto_shell_add_script(g.gl_pathv[i]);