X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-shell.c;h=02f1836d8da4764fb37ff82cd014fff739afa431;hp=ae0f9383f4fbea2c47843f9e161b48f5c0080f09;hb=ec72439d9960e6f37293c715c3f7b9584b03ddd8;hpb=fa31a460d8cb59288c4324eb684bd3ce21e837c3

diff --git a/proto-shell.c b/proto-shell.c
index ae0f938..02f1836 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,
@@ -316,6 +317,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);
@@ -704,10 +706,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);
 
@@ -811,15 +813,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;
@@ -907,11 +906,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]);