X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-shell.c;h=977cdbceedc8d69639dd79082838610a325cf0bc;hp=7e9cbcf05231fee8b2da19ac08fdf16fe31e1dad;hb=d788b74c31d95a13630b0d61f69c5bd3eab63ca4;hpb=c9e9cbb340953d04a34816d6b8475608b8ec6eae

diff --git a/proto-shell.c b/proto-shell.c
index 7e9cbcf..977cdbc 100644
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -71,6 +71,7 @@ struct proto_shell_state {
 
 	enum proto_shell_sm sm;
 	bool proto_task_killed;
+	bool renew_pending;
 
 	int last_error;
 
@@ -155,36 +156,63 @@ proto_shell_handler(struct interface_proto_state *proto,
 	proc = &state->script_task;
 
 	if (cmd == PROTO_CMD_SETUP) {
-		action = "setup";
-		state->last_error = -1;
-		proto_shell_clear_host_dep(state);
-		state->sm = S_SETUP;
+		switch (state->sm) {
+		case S_IDLE:
+			action = "setup";
+			state->last_error = -1;
+			proto_shell_clear_host_dep(state);
+			state->sm = S_SETUP;
+			break;
+
+		case S_SETUP_ABORT:
+		case S_TEARDOWN:
+		case S_SETUP:
+			return 0;
+
+		default:
+			return -1;
+		}
 	} else if (cmd == PROTO_CMD_RENEW) {
 		if (!(handler->proto.flags & PROTO_FLAG_RENEW_AVAILABLE))
 			return 0;
-		action = "renew";
-	} else {
-		if (state->sm == S_TEARDOWN)
-			return 0;
 
 		if (state->script_task.uloop.pending) {
-			if (state->sm != S_SETUP_ABORT) {
+			state->renew_pending = true;
+			return 0;
+		}
+
+		state->renew_pending = false;
+		action = "renew";
+	} else {
+		switch (state->sm) {
+		case S_SETUP:
+			if (state->script_task.uloop.pending) {
 				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->renew_pending = false;
 				state->sm = S_SETUP_ABORT;
+				return 0;
+			}
+		/* fall through if no script task is running */
+		case S_IDLE:
+			action = "teardown";
+			state->renew_pending = false;
+			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);
+			break;
+
+		case S_TEARDOWN:
 			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;
+		default:
+			return -1;
 		}
-		uloop_timeout_set(&state->teardown_timeout, 5000);
 	}
 
 	D(INTERFACE, "run %s for interface '%s'\n", action, proto->iface->name);
@@ -256,6 +284,9 @@ proto_shell_task_finish(struct proto_shell_state *state,
 		if (task == &state->proto_task)
 			proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN,
 					    false);
+		if (task == &state->script_task && state->renew_pending)
+			proto_shell_handler(&state->proto, PROTO_CMD_RENEW,
+					    false);
 		break;
 
 	case S_SETUP_ABORT:
@@ -428,6 +459,9 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
 	bool keep = false;
 	bool up;
 
+	if (state->sm == S_TEARDOWN || state->sm == S_SETUP_ABORT)
+		return UBUS_STATUS_PERMISSION_DENIED;
+
 	if (!tb[NOTIFY_LINK_UP])
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
@@ -491,9 +525,11 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
 
 	interface_update_complete(state->proto.iface);
 
-	if (!keep)
-		state->proto.proto_event(&state->proto, IFPEV_UP);
-	state->sm = S_IDLE;
+	if ((state->sm != S_SETUP_ABORT) && (state->sm != S_TEARDOWN)) {
+		if (!keep)
+			state->proto.proto_event(&state->proto, IFPEV_UP);
+		state->sm = S_IDLE;
+	}
 
 	return 0;
 }
@@ -531,6 +567,9 @@ proto_shell_run_command(struct proto_shell_state *state, struct blob_attr **tb)
 	static char *argv[64];
 	static char *env[32];
 
+	if (state->sm == S_TEARDOWN || state->sm == S_SETUP_ABORT)
+		return UBUS_STATUS_PERMISSION_DENIED;
+
 	if (!tb[NOTIFY_COMMAND])
 		goto error;
 
@@ -560,7 +599,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;
+		if (signal == SIGTERM || signal == SIGKILL)
+			state->proto_task_killed = true;
 		kill(state->proto_task.uloop.pid, signal);
 	}
 
@@ -629,6 +669,9 @@ proto_shell_add_host_dependency(struct proto_shell_state *state, struct blob_att
 	const char *ifname_str = ifname_a ? blobmsg_data(ifname_a) : "";
 	char *ifname;
 
+	if (state->sm == S_TEARDOWN || state->sm == S_SETUP_ABORT)
+		return UBUS_STATUS_PERMISSION_DENIED;
+
 	if (!host)
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
@@ -658,6 +701,8 @@ proto_shell_add_host_dependency(struct proto_shell_state *state, struct blob_att
 static int
 proto_shell_setup_failed(struct proto_shell_state *state)
 {
+	int ret = 0;
+
 	switch (state->sm) {
 	case S_IDLE:
 		state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
@@ -665,10 +710,13 @@ proto_shell_setup_failed(struct proto_shell_state *state)
 	case S_SETUP:
 		proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false);
 		break;
+	case S_SETUP_ABORT:
+	case S_TEARDOWN:
 	default:
+		ret = UBUS_STATUS_PERMISSION_DENIED;
 		break;
 	}
-	return 0;
+	return ret;
 }
 
 static int