X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-shell.c;h=5f2224b3d11309d283adabb60b6100ada588fa0c;hp=d85a8d7e022bd2808c88b5d6afa0a5fd4c3bdfef;hb=c430d3278b91369204c83cd135673a5d5cded699;hpb=4156ba83483d0f1203fd17159974ae958325368c

diff --git a/proto-shell.c b/proto-shell.c
index d85a8d7..5f2224b 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;
 
@@ -162,11 +163,18 @@ proto_shell_handler(struct interface_proto_state *proto,
 	} else if (cmd == PROTO_CMD_RENEW) {
 		if (!(handler->proto.flags & PROTO_FLAG_RENEW_AVAILABLE))
 			return 0;
+
+		if (state->script_task.uloop.pending) {
+			state->renew_pending = true;
+			return 0;
+		}
+
 		action = "renew";
 	} else {
 		if (state->sm == S_TEARDOWN)
 			return 0;
 
+		state->renew_pending = false;
 		if (state->script_task.uloop.pending) {
 			if (state->sm != S_SETUP_ABORT) {
 				uloop_timeout_set(&state->teardown_timeout, 1000);
@@ -256,6 +264,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: