enum proto_shell_sm sm;
bool proto_task_killed;
+ bool renew_pending;
int last_error;
} 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;
+ }
+
+ state->renew_pending = false;
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);
uloop_timeout_set(&state->teardown_timeout, 5000);
}
+ D(INTERFACE, "run %s for interface '%s'\n", action, proto->iface->name);
config = blobmsg_format_json(state->config, true);
if (!config)
return -1;
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:
return UBUS_STATUS_INVALID_ARGUMENT;
up = blobmsg_get_bool(tb[NOTIFY_LINK_UP]);
- if (!up) {
+ if (!up || state->sm == S_TEARDOWN) {
state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
return 0;
}