X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-shell.c;h=38d3871ff6f95858064e7f15b8c1576e30bcb0d2;hp=2317209b2442c8619adc7ed1a62f6eb87234a11f;hb=e93c42c036c4b4df1f65f261def31cf1a429e942;hpb=b0b11b2295fbb8399949139d82156e123e005902

diff --git a/proto-shell.c b/proto-shell.c
index 2317209..38d3871 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,
@@ -43,7 +44,7 @@ enum proto_shell_sm {
 struct proto_shell_handler {
 	struct list_head list;
 	struct proto_handler proto;
-	struct config_param_list config;
+	struct uci_blob_param_list config;
 	char *config_buf;
 	bool init_available;
 	char script_name[];
@@ -57,6 +58,8 @@ struct proto_shell_dependency {
 
 	union if_addr host;
 	bool v6;
+
+	char interface[];
 };
 
 struct proto_shell_state {
@@ -104,12 +107,15 @@ proto_shell_if_down_cb(struct interface_user *dep, struct interface *iface,
 static void
 proto_shell_update_host_dep(struct proto_shell_dependency *dep)
 {
-	struct interface *iface;
+	struct interface *iface = NULL;
 
 	if (dep->dep.iface)
 		goto out;
 
-	iface = interface_ip_add_target_route(&dep->host, dep->v6);
+	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;
 
@@ -219,7 +225,7 @@ proto_shell_if_down_cb(struct interface_user *dep, struct interface *iface,
 	struct proto_shell_dependency *pdep;
 	struct proto_shell_state *state;
 
-	if (ev == IFEV_UP)
+	if (ev == IFEV_UP || ev == IFEV_UPDATE)
 		return;
 
 	pdep = container_of(dep, struct proto_shell_dependency, dep);
@@ -316,6 +322,7 @@ 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);
@@ -455,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)
@@ -613,17 +621,28 @@ proto_shell_add_host_dependency(struct proto_shell_state *state, struct blob_att
 {
 	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));
-	if (!inet_pton(AF_INET, blobmsg_data(host), &dep->host)) {
-		free(dep);
-		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);
@@ -703,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);
 
@@ -736,7 +755,7 @@ get_field(json_object *obj, const char *name, json_type type)
 }
 
 static char *
-proto_shell_parse_config(struct config_param_list *config, json_object *obj)
+proto_shell_parse_config(struct uci_blob_param_list *config, json_object *obj)
 {
 	struct blobmsg_policy *attrs;
 	char *str_buf, *str_cur;
@@ -810,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;
@@ -906,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]);