projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netifd: Fix restore of original device settings
[project/netifd.git]
/
proto-shell.c
diff --git
a/proto-shell.c
b/proto-shell.c
index
7e9cbcf
..
0131e19
100644
(file)
--- 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;
enum proto_shell_sm sm;
bool proto_task_killed;
+ bool renew_pending;
int last_error;
int last_error;
@@
-162,11
+163,19
@@
proto_shell_handler(struct interface_proto_state *proto,
} else if (cmd == PROTO_CMD_RENEW) {
if (!(handler->proto.flags & PROTO_FLAG_RENEW_AVAILABLE))
return 0;
} 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;
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);
if (state->script_task.uloop.pending) {
if (state->sm != S_SETUP_ABORT) {
uloop_timeout_set(&state->teardown_timeout, 1000);
@@
-256,6
+265,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->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:
break;
case S_SETUP_ABORT:
@@
-428,6
+440,9
@@
proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
bool keep = false;
bool up;
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;
if (!tb[NOTIFY_LINK_UP])
return UBUS_STATUS_INVALID_ARGUMENT;
@@
-491,9
+506,11
@@
proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
interface_update_complete(state->proto.iface);
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;
}
return 0;
}
@@
-531,6
+548,9
@@
proto_shell_run_command(struct proto_shell_state *state, struct blob_attr **tb)
static char *argv[64];
static char *env[32];
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;
if (!tb[NOTIFY_COMMAND])
goto error;
@@
-560,7
+580,8
@@
proto_shell_kill_command(struct proto_shell_state *state, struct blob_attr **tb)
signal = SIGTERM;
if (state->proto_task.uloop.pending) {
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);
}
kill(state->proto_task.uloop.pid, signal);
}
@@
-629,6
+650,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;
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;
if (!host)
return UBUS_STATUS_INVALID_ARGUMENT;
@@
-658,6
+682,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)
{
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);
switch (state->sm) {
case S_IDLE:
state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
@@
-665,10
+691,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:
proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false);
break;
+ case S_SETUP_ABORT:
+ case S_TEARDOWN:
default:
default:
+ ret = UBUS_STATUS_PERMISSION_DENIED;
break;
}
break;
}
- return
0
;
+ return
ret
;
}
static int
}
static int